A lot texts rewritten and exclamation signs removed

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

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index 4f7f51e59fcb844ca26fd013c36f77e59b96e640..eb3ec7336682ec831abdf7d1b406460ea04fca7c 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Neues Administrator-Account anlegen              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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 *
@@ -32,41 +37,41 @@
  ************************************************************************/
 
 // 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__);
 
 // Display form is default
 $FORM = true;
 
-if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('email'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
+if ((isPostRequestElementSet('add')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('email')) && (isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')) && (postRequestElement('pass1') == postRequestElement('pass2'))) {
        // Add admin when not added already
-       if (REGISTER_ADMIN(REQUEST_POST('login'), generateHash(REQUEST_POST('pass1')), REQUEST_POST('email')) == "done") {
+       if (addAdminAccount(postRequestElement('login'), generateHash(postRequestElement('pass1')), postRequestElement('email')) == 'done') {
                // Do not ouput any form!
                $FORM = false;
 
                // Admin login saved
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ADD_DONE'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ADD_DONE'));
 
                // Run filter chain
-               RUN_FILTER('post_admin_added', REQUEST_POST_ARRAY());
+               runFilterChain('post_admin_added', postRequestArray());
        } // END - if
 } // END - if
 
 // Shall we display the form?
 if ($FORM === true) {
-       // Set missing elements
-       // @TODO Do we still need this ugly code here?
-       if (!REQUEST_ISSET_POST(('login'))) REQUEST_SET_POST('login', "");
-       if (!REQUEST_ISSET_POST(('email'))) REQUEST_SET_POST('email', "");
+       // Prepare content
+       $content = merge_array(
+               array('login' => '', 'email' => ''),
+               postRequestArray()
+       );
 
        // Load form from template
-       LOAD_TEMPLATE("admin_admins_add");
+       loadTemplate('admin_admins_add', false, $content);
 } // END - if
 
-//
+// [EOF]
 ?>