'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 9a9eab41e00d956cafb98c7eedcea76a581cfb1e..bdb9dedaf6c4ed86e8a64b269737850f92662f81 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -239,19 +239,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']."*<br />\n";
+       //* DEBUG: */ echo __LINE__."*".$wht.'/'.getModule().'/'.getAction().'/'.getWhat()."*<br />\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 +259,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 +281,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 +298,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 +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."_".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 +345,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;
                        }
 
@@ -393,7 +393,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                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 +488,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 = "      <option value=\"all\">{--ALL_MEMBERS--}</option>\n";
-       elseif ($none === true) $OUT = "      <option value=\"0\">{--SELECT_NONE--}</option>\n";
+        elseif ($none === true) $OUT = "      <option value=\"0\">{--SELECT_NONE--}</option>\n";
 
        while ($content = SQL_FETCHARRAY($result)) {
                $OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
@@ -508,7 +508,7 @@ function ADD_MEMBER_SELECTION_BOX ($def='0', $add_all=false, $return=false, $non
                define('__LANG_VALUE', getLanguage());
 
                // Load template
-               LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);
+               LOAD_TEMPLATE('admin_member_selection_box', false, getWhat());
        } else {
                // Return content in selection frame
                return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
@@ -564,7 +564,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
        // Now, walk through all entries and prepare them for saving
        foreach ($POST as $id => $val) {
                // Process only formular field but not submit buttons ;)
-               if ($id != "ok") {
+               if ($id != 'ok') {
                        // Do not save the ok value
                        convertSelectionsToTimestamp($POST, $DATA, $id, $skip);
 
@@ -672,7 +672,7 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default = '') {
                                $part = substr($part, 0, -4);
 
                                // Is that part different from the overview?
-                               if ($part != "overview") {
+                               if ($part != 'overview') {
                                        $OUT .= "       <option value=\"".$part."\"";
                                        if ($part == $default) $OUT .= ' selected="selected"';
                                        $OUT .= ">".$part."</option>\n";
@@ -733,7 +733,7 @@ function ADMIN_CHECK_MENU_MODE () {
        }
 
        // Check what the admin wants and set it when it's not the global mode
-       if ($ADMIN != "global") $mode = $ADMIN;
+       if ($ADMIN != 'global') $mode = $ADMIN;
 
        // Return admin-menu's mode
        return $mode;
@@ -1278,13 +1278,13 @@ function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
 // Checks wether if the admin menu has entries
 function ifAdminMenuHasEntries ($action) {
        return (
-       ((
-       isset($GLOBALS['admin_menu_has_entries'][$action])
-       ) && (
-       $GLOBALS['admin_menu_has_entries'][$action] === true
-       )) || (
-       $action == "login"
-       )
+               ((
+                       isset($GLOBALS['admin_menu_has_entries'][$action])
+               ) && (
+                       $GLOBALS['admin_menu_has_entries'][$action] === true
+               )) || (
+                       $action == 'login'
+               )
        );
 }
 
@@ -1298,11 +1298,11 @@ function ADMIN_CREATE_USERID_LINK ($uid) {
        // Is the userid set correctly?
        if ($uid > 0) {
                // Create a link to that profile
-               return "{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid=".bigintval($uid);
+               return '{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid='.bigintval($uid);
        } // END - if
 
        // Return a link to the user list
-       return "{!URL!}/modules.php?module=admin&amp;what=list_user";
+       return '{!URL!}/modules.php?module=admin&amp;what=list_user';
 }
 
 //