Fix: Bad check on mandatory parameters

Dolibarr · May 12, 2013 · 4fc1fe7 · 4fc1fe7
1 parent df6c796
commit 4fc1fe7
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
@@ -246,9 +246,22 @@
 	{
 		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 	}
+	$lastname=$_POST["lastname"];
+	$firstname=$_POST["firstname"];
+	$morphy=$morphy=$_POST["morphy"];;
+	if ($morphy != 'mor' && empty($lastname)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
+	}
+	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
+	}
 
 	// Create new object
-	if ($result > 0)
+	if ($result > 0 && ! $error)
 	{
 		$object->oldcopy=dol_clone($object);
 
@@ -389,6 +402,10 @@
 			$action='';
 		}
 	}
+	else
+	{
+		$action='edit';
+	}
 }
 
 if ($action == 'add' && $user->rights->adherent->creer)
@@ -489,7 +506,7 @@
 			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Password"))."<br>\n";
 		}
 	}
-	if (empty($lastname)) {
+	if ($morphy != 'mor' && empty($lastname)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";