Direct registration added, typo fixed, admin session on missing/failed login fixed...

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 515c745ee9fb0e8ffc28c647ac18bc9e0b2e8f2a..1017c5b164705944c20cd1611f67304cbe962214 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");
 if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");

-}
+} // END - if

 
 // Load include file
 require_once(PATH."inc/modules/admin/admin-inc.php");
 
 // Load include file
 require_once(PATH."inc/modules/admin/admin-inc.php");


@@ -228,11 +228,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
                        $ret = ADMIN_NOT_FOUND;
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
                        $ret = ADMIN_NOT_FOUND;

+                       DESTROY_ADMIN_SESSION();

                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
                        $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";

+                       DESTROY_ADMIN_SESSION();

                        break;
                }
        }
                        break;
                }
        }


@@ -299,16 +301,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        }
 } elseif (isset($_GET['logout'])) {
        // Only try to remove cookies
        }
 } elseif (isset($_GET['logout'])) {
        // Only try to remove cookies

-       if (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) {
-               // Also remove array elements
-               set_session('admin_login', "");
-               set_session('admin_md5'  , "");
-               set_session('admin_last' , "");
-               set_session('admin_to'   , "");
-
-               // Destroy session
-               @session_destroy();
-
+       if (DESTROY_ADMIN_SESSION()) {

                // Load logout template
                if (isset($_GET['register'])) {
                        // Secure input
                // Load logout template
                if (isset($_GET['register'])) {
                        // Secure input


@@ -387,11 +380,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
 
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;

+               DESTROY_ADMIN_SESSION();

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

+               DESTROY_ADMIN_SESSION();

                ADD_FATAL(WRONG_PASS);
                break;
        }
                ADD_FATAL(WRONG_PASS);
                break;
        }