X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fchange_current_user_password.php;h=f2b270c8138a38dc0241f501be4d6b69e7587364;hb=3e2f1b46bb33c1720b4373f324f6126ca26d2ac7;hp=abfd8529f43c6647533708b1738a06208677c211;hpb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;p=fa-stable.git

diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php
index abfd8529..f2b270c8 100644
--- a/admin/change_current_user_password.php
+++ b/admin/change_current_user_password.php
@@ -1,13 +1,13 @@
 <?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.
+	Released under the terms of the GNU General Public License, GPL, 
+	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>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security=1;
 $path_to_root="..";
@@ -20,9 +20,6 @@ include_once($path_to_root . "/includes/ui.inc");
 
 include_once($path_to_root . "/admin/db/users_db.inc");
 
-$selected_id = $_SESSION["wa_current_user"]->username;
-
-
 function can_process()
 {
 
@@ -33,7 +30,7 @@ function can_process()
    		return false;
    	}
 
-   	if (strstr($_POST['password'], $_POST['user_id']) != false)
+   	if (strstr($_POST['password'], $_SESSION["wa_current_user"]->username) != false)
    	{
    		display_error( _("The password cannot contain the user login."));
 		set_focus('password');
@@ -55,8 +52,14 @@ if (isset($_POST['UPDATE_ITEM']))
 
 	if (can_process())
 	{
-		update_user_password($_POST['user_id'], md5($_POST['password']));
-	    display_notification(_("Your password has been updated."));
+		if ($allow_demo_mode) {
+		    display_warning(_("Password cannot be changed in demo mode."));
+		} else {
+			update_user_password($_SESSION["wa_current_user"]->user, 
+				$_SESSION["wa_current_user"]->username,
+				md5($_POST['password']));
+		    display_notification(_("Your password has been updated."));
+		}
 		$Ajax->activate('_page_body');
 	}
 }
@@ -65,13 +68,9 @@ start_form();
 
 start_table($table_style);
 
-$myrow = get_user($selected_id);
-
-$_POST['user_id'] = $myrow["user_id"];
-hidden('selected_id', $selected_id);
-hidden('user_id', $_POST['user_id']);
+$myrow = get_user($_SESSION["wa_current_user"]->user);
 
-label_row(_("User login:"), $_POST['user_id']);
+label_row(_("User login:"), $myrow['user_id']);
 
 $_POST['password'] = "";
 $_POST['passwordConfirm'] = "";
@@ -90,7 +89,7 @@ table_section_title(_("Enter your new password in the fields."));
 
 end_table(1);
 
-submit_center( 'UPDATE_ITEM', _('Change password'), true, '', true);
+submit_center( 'UPDATE_ITEM', _('Change password'), true, '',  'default');
 end_form();
 end_page();
 ?>