New wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 6922dbedb93b0ab40773e97c5b2c79d110030faf..bb2904d744f4e36c081bc8c57be2eca02b53a2f8 100644 (file)
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -14,12 +14,11 @@
  * $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!!!!!!            *
  * -------------------------------------------------------------------- *
  * @TODO Add support for ext-country                                    *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Fix a notice
 $result_main = false;
@@ -65,12 +64,12 @@ LIMIT 1",
                ), __FILE__, __LINE__);
 } // END - if
 
-if ((SQL_NUMROWS($result_main) == 1) || (!isGetRequestParameterSet('userid'))) {
+if ((!isGetRequestParameterSet('userid')) || (SQL_NUMROWS($result_main) == 1)) {
        // User found
        if (!isGetRequestParameterSet('userid')) {
                // Output selection form with all confirmed user accounts listed
                addMemberSelectionBox();
-       } elseif (isPostRequestParameterSet('edit')) {
+       } elseif (isFormSent('edit')) {
                // Ok, change the account...
                $updateUser = false; $add = '';
                if ((!isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
@@ -110,14 +109,14 @@ LIMIT 1",
                                postRequestParameter('email'),
                                bigintval(getRequestParameter('userid')),
                        ), __FILE__, __LINE__);
-                       $content = getMessage('USER_ACCOUNT_SAVED');
+                       $content = '{--ADMIN_USER_ACCOUNT_SAVED--}';
                } else {
                        // Problem while saving data
-                       $content = getMessage('USER_ACCOUNT_NOT_SAVED');
+                       $content = '{--ADMIN_USER_ACCOUNT_NOT_SAVED--}';
                }
 
                // Load template
-               loadTemplate('admin_settings_saved', false, $content);
+               displayMessage($content);
        } else {
                // Load entry
                $content = SQL_FETCHARRAY($result_main);
@@ -135,7 +134,7 @@ LIMIT 1",
        }
 } else {
        // Account does not exists!
-       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+       loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 }
 
 // Free the result