MINOR: Small code improvements

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index b67226cf919c390c400382aa71fceef7cf68fb4a..8e0abb3736506004d06c1963b0c07ab132c073a9 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -99,9 +99,9 @@ if (!isAdminRegistered()) {
                redirectToUrl('modules.php?module=admin&logout=1');
        } // END - if
 
-       if (isGetRequestElementSet('register')) {
+       if (isGetRequestElementSet('setup')) {
                // Registration of first admin is done
-               if (getRequestElement('register') == 'done') {
+               if (getRequestElement('setup') == 'done') {
                        // Regisration done!
                        displayMessage('{--ADMIN_REGISTER_DONE--}');
                } // END - if
@@ -197,9 +197,9 @@ if (!isAdminRegistered()) {
        // Only try to remove cookies
        if (destroyAdminSession(TRUE)) {
                // Load logout template
-               if (isGetRequestElementSet('register')) {
+               if (isGetRequestElementSet('setup')) {
                        // Secure input
-                       $register = getRequestElement('register');
+                       $register = getRequestElement('setup');
 
                        // Special logout redirect for installation of given extension
                        loadTemplate(sprintf("admin_logout_%s_install", $register));
@@ -215,7 +215,7 @@ if (!isAdminRegistered()) {
                }
        } else {
                // Something went wrong here...
-               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}');
+               displayErrorMessage('{--ADMIN_LOGOUT_FAILED--}');
 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');