Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Modif mineures

Browse Source
This commit is contained in:
Laurent Destailleur
2007-02-27 22:00:59 +00:00
parent 478a9eb5dc
commit d297e9ad9a
2 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/fiche.php
View File

@@ -194,7 +194,7 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"])
{ {
if (isset($_POST["password"]) && $_POST["password"] !='') if (isset($_POST["password"]) && $_POST["password"] !='')
{ {
$ret=$edituser->password($user,$password,$conf->password_encrypted,1); $ret=$edituser->password($user,$password,$conf->password_encrypted,0);
if ($ret < 0) if ($ret < 0)
{ {
$message.='<div class="error">'.$edituser->error.'</div>'; $message.='<div class="error">'.$edituser->error.'</div>';
@@ -333,7 +333,7 @@ if ($_POST["action"] == 'add')
{ {
if (isset($_POST['password']) && trim($_POST['password'])) if (isset($_POST['password']) && trim($_POST['password']))
{ {
$adh->password($user,trim($_POST['password']),$conf->password_encrypted); $adh->password($user,trim($_POST['password']),0);
} }
if ($cotisation > 0) if ($cotisation > 0)
@@ -1023,7 +1023,7 @@ if ($rowid && $action != 'edit')
} }
// Envoi fiche par mail // Envoi fiche par mail
if ($adh->statut >= 1) if ($adh->statut >= 1 && $adh->email)
{ {
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n"; print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n";
} }

2
htdocs/lib/functions.inc.php
View File

@@ -194,7 +194,6 @@ function dolibarr_syslog($message, $level=LOG_INFO)
else else
{ {
//define_syslog_variables(); d<>j<EFBFBD> d<>finit dans master.inc.php //define_syslog_variables(); d<>j<EFBFBD> d<>finit dans master.inc.php
if (defined("MAIN_SYSLOG_FACILITY") && MAIN_SYSLOG_FACILITY) if (defined("MAIN_SYSLOG_FACILITY") && MAIN_SYSLOG_FACILITY)
{ {
$facility = MAIN_SYSLOG_FACILITY; $facility = MAIN_SYSLOG_FACILITY;
@@ -224,6 +223,7 @@ function dolibarr_syslog($message, $level=LOG_INFO)
} }
} }
} }
/** /**
\brief Affiche le header d'une fiche \brief Affiche le header d'une fiche
\param links Tableau de titre d'onglets \param links Tableau de titre d'onglets