X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=b78e6ba25384a7a760bedd7b7e95df3efdfd371b;hb=1355d2c0b29510dbd407f9cde9f41a5ac02d01fa;hp=fccceb81af9bdf0c0983913c6dbd7e77fe4515fa;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index fccceb81af..b78e6ba253 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -48,15 +48,15 @@ function REGISTER_ADMIN ($user, $md5, $email) { $ret = "already"; // Lookup the admin - $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", - array($user), __FUNCTION__, __LINE__); + $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 SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')", - array($user, $md5, $email), __FUNCTION__, __LINE__); - $ret = "done"; + array($user, $md5, $email), __FUNCTION__, __LINE__); + $ret = 'done'; } // END - if // Free memory @@ -69,7 +69,7 @@ function REGISTER_ADMIN ($user, $md5, $email) { // Only be executed on login procedure! function CHECK_ADMIN_LOGIN ($admin_login, $password) { // By default no admin is found - $ret = "404"; + $ret = '404'; // Get admin id $aid = GET_ADMIN_ID($admin_login); @@ -95,8 +95,8 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { $add = runFilterChain('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), __FUNCTION__, __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) { @@ -111,14 +111,14 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { SQL_FREERESULT($result); } - //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."
"; + //* DEBUG: */ echo "*".$data['password'].'/'.md5($password).'/'.$ret."
"; if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) { // Generate new hash $data['password'] = generateHash($password); // Is the sql_patches not installed, than we cannot have a valid hashed password here! - 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') == "")) { + 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'])) { @@ -131,7 +131,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { $salt = __SALT; // Check if password is same - //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*
\n"; + //* 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); @@ -140,45 +140,45 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { // 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']); + setSession('mxchange_admin_failures', $data['login_failures']); + setSession('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), __FUNCTION__, __LINE__); + 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 - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1", - array($data['password'], $aid), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE `id`=%s LIMIT 1", + array($data['password'], $aid), __FUNCTION__, __LINE__); } // Rebuild cache rebuildCacheFiles('admins', 'admin'); // Login has failed by default... ;-) - $ret = "failed"; + $ret = 'failed'; // Password matches so login here if (LOGIN_ADMIN($admin_login, $data['password'])) { // All done now - $ret = "done"; + $ret = 'done'; } // END - if } elseif ((empty($salt)) && ($ret == 'pass')) { // Something bad went wrong - $ret = "failed"; - } elseif ($ret == "done") { + $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, $data['password'])) { // Something went wrong - $ret = "failed"; + $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), __FUNCTION__, __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 rebuildCacheFiles('admins', 'admin'); @@ -192,10 +192,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { // Try to login the admin by setting some session/cookie variables function LOGIN_ADMIN ($adminLogin, $passHash) { // 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') == ""))) { + 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), __FUNCTION__, __LINE__); + array($adminLogin), __FUNCTION__, __LINE__); // Rebuild cache rebuildCacheFiles('admins', 'admin'); @@ -203,33 +203,33 @@ function LOGIN_ADMIN ($adminLogin, $passHash) { // Now set all session variables and return the result return ( - ( - set_session('admin_md5', generatePassString($passHash)) - ) && ( - set_session('admin_login', $adminLogin) - ) && ( - set_session('admin_last', time()) - ) && ( - set_session('admin_to', bigintval(REQUEST_POST('timeout'))) - ) + ( + setSession('admin_md5', generatePassString($passHash)) + ) && ( + setSession('admin_login', $adminLogin) + ) && ( + setSession('admin_last', time()) + ) && ( + setSession('admin_to', bigintval(REQUEST_POST('timeout'))) + ) ); } // Only be executed on cookie checking function CHECK_ADMIN_COOKIES ($admin_login, $password) { // By default no admin cookies are found - $ret = "404"; $pass = ''; + $ret = '404'; $pass = ''; // Get hash $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login)); - if ($pass != "-1") $ret = 'pass'; + if ($pass != '-1') $ret = 'pass'; - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):".generatePassString($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)))) { // Passwords matches! - $ret = "done"; + $ret = 'done'; } // Return result @@ -239,7 +239,7 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) { // function ADMIN_DO_ACTION ($wht) { global $DATA; - //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; + //* DEBUG: */ echo __LINE__."*".$wht.'/'.$GLOBALS['module'].'/'.$GLOBALS['action'].'/'.$GLOBALS['what']."*
\n"; // Remove any spaces from variable if (empty($wht)) { @@ -251,11 +251,11 @@ function ADMIN_DO_ACTION ($wht) { } // Get action value - $act = GET_ACTION($GLOBALS['module'], $wht); + $act = getModeAction($GLOBALS['module'], $wht); // Define admin login name and ID number - define('__ADMIN_LOGIN', get_session('admin_login')); - define('__ADMIN_ID' , GET_CURRENT_ADMIN_ID()); + define('__ADMIN_LOGIN', getSession('admin_login')); + define('__ADMIN_ID' , getCurrentAdminId()); // Preload templates if (EXT_IS_ACTIVE('admins')) { @@ -270,15 +270,15 @@ 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` + $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("inc/modules/admin/action-%s.php", $act); - if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) { + if ((isIncludeReadable($INC)) && (isMenuActionValid('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) { // Ok, we finally load the admin action module - LOAD_INC($INC); + loadInclude($INC); } elseif ($GLOBALS['acl_allow'] === false) { // Access denied LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED')); @@ -290,8 +290,8 @@ LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__); } } else { // Invalid action/what pair found! - LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht)); - addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); + LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act.'/'.$wht)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act.'/'.$wht); } // Free memory @@ -314,7 +314,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { // Is there a cache instance? if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) { // Create cache name - $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login')); + $cacheName = "admin_".$act."_".$wht."_".getLanguage()."_".strtolower(getSession('admin_login')); // Is that cache there? if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) { @@ -338,12 +338,12 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { // 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", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_main) > 0) { - $OUT = " -\n"; + $OUT = "
 
\n"; + $OUT .= " - -\n"; + $OUT .= " +\n"; // Check for menu entries $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", @@ -387,32 +386,30 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) { $GLOBALS['menu']['description'] = array(); $GLOBALS['menu']['title'] = array(); $SUB = true; - $OUT .= " - - -\n"; + $OUT .= " +\n"; } - $OUT .= "\n"; + $OUT .= "
  •  
    • \n"; } } // Free memory SQL_FREERESULT($result_main); - $OUT .= "
     
    -
     · "; + $OUT .= "
  • +
    · "; if (($menu == $act) && (empty($wht))) { $OUT .= ""; @@ -373,8 +372,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { $OUT .= "]"; } - $OUT .= "
    •   - \n"; + $OUT .= "
    • \n"; // @TODO Rewrite this to $content = SQL_FETCHARRAY() while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { - // Filename - $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub); + // Check for access level if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) { - $ACL = ADMINS_CHECK_ACL("", $wht_sub); + $ACL = adminsCheckAdminAcl('', $wht_sub); } else { // ACL is "allow"... hmmm $ACL = true; } + // Filename + $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub); + // Is the file readable? - $readable = INCLUDE_READABLE($INC); + $readable = isIncludeReadable($INC); // Access allowed? if ($ACL === true) { // Insert compiled title and description $GLOBALS['menu']['title'][$wht_sub] = $title_what; $GLOBALS['menu']['description'][$wht_sub] = $desc_what; - $OUT .= "
    • - -\n"; + $OUT .= " +\n"; } } // Free memory SQL_FREERESULT($result_what); - $OUT .= "
    -
     --> "; + $OUT .= "
  • +
    --> "; if ($readable === true) { if ($wht == $wht_sub) { $OUT .= ""; @@ -420,7 +417,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { $OUT .= "["; } } else { - $OUT .= ""; + $OUT .= ""; } $OUT .= $title_what; @@ -434,25 +431,24 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { } else { $OUT .= ""; } - $OUT .= "
    • -
    \n"; + $OUT .= "\n"; } // Is there a cache instance again? @@ -483,20 +479,20 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { } // Create member selection box -function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field='userid') { +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", __FUNCTION__, __LINE__); + $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__); // Default output $OUT = ''; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) if ($add_all === true) $OUT = " \n"; - elseif ($none === true) $OUT = " \n"; + elseif ($none === true) $OUT = " \n"; while ($content = SQL_FETCHARRAY($result)) { $OUT .= "