'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

[mailer.git] / inc / modules / admin / action-logout.php

diff --git a/inc/modules/admin/action-logout.php b/inc/modules/admin/action-logout.php
index 6a640501a6d46f9d732a6cf79dcc30bf95f1498a..d31da7d8703bb8ba86b978458925b0b605a5532a 100644 (file)
--- a/inc/modules/admin/action-logout.php
+++ b/inc/modules/admin/action-logout.php
@@ -40,17 +40,17 @@
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
+} // END - if
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
-if (REQUEST_ISSET_POST(('no'))) {
+if (REQUEST_ISSET_POST('no')) {
        // Do not logout now
-       LOAD_URL('admin.php');
-} elseif ((REQUEST_ISSET_POST(('yes'))) && ($GLOBALS['action'] == 'logout')) {
+       redirectToUrl('admin.php');
+} elseif ((REQUEST_ISSET_POST(('yes'))) && (getAction() == 'logout')) {
        // Redirect to logout link
-       LOAD_URL('modules.php?module=admin&logout=1');
+       redirectToUrl('modules.php?module=admin&logout=1');
 }
 
 // Load logout form template