mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

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");