X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=288510d631cd95a701c338fb6a2a3765ebc7ea51;hp=b99efa4a150b4e6a4a65dddc33818e3759984183;hb=d22205247313f4b67db5c9aa3aac07cd9d073bce;hpb=5f8c1a333627cd0145f778a6eebdb251f5bb40b6 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index b99efa4a15..288510d631 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -37,61 +37,62 @@ if (!defined('__SECURITY')) { require($INC); } -// -function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) -{ - $ret = "failed"; - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($user), __FILE__, __LINE__); +// Register an administrator account +function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) { + // Login does already exist + $ret = "already"; + + // Lookup the user + $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", + array($user), __FUNCTION__, __LINE__); + + // Is the entry there? if (SQL_NUMROWS($result) == 0) { // Ok, let's create the admin login - $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')", - array($user, $md5, $email), __FILE__, __LINE__); + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')", + array($user, $md5, $email), __FUNCTION__, __LINE__); $ret = "done"; - } else { - // Free memory - SQL_FREERESULT($result); + } // END - if - // Login does already exist - $ret = "already"; - } + // Free memory + SQL_FREERESULT($result); + + // Return result return $ret; } // Only be executed on login procedure! -function CHECK_ADMIN_LOGIN ($admin_login, $password) -{ - global $cacheArray, $_CONFIG, $cacheInstance; - - // Init variables +function CHECK_ADMIN_LOGIN ($admin_login, $password) { + // By default no admin is found $ret = "404"; - $data = array(); // Get admin id $aid = GET_ADMIN_ID($admin_login); + // Init array with admin id by default + $data = array('aid' => $aid); + // Is the cache valid? - if (!empty($cacheArray['admins']['password'][$aid])) { + if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) { // Get password from cache - $data['password'] = $cacheArray['admins']['password'][$aid]; + $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid]; $ret = "pass"; - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + incrementConfigEntry('cache_hits'); // Include more admins data? if (GET_EXT_VERSION("admins") >= "0.7.0") { // Load them here - $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$aid]; - $data['last_failture'] = $cacheArray['admins']['last_failture'][$aid]; + $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid]; + $data['last_failure'] = $GLOBALS['cache_array']['admins']['last_failure'][$aid]; } // END - if } elseif (!EXT_IS_ACTIVE("cache")) { - $ADD = ""; - if (GET_EXT_VERSION("admins") >= "0.7.0") { - // Load them here - $ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture"; - } // END - if + // Add extra data via filter now + $ADD = RUN_FILTER('sql_admin_extra_data'); // Get password from DB - $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1", - array($aid), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1", + array($aid), __FUNCTION__, __LINE__); + + // Entry found? if (SQL_NUMROWS($result) == 1) { // Login password found $ret = "pass"; @@ -130,19 +131,19 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) $data['password'] = generateHash($password); // Do we have 0.7.0 of admins or later? - // Remmeber login failtures if available - if (GET_EXT_VERSION("admins") >= "0.7.0") { + // Remmeber login failures if available + if (GET_EXT_VERSION("admins") >= "0.7.2") { // Store it in session - set_session('mxchange_admin_failtures', $data['login_failtures']); - set_session('mxchange_admin_last_fail', $data['last_failture']); + set_session('mxchange_admin_failures', $data['login_failures']); + set_session('mxchange_admin_last_fail', $data['last_failure']); - // Update password and reset login failtures - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE id=%s LIMIT 1", - array($data['password'], $aid), __FILE__, __LINE__); + // Update password and reset login failures + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1", + array($data['password'], $aid), __FUNCTION__, __LINE__); } else { // Update password - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE id=%s LIMIT 1", - array($data['password'], $aid), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1", + array($data['password'], $aid), __FUNCTION__, __LINE__); } // Rebuild cache @@ -167,11 +168,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) } // END - if } - // Count login failture if admins extension version is 0.7.0+ + // Count login failure if admins extension version is 0.7.0+ if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) { // Update counter - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=login_failtures+1,last_failture=NOW() WHERE id=%s LIMIT 1", - array($aid), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1", + array($aid), __FUNCTION__, __LINE__); // Rebuild cache REBUILD_CACHE("admins", "admin"); @@ -184,13 +185,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) // Try to login the admin by setting some session/cookie variables function LOGIN_ADMIN ($adminLogin, $passHash) { - global $cacheInstance; - - // Reset failture counter on matching admins version + // Reset failure counter on matching admins version if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) { // Reset counter on out-dated sql_patches version - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", - array($adminLogin), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", + array($adminLogin), __FUNCTION__, __LINE__); // Rebuild cache REBUILD_CACHE("admins", "admin"); @@ -199,20 +198,20 @@ function LOGIN_ADMIN ($adminLogin, $passHash) { // Now set all session variables and return the result return ( ( - set_session("admin_md5", generatePassString($passHash)) + set_session('admin_md5', generatePassString($passHash)) ) && ( - set_session("admin_login", $adminLogin) + set_session('admin_login', $adminLogin) ) && ( - set_session("admin_last", time()) + set_session('admin_last', time()) ) && ( - set_session("admin_to", bigintval($_POST['timeout'])) + set_session('admin_to', bigintval(REQUEST_POST('timeout'))) ) ); } // Only be executed on cookie checking function CHECK_ADMIN_COOKIES ($admin_login, $password) { - global $cacheArray, $_CONFIG; + // By default no admin cookies are found $ret = "404"; $pass = ""; // Get hash @@ -230,86 +229,11 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) { // Return result return $ret; } -// -function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { - // Initialize some variables - $done = false; - $seek++; - $next=-1; - $found = false; - - // Is the file there and read-/write-able? - if ((FILE_READABLE($file)) && (is_writeable($file))) { - $search = "CFG: ".$comment; - $tmp = $file.".tmp"; - - // Open the source file - $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); - - // Is the resource valid? - if (is_resource($fp)) { - // Open temporary file - $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); - - // Is the resource again valid? - if (is_resource($fp_tmp)) { - while (!feof($fp)) { - // Read from source file - $line = fgets ($fp, 1024); - - if (strpos($line, $search) > -1) { $next = 0; $found = true; } - - if ($next > -1) { - if ($next === $seek) { - $next = -1; - $line = $prefix . $DATA . $suffix."\n"; - } else { - $next++; - } - } - - // Write to temp file - fputs($fp_tmp, $line); - } - - // Close temp file - fclose($fp_tmp); - - // Finished writing tmp file - $done = true; - } - - // Close source file - fclose($fp); - - if (($done) && ($found)) { - // Copy back tmp file and delete tmp :-) - @copy($tmp, $file); - @unlink($tmp); - define('_FATAL', false); - } elseif (!$found) { - OUTPUT_HTML("CHANGE: 404!"); - define('_FATAL', true); - } else { - OUTPUT_HTML("TMP: UNDONE!"); - define('_FATAL', true); - } - } - } else { - // File not found, not readable or writeable - OUTPUT_HTML("404: ".$file."
"); - } -} // -function ADMIN_DO_ACTION($wht) { - global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH; - +function ADMIN_DO_ACTION ($wht) { + global $DATA; //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; - if (EXT_IS_ACTIVE("cache")) { - // Include cache instance - global $cacheInstance; - } // Remove any spaces from variable if (empty($wht)) { @@ -325,7 +249,7 @@ function ADMIN_DO_ACTION($wht) { // Define admin login name and ID number define('__ADMIN_LOGIN', get_session('admin_login')); - define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login'))); + define('__ADMIN_ID' , GET_CURRENT_ADMIN_ID()); // Preload templates if (EXT_IS_ACTIVE("admins")) { @@ -340,29 +264,28 @@ function ADMIN_DO_ACTION($wht) { LOAD_TEMPLATE("admin_main_header"); // Check if action/what pair is valid - $result_action = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu -WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR what IS NULL) AND '%s'='overview')) -LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); + $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` +WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview')) +LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_action) == 1) { - // Is valid but does the inlcude file exists? - $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act); - if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) { + $INC = sprintf("inc/modules/admin/action-%s.php", $act); + if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && ($GLOBALS['acl_allow'] === true)) { // Ok, we finally load the admin action module - include($INC); - } elseif (__ACL_ALLOW == false) { + LOAD_INC($INC); + } elseif ($GLOBALS['acl_allow'] === false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED); - ADD_FATAL(ADMINS_ACCESS_DENIED); + LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED')); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACCESS_DENIED')); } else { // Include file not found! :-( - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION); - ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2); + LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_404'), $act); } } else { // Invalid action/what pair found! - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION); - ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2); + LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); } // Free memory @@ -373,30 +296,28 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); } // function ADD_ADMIN_MENU($act, $wht, $return=false) { - global $menuDesription, $menuTitle, $cacheInstance, $_CONFIG; - // Init variables $SUB = false; $OUT = ""; // Menu descriptions - $menuDesription = array(); - $menuTitle = array(); + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); // Is there a cache instance? - if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) { + if ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) { // Create cache name $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login')); // Is that cache there? - if ($cacheInstance->cache_file($cacheName, true)) { + if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) { // Then load it - $data = $cacheInstance->cache_load(); + $data = $GLOBALS['cache_instance']->getArrayFromCache(); // Extract all parts $OUT = base64_decode($data['output'][0]); - $menuTitle = unserialize(base64_decode($data['title'][0])); - $menuDescription = unserialize(base64_decode($data['descr'][0])); + $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0])); + $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0])); // Return or output content? if ($return) { @@ -408,152 +329,147 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { } // END - if // Build main menu - $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__); - if (SQL_NUMROWS($result_main) > 0) - { - $OUT = " -\n"; - while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) - { - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { + $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__); + if (SQL_NUMROWS($result_main) > 0) { + $OUT = "
 
+\n"; + while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) { + if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) { $ACL = ADMINS_CHECK_ACL($menu, ""); - } - else - { + } else { // ACL is "allow"... hmmm $ACL = true; } - if ($ACL) - { - if (!$SUB) - { + + if ($ACL === true) { + if (!$SUB) { // Insert compiled menu title and description - $menuTitle[$menu] = $title; - $menuDesription[$menu] = $descr; + $GLOBALS['menu']['title'][$menu] = $title; + $GLOBALS['menu']['description'][$menu] = $descr; } - $OUT .= " - + -\n"; - $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort, id DESC", - array($menu), __FILE__, __LINE__); + $OUT .= " +\n"; + $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC", + array($menu), __FUNCTION__, __LINE__); if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) { - $menuDesription = array(); - $menuTitle = array(); $SUB = true; - $OUT .= " - - +\n"; } - $OUT .= "\n"; + $OUT .= "\n"; } } // Free memory SQL_FREERESULT($result_main); - $OUT .= "
 
-  · "; + $OUT .= "
+  · "; if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "["; + $OUT .= "["; } $OUT .= $title; if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "]"; + $OUT .= "]"; } - $OUT .= "
  - \n"; + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); $SUB = true; + $OUT .= " + + -\n"; + $OUT .= "
  + \n"; while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { // Filename - $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub); + $INC = sprintf("%sinc/modules/admin/what-%s.php", constant('PATH'), $wht_sub); if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) { $ACL = ADMINS_CHECK_ACL("", $wht_sub); } else { // ACL is "allow"... hmmm $ACL = true; } - $readable = FILE_READABLE($INC); - if ($ACL) { + $readable = INCLUDE_READABLE($INC); + if ($ACL === true) { // Insert compiled title and description - $menuTitle[$wht_sub] = $title_what; - $menuDesription[$wht_sub] = $desc_what; - $OUT .= " - + -\n"; + $OUT .= " +\n"; } } // Free memory SQL_FREERESULT($result_what); - $OUT .= "
-  --> "; - if ($readable) + $GLOBALS['menu']['title'][$wht_sub] = $title_what; + $GLOBALS['menu']['description'][$wht_sub] = $desc_what; + $OUT .= "
+  --> "; + if ($readable === true) { if ($wht == $wht_sub) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "["; + $OUT .= "["; } } else { - $OUT .= ""; + $OUT .= ""; } $OUT .= $title_what; - if ($readable) + if ($readable === true) { if ($wht == $wht_sub) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "]"; + $OUT .= "]"; } } else { - $OUT .= ""; + $OUT .= ""; } - $OUT .= "
-
+
\n"; + $OUT .= "\n"; } // Compile and run the code here. This inserts all constants into the // HTML output. Costs me some time to figure this out... *sigh* Quix0r - $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";"; + // @TODO Is this eval longer needed? + $eval = "\$OUT = \"".COMPILE_CODE(smartAddSlashes($OUT))."\";"; eval($eval); // Is there a cache instance again? - if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) { + if ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) { // Init cache - $cacheInstance->cache_init($cacheName); + $GLOBALS['cache_instance']->init($cacheName); // Prepare cache data $data = array( 'output' => base64_encode($OUT), - 'title' => $menuTitle, - 'descr' => $menuDesription + 'title' => $GLOBALS['menu']['title'], + 'descr' => $GLOBALS['menu']['description'] ); // Write the data away - $cacheInstance->add_row($data); + $GLOBALS['cache_instance']->addRow($data); // Close cache - $cacheInstance->cache_close(); + $GLOBALS['cache_instance']->finalize(); } // END - if // Return or output content? @@ -567,17 +483,17 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid") { // Output selection form with all confirmed user accounts listed - $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FUNCTION__, __LINE__); $OUT = ""; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all) $OUT = " \n"; - elseif ($none) $OUT = " \n"; + if ($add_all) $OUT = " \n"; + elseif ($none) $OUT = " \n"; while (list($id, $sname, $fname) = SQL_FETCHROW($result)) { - $OUT .= " \n"; } // Free memory @@ -599,37 +515,45 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non } // function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") { - $wht = "what != ''"; - if ($MODE == "action") $wht = "(what='' OR what IS NULL) AND action !='login'"; - $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort", - array($MODE), __FILE__, __LINE__); + $wht = "`what` != ''"; + if ($MODE == "action") $wht = "(what='' OR `what` IS NULL) AND action !='login'"; + $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`", + array($MODE), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Load menu as selection - $OUT = "\n"; + $OUT .= "\n"; } else { // No menus??? - $OUT = ADMIN_PROBLEM_NO_MENU; + $OUT = getMessage('ADMIN_PROBLEM_NO_MENU'); } // Return output return $OUT; } -// Save settings to the database -function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) { - global $_CONFIG, $cacheArray, $cacheInstance; +// Wrapper for $_POST and ADMIN_SAVE_SETTINGS +function ADMIN_SAVE_SETTINGS_POST () { + // Get the array + $POST = REQUEST_POST_ARRAY(); + + // Call the lower function + ADMIN_SAVE_SETTINGS($POST); +} + +// Save settings to the database +function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement = "config=0", $translateComma = array(), $alwaysAdd = false) { // Prepare all arrays, variables $DATA = array(); $skip = false; @@ -656,14 +580,14 @@ 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 - $_CONFIG[$id] = $val; + setConfigEntry($id, $val); } // END - if } // END - if } // END - foreach @@ -672,9 +596,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", __FUNCTION__, __LINE__); } else { - $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` LIMIT 1", __FUNCTION__, __LINE__); } } // END - if @@ -683,7 +607,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,45 +626,52 @@ 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 SQL_FREERESULT($result); // Simply run generated SQL string - $result = SQL_QUERY($SQL, __FILE__, __LINE__); + SQL_QUERY($SQL, __FUNCTION__, __LINE__); // Rebuild cache REBUILD_CACHE("config", "config"); // Settings saved - LOAD_TEMPLATE("admin_settings_saved", false, "".SETTINGS_SAVED.""); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED')); } -// -function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") { + +// Generate a selection box +function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") { // Open the requested menu directory - $handle = opendir(sprintf("%sinc/modules/%s/", PATH, $menu)) or mxchange_die("Cannot load menu ".$menu."!"); + $handle = opendir(sprintf("%sinc/modules/%s/", constant('PATH'), $menu)) or mxchange_die("Cannot load menu ".$menu."!"); // Init the selection box - $OUT = "\n \n"; // Walk through all files while ($file = readdir($handle)) { // Is this a PHP script? if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) { // Then test if the file is readable - $test = sprintf("%sinc/modules/%s/%s", PATH, $menu, $file); - if ((is_file($test)) && (is_readable($test))) { + $test = sprintf("%sinc/modules/%s/%s", constant('PATH'), $menu, $file); + + // Is the file there? + if (FILE_READABLE($test)) { // Extract the value for what=xxx $part = substr($file, (strlen($type) + 1)); $part = substr($part, 0, -4); // Is that part different from the overview? if ($part != "overview") { - $OUT .= "