Some functions rewritten to hungarian notation, handling of array rewritten
[mailer.git] / inc / modules / admin.php
index cbf18f8..9bb05dc 100644 (file)
@@ -71,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
-                               LOAD_URL(URL."/modules.php?module=admin&action=login&register=done");
+                               LOAD_URL("modules.php?module=admin&action=login&register=done");
                        } else {
                                $ret = ADMIN_CANNOT_COMPLETE;
                        }
@@ -99,7 +99,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
-                               LOAD_URL(URL."/modules.php?module=admin&action=login");
+                               LOAD_URL("modules.php?module=admin&action=login");
                        } // END - if
                        break;
                }
@@ -192,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!
-               LOAD_URL(URL."/modules.php?module=admin&action=login&logout=1");
+               LOAD_URL("modules.php?module=admin&action=login&logout=1");
        } // END - if
 
        if (!empty($_GET['register'])) {
@@ -211,7 +211,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                {
                case "done": // Admin and password are okay, so we log in now
                        // Construct URL and redirect
-                       $URL = URL."/modules.php?module=admin&";
+                       $URL = "modules.php?module=admin&";
 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == "overview") {
@@ -332,7 +332,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                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?
@@ -340,50 +340,42 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        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
-                       // Check for access control line of current menu entry
-                       define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));
+               // 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 {
-                       // 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();
-               ADD_FATAL(ADMIN_NOT_FOUND);
+               addFatalMessage(ADMIN_NOT_FOUND);
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
-               ADD_FATAL(WRONG_PASS);
+               addFatalMessage(WRONG_PASS);
                break;
 
        default: // Others will be logged