X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=970dd69ff5ef87e460c4a93bc1f47ab8bf20ea4a;hb=f13b0c89b6dce2dc31ef3c58f0e2ad4821d7bee8;hp=355d5ef93860ae1aad34aabbd63faa45f3c278b2;hpb=78815656dde7ad2e609f884f5778a5f421ff8621;p=mailer.git

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 355d5ef938..970dd69ff5 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -389,7 +389,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 		$cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
 		// Is that cache there?
-		if ($cacheInstance->cache_file($cacheName, true)) {
+		if ($cacheInstance->cache_file($cacheName)) {
 			// Then load it
 			$data = $cacheInstance->cache_load();
 
@@ -656,10 +656,10 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
 				$test = (float)$val;
 				if ("".$val."" == "".$test."") {
 					// Add numbers
-					$DATA[] = $id."=".$val."";
+					$DATA[] = sprintf("`%s`=%s", $id, $test);
 				} else {
 					// Add strings
-					$DATA[] = $id."='".trim($val)."'";
+					$DATA[] = sprintf("`%s`='%s'", $id, trim($val));
 				}
 
 				// Update current configuration
@@ -672,9 +672,9 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
 	$result = false;
 	if (!$alwaysAdd) {
 		if (!empty($whereStatement)) {
-			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
 		} else {
-			$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` LIMIT 1", __FILE__, __LINE__);
 		}
 	} // END - if
 
@@ -683,7 +683,11 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
 		$DATA_UPDATE = implode(", ", $DATA);
 
 		// Generate SQL string
-		$SQL = "UPDATE "._MYSQL_PREFIX.$tableName." SET ".$DATA_UPDATE." WHERE ".$whereStatement." LIMIT 1";
+		$SQL = sprintf("UPDATE `"._MYSQL_PREFIX."%s` SET %s WHERE %s LIMIT 1",
+			$tableName,
+			$DATA_UPDATE,
+			$whereStatement
+		);
 	} else {
 		// Add Line (does only work with auto_increment!
 		$KEYs = array(); $VALUEs = array();
@@ -698,7 +702,11 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
 		$VALUEs = implode(", ", $VALUEs);
 
 		// Generate SQL string
-		$SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES (".$VALUEs.")";
+		$SQL = sprintf("INSERT INTO "._MYSQL_PREFIX."%s (%s) VALUES (%s)",
+			$tableName,
+			$KEYs,
+			$VALUEs
+		);
 	}
 
 	// Free memory
@@ -972,7 +980,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
 					} // END - if
 				} elseif (isset($content[$column])) {
 					// Unfinished!
-					mxchange_die("{--".__FUNCTION__."--}:UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+					mxchange_die("{--".__FUNCTION__."--}:".__LINE__.":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
 				}
 			} // END - foreach
 
@@ -987,6 +995,9 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
 					} else {
 						// Add regular entry
 						$SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+
+						// Add entry
+						$content[$key] = $entries[$id];
 					}
 				} // END - if
 			} // END - foreach
@@ -1156,7 +1167,7 @@ function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
 		// Shall we un-/lock here or list for locking?
 		if ($lockNow) {
 			// Un-/lock entries
-			ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+			ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
 		} else {
 			// List for editing
 			ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);