New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index f92332230e8a55c3b6dfee8ee3604326db46d28c..3a3472bcc1e9686b908203ad2e99065bf132e1bc 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -43,22 +43,22 @@ if (!defined('__SECURITY')) {
 }
 
 // Load include file
-LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
+loadIncludeOnce('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'));
+fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
 // Init return value
-$ret = "init";
+$ret = 'init';
 
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
        if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
-               REQUEST_SET_POST('ok', "***");
+               REQUEST_SET_POST('ok', '***');
        }
 
-       if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != "***")) {
+       if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
                // Hash the password with the old function because we are here in install mode
                $hashedPass = md5(REQUEST_POST('pass'));
 
@@ -69,11 +69,11 @@ if (!isAdminRegistered()) {
                $ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
                switch ($ret)
                {
-               case "done":
+               case 'done':
                        $done = changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
                        if ($done === true) {
                                // Registering is done
-                               LOAD_URL('modules.php?module=admin&amp;register=done');
+                               redirectToUrl('modules.php?module=admin&amp;register=done');
                        } else {
                                $ret = getMessage('ADMIN_CANNOT_COMPLETE');
                        }
@@ -101,7 +101,7 @@ if (!isAdminRegistered()) {
                                changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
                                // Load URL for login
-                               LOAD_URL('modules.php?module=admin');
+                               redirectToUrl('modules.php?module=admin');
                        } // END - if
                        break;
                }
@@ -193,11 +193,11 @@ if (!isAdminRegistered()) {
                // Output reset password form
                LOAD_TEMPLATE('admin_send_reset_link');
        }
-} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((get_session('admin_last') + bigintval(get_session('admin_to')) * 3600 * 24) < time())) {
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((getSession('admin_last') + bigintval(getSession('admin_to')) * 3600 * 24) < time())) {
        // 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('modules.php?module=admin&amp;logout=1');
+               redirectToUrl('modules.php?module=admin&amp;logout=1');
        } // END - if
 
        if (REQUEST_ISSET_GET(('register'))) {
@@ -223,7 +223,7 @@ if (!isAdminRegistered()) {
 
                        // Rewrite overview module
                        if ($GLOBALS['what'] == 'overview') {
-                               $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
+                               $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
                        } // END - if
 
                        // Add data to URL
@@ -232,7 +232,7 @@ if (!isAdminRegistered()) {
                         elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area');
 
                        // Load URL
-                       LOAD_URL($URL);
+                       redirectToUrl($URL);
                        break;
 
                case '404': // Administrator login not found
@@ -346,7 +346,7 @@ if (!isAdminRegistered()) {
        }
 } else {
        // Maybe an Admin want's to login?
-       $ret = CHECK_ADMIN_COOKIES(get_session('admin_login'), get_session('admin_md5'));
+       $ret = CHECK_ADMIN_COOKIES(getSession('admin_login'), getSession('admin_md5'));
        switch ($ret)
        {
        case 'done':
@@ -357,7 +357,7 @@ if (!isAdminRegistered()) {
                if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
 
                // Check for version and switch between old menu system and new intelligent menu system
-               if ((ADMIN_CHECK_MENU_MODE() == 'NEW') && (INCLUDE_READABLE('inc/modules/admin/lasys-inc.php'))) {
+               if ((ADMIN_CHECK_MENU_MODE() == 'NEW') && (isIncludeReadable('inc/modules/admin/lasys-inc.php'))) {
                        // Default area is the entrance, of course
                        $area = 'entrance';
 
@@ -365,7 +365,7 @@ if (!isAdminRegistered()) {
                        if (REQUEST_ISSET_GET('area')) $area = REQUEST_GET('area');
 
                        // Load logical-area menu-system file
-                       LOAD_INC_ONCE('inc/modules/admin/lasys-inc.php');
+                       loadIncludeOnce('inc/modules/admin/lasys-inc.php');
 
                        // Create new-style menu system will logical areas
                        ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);