Corrected password validation and creation of new user

ionize · Oct 21, 2014 · bbceac7 · bbceac7
1 parent 9005b0c
commit bbceac7
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/application/controllers/admin/user.php b/application/controllers/admin/user.php
@@ -191,23 +191,21 @@ public function save()
 				)
 			);
 
-			// Existing
-			if ($id_user != FALSE)
+			// Passwords must match
+			if (($this->input->post('password') != '') &&
+				($this->input->post('password') == $this->input->post('password2')))
 			{
-				if (($this->input->post('password') != '' && $this->input->post('password2') != '') &&
-					($this->input->post('password') == $this->input->post('password2'))	)
-				{
-					$post['password'] = User()->encrypt($this->input->post('password'), $post);
-				}
-				else
-				{
-					unset($post['password'], $post['password2']);
-				}
+				$post['password'] = User()->encrypt($this->input->post('password'), $post);
 			}
-			// New
 			else
 			{
-				$post['password'] = User()->encrypt($this->input->post('password'), $post);
+				unset($post['password'], $post['password2']);
+			}
+
+			// New user?
+			if ($id_user == false)
+			{
+				$post['id_user'] = null;
 			}
 
 			// Save