Changed all admin getter, closed internal TODOs:

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 3ea2e49dc97bc31d10cf3f428f38bfeab50e7203..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';
@@ -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&logout=1');
        } // END - if
@@ -356,7 +356,7 @@ if (!isAdminRegistered()) {
        }
 } 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;