1 files changed, 5 insertions, 8 deletions

diff --git a/final/app/profil.php b/final/app/profil.php
index eebc750..55e91ff 100644
--- a/final/app/profil.php
+++ b/final/app/profil.php
@@ -11,20 +11,17 @@ if ( isset($_REQUEST['action']) )
 	if ($_POST['action'] == "maj_profil")
 	{
 		include('auth_dialog.php');
-		if ( authentification(addslashes_if_needed($_POST['loginP']),addslashes_if_needed($_POST['pass']),addslashes_if_needed($_POST['methodeAuth'])) === true )
+		$result_fonc = authentification(addslashes_if_needed($_POST['loginP']),addslashes_if_needed($_POST['pass']),addslashes_if_needed($_POST['methodeAuth']));
+		if ($result_fonc  === true )
 		{
 			$nom_func = 'traiter_formulaire_' . $_REQUEST['action'];
 			$result_fonc = $nom_func();
 		}
-		else
-		{
-			$result_fonc = -1;
-		}
 	}
 }
 if (isset($_POST['pre_action']) )
 {
-	if (($_POST['pre_action'] == "verif_profil"  & ($_POST["oldLogin"] == $_POST["loginP"]) | ($_POST["oldMethodeAuth"] == $_POST["methodeAuth"])))
+	if (($_POST['pre_action'] == "verif_profil"  & ($_POST["oldLogin"] == $_POST["loginP"]) & ($_POST["oldMethodeAuth"] == $_POST["methodeAuth"])))
 	{
 		$nom_func = 'traiter_formulaire_maj_profil';
 		$result_fonc = $nom_func();
@@ -85,8 +82,7 @@ if ($verif_auth==false)
 		if (isset($result_fonc))
 		{
 			if ($result_fonc === true) echo "Les modifications ont été prises en compte.";
-			if ($result_fonc === false) echo "Erreur de modification de votre compte.";
-			if ($result_fonc === -1) echo "Erreur, le mot de passe et le login ne sont pas conformes.";
+			else echo $result_fonc;
 			echo "<br/><br/>\n";
 			
 		}
@@ -94,6 +90,7 @@ if ($verif_auth==false)
 		echo "<form method=\"post\" action=\"profil.php\"  onSubmit=\"return verifProfil()\" >\n";
 		echo "<table summary=\"Formulaire permettant de modifier le profil de l'utilisateur\" >\n";
 		echo "<tr><td>Methode d'authentification : </td><td>\n<select name=\"methodeAuth\">\n";
+		//echo "<option value=\"bypass\" selected=\"selected\">bypass</option>\n";
 		if($p["methodeAuth"] == "webetud") echo "<option value=\"webetud\" selected=\"selected\">Webetud</option>\n"; else echo "<option value=\"webetud\">Webetud</option>\n";
 		if($p["methodeAuth"] == "pop") echo "<option value=\"pop\" selected=\"selected\">POP3</option>\n"; else echo "<option value=\"pop\">POP3</option>\n";
 		echo "</select></td></tr>\n";