X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=1353ad3d10da2d8b9c733016b2c1dc9fdac96d65;hp=3ce4e97ca2e30ff4efe7eae997a4ab42178e029d;hb=98077af43126dd7c274fe57f6ea0494e906e8943;hpb=5071030af40e69ca4284642f44758964e18f5be8 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 3ce4e97ca2..1353ad3d10 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -45,11 +45,11 @@ if (!defined('__SECURITY')) { // Register an administrator account function REGISTER_ADMIN ($user, $md5, $email) { // Login does already exist - $ret = "already"; + $ret = 'already'; // Lookup the admin $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", - array($user), __FUNCTION__, __LINE__); + array($user), __FUNCTION__, __LINE__); // Is the entry there? if (SQL_NUMROWS($result) == 0) { @@ -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) { @@ -156,7 +156,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { rebuildCacheFiles('admins', 'admin'); // Login has failed by default... ;-) - $ret = "failed"; + $ret = 'failed'; // Password matches so login here if (LOGIN_ADMIN($admin_login, $data['password'])) { @@ -165,12 +165,12 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { } // END - if } elseif ((empty($salt)) && ($ret == 'pass')) { // Something bad went wrong - $ret = "failed"; + $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 } @@ -195,30 +195,29 @@ function LOGIN_ADMIN ($adminLogin, $passHash) { 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'); } // END - if // Now set all session variables and return the result - return ( - ( - setSession('admin_md5', generatePassString($passHash)) + return (( + setSession('admin_md5', generatePassString($passHash)) ) && ( - setSession('admin_login', $adminLogin) + setSession('admin_login', $adminLogin) ) && ( - setSession('admin_last', time()) + setSession('admin_last', time()) ) && ( - setSession('admin_to', bigintval(REQUEST_POST('timeout'))) - ) - ); + 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)); @@ -230,7 +229,7 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) { if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) { // Passwords matches! $ret = 'done'; - } + } // END - if // Return result return $ret; @@ -239,19 +238,19 @@ 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.'/'.getModule().'/'.getAction().'/'.getWhat()."*
\n"; // Remove any spaces from variable if (empty($wht)) { // Default admin action is the overview page - $wht = "overview"; + $wht = 'overview'; } else { // Compile out some chars $wht = COMPILE_CODE($wht, false, false, false); } // Get action value - $act = getModeAction($GLOBALS['module'], $wht); + $act = getModeAction(getModule(), $wht); // Define admin login name and ID number define('__ADMIN_LOGIN', getSession('admin_login')); @@ -259,15 +258,15 @@ function ADMIN_DO_ACTION ($wht) { // Preload templates if (EXT_IS_ACTIVE('admins')) { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true)); + define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome_admins', true)); } else { - define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true)); + define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome', true)); } - define('__ADMIN_FOOTER' , LOAD_TEMPLATE("admin_footer" , true)); + define('__ADMIN_FOOTER' , LOAD_TEMPLATE('admin_footer' , true)); define('__ADMIN_MENU' , ADD_ADMIN_MENU($act, $wht, true)); // Tableset header - LOAD_TEMPLATE("admin_main_header"); + LOAD_TEMPLATE('admin_main_header'); // Check if action/what pair is valid $result_action = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` @@ -281,16 +280,16 @@ LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__); loadInclude($INC); } elseif ($GLOBALS['acl_allow'] === false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_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, sprintf(getMessage('ADMIN_ACTION_404'), $act)); + 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, sprintf(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); } @@ -298,7 +297,7 @@ LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__); SQL_FREERESULT($result_action); // Tableset footer - LOAD_TEMPLATE("admin_main_footer"); + LOAD_TEMPLATE('admin_main_footer'); } // @@ -314,7 +313,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."_".getLanguage()."_".strtolower(getSession('admin_login')); + $cacheName = 'admin_' . $act . '_' . $wht . '_' . getLanguage() . '_' . strtolower(getSession('admin_login')); // Is that cache there? if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) { @@ -345,7 +344,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) { $ACL = adminsCheckAdminAcl($menu, ''); } else { - // ACL is "allow"... hmmm + // @TODO ACL is 'allow'... hmmm $ACL = true; } @@ -356,7 +355,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { $GLOBALS['menu']['description'][$menu] = $descr; } $OUT .= "
  • -
    · "; +
    · "; if (($menu == $act) && (empty($wht))) { $OUT .= ""; @@ -377,7 +376,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { // 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", - array($menu), __FUNCTION__, __LINE__); + array($menu), __FUNCTION__, __LINE__); // Remember the count for later checks setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))); @@ -386,14 +385,14 @@ 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"; // @TODO Rewrite this to $content = SQL_FETCHARRAY() while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { // Check for access level if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) { $ACL = adminsCheckAdminAcl('', $wht_sub); } else { - // ACL is "allow"... hmmm + // @TODO ACL is 'allow'... hmmm $ACL = true; } @@ -488,7 +487,7 @@ function ADD_MEMBER_SELECTION_BOX ($def='0', $add_all=false, $return=false, $non // 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 .= "