X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=38bd814274fdaf32df5e7870b8188c10b01c0b30;hp=586f1803f7e6aac8004a6ff6f471002993e63a73;hb=89c00e43d2ce1dd1afe11c2c8485307342805f97;hpb=7ce379f8009cb988e0af74c5e5bf6f8ddb6de37b diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 586f1803f7..38bd814274 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -45,8 +45,8 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) array($user), __FILE__, __LINE__); 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 @@ -61,19 +61,21 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) function CHECK_ADMIN_LOGIN ($admin_login, $password) { global $cacheArray, $_CONFIG, $cacheInstance; - // Init variables + // 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($cacheArray['admins']['password'][$aid])) { // Get password from cache $data['password'] = $cacheArray['admins']['password'][$aid]; $ret = "pass"; - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } // Include more admins data? if (GET_EXT_VERSION("admins") >= "0.7.0") { @@ -82,15 +84,14 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { $data['last_failture'] = $cacheArray['admins']['last_failture'][$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__); + array($aid), __FILE__, __LINE__); + + // Entry found? if (SQL_NUMROWS($result) == 1) { // Login password found $ret = "pass"; @@ -136,11 +137,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { set_session('mxchange_admin_last_fail', $data['last_failture']); // 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", + 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__); } else { // Update password - $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE id=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE id=%s LIMIT 1", array($data['password'], $aid), __FILE__, __LINE__); } @@ -302,7 +303,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { // function ADMIN_DO_ACTION($wht) { - global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH; + global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA; //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; if (EXT_IS_ACTIVE("cache")) { @@ -351,8 +352,8 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); include($INC); } elseif (__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, ADMIN_ACCESS_DENIED); + ADD_FATAL(ADMIN_ACCESS_DENIED); } else { // Include file not found! :-( LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION); @@ -383,7 +384,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { $menuTitle = array(); // Is there a cache instance? - if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) { + if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) { // Create cache name $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login')); @@ -537,7 +538,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { eval($eval); // Is there a cache instance again? - if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) { + if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) { // Init cache $cacheInstance->init($cacheName); @@ -775,7 +776,8 @@ function ADMIN_CHECK_MENU_MODE() { global $_CONFIG, $cacheArray; // Set the global mode as the mode for all admins - $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE; + $MODE = getConfig('admin_menu'); + $ADMIN = $MODE; // Get admin id $aid = GET_CURRENT_ADMIN_ID(); @@ -784,11 +786,11 @@ function ADMIN_CHECK_MENU_MODE() { if (isset($cacheArray['admins']['la_mode'][$aid])) { // Load from cache $ADMIN = $cacheArray['admins']['la_mode'][$aid]; - if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } + if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; } } elseif (GET_EXT_VERSION("admins") >= "0.6.7") { // Load from database when version of "admins" is enough $result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1", - array($aid), __FILE__, __LINE__); + array($aid), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data list($ADMIN) = SQL_FETCHROW($result); @@ -1192,7 +1194,7 @@ function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) { global $_CONFIG; // Set temporary the new settings - $_CONFIG = array_merge($_CONFIG, $settingsArray); + $_CONFIG = merge_array($_CONFIG, $settingsArray); // Now get the test URL $content = GET_URL("check-updates3.php");