Rewrites/fixes for handling config entries in SQLs

[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 8764a6e4314766f673fdb53062a2d3c6c41b811c..b617cb7993586a01c70388c15813b1818e7a19fb 100644 (file)
--- a/inc/modules/admin/action-logout.php
+++ b/inc/modules/admin/action-logout.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/13/2006 *
- * ===============                              Last change: 01/13/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 01/13/2006 *
+ * ===================                          Last change: 01/13/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : action-logout.php                                *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,24 +38,23 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
 
-if (REQUEST_ISSET_POST(('no'))) {
+if (isPostRequestParameterSet('no')) {
        // Do not logout now
-       LOAD_URL("admin.php");
-} elseif ((REQUEST_ISSET_POST(('yes'))) && ($GLOBALS['action'] == "logout")) {
+       redirectToUrl('admin.php');
+} elseif ((isPostRequestParameterSet(('yes'))) && (getAction() == 'logout')) {
        // Redirect to logout link
-       LOAD_URL("modules.php?module=admin&amp;logout=1");
+       redirectToUrl('modules.php?module=admin&amp;logout=1');
 }
 
 // Load logout form template
-LOAD_TEMPLATE("admin_logout_form");
+loadTemplate('admin_logout_form');
 
-//
+// [EOF]
 ?>