diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 64c9a99f49b..e216b11ad5c 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -82,16 +82,19 @@ if ($_POST["action"] == 'add') { // test si le login existe deja $login=$_POST["login"]; - if(!isset($_POST["login"]) || $_POST["login"]='') + if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { - $error+=1; - $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Login"))."
\n"; - } - $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$login."';"; - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); + if(!isset($_POST["login"]) || $_POST["login"]='') + { + $error+=1; + $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Login"))."
\n"; + } + $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$login."';"; + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + } } if (!isset($_POST["nom"]) || !isset($_POST["prenom"]) || $_POST["prenom"]=='' || $_POST["nom"]=='') { @@ -103,16 +106,18 @@ if ($_POST["action"] == 'add') $error+=1; $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("EMail"))."
\n"; } - if ($num !=0) { - $error+=1; - $errmsg .= $langs->trans("ErrorLoginAlreadyExists")."
\n"; - } - if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"]!=$_POST["pass2"]) - { - $error+=1; - $langs->load("errors"); - $errmsg .= $langs->trans("ErrorPasswordsMustMatch")."
\n"; + if ($num !=0) + { + $error+=1; + $errmsg .= $langs->trans("ErrorLoginAlreadyExists")."
\n"; + } + if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"]!=$_POST["pass2"]) + { + $error+=1; + $langs->load("errors"); + $errmsg .= $langs->trans("ErrorPasswordsMustMatch")."
\n"; + } } if (isset($_POST["naiss"]) && $_POST["naiss"] !='') { @@ -142,8 +147,11 @@ if ($_POST["action"] == 'add') $adh->cp = $_POST["cp"]; $adh->ville = $_POST["ville"]; $adh->email = $_POST["email"]; - $adh->login = $login; - $adh->pass = $_POST["pass1"]; + if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) + { + $adh->login = $login; + $adh->pass = $_POST["pass1"]; + } $adh->photo = $_POST["photo"]; $adh->note = $_POST["note"]; $adh->pays = $_POST["pays"]; @@ -269,9 +277,12 @@ print '