Some functions rewritten to hungarian notation, handling of array rewritten

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index cccd51af5adeb4efed3c25cc53f7045cdf09e239..9bb05dc9ec0814cf6ddd19103a2d8452f32abc84 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -49,6 +49,10 @@ require_once(PATH."inc/modules/admin/admin-inc.php");
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 

+// Init return value
+$ret = "init";
+
+// Is no admin registered?

 if (!isBooleanConstantAndTrue('admin_registered')) {
        // Admin is not registered so we have to inform the user
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
 if (!isBooleanConstantAndTrue('admin_registered')) {
        // Admin is not registered so we have to inform the user
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";


@@ -67,7 +71,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if (!_FATAL) {
                                // Registering is done
                        admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if (!_FATAL) {
                                // Registering is done

-                               LOAD_URL(URL."/modules.php?module=admin&amp;action=login&register=done");
+                               LOAD_URL("modules.php?module=admin&amp;action=login&register=done");

                        } else {
                                $ret = ADMIN_CANNOT_COMPLETE;
                        }
                        } else {
                                $ret = ADMIN_CANNOT_COMPLETE;
                        }


@@ -83,7 +87,9 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                                // Admin does already exists!
                                $ret = ADMIN_LOGIN_ALREADY_REG;
                        } else {
                                // Admin does already exists!
                                $ret = ADMIN_LOGIN_ALREADY_REG;
                        } else {

-                               // Any other kind
+                               // Any other kind will be logged and interpreted as 'done'
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+                               // @TODO Why is this set to 'done'?

                                $ret = "done";
                        }
 
                                $ret = "done";
                        }
 


@@ -93,7 +99,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login

-                               LOAD_URL(URL."/modules.php?module=admin&amp;action=login");
+                               LOAD_URL("modules.php?module=admin&amp;action=login");

                        } // END - if
                        break;
                }
                        } // END - if
                        break;
                }


@@ -186,7 +192,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        // At leat one administrator account was created
        if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
                // Timeout for last login, we have to logout first!
        // At leat one administrator account was created
        if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
                // Timeout for last login, we have to logout first!

-               LOAD_URL(URL."/modules.php?module=admin&amp;action=login&amp;logout=1");
+               LOAD_URL("modules.php?module=admin&amp;action=login&amp;logout=1");

        } // END - if
 
        if (!empty($_GET['register'])) {
        } // END - if
 
        if (!empty($_GET['register'])) {


@@ -195,7 +201,6 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        } // END - if
 
        // Check if the admin has submitted data or not
        } // END - if
 
        // Check if the admin has submitted data or not

-       $ret = "";

        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
                // All required data was entered so we check his account
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
                // All required data was entered so we check his account


@@ -206,7 +211,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                {
                case "done": // Admin and password are okay, so we log in now
                        // Construct URL and redirect
                {
                case "done": // Admin and password are okay, so we log in now
                        // Construct URL and redirect

-                       $URL = URL."/modules.php?module=admin&amp;";
+                       $URL = "modules.php?module=admin&amp;";

 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == "overview") {
 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == "overview") {


@@ -233,6 +238,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
                        DESTROY_ADMIN_SESSION();
                        break;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
                        DESTROY_ADMIN_SESSION();
                        break;

+
+               default: // Others will be logged
+                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+                       break;

                } // END - switch
        } // END - if
 
                } // END - switch
        } // END - if
 


@@ -323,7 +332,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message

-               ADD_FATAL(CANNOT_UNREG_SESS);
+               addFatalMessage(CANNOT_UNREG_SESS);

        }
 } else {
        // Maybe an Admin want's to login?
        }
 } else {
        // Maybe an Admin want's to login?


@@ -331,62 +340,46 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        switch ($ret)
        {
        case "done":
        switch ($ret)
        {
        case "done":

-               // Cookie-Data accepted
-               if ((set_session("admin_md5", get_session('admin_md5'))) && (set_session("admin_login", get_session('admin_login'))) && (set_session("admin_last", time())) && (set_session("admin_to", bigintval(get_session('admin_to'))))) {
-                       // Ok, Cookie-Update done
-                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
-                               // Check if action GET variable was set
-                               $act = SQL_ESCAPE($GLOBALS['action']);
-                               if (!empty($GLOBALS['what'])) {
-                                       // Get action value by what-value
-                                       $act = GET_ACTION("admin", $GLOBALS['what']);
-                               }
-
-                               // Check for access control line of current menu entry
-                               define('__ACL_ALLOW', ADMINS_CHECK_ACL($act, $GLOBALS['what']));
-                       } else {
-                               // Extension not installed so it's always allowed to access everywhere!
-                               define('__ACL_ALLOW', true);
-                       }
+               // Check for access control line of current menu entry
+               define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));

 
 

-                       // When type of admin menu is not set fallback to old menu system
-                       if (getConfig('admin_menu') == null) $_CONFIG['admin_menu'] = "OLD";
+               // When type of admin menu is not set fallback to old menu system
+               if (getConfig('admin_menu') == null) $_CONFIG['admin_menu'] = "OLD";

 
 

-                       // Check for version and switch between old menu system and new "intelligent menu system"
-                       if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
-                               // Default area is the entrance, of course
-                               $area = "entrance";
+               // Check for version and switch between old menu system and new "intelligent menu system"
+               if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
+                       // Default area is the entrance, of course
+                       $area = "entrance";

 
 

-                               // Check for similar URL variable
-                               if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
+                       // Check for similar URL variable
+                       if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);

 
 

-                               // Load "logical-area menu-system" file
-                               require_once(PATH."inc/modules/admin/lasys-inc.php");
+                       // Load "logical-area menu-system" file
+                       require_once(PATH."inc/modules/admin/lasys-inc.php");

 
 

-                               // Create new-style menu system will "logical areas"
-                               ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
-                       } else {
-                               // This little call constructs the whole default old and lacky menu system
-                               // on left side
-                               ADMIN_DO_ACTION($GLOBALS['what']);
-                       }
+                       // Create new-style menu system will "logical areas"
+                       ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);

                } else {
                } else {

-                       // Login failed (cookies enabled?)
-                       OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
-                       ADD_FATAL(CANNOT_RE_REGISTER_SESS);
+                       // This little call constructs the whole default old and lacky menu system
+                       // on left side
+                       ADMIN_DO_ACTION($GLOBALS['what']);

                }
                break;
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
                }
                break;
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();

-               ADD_FATAL(ADMIN_NOT_FOUND);
+               addFatalMessage(ADMIN_NOT_FOUND);

                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();

-               ADD_FATAL(WRONG_PASS);
+               addFatalMessage(WRONG_PASS);
+               break;
+
+       default: // Others will be logged
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));

                break;
        }
 }
                break;
        }
 }