X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=7ab5e1283ab55aa84f147e8d87058e4efb97c780;hp=1a8c01ad9970852bf207cae40bceab83fe3b45f5;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=8dd0d1496c53d3befb4b1c85806a811595d398e3 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 1a8c01ad99..7ab5e1283a 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -32,103 +32,154 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ +if (!defined('__SECURITY')) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; 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), __FILE__, __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), __FILE__, __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; - $ret = "404"; $pass = ""; - if (!empty($cacheArray['admins']['aid'][$admin_login])) { +function CHECK_ADMIN_LOGIN ($admin_login, $password) { + global $cacheArray, $cacheInstance; + + // By default no admin is found + $ret = "404"; + + // 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 (isset($cacheArray['admins']['password'][$aid])) { // Get password from cache - $pass = $cacheArray['admins']['password'][$admin_login]; + $data['password'] = $cacheArray['admins']['password'][$aid]; $ret = "pass"; - $_CONFIG['cache_hits']++; - } else { + incrementConfigEntry('cache_hits'); + + // Include more admins data? + if (GET_EXT_VERSION("admins") >= "0.7.0") { + // Load them here + $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid]; + $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid]; + } // END - if + } elseif (!EXT_IS_ACTIVE("cache")) { + // Add extra data via filter now + $ADD = RUN_FILTER('sql_admin_extra_data'); + // Get password from DB - $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($admin_login), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1", + array($aid), __FILE__, __LINE__); + + // Entry found? if (SQL_NUMROWS($result) == 1) { + // Login password found $ret = "pass"; - list($pass) = SQL_FETCHROW($result); - SQL_FREERESULT($result); - } + + // Fetch data + $data = SQL_FETCHARRAY($result); + } // END - if + + // Free result + SQL_FREERESULT($result); } - //* DEBUG: */ echo "*".$pass."/".md5($password)."/".$ret."
"; - if ((strlen($pass) == 32) && ($pass == md5($password))) { + //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."
"; + if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) { // Generate new hash - $pass = generateHash($password); + $data['password'] = generateHash($password); // Is the sql_patches not installed, than we cannot have a valid hashed password here! - if (($ret == "pass") && ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == ""))) $ret = "done"; - } elseif ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) { + if (($ret == "pass") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) $ret = "done"; + } elseif ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == "")) { // Old hashing way return $ret; + } elseif (!isset($data['password'])) { + // Password not found, so no valid login! + return $ret; } // Generate salt of password - define('__SALT', substr($pass, 0, -40)); + define('__SALT', substr($data['password'], 0, -40)); $salt = __SALT; // Check if password is same - //* DEBUG: */ echo "*".$ret.",".$pass.",".$password.",".$salt."*
\n"; - if (($ret == "pass") && ($pass == generateHash($password, $salt)) && (!empty($salt))) { - // Change the passord hash here - $pass = generateHash($password); - - // Update password - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1", - array($pass, $admin_login), __FILE__, __LINE__); - - // Shall I remove the cache file? - if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false)) { - if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy(); + //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*
\n"; + if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) { + // Re-hash the plain passord with new random salt + $data['password'] = generateHash($password); + + // Do we have 0.7.0 of admins or later? + // Remmeber login failures if available + if (GET_EXT_VERSION("admins") >= "0.7.2") { + // Store it in session + set_session('mxchange_admin_failures', $data['login_failures']); + set_session('mxchange_admin_last_fail', $data['last_failure']); + + // 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), __FILE__, __LINE__); + } else { + // Update password + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1", + array($data['password'], $aid), __FILE__, __LINE__); } + // Rebuild cache + REBUILD_CACHE("admins", "admin"); + // Login has failed by default... ;-) $ret = "failed"; // Password matches so login here - if (LOGIN_ADMIN($admin_login, $pass)) { + if (LOGIN_ADMIN($admin_login, $data['password'])) { // All done now $ret = "done"; - } + } // END - if } elseif ((empty($salt)) && ($ret == "pass")) { // Something bad went wrong $ret = "failed"; } elseif ($ret == "done") { // Try to login here if we have the old hashing way (sql_patches not installed?) - if (!LOGIN_ADMIN($admin_login, $pass)) { + if (!LOGIN_ADMIN($admin_login, $data['password'])) { // Something went wrong $ret = "failed"; - } + } // END - if } + // 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_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1", + array($aid), __FILE__, __LINE__); + + // Rebuild cache + REBUILD_CACHE("admins", "admin"); + } // END - if + // Return the result //* DEBUG: */ die("RETURN=".$ret); return $ret; @@ -136,46 +187,42 @@ 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 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_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", + array($adminLogin), __FILE__, __LINE__); + + // Rebuild cache + REBUILD_CACHE("admins", "admin"); + } // END - if + // 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", $_POST['timeout']) + set_session('admin_to', bigintval($_POST['timeout'])) ) ); } // Only be executed on cookie checking function CHECK_ADMIN_COOKIES ($admin_login, $password) { - global $cacheArray, $_CONFIG; + global $cacheArray; $ret = "404"; $pass = ""; - if (!empty($cacheArray['admins']['aid'][$admin_login])) { - // Get password from cache - $pass = $cacheArray['admins']['password'][$admin_login]; - $ret = "pass"; - $_CONFIG['cache_hits']++; - } else { - // Get password from DB - $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", - array($admin_login), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) { - // Entry found - $ret = "pass"; - // Fetch password - list($pass) = SQL_FETCHROW($result); - } + // Get hash + $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login)); + if ($pass != "-1") $ret = "pass"; - // Free result - SQL_FREERESULT($result); - } - - //* DEBUG: */ echo __FUNCTION__.":".$pass."(".strlen($pass).")/".$password."(".strlen($password).")
\n"; + //* DEBUG: */ print __FUNCTION__."(".__LINE__."):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")
\n"; // Check if password matches if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) { @@ -191,6 +238,7 @@ 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? @@ -199,12 +247,12 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { $tmp = $file.".tmp"; // Open the source file - $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$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."
"); + $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); // Is the resource again valid? if (is_resource($fp_tmp)) { @@ -215,7 +263,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { if (strpos($line, $search) > -1) { $next = 0; $found = true; } if ($next > -1) { - if ($next == $seek) { + if ($next === $seek) { $next = -1; $line = $prefix . $DATA . $suffix."\n"; } else { @@ -243,38 +291,34 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { @unlink($tmp); define('_FATAL', false); } elseif (!$found) { - OUTPUT_HTML("CHANGE: 404!"); + OUTPUT_HTML("CHANGE: 404!"); define('_FATAL', true); } else { - OUTPUT_HTML("TMP: UNDONE!"); + OUTPUT_HTML("TMP: UNDONE!"); define('_FATAL', true); } } } else { // File not found, not readable or writeable - OUTPUT_HTML("404: ".$file."
"); + OUTPUT_HTML("404: ".$file."
"); } } // -function ADMIN_DO_ACTION($wht) -{ - global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH; +function ADMIN_DO_ACTION($wht) { + global $menuDesription, $menuTitle, $cacheArray, $DATA; + //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; - if (EXT_IS_ACTIVE("cache")) - { + if (EXT_IS_ACTIVE("cache")) { // Include cache instance global $cacheInstance; } // Remove any spaces from variable - if (empty($wht)) - { + if (empty($wht)) { // Default admin action is the overview page $wht = "overview"; - } - else - { + } else { // Compile out some chars $wht = COMPILE_CODE($wht, false, false, false); } @@ -284,7 +328,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")) { @@ -299,188 +343,216 @@ function ADMIN_DO_ACTION($wht) LOAD_TEMPLATE("admin_main_header"); // Check if action/what pair is valid - $result = 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')) + $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__); - if (SQL_NUMROWS($result) == 1) - { - // Free memory - SQL_FREERESULT($result); + 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)) && (__ACL_ALLOW == true)) { // Ok, we finally load the admin action module - include($INC); - } - elseif (__ACL_ALLOW == false) - { + LOAD_INC($INC); + } elseif (__ACL_ALLOW == false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED); - ADD_FATAL(ADMINS_ACCESS_DENIED); - } - else - { + LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED')); + addFatalMessage(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(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(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); } + // Free memory + SQL_FREERESULT($result_action); + // Tableset footer LOAD_TEMPLATE("admin_main_footer"); } // -function ADD_ADMIN_MENU($act, $wht,$return=false) -{ - global $menuDesription, $menuTitle, $link; +function ADD_ADMIN_MENU($act, $wht, $return=false) { + global $menuDesription, $menuTitle, $cacheInstance; + + // Init variables $SUB = false; + $OUT = ""; // Menu descriptions $menuDesription = array(); $menuTitle = array(); + // Is there a cache instance? + if ((is_object($cacheInstance)) && (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->loadCacheFile($cacheName)) { + // Then load it + $data = $cacheInstance->getArrayFromCache(); + + // Extract all parts + $OUT = base64_decode($data['output'][0]); + $menuTitle = unserialize(base64_decode($data['title'][0])); + $menuDescription = unserialize(base64_decode($data['descr'][0])); + + // Return or output content? + if ($return) { + return $OUT; + } else { + OUTPUT_HTML($OUT); + } + } // END - if + } // 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__); - $OUT = ""; - 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", __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")) { $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; + $menuTitle[$menu] = $title; $menuDesription[$menu] = $descr; } - $OUT .= " - + -\n"; - $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' 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), __FILE__, __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 .= "
 
-  · "; - if (($menu == $act) && (empty($wht))) + $OUT .= "
+  · "; + if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "["; + $OUT .= "["; } $OUT .= $title; - if (($menu == $act) && (empty($wht))) + if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "]"; + $OUT .= "]"; } - $OUT .= "
  - \n"; - while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) - { + $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); - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { + $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 - { + } 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; + $menuTitle[$wht_sub] = $title_what; $menuDesription[$wht_sub] = $desc_what; - $OUT .= " - + -\n"; + $OUT .= " +\n"; } } // Free memory SQL_FREERESULT($result_what); - $OUT .= "
-  --> "; - if ($readable) + $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))."\";"; + $eval = "\$OUT = \"".COMPILE_CODE(SQL_ESCAPE($OUT))."\";"; eval($eval); + // Is there a cache instance again? + if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) { + // Init cache + $cacheInstance->init($cacheName); + + // Prepare cache data + $data = array( + 'output' => base64_encode($OUT), + 'title' => $menuTitle, + 'descr' => $menuDesription + ); + + // Write the data away + $cacheInstance->addRow($data); + + // Close cache + $cacheInstance->finalize(); + } // END - if + // Return or output content? if ($return) { return $OUT; @@ -489,57 +561,60 @@ function ADD_ADMIN_MENU($act, $wht,$return=false) } } // -function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0") +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", __FILE__, __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 SQL_FREERESULT($result); - // Remeber options in constant - define('_MEMBER_SELECTION', $OUT); - if (!$return) { + // Remeber options in constant + define('_MEMBER_SELECTION', $OUT); + // Display selection box define('__LANG_VALUE', GET_LANGUAGE()); // Load template LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']); + } else { + // Return content in selection frame + return "\n"; } } // 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", + $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__); if (SQL_NUMROWS($result) > 0) { // Load menu as selection - $OUT = "\n"; + $OUT .= "\n"; } else { // No menus??? $OUT = ADMIN_PROBLEM_NO_MENU; @@ -548,9 +623,10 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") { // 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; + global $cacheArray, $cacheInstance; // Prepare all arrays, variables $DATA = array(); @@ -571,21 +647,21 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con // Translate the value? (comma to dot!) if ((is_array($translateComma)) && (in_array($id, $translateComma))) { // Then do it here... :) - $val = str_replace(",", ".", $val); + $val = REVERT_COMMA($val); } // END - if // Shall we add numbers or strings? $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 @@ -594,9 +670,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 @@ -605,7 +681,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(); @@ -620,49 +700,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, __FILE__, __LINE__); - // Is the config table updated and the cache extension installed? - if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) { - // Remove it here... - if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy(); - unset($cacheArray); - } // END - if + // 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 .= "