benkeen#502 Resolved: Requested Changes

chinayin · Oct 21, 2019 · aab1a38 · aab1a38
1 parent c1a37d0
commit aab1a38
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/library.php b/library.php
@@ -38,12 +38,12 @@
 require_once(__DIR__ . "/resources/classes/Templates.class.php");
 require_once(__DIR__ . "/resources/classes/Translations.class.php");
 require_once(__DIR__ . "/resources/classes/Utils.class.php");
+require_once(__DIR__ . "/resources/classes/ImportSql.class.php");
 
 // External libs
 require_once(__DIR__ . "/resources/libs/jsv4.php");
 require_once(__DIR__ . "/resources/libs/smarty/Smarty.class.php");
 require_once(__DIR__ . "/resources/classes/SecureSmarty.class.php");
-require_once(__DIR__ . "/resources/classes/ImportSql.class.php");
 
 
 // handle magic quotes

diff --git a/resources/classes/Core.class.php b/resources/classes/Core.class.php
@@ -34,7 +34,7 @@ class Core {
 	private static $timeout = 300; // 5 minutes
 	private static $apiEnabled = false;
 	private static $importSqlFeatureEnabled=true;
-	private static $importSqlListDatabase=false;
+	private static $importSqlListDatabases=false;
 
 	// non-overridable settings
 	private static $version = "3.3.1";
@@ -179,7 +179,7 @@ private static function loadSettingsFile() {
 			self::$encryptionSalt = (isset($encryptionSalt)) ? $encryptionSalt : null;
 			self::$pluginSettings = (isset($pluginSettings)) ? $pluginSettings : array();
 			self::$importSqlFeatureEnabled = (isset($importSqlFeatureEnabled)) ? $importSqlFeatureEnabled : true;
-			self::$importSqlListDatabase = (isset($importSqlListDatabase)) ? $importSqlListDatabase : false;
+			self::$importSqlListDatabases = (isset($importSqlListDatabases)) ? $importSqlListDatabases : false;
 
 			if (isset($isInDemoMode)) {
 				self::$isInDemoMode = $isInDemoMode;
@@ -345,9 +345,9 @@ public static function isImportSqlFeatureEnabled()
     /**
      * @return bool
      */
-    public static function isImportSqlListDatabase()
+    public static function isImportSqlListDatabases()
     {
-        return self::$importSqlListDatabase;
+        return self::$importSqlListDatabases;
     }
 
 	/**

diff --git a/resources/classes/ImportSql.class.php b/resources/classes/ImportSql.class.php
@@ -58,7 +58,7 @@ private static function checkDBinIgnore($dbName)
     private static function isEverythingOk()
     {
         return Core::isImportSqlFeatureEnabled()
-            && Core::isImportSqlListDatabase()
+            && Core::isImportSqlListDatabases()
             && !Core::checkDemoMode()
             && Core::checkIsLoggedIn()
             && Core::checkIsInstalled()

diff --git a/resources/classes/Installation.class.php b/resources/classes/Installation.class.php
@@ -24,7 +24,7 @@ public static function createSettingsFile($dbHostname, $dbName, $dbUsername, $db
 \$dbTablePrefix  = '$tablePrefix';
 \$encryptionSalt = '$encryptionSalt';
 \$importSqlFeatureEnabled = true;
-\$importSqlListDatabase = false;
+\$importSqlListDatabases = false;
 END;
 
 		$file = __DIR__ . "/../../settings.php";

diff --git a/resources/scripts/importSql.js b/resources/scripts/importSql.js
@@ -16,10 +16,10 @@ define([
             contentType: "application/x-www-form-urlencoded;charset=utf-8",
             success: function (result) {
                 if (result.success) {
-                    $("#m_sel_databases").html('<option value="" disabled selected>' + L.import_sql_select_db_option_hint + "</option>");
+                    $("#mSelDatabases").html('<option value="" disabled selected>' + L.import_sql_select_db_option_hint + "</option>");
                     result.content.forEach(function (rs) {
                         var option = $("<option></option>").text(rs);
-                        $("#m_sel_databases").append(option);
+                        $("#mSelDatabases").append(option);
                     });
                 }
             }
@@ -38,10 +38,10 @@ define([
             contentType: "application/x-www-form-urlencoded;charset=utf-8",
             success: function (result) {
                 if (result.success) {
-                    $("#m_sel_table").html('<option value="" disabled selected>' + L.import_sql_select_table_option_hint + "</option>");
+                    $("#mSelTable").html('<option value="" disabled selected>' + L.import_sql_select_table_option_hint + "</option>");
                     result.content.forEach(function (tbl) {
                         var option = $("<option></option>").text(tbl.table_name);
-                        $("#m_sel_table").append(option);
+                        $("#mSelTable").append(option);
                     });
                 }
             }
@@ -68,16 +68,16 @@ define([
 
     //////Select DB & Table to generate Sql
     //load all databases
-    if ($("#m_sel_databases").length > 0) {
+    if ($("#mSelDatabases").length > 0) {
         loadDatabases();
 
         //on db selected
-        $("#m_sel_databases").on('change', function () {
-            loadTables($("#m_sel_databases").val());
+        $("#mSelDatabases").on('change', function () {
+            loadTables($("#mSelDatabases").val());
         });
         //on table selected
-        $("#m_sel_table").on('change', function () {
-            loadCreateSql($("#m_sel_databases").val(), $("#m_sel_table").val());
+        $("#mSelTable").on('change', function () {
+            loadCreateSql($("#mSelDatabases").val(), $("#mSelTable").val());
         });
     }
     //////////////////////////

diff --git a/resources/templates/generate.tab1.tpl b/resources/templates/generate.tab1.tpl
@@ -41,14 +41,14 @@
 
 		{if Core::isImportSqlFeatureEnabled()}
 		<div id="dialogSql" title="{$L.import_sql_input_placeholder}">
-			{if Core::isImportSqlListDatabase()}
+			{if Core::isImportSqlListDatabases()}
 			<div>
 				<label>{$L.import_sql_select_db_tbl}</label>
 				<div>
-					<select name="m_sel_databases" id="m_sel_databases" style="width: 48%;">
+					<select name="mSelDatabases" id="mSelDatabases" style="width: 48%;">
 						<option value="" disabled>{$L.import_sql_select_db_option_hint}</option>
 					</select>
-					<select name="m_sel_table" id="m_sel_table" style="width: 48%;">
+					<select name="mSelTable" id="mSelTable" style="width: 48%;">
 						<option value="" disabled selected>{$L.import_sql_select_table_option_hint}</option>
 					</select>
 				</div>

diff --git a/settings.example.php b/settings.example.php
@@ -13,4 +13,4 @@
 $encryptionSalt = 'ABC'; // any 3 A-Z chars
 $apiEnabled     = false;
 $importSqlFeatureEnabled = true;
-$importSqlListDatabase = false;
+$importSqlListDatabases = false;