mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Issue #2846 LAN vars cleanup

Browse Source
This commit is contained in:
Cameron 2017-11-07 06:59:11 -08:00
parent e472801191
commit 35f5748ba2
9 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/users_extended.php
View File

@ -621,7 +621,7 @@ e107::js('footer-inline', js());
}
else
{
$ret .= str_replace('--FILE--',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
$ret .= str_replace('[x]',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
}
}
}
@ -2373,7 +2373,7 @@ class users_ext
}
else
{
$ret .= str_replace('--FILE--',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
$ret .= str_replace('[x]',e_CORE.'sql/extended_'.$f.'.php',EXTLAN_78);
}
}
}

10
e107_handlers/userclass_class.php
View File

@ -494,7 +494,7 @@ class user_class
if($k != e_UC_PUBLIC && $k != e_UC_NOBODY && $k != e_UC_READONLY) // remove everyone, nobody and readonly from list.
{
$s = ($curval == ('-'.$k) && $curval !== '') ? "selected='selected'" : '';
$text .= "<option class='uc-select-inverted' value='-".$k."' ".$s.">".str_replace("--CLASS--", $v, UC_LAN_INVERT)."</option>\n";
$text .= "<option class='uc-select-inverted' value='-".$k."' ".$s.">".str_replace("[x]", $v, UC_LAN_INVERT)."</option>\n";
}
}
$text .= "</optgroup>\n";
@ -790,7 +790,7 @@ class user_class
$ucString = $this->class_tree[$classIndex]['userclass_name'];
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
$ucString = str_replace('[x]', $ucString, UC_LAN_INVERT);
}
return "<option value='{$classSign}{$classIndex}'{$sel}{$style}>".$prefix.$ucString."</option>\n";
}
@ -826,7 +826,7 @@ class user_class
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
$ucString = str_replace('[x]', $ucString, UC_LAN_INVERT);
}
$checked = in_array($classnum, $tmp) ? true : false;
@ -866,7 +866,7 @@ class user_class
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
$ucString = str_replace('[x]', $ucString, UC_LAN_INVERT);
}
$description = $ucString.' ('.$this->class_tree[$classIndex]['userclass_description'].")";
@ -928,7 +928,7 @@ class user_class
{
//$val = abs($id);
//$name = isset($this->class_tree[$val]['userclass_name']) ? $this->class_tree[$val]['userclass_name'] : $this->fixed_classes[$val];
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
$ucString = str_replace('[x]', $ucString, UC_LAN_INVERT);
}
return $ucString;
}

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

@ -23,7 +23,7 @@ define("FLALAN_10", "Delete / Ban checked entries");
define("FLALAN_15", "The following IP address(es) have been auto-banned - user attempted more than ten failed logins");
define("FLALAN_16", "delete this auto ban list");
define("FLALAN_17", "Auto-ban list deleted");
define('FLALAN_18', "Could not ban IP address --IP-- - on whitelist");
// define('FLALAN_18', "Could not ban IP address --IP-- - on whitelist");
// define('FLALAN_19', "Check All Delete");
?>

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

@ -88,7 +88,7 @@ define("EXTLAN_74", "is a reserved field name and can not be used.");
define("EXTLAN_75", "Error adding field to database.");
define("EXTLAN_76", "Invalid characters in field name - only A-Z, a-z, 0-9, allowed.");
define("EXTLAN_77", "Category not deleted - must delete fields in category first: ");
define("EXTLAN_78", "Cannot find file --FILE-- needed to create data table");
define("EXTLAN_78", "Cannot find file [x] needed to create data table");
define("EXTLAN_79", "Label");
define("EXTLAN_80", "Validation error - aborted.");

2
e107_languages/English/lan_search.php
View File

@ -21,7 +21,7 @@ define("LAN_198", "No matches found");
define("LAN_199", "Search For:");
define("LAN_416", "You must be logged in to access this page");
define("LAN_417", "Search terms must be at least --CHARS-- characters.");
define("LAN_417", "Search terms must be at least [x] characters.");
define("LAN_418", "Other Pages");

3
e107_languages/English/lan_userclass.php
View File

@ -20,8 +20,7 @@ define("UC_LAN_7", "Forum Moderators");
define("UC_LAN_8","Admins and Mods");
define("UC_LAN_9","New Users");
define("UC_LAN_10", "Search Bots");
define("UC_LAN_INVERT", "Not --CLASS--");
define("UC_LAN_INVERT", "Not [x]");
define("UC_LAN_INVERTLABEL", "Everyone but..");
?>

4
e107_plugins/import/admin_import.php
View File

@ -795,7 +795,7 @@ class import_main_ui extends e_admin_ui
$errorCounter++;
$line_error = $exporter->getErrorText($result);
// if ($msg) $msg .= "<br />";
$msg = str_replace(array('--ERRNUM--','--DB--'),array($line_error,$k),LAN_CONVERT_46).$loopCounter;
$msg = str_replace(array('[x]','[y]'),array($line_error,$k),LAN_CONVERT_46).$loopCounter;
$mes->addError($msg); // couldn't set query
}
}
@ -805,7 +805,7 @@ class import_main_ui extends e_admin_ui
unset($exporter);
$msg = str_replace(array('--LINES--','--USERS--', '--ERRORS--','--BLOCK--'),
$msg = str_replace(array('[x]','[y]', '[z]','[w]'),
array($loopCounter,$loopCounter-$errorCounter,$errorCounter, $k),LAN_CONVERT_47);
$mes->addSuccess($msg); // couldn't set query
}

10
e107_plugins/import/languages/English_admin.php
View File

@ -60,8 +60,8 @@ define("LAN_CONVERT_30","Import routine Information");
define("LAN_CONVERT_31","CSV data file does not exist, or invalid permissions");
define("LAN_CONVERT_32","Error reading CSV data file");
define("LAN_CONVERT_33","Error in CSV data line ");
define("LAN_CONVERT_34","Error: --ERRNUM-- while writing to user database, line ");
define("LAN_CONVERT_35","CSV import completed. --LINES-- read, --USERS-- users added, --ERRORS-- errors");
define("LAN_CONVERT_34","Error: [x] while writing to user database, line ");
define("LAN_CONVERT_35","CSV import completed. [x] read, [y] users added, [z] errors");
define("LAN_CONVERT_36","Filename for CSV data");
define("LAN_CONVERT_37","Invalid format specification for import type");
define("LAN_CONVERT_38","Delete existing data");
@ -72,8 +72,8 @@ define("LAN_CONVERT_42","Error in definition file - required class does not exis
define("LAN_CONVERT_43","Error connecting to source database");
define("LAN_CONVERT_44","Query setup error for ");
define("LAN_CONVERT_45","Cannot read import code file");
define("LAN_CONVERT_46","Error: --ERRNUM-- while writing to --DB-- database, line ");
define("LAN_CONVERT_47","Batch --BLOCK-- import completed. --LINES-- read, --USERS-- added, --ERRORS-- errors");
define("LAN_CONVERT_46","Error: [x] while writing to [y] database, line ");
define("LAN_CONVERT_47","Batch [w] import completed. [x] read, [y] added, [z] errors");
define("LAN_CONVERT_48","Forum posts");
define("LAN_CONVERT_49","Drupal");
define("LAN_CONVERT_50","Basic import");
@ -84,7 +84,7 @@ define("LAN_CONVERT_54","Drupal Base URL");
define("LAN_CONVERT_55","The base URL path (i.e., directory) of the Drupal installation (e.g., /drupal/).");
define("LAN_CONVERT_56","Drupal Base Path");
define("LAN_CONVERT_57", "No error");
define("LAN_CONVERT_58", "Can\'t change main admin data");
define("LAN_CONVERT_58", "Can't change main admin data");
define("LAN_CONVERT_59", "invalid field passed");
define("LAN_CONVERT_60", "Mandatory field not set");
define("LAN_CONVERT_61", "User already exists");

2
search.php
View File

@ -944,7 +944,7 @@ class search extends e_shortcode
elseif (strlen($full_query) < ($char_count = ($this->search_prefs['mysql_sort'] ? 4 : 3)))
{
$perform_search = false;
$this->message = str_replace('--CHARS--', $char_count, LAN_417);
$this->message = str_replace('[x]', $char_count, LAN_417);
}
elseif ($this->search_prefs['time_restrict'])
{