Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Bad error management when validating member

Browse Source
This commit is contained in:
Laurent Destailleur 2012-10-22 00:18:32 +02:00
parent bba5057d5d
commit 732b3ceace
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/admin/mailman.php
View File

@ -200,8 +200,6 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN))
print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL% <br>';
print '<br>';
}
else
{

4
htdocs/adherents/class/adherent.class.php
View File

@ -1377,6 +1377,7 @@ class Adherent extends CommonObject
$result=$mailmanspip->add_to_mailman($this);
if ($result < 0)
{
$this->error=$mailmanspip->error;
$err+=1;
}
}
@ -1387,7 +1388,8 @@ class Adherent extends CommonObject
$result=$mailmanspip->add_to_spip($this);
if ($result < 0)
{
$err+=1;
$this->error=$mailmanspip->error;
$err+=1;
}
}
if ($err)

31
htdocs/adherents/fiche.php
View File

@ -578,36 +578,53 @@ if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confir
if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
{
$result=$object->validate($user);
$error=0;
$db->begin();
$adht = new AdherentType($db);
$adht->fetch($object->typeid);
$result=$object->validate($user);
if ($result >= 0 && ! count($object->errors))
{
// Send confirmation Email (selon param du type adherent sinon generique)
if ($object->email && $_POST["send_mail"])
if ($object->email && ! empty($_POST["send_mail"]))
{
$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
if ($result < 0)
{
$error++;
$errmsg.=$object->error;
}
}
// Rajoute l'utilisateur dans les divers abonnements (mailman, spip, etc...)
if ($object->add_to_abo() < 0)
// Add user to other systems (mailman, spip, etc...)
// TODO Move this into trigger on validate action
if (! $error && $object->add_to_abo() < 0)
{
// error
$errmsg.= $langs->trans("ErrorFailedToAddToMailmanList").': '.$object->error."<br>\n";
$langs->load("errors");
$error++;
$errmsg.= $langs->trans("ErrorFailedToAddToMailmanList").': '.$object->error." ".join(',',$object->errors)."<br>\n";
}
}
else
{
$error++;
if ($object->error) $errmsg=$object->error;
else $errmsgs=$object->errors;
$action='';
}
if (! $error)
{
$db->commit();
}
else
{
$db->rollback();
}
$action='';
}
if ($user->rights->adherent->supprimer && $action == 'confirm_resign')