Browse Source

change password without change email see #5403

Carlos Vargas 15 years ago
parent
commit
d8d82b7dfd
1 changed files with 14 additions and 5 deletions
  1. 14 5
      main/auth/profile.php

+ 14 - 5
main/auth/profile.php

@@ -534,19 +534,25 @@ $msg_is_not_password = false;
 if (!empty($_SESSION['change_email'])) {
 	$msg_fail_changue_email= ($_SESSION['change_email'] == 'success');
 	unset($_SESSION['change_email']);
-} elseif (!empty($_SESSION['is_not_password'])) {
+}
+
+elseif (!empty($_SESSION['is_not_password'])) {
 	$msg_is_not_password = ($_SESSION['is_not_password'] == 'success');
 	unset($_SESSION['is_not_password']);
-} elseif (!empty($_SESSION['profile_update'])) {
+} 
+elseif (!empty($_SESSION['profile_update'])) {
 	$update_success = ($_SESSION['profile_update'] == 'success');
 	unset($_SESSION['profile_update']);
-} elseif (!empty($_SESSION['image_uploaded'])) {
+} 
+elseif (!empty($_SESSION['image_uploaded'])) {
 	$upload_picture_success = ($_SESSION['image_uploaded'] == 'success');
 	unset($_SESSION['image_uploaded']);
-} elseif (!empty($_SESSION['production_uploaded'])) {
+} 
+elseif (!empty($_SESSION['production_uploaded'])) {
 	$upload_production_success = ($_SESSION['production_uploaded'] == 'success');
 	unset($_SESSION['production_uploaded']);
-} elseif (isset($_POST['remove_production'])) {
+} 
+elseif (isset($_POST['remove_production'])) {
 	foreach (array_keys($_POST['remove_production']) as $production) {
 		UserManager::remove_user_production($_user['user_id'], urldecode($production));
 	}
@@ -638,6 +644,9 @@ if (!empty($_SESSION['change_email'])) {
 		$sql .= " email = '".Database::escape_string($changeemail)."', ";		
 		$password = api_get_encrypted_password($password);
 		$sql .= " password = '".Database::escape_string($password)."'";
+	} elseif (isset($password) && !isset($changeemail)) {
+		$password = api_get_encrypted_password($password);
+		$sql .= " password = '".Database::escape_string($password)."'";
 	} else {
 		// remove trailing , from the query we have so far
 		$sql = rtrim($sql, ',');