Merged all main trunk bugfixes up to release 2.0.5

[fa-stable.git] / admin / change_current_user_password.php

diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php
index 817c94f64a94910364c66d3625f2aef3de01a5a2..abfd8529f43c6647533708b1738a06208677c211 100644 (file)
--- a/admin/change_current_user_password.php
+++ b/admin/change_current_user_password.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security=1;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -14,11 +23,6 @@ include_once($path_to_root . "/admin/db/users_db.inc");
 $selected_id = $_SESSION["wa_current_user"]->username;
 
 
-if (isset($_GET['UpdatedID']))
-{
-    display_notification_centered(_("Your password has been updated."));
-}
-
 function can_process()
 {
 
@@ -51,14 +55,9 @@ if (isset($_POST['UPDATE_ITEM']))
 
        if (can_process())
        {
-       if (isset($selected_id))
-       {
-               if ($_POST['password'] != "")
-                       update_user_password($_POST['user_id'], md5($_POST['password']));
-
-                       unset($selected_id);
-               meta_forward($_SERVER['PHP_SELF'], "UpdatedID=1");
-       }
+               update_user_password($_POST['user_id'], md5($_POST['password']));
+           display_notification(_("Your password has been updated."));
+               $Ajax->activate('_page_body');
        }
 }
 
@@ -66,19 +65,14 @@ start_form();
 
 start_table($table_style);
 
-if (isset($selected_id))
-{
-       //editing an existing User
-
-       $myrow = get_user($selected_id);
+$myrow = get_user($selected_id);
 
-       $_POST['user_id'] = $myrow["user_id"];
-       hidden('selected_id', $selected_id);
-       hidden('user_id', $_POST['user_id']);
+$_POST['user_id'] = $myrow["user_id"];
+hidden('selected_id', $selected_id);
+hidden('user_id', $_POST['user_id']);
 
-       label_row(_("User login:"), $_POST['user_id']);
+label_row(_("User login:"), $_POST['user_id']);
 
-}
 $_POST['password'] = "";
 $_POST['passwordConfirm'] = "";
 
@@ -92,15 +86,11 @@ label_cell(_("Repeat password:"));
 label_cell("<input type='password' name='passwordConfirm' size=22 maxlength=20 value='" . $_POST['passwordConfirm'] . "'>");
 end_row();
 
-if (isset($selected_id))
-{
-       table_section_title(_("Enter your new password in the fields."));
-}
+table_section_title(_("Enter your new password in the fields."));
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
-
+submit_center( 'UPDATE_ITEM', _('Change password'), true, '', true);
 end_form();
 end_page();
 ?>