Module-related code moved, deprecated templates deleted, internals stats are now...

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 05deff7ed5b7ecef3c7aff7161a69803b0db362e..01facaab06f0026c69e97acdb88e1f24108ad377 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 loadIncludeOnce('inc/modules/admin/admin-inc.php');
 
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
-fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last'));
+fixDeletedCookies(array('admin_id', 'admin_md5', 'admin_last'));
 
 // Init return value
 $ret = 'init';
@@ -80,7 +80,7 @@ if (!isAdminRegistered()) {
                                        redirectToUrl('modules.php?module=admin&register=done');
                                } else {
                                        // Registration incomplete
-                                       $errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+                                       $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
 
                                        // Set this to have our error message displayed
                                        setPostRequestParameter('ok', '***');
@@ -88,14 +88,14 @@ if (!isAdminRegistered()) {
                                break;
 
                        case 'failed': // Registration has failed
-                               $errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+                               $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
 
                                // Set this to have our error message displayed
                                setPostRequestParameter('ok', '***');
                                break;
 
                        case 'already': // Admin does already exists!
-                               $errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+                               $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
 
                                // Set this to have our error message displayed
                                setPostRequestParameter('ok', '***');
@@ -133,24 +133,24 @@ if (!isAdminRegistered()) {
                        $pass2Message = '';
 
                        // No login entered?
-                       if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+                       if (empty($content['login'])) $loginMessage = '{--ADMIN_NO_LOGIN--}';
 
                        // An error comes back from registration?
                        if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
 
                        // No password 1 entered or to short?
-                       if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
-                        elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1');
+                       if (!isPostRequestParameterSet('pass1')) $pass1Message = '{--ADMIN_NO_PASS1--}';
+                        elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = '{--ADMIN_SHORT_PASS1--}';
 
                        // No password 2 entered or to short?
-                       if (!isPostRequestParameterSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2');
-                        elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2');
+                       if (!isPostRequestParameterSet('pass2')) $pass2Message = '{--ADMIN_NO_PASS2--}';
+                        elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = '{--ADMIN_SHORT_PASS2--}';
 
                        // Both didn't match?
                        if (postRequestParameter('pass1') != postRequestParameter('pass2')) {
                                // No match
-                               if (empty($pass1Message)) $pass1Message = getMessage('ADMIN_PASS1_MISMATCH');
-                               if (empty($pass2Message)) $pass2Message = getMessage('ADMIN_PASS2_MISMATCH');
+                               if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}';
+                               if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}';
                        } // END - if
 
                        // Output error messages
@@ -204,9 +204,9 @@ if (!isAdminRegistered()) {
                // Output reset password form
                loadTemplate('admin_send_reset_link');
        }
-} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
+} elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
        // At leat one administrator account was created
-       if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
+       if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
                // Timeout for last login, we have to logout first!
                redirectToUrl('modules.php?module=admin&amp;logout=1');
        } // END - if
@@ -279,16 +279,16 @@ if (!isAdminRegistered()) {
                        $loginMessage = ''; $passwdMessage = '';
 
                        // No login entered?
-                       if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+                       if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
 
                        // An error comes back from login?
                        if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+                       if (!isPostRequestParameterSet('pass')) $passwdMessage = '{--ADMIN_NO_PASS--}';
 
                        // Or password too short?
-                       if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+                       if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
 
                        // An error comes back from login?
                        if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
@@ -352,11 +352,11 @@ if (!isAdminRegistered()) {
                loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
 
                // Add fatal message
-               addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
+               addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
        }
 } else {
        // Maybe an Admin want's to login?
-       $ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
+       $ret = ifAdminCookiesAreValid(getSession('admin_id'), getSession('admin_md5'));
 
        // Check status
        switch ($ret) {
@@ -389,7 +389,7 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_id')));
                        destroyAdminSession();
                        break;