Several kinky code smoothed, fixes for admin login

[mailer.git] / inc / modules / admin / what-config_session.php

diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php
index 4ee5e525a64427887afba30d700120a0a17a8682..abc556d8de7da7cae2923cfb58364558ffef1b87 100644 (file)
--- a/inc/modules/admin/what-config_session.php
+++ b/inc/modules/admin/what-config_session.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,22 +37,21 @@
  ************************************************************************/
 
 // 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 (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Test Path
-       if ((!REQUEST_ISSET_POST(('session_save_path'))) || ((isDirectory(REQUEST_POST('session_save_path'))) && (is_writeable(REQUEST_POST('session_save_path'))))) {
+       if ((!isPostRequestElementSet(('session_save_path'))) || ((isDirectory(postRequestElement('session_save_path'))) && (is_writeable(postRequestElement('session_save_path'))))) {
                // Save configuration
-               ADMIN_SAVE_SETTINGS_POST();
+               adminSaveSettingsFromPostData();
        } else {
                // Invalid!
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_SESSION_SAVE_PATH_INVALID'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SESSION_SAVE_PATH_INVALID'));
        }
 } else {
        // Prepare content
@@ -61,8 +60,8 @@ if (IS_FORM_SENT()) {
        );
 
        // Load template
-       LOAD_TEMPLATE("admin_config_session", false, $content);
+       loadTemplate('admin_config_session', false, $content);
 }
 
-//
+// [EOF]
 ?>