mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Replace Duplicate LANs : LAN_ID

Browse Source 
Duplicate LANs for ID replaced with LAN_ID
Plus correct bad quotes in installer LANINS_030.
This commit is contained in:
MikeyGMT
2015-07-02 13:03:03 +01:00
parent 586c5307e3
commit dccba01f37
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/db.php
View File

@@ -1869,7 +1869,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
<thead> <thead>
<tr> <tr>
<th>".DBLAN_41."</th> <th>".DBLAN_41."</th>
<th>".DBLAN_42."</th> <th>".LAN_ID."</th>
<th>".DBLAN_43."</th> <th>".DBLAN_43."</th>
<th class='center last'>".LAN_OPTIONS."</th> <th class='center last'>".LAN_OPTIONS."</th>
</tr> </tr>

2
e107_admin/mailout.php
View File

@@ -289,7 +289,7 @@ class mailout_main_ui extends e_admin_ui
'mail_selectors' => array('title' => LAN_MAILOUT_03, 'type'=>'method', 'data'=>false, 'nolist' => true, 'writeParms'=>'nolabel=0'), 'mail_selectors' => array('title' => LAN_MAILOUT_03, 'type'=>'method', 'data'=>false, 'nolist' => true, 'writeParms'=>'nolabel=0'),
'mail_title' => array('title' => LAN_MAILOUT_135, 'type'=>'text', 'forced' => TRUE, 'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1', 'help'=>'whatever'), 'mail_title' => array('title' => LAN_MAILOUT_135, 'type'=>'text', 'forced' => TRUE, 'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1', 'help'=>'whatever'),
'mail_sender_name' => array('title' => LAN_MAILOUT_150, 'type'=>'method', 'data'=>false), 'mail_sender_name' => array('title' => LAN_MAILOUT_150, 'type'=>'method', 'data'=>false),
'mail_sender_email' => array('title' => LAN_MAILOUT_149,'type'=>'method','data'=>false), 'mail_sender_email' => array('title' => LAN_ID,'type'=>'method','data'=>false),
'mail_copy_to' => array('title' => LAN_MAILOUT_151,'tab'=>1, 'type'=>'method','data'=>false), 'mail_copy_to' => array('title' => LAN_MAILOUT_151,'tab'=>1, 'type'=>'method','data'=>false),
'mail_bcopy_to' => array('title' => LAN_MAILOUT_152,'tab'=>1, 'type'=>'method','data'=>false), 'mail_bcopy_to' => array('title' => LAN_MAILOUT_152,'tab'=>1, 'type'=>'method','data'=>false),
'mail_subject' => array('title' => LAN_MAILOUT_06, 'type'=>'text', 'forced' => TRUE,'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1'), 'mail_subject' => array('title' => LAN_MAILOUT_06, 'type'=>'text', 'forced' => TRUE,'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1'),

4
e107_admin/upload.php
View File

@@ -678,7 +678,7 @@ switch ($action)
</colgroup> </colgroup>
<tr> <tr>
<td class='forumheader3'>".UPLLAN_3."</td> <td class='forumheader3'>".LAN_ID."</td>
<td class='forumheader3'>{$upload_id}</td> <td class='forumheader3'>{$upload_id}</td>
</tr> </tr>
@@ -763,7 +763,7 @@ switch ($action)
<col style='width:50px;white-space:nowrap' /> <col style='width:50px;white-space:nowrap' />
</colgroup> </colgroup>
<tr> <tr>
<td class='fcaption'>".UPLLAN_22."</td> <td class='fcaption'>".LAN_ID."</td>
<td class='fcaption'>".LAN_DATE."</td> <td class='fcaption'>".LAN_DATE."</td>
<td class='fcaption'>".UPLLAN_5."</td> <td class='fcaption'>".UPLLAN_5."</td>
<td class='fcaption'>".UPLLAN_23."</td> <td class='fcaption'>".UPLLAN_23."</td>

2
e107_languages/English/admin/lan_admin_log.php
View File

@@ -94,7 +94,7 @@ define("RL_LAN_098", "Source");
define("RL_LAN_099", "Comments"); define("RL_LAN_099", "Comments");
define("RL_LAN_100", "CID"); // Comment ID field define("RL_LAN_100", "CID"); // Comment ID field
define("RL_LAN_101", "PID"); define("RL_LAN_101", "PID");
define("RL_LAN_102", "ID"); //define("RL_LAN_102", "ID");//LAN_ID
define("RL_LAN_103", "Subject"); define("RL_LAN_103", "Subject");
define("RL_LAN_104", "UID"); define("RL_LAN_104", "UID");
// define("RL_LAN_105", "Author"); // define("RL_LAN_105", "Author");

2
e107_languages/English/admin/lan_db.php
View File

@@ -49,7 +49,7 @@ define("DBLAN_38", "Start Verify");
define("DBLAN_39", "Database Record Validation"); define("DBLAN_39", "Database Record Validation");
define("DBLAN_40", "Record Validation : "); define("DBLAN_40", "Record Validation : ");
define("DBLAN_41", "table"); define("DBLAN_41", "table");
define("DBLAN_42", "id"); //define("DBLAN_42", "id");//LAN_ID
define("DBLAN_43", "remark"); define("DBLAN_43", "remark");
// define("DBLAN_44", "options"); // define("DBLAN_44", "options");
define("DBLAN_45", "Id Not Found!"); define("DBLAN_45", "Id Not Found!");

2
e107_languages/English/admin/lan_mailout.php
View File

@@ -59,7 +59,7 @@ define("LAN_MAILOUT_45", "User Email");
define("LAN_MAILOUT_46", "User-Match"); define("LAN_MAILOUT_46", "User-Match");
define("LAN_MAILOUT_47", "contains"); define("LAN_MAILOUT_47", "contains");
define("LAN_MAILOUT_48", "equals"); define("LAN_MAILOUT_48", "equals");
define("LAN_MAILOUT_49", "Id"); //define("LAN_MAILOUT_49", "Id");//LAN_ID
define("LAN_MAILOUT_50", "Author"); define("LAN_MAILOUT_50", "Author");
define("LAN_MAILOUT_51", "Subject"); define("LAN_MAILOUT_51", "Subject");
define("LAN_MAILOUT_52", "Last mod"); define("LAN_MAILOUT_52", "Last mod");

4
e107_languages/English/admin/lan_upload.php
View File

@@ -22,7 +22,7 @@
define("UPLLAN_1", "Upload removed from list."); define("UPLLAN_1", "Upload removed from list.");
define("UPLLAN_2", "Settings saved in database"); define("UPLLAN_2", "Settings saved in database");
define("UPLLAN_3", "Upload ID"); //define("UPLLAN_3", "Upload ID");//LAN_ID
define('UPLLAN_4', 'Nothing changed - not updated'); define('UPLLAN_4', 'Nothing changed - not updated');
define("UPLLAN_5", "Poster"); define("UPLLAN_5", "Poster");
define("UPLLAN_6", "Email"); define("UPLLAN_6", "Email");
@@ -42,7 +42,7 @@ define("UPLLAN_18", "View details");
define("UPLLAN_19", "There are no unmoderated public uploads"); define("UPLLAN_19", "There are no unmoderated public uploads");
define("UPLLAN_20", "There"); define("UPLLAN_20", "There");
define("UPLLAN_21", "unmoderated public upload"); define("UPLLAN_21", "unmoderated public upload");
define("UPLLAN_22", "ID"); //define("UPLLAN_22", "ID");//LAN_ID
define("UPLLAN_23", "Name"); define("UPLLAN_23", "Name");
define("UPLLAN_24", "Filetype"); define("UPLLAN_24", "Filetype");
define("UPLLAN_25", "Uploads Enabled?"); define("UPLLAN_25", "Uploads Enabled?");

2
e107_languages/English/lan_installer.php
View File

@@ -51,7 +51,7 @@ define("LANINS_026", "MySQL Password:");
define("LANINS_027", "MySQL Database:"); define("LANINS_027", "MySQL Database:");
define("LANINS_028", "Create Database?"); define("LANINS_028", "Create Database?");
define("LANINS_029", "Table prefix:"); define("LANINS_029", "Table prefix:");
define("LANINS_030", "The MySQL server you would like e107 to use. It can also include a port number. e.g. “hostname:port” or a path to a local socket e.g. \":/path/to/socket\" for the localhost."); define("LANINS_030", "The MySQL server you would like e107 to use. It can also include a port number. e.g. 'hostname:port' or a path to a local socket e.g. \":/path/to/socket\" for the localhost.");
define("LANINS_031", "The username you wish e107 to use to connect to your MySQL server"); define("LANINS_031", "The username you wish e107 to use to connect to your MySQL server");
define("LANINS_032", "The Password for the user you just entered. Must not contain single or double quotes."); define("LANINS_032", "The Password for the user you just entered. Must not contain single or double quotes.");
define("LANINS_033", "The MySQL database you wish e107 to reside in, sometimes referred to as a schema. Must begin with a letter. If the user has database create permissions you can opt to create the database automatically if it doesn't already exist."); define("LANINS_033", "The MySQL database you wish e107 to reside in, sometimes referred to as a schema. Must begin with a letter. If the user has database create permissions you can opt to create the database automatically if it doesn't already exist.");

2
e107_plugins/download/admin_download.php
View File

@@ -329,7 +329,7 @@ if ($action == "uopt")
$columnInfo = array( $columnInfo = array(
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"), "checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"),
"upload_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true), "upload_id" => array("title"=>LAN_ID, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true),
"upload_date" => array("title"=>DOWLAN_78, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_date" => array("title"=>DOWLAN_78, "type"=>"", "width"=>"auto", "thclass"=>""),
"upload_uploader" => array("title"=>DOWLAN_79, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_uploader" => array("title"=>DOWLAN_79, "type"=>"", "width"=>"auto", "thclass"=>""),
"upload_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""),

6
e107_plugins/download/handlers/adminDownload_class.php
View File

@@ -199,7 +199,7 @@ class adminDownload extends download
$sort_link = $sortdirection == 'asc' ? 'desc' : 'asc'; $sort_link = $sortdirection == 'asc' ? 'desc' : 'asc';
$columnInfo = array( $columnInfo = array(
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"), "checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"),
"download_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true), "download_id" => array("title"=>LAN_ID, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true),
"download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""), "download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>""), "download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>""), "download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>""),
@@ -1521,7 +1521,7 @@ class adminDownload extends download
<td> <td>
<select name='mirror_order' class='tbox'>". <select name='mirror_order' class='tbox'>".
($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>"). ($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>").
($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".DOWLAN_67."</option>" : "<option value='1'>".DOWLAN_67."</option>"). ($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".LAN_ID."</option>" : "<option value='1'>".LAN_ID."</option>").
($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")." ($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")."
</select> </select>
</td> </td>
@@ -1612,7 +1612,7 @@ class adminDownload extends download
$imgd = e_BASE.$IMAGES_DIRECTORY; $imgd = e_BASE.$IMAGES_DIRECTORY;
$columnInfo = array( $columnInfo = array(
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"), "checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"),
"upload_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true), "upload_id" => array("title"=>LAN_ID, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true),
"upload_date" => array("title"=>DOWLAN_78, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_date" => array("title"=>DOWLAN_78, "type"=>"", "width"=>"auto", "thclass"=>""),
"upload_uploader" => array("title"=>DOWLAN_79, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_uploader" => array("title"=>DOWLAN_79, "type"=>"", "width"=>"auto", "thclass"=>""),
"upload_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""), "upload_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""),

16
e107_plugins/download/includes/admin.php
View File

@@ -276,7 +276,7 @@ class download_main_admin_ui extends e_admin_ui
/* /*
$columnInfo = array( $columnInfo = array(
"checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"), "checkboxes" => array("title" => "", "forced"=> TRUE, "width" => "3%", "thclass" => "center first", "toggle" => "dl_selected"),
"download_id" => array("title"=>DOWLAN_67, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true), "download_id" => array("title"=>LAN_ID, "type"=>"", "width"=>"auto", "thclass"=>"", "forced"=>true),
"download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""), "download_name" => array("title"=>DOWLAN_12, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>""), "download_url" => array("title"=>DOWLAN_13, "type"=>"", "width"=>"auto", "thclass"=>""),
"download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>""), "download_author" => array("title"=>DOWLAN_15, "type"=>"", "width"=>"auto", "thclass"=>""),
@@ -576,7 +576,7 @@ $columnInfo = array(
</td> </td>
</tr> </tr>
<tr> <tr>
<th class='fcaption'>".DOWLAN_67."</th> <th class='fcaption'>".LAN_ID."</th>
<th class='fcaption'>".DOWLAN_113."</th> <th class='fcaption'>".DOWLAN_113."</th>
<th class='fcaption'>".DOWLAN_107."</th> <th class='fcaption'>".DOWLAN_107."</th>
<th class='fcaption'>".DOWLAN_108."</th> <th class='fcaption'>".DOWLAN_108."</th>
@@ -676,7 +676,7 @@ $columnInfo = array(
<table class="table adminform">'; <table class="table adminform">';
$text .= '<tr>'; $text .= '<tr>';
$text .= '<th>'.DOWLAN_13.'</th>'; $text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.DOWLAN_67.'</th>'; $text .= '<th>'.LAN_ID.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>'; $text .= '<th>'.DOWLAN_27.'</th>';
$text .= '<th>'.DOWLAN_11.'</th>'; $text .= '<th>'.DOWLAN_11.'</th>';
$text .= '<th>'.LAN_OPTIONS.'</th>'; $text .= '<th>'.LAN_OPTIONS.'</th>';
@@ -778,7 +778,7 @@ $columnInfo = array(
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform"> $text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="adminlist">'; <table class="adminlist">';
$text .= '<tr>'; $text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>'; $text .= '<th>'.LAN_ID.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>'; $text .= '<th>'.DOWLAN_27.'</th>';
$text .= '<th>'.DOWLAN_11.'</th>'; $text .= '<th>'.DOWLAN_11.'</th>';
$text .= '<th>'.DOWLAN_13.'</th>'; $text .= '<th>'.DOWLAN_13.'</th>';
@@ -824,7 +824,7 @@ $columnInfo = array(
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform"> $text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="table adminform">'; <table class="table adminform">';
$text .= '<tr>'; $text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>'; $text .= '<th>'.LAN_ID.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>'; $text .= '<th>'.DOWLAN_27.'</th>';
$text .= '<th>'.DOWLAN_11.'</th>'; $text .= '<th>'.DOWLAN_11.'</th>';
$text .= '<th>'.DOWLAN_13.'</th>'; $text .= '<th>'.DOWLAN_13.'</th>';
@@ -879,7 +879,7 @@ $columnInfo = array(
<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform"> <form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="table adminlist">'; <table class="table adminlist">';
$text .= '<tr>'; $text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>'; $text .= '<th>'.LAN_ID.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>'; $text .= '<th>'.DOWLAN_27.'</th>';
$text .= '<th>'.DOWLAN_13.'</th>'; $text .= '<th>'.DOWLAN_13.'</th>';
$text .= '<th>'.LAN_OPTIONS.'</th>'; $text .= '<th>'.LAN_OPTIONS.'</th>';
@@ -933,7 +933,7 @@ $columnInfo = array(
$text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform"> $text .= '<form method="post" action="'.e_SELF.'?'.e_QUERY.'" id="myform">
<table class="table adminlist">'; <table class="table adminlist">';
$text .= '<tr>'; $text .= '<tr>';
$text .= '<th>'.DOWLAN_67.'</th>'; $text .= '<th>'.LAN_ID.'</th>';
$text .= '<th>'.DOWLAN_27.'</th>'; $text .= '<th>'.DOWLAN_27.'</th>';
$text .= '<th>'.DOWLAN_11.'</th>'; $text .= '<th>'.DOWLAN_11.'</th>';
$text .= '<th>'.DOWLAN_13.'</th>'; $text .= '<th>'.DOWLAN_13.'</th>';
@@ -2096,7 +2096,7 @@ $columnInfo = array(
<td> <td>
<select name='mirror_order' class='tbox'>". <select name='mirror_order' class='tbox'>".
($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>"). ($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>").
($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".DOWLAN_67."</option>" : "<option value='1'>".DOWLAN_67."</option>"). ($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".LAN_ID."</option>" : "<option value='1'>".LAN_ID."</option>").
($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")." ($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")."
</select> </select>
</td> </td>

2
e107_plugins/download/languages/English/English_admin.php
View File

@@ -86,7 +86,7 @@ define("DOWLAN_63", "Descending");
define("DOWLAN_64", "Update Options"); define("DOWLAN_64", "Update Options");
define("DOWLAN_65", "Options Updated"); define("DOWLAN_65", "Options Updated");
define("DOWLAN_66", "Filesize"); define("DOWLAN_66", "Filesize");
define("DOWLAN_67", "ID"); //FIXME Use Generic //define("DOWLAN_67", "ID"); //FIXME Use Generic // LAN_ID
define("DOWLAN_68", "File Missing!"); define("DOWLAN_68", "File Missing!");
// define("DOWLAN_69", "Downloads handled by PHP"); // define("DOWLAN_69", "Downloads handled by PHP");
// define("DOWLAN_70", "Checking this will send all download requests through PHP."); // define("DOWLAN_70", "Checking this will send all download requests through PHP.");