]> git.mxchange.org Git - mailer.git/blobdiff - inc/libs/admins_functions.php
Fixes for admin ACLs
[mailer.git] / inc / libs / admins_functions.php
index 71e179e00e7c052c8896e2309ac183ae252b80fc..c0d4c13023df4398210569cb391dad0960c30404 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die admins-Erweiterung           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -65,64 +70,49 @@ function ADMINS_CHECK_ACL($act, $wht) {
        }
 
        // Shall I test for a main or sub menu? (action or what?)
-       $lines = 0; $acl_mode = "failed";
-       if (GET_EXT_VERSION("cache") >= "0.1.2") {
-               // Load only from array when there are lines!
-               if ((isset($GLOBALS['cache_array']['admin_acls'])) && (is_array($GLOBALS['cache_array']['admin_acls'])) && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
-                       // Load ACL from array
-                       foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $id => $aid_acls) {
-                               if ($aid == $aid_acls) {
-                                       // Okay, one line was found!
-                                       if ((!empty($act)) && ($GLOBALS['cache_array']['admin_acls']['action_menu'][$id] == $act)) {
-                                               // Main menu line found
-                                               $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
-                                               $lines = 1;
-                                       }
-                                        elseif ((!empty($wht)) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$id] == $wht)) {
-                                               // Check sub menu
-                                               $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
-                                               $lines = 1;
-                                       }
-                                       if ($lines == 1) {
-                                               // Count cache hits
-                                               incrementConfigEntry('cache_hits');
-                                               break;
-                                       }
-                               }
-                       }
-
-                       // No ACL found?
-                       if ($acl_mode == "failed") {
-                               $acl_mode = "";
-                               $lines = 0;
-                       }
-               } else {
-                       // No lines here
-                       $lines = 0;
+       $acl_mode = "failed";
+       if ((GET_EXT_VERSION("cache") >= "0.1.2") && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
+               // Lookup in cache
+               if ((!empty($act)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid] == $act)) {
+                       // Main menu line found
+                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+                       // Count cache hits
+                       incrementConfigEntry('cache_hits');
+               } elseif ((!empty($wht)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid])) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid] == $wht)) {
+                       // Check sub menu
+                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+                       // Count cache hits
+                       incrementConfigEntry('cache_hits');
                }
-       } else {
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Old version, so load it from database
-               if (!empty($act))
-               {
+               if (!empty($act)) {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $act), __FILE__, __LINE__);
+                               array(bigintval($aid), $act), __FUNCTION__, __LINE__);
                } elseif (!empty($wht)) {
                        // Sub menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $wht), __FILE__, __LINE__);
+                               array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
                }
 
-               // Get number of lines
-               $lines = SQL_NUMROWS($result);
+               // Is an entry found?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load ACL
+                       list($acl_mode) = SQL_FETCHROW($result);
+               } // END - if
 
-               // Load ACL
-               list($acl_mode) = SQL_FETCHROW($result);
+               // Free memory
                SQL_FREERESULT($result);
        }
 
        // Check ACL and (maybe) allow
-       if ((($default == "allow") && ($lines == 0)) || (($default == "deny") && ($lines == "1") && ($acl_mode == "allow")) || (($lines == 0) && ($parent))) $ret = true;
+       if (($default == "allow") || (($default == "deny") && ($acl_mode == "allow")) || ($parent === true)) {
+               // Access is granted
+               $ret = true;
+       } // END - if
 
        // Return value
        return $ret;
@@ -130,16 +120,14 @@ function ADMINS_CHECK_ACL($act, $wht) {
 
 // Create email link to admins's account
 function ADMINS_CREATE_EMAIL_LINK ($email, $mod="admin") {
-       $locked = " AND `status`='CONFIRMED'";
-       if (IS_ADMIN()) $locked = "";
        if (strpos("@", $email) > 0) {
                // Create email link
                $result = SQL_QUERY_ESC("SELECT id
 FROM `{!_MYSQL_PREFIX!}_admins`
-WHERE email='%s'".$locked." LIMIT 1",
array($email), __FILE__, __LINE__);
+WHERE email='%s' LIMIT 1",
                      array($email), __FUNCTION__, __LINE__);
 
-               // Is there an entry?
+               // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
                        // Load userid
                        list($uid) = SQL_FETCHROW($result);
@@ -150,7 +138,7 @@ WHERE email='%s'".$locked." LIMIT 1",
 
                // Free memory
                SQL_FREERESULT($result);
-       } elseif (bigintval($email) > 0) {
+       } elseif ((is_int($email)) && ($email > 0)) {
                // Direct ID given
                $email = "{!URL!}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($email);
        }
@@ -170,13 +158,13 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                // When both passwords match update admin account
                if ($POST['pass1'][$id] == $POST['pass2'][$id]) {
                        // Save only when both passwords are the same (also when they are empty)
-                       $ADD = ""; $cache_update = "1";
+                       $add = ""; $cache_update = "1";
 
                        // Generate hash
                        $hash = generateHash($POST['pass1'][$id]);
 
                        // Save password when set
-                       if (!empty($POST['pass1'][$id])) $ADD = sprintf(", password='%s'", SQL_ESCAPE($hash));
+                       if (!empty($POST['pass1'][$id])) $add = sprintf(", password='%s'", SQL_ESCAPE($hash));
 
                        // Get admin's ID
                        $aid = GET_CURRENT_ADMIN_ID();
@@ -192,7 +180,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                                        set_session('admin_login', $login);
 
                                        // Update password cookie as well?
-                                       if (!empty($ADD)) set_session('admin_md5', $hash);
+                                       if (!empty($add)) set_session('admin_md5', $hash);
                                } elseif (generateHash($POST['pass1'][$id], $salt) != get_session('admin_md5')) {
                                        // Update password cookie
                                        set_session('admin_md5', $hash);
@@ -206,7 +194,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                        if ($default == "allow") {
                                // Allow changing default ACL
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
-login='%s'".$ADD.",
+login='%s'".$add.",
 email='%s',
 default_acl='%s',
 la_mode='%s'
@@ -217,11 +205,11 @@ WHERE id=%s LIMIT 1",
                                                $POST['mode'][$id],
                                                $POST['la_mode'][$id],
                                                $id
-                                       ), __FILE__, __LINE__);
+                                       ), __FUNCTION__, __LINE__);
                        } else {
                                // Do not allow it here
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
-login='%s'".$ADD.",
+login='%s'".$add.",
 email='%s',
 la_mode='%s'
 WHERE id=%s LIMIT 1",
@@ -230,27 +218,27 @@ WHERE id=%s LIMIT 1",
                                                $POST['email'][$id],
                                                $POST['la_mode'][$id],
                                                $id
-                                       ), __FILE__, __LINE__);
+                                       ), __FUNCTION__, __LINE__);
                        }
 
                        // Purge cache
                        CACHE_PURGE_ADMIN_MENU($id);
 
                        // Admin account saved
-                       $MSG = ADMIN_ACCOUNT_SAVED;
+                       $message = ADMIN_ACCOUNT_SAVED;
                } else {
                        // Passwords did not match
-                       $MSG = ADMINS_ERROR_PASS_MISMATCH;
+                       $message = ADMINS_ERROR_PASS_MISMATCH;
                }
 
                // Display message
-               if (!empty($MSG)) {
-                       LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+               if (!empty($message)) {
+                       LOAD_TEMPLATE("admin_settings_saved", false, $message);
                }
        }
 
        // Remove cache file
-       RUN_FILTER('post_admin_edited', REQUEST_POST_ARRAY());
+       runFilterChain('post_admin_edited', REQUEST_POST_ARRAY());
 }
 
 // Make admin accounts editable
@@ -259,15 +247,15 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
        $currMode = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
 
        // Begin the edit loop
-       $SW = 2; $OUT = "";
-       foreach ($POST['sel'] as $id => $sel) {
+       $OUT = ""; $SW = 2;
+       foreach ($POST['sel'] as $id => $selected) {
                // Secure ID number
                $id = bigintval($id);
 
                // Get the admin's data
                $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                       array($id), __FILE__, __LINE__);
-               if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
+                       array($id), __FUNCTION__, __LINE__);
+               if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
                        // Entry found
                        $content = SQL_FETCHARRAY($result);
                        SQL_FREERESULT($result);
@@ -300,19 +288,19 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
        // Check if this account is the last one which cannot be deleted...
-       $result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FUNCTION__, __LINE__);
        $accounts = SQL_NUMROWS($result_main);
        SQL_FREERESULT($result_main);
        if ($accounts > 1) {
                // Delete accounts
-               $SW = 2; $OUT = "";
-               foreach ($POST['sel'] as $id => $sel) {
+               $OUT = ""; $SW = 2;
+               foreach ($POST['sel'] as $id => $selected) {
                        // Secure ID number
                        $id = bigintval($id);
 
                        // Get the admin's data
                        $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                        array($id), __FILE__, __LINE__);
+                               array($id), __FUNCTION__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found
                                $content = SQL_FETCHARRAY($result);
@@ -351,11 +339,11 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
                if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
                        // Rewrite his tasks to all admins
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE assigned_admin=%s",
-                        array($id), __FILE__, __LINE__);
+                        array($id), __FUNCTION__, __LINE__);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                               array($id), __FILE__, __LINE__);
+                               array($id), __FUNCTION__, __LINE__);
 
                        // Purge cache
                        CACHE_PURGE_ADMIN_MENU($id);
@@ -364,14 +352,14 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
        }
 
        // Remove cache if cache system is activated
-       RUN_FILTER('post_admin_deleted', REQUEST_POST_ARRAY());
+       runFilterChain('post_admin_deleted', REQUEST_POST_ARRAY());
 }
 
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
        // Select all admin accounts
-       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FILE__, __LINE__);
-       $SW = 2; $OUT = "";
+       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FUNCTION__, __LINE__);
+       $OUT = ""; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
                $content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
@@ -395,14 +383,14 @@ function ADMINS_LIST_ADMIN_ACCOUNTS() {
 }
 
 // Filter for adding extra data to the query
-function FILTER_ADD_EXTRA_SQL_DATA ($ADD = "") {
+function FILTER_ADD_EXTRA_SQL_DATA ($add = "") {
        // Is the admins extension updated? (should be!)
-       if (GET_EXT_VERSION("admins") >= "0.3")   $ADD .= ", default_acl AS def_acl";
-       if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
-       if (GET_EXT_VERSION("admins") >= "0.7.2") $ADD .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
+       if (GET_EXT_VERSION("admins") >= "0.3")   $add .= ", default_acl AS def_acl";
+       if (GET_EXT_VERSION("admins") >= "0.6.7") $add .= ", la_mode";
+       if (GET_EXT_VERSION("admins") >= "0.7.2") $add .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
 
        // Return it
-       return $ADD;
+       return $add;
 }
 
 //