" . $this->error[$i];
+ }
+ }
- /**
- * \brief Fonction qui permet de creer le status de l'adherent
- * \param userid userid de l'adherent
- * \return > 0 si ok, < 0 si ko
- */
- function create($userid)
- {
- global $conf;
+ /**
+ * \brief Fonction qui permet de creer le status de l'adherent
+ * \param userid userid de l'adherent
+ * \return > 0 si ok, < 0 si ko
+ */
+ function create($userid)
+ {
+ global $conf;
- $this->statut=trim($this->statut);
+ $this->statut=trim($this->statut);
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
- $sql.= "libelle";
- $sql.= ", entity";
- $sql.= ") VALUES (";
- $sql.= "'".addslashes($this->libelle)."'";
- $sql.= ", ".$conf->entity;
- $sql.= ")";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
+ $sql.= "libelle";
+ $sql.= ", entity";
+ $sql.= ") VALUES (";
+ $sql.= "'".addslashes($this->libelle)."'";
+ $sql.= ", ".$conf->entity;
+ $sql.= ")";
- dol_syslog("Adherent_type::create sql=".$sql);
- $result = $this->db->query($sql);
- if ($result)
- {
- $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
- return $this->update();
- }
- else
- {
- $this->error=$this->db->error().' sql='.$sql;
- return -1;
- }
- }
+ dol_syslog("Adherent_type::create sql=".$sql);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
+ return $this->update();
+ }
+ else
+ {
+ $this->error=$this->db->error().' sql='.$sql;
+ return -1;
+ }
+ }
- /**
- * \brief Met a jour en base donnees du type
- * \return > 0 si ok, < 0 si ko
- */
- function update()
- {
- $this->libelle=trim($this->libelle);
+ /**
+ * \brief Met a jour en base donnees du type
+ * \return > 0 si ok, < 0 si ko
+ */
+ function update()
+ {
+ $this->libelle=trim($this->libelle);
- $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
- $sql.= "SET ";
- $sql.= "statut = ".$this->statut.",";
- $sql.= "libelle = '".addslashes($this->libelle) ."',";
- $sql.= "cotisation = '".$this->cotisation."',";
- $sql.= "note = '".addslashes($this->note)."',";
- $sql.= "vote = '".$this->vote."',";
- $sql.= "mail_valid = '".addslashes($this->mail_valid)."'";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
+ $sql.= "SET ";
+ $sql.= "statut = ".$this->statut.",";
+ $sql.= "libelle = '".addslashes($this->libelle) ."',";
+ $sql.= "cotisation = '".$this->cotisation."',";
+ $sql.= "note = '".addslashes($this->note)."',";
+ $sql.= "vote = '".$this->vote."',";
+ $sql.= "mail_valid = '".addslashes($this->mail_valid)."'";
- $sql .= " WHERE rowid = $this->id";
+ $sql .= " WHERE rowid = $this->id";
- $result = $this->db->query($sql);
+ $result = $this->db->query($sql);
- if ($result)
- {
- return 1;
- }
- else
- {
- $this->error=$this->db->error().' sql='.$sql;
- return -1;
- }
- }
+ if ($result)
+ {
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->error().' sql='.$sql;
+ return -1;
+ }
+ }
- /**
- * \brief Fonction qui permet de supprimer le status de l'adherent
- * \param rowid
- */
- function delete($rowid)
- {
+ /**
+ * \brief Fonction qui permet de supprimer le status de l'adherent
+ * \param rowid
+ */
+ function delete($rowid)
+ {
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid";
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid";
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ( $this->db->affected_rows($resql) )
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- print "Err : ".$this->db->error();
- return 0;
- }
- }
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ( $this->db->affected_rows($resql) )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ print "Err : ".$this->db->error();
+ return 0;
+ }
+ }
- /**
- * \brief Fonction qui permet de recuperer le status de l'adherent
- * \param rowid
- * \return int <0 si KO, >0 si OK
- */
- function fetch($rowid)
- {
- $sql = "SELECT d.rowid, d.libelle, d.statut, d.cotisation, d.mail_valid, d.note, d.vote";
- $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
- $sql .= " WHERE d.rowid = ".$rowid;
+ /**
+ * \brief Fonction qui permet de recuperer le status de l'adherent
+ * \param rowid
+ * \return int <0 si KO, >0 si OK
+ */
+ function fetch($rowid)
+ {
+ $sql = "SELECT d.rowid, d.libelle, d.statut, d.cotisation, d.mail_valid, d.note, d.vote";
+ $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
+ $sql .= " WHERE d.rowid = ".$rowid;
- dol_syslog("Adherent_type::fetch sql=".$sql);
+ dol_syslog("Adherent_type::fetch sql=".$sql);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
- $obj = $this->db->fetch_object($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->ref = $obj->rowid;
- $this->libelle = $obj->libelle;
- $this->statut = $obj->statut;
- $this->cotisation = $obj->cotisation;
- $this->mail_valid = $obj->mail_valid;
- $this->note = $obj->note;
- $this->vote = $obj->vote;
- }
- return 1;
- }
- else
- {
- $this->error=$this->db->lasterror();
- dol_syslog("Adherent_type::fetch ".$this->error, LOG_ERR);
- return -1;
- }
- }
+ $this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
+ $this->libelle = $obj->libelle;
+ $this->statut = $obj->statut;
+ $this->cotisation = $obj->cotisation;
+ $this->mail_valid = $obj->mail_valid;
+ $this->note = $obj->note;
+ $this->vote = $obj->vote;
+ }
+ return 1;
+ }
+ else
+ {
+ $this->error=$this->db->lasterror();
+ dol_syslog("Adherent_type::fetch ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
- /**
- * \brief Return list of members' type
- * \return array List of types
- */
- function liste_array()
- {
- global $conf;
+ /**
+ * \brief Return list of members' type
+ * \return array List of types
+ */
+ function liste_array()
+ {
+ global $conf;
- $projets = array();
+ $projets = array();
- $sql = "SELECT rowid, libelle";
- $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
- $sql.= " WHERE entity = ".$conf->entity;
+ $sql = "SELECT rowid, libelle";
+ $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
+ $sql.= " WHERE entity = ".$conf->entity;
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $nump = $this->db->num_rows($resql);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $nump = $this->db->num_rows($resql);
- if ($nump)
- {
- $i = 0;
- while ($i < $nump)
- {
- $obj = $this->db->fetch_object($resql);
+ if ($nump)
+ {
+ $i = 0;
+ while ($i < $nump)
+ {
+ $obj = $this->db->fetch_object($resql);
- $projets[$obj->rowid] = $obj->libelle;
- $i++;
- }
- }
- return $projets;
- }
- else
- {
- print $this->db->error();
- }
+ $projets[$obj->rowid] = $obj->libelle;
+ $i++;
+ }
+ }
+ return $projets;
+ }
+ else
+ {
+ print $this->db->error();
+ }
- }
+ }
- /**
- * \brief Renvoie nom clicable (avec eventuellement le picto)
- * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
- * \param maxlen Longueur max libelle
- * \param option Page lien
- * \return string Chaine avec URL
- */
- function getNomUrl($withpicto=0,$maxlen=0)
- {
- global $langs;
+ /**
+ * \brief Renvoie nom clicable (avec eventuellement le picto)
+ * \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
+ * \param maxlen Longueur max libelle
+ * \param option Page lien
+ * \return string Chaine avec URL
+ */
+ function getNomUrl($withpicto=0,$maxlen=0)
+ {
+ global $langs;
- $result='';
+ $result='';
- $lien = '';
- $lienfin='';
+ $lien = '';
+ $lienfin='';
- $picto='group';
- $label=$langs->trans("ShowTypeCard",$this->libelle);
+ $picto='group';
+ $label=$langs->trans("ShowTypeCard",$this->libelle);
- if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
- if ($withpicto && $withpicto != 2) $result.=' ';
- $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin;
- return $result;
- }
+ if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
+ if ($withpicto && $withpicto != 2) $result.=' ';
+ $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin;
+ return $result;
+ }
+
+ /**
+ * getMailOnValid
+ * @return Return mail model
+ */
+ function getMailOnValid()
+ {
+ global $conf;
+
+ if (! empty($this->mail_valid))
+ {
+ return $this->mail_valid;
+ }
+ else
+ {
+ return $conf->global->ADHERENT_MAIL_VALID;
+ }
+ }
+
+ /**
+ * getMailOnSubscription
+ * @return Return mail model
+ */
+ function getMailOnSubscription()
+ {
+ global $conf;
+
+ if (! empty($this->mail_subscription)) // Not yet developped
+ {
+ return $this->mail_subscription;
+ }
+ else
+ {
+ return $conf->global->ADHERENT_MAIL_COTIS;
+ }
+ }
+
+ /**
+ * getMailOnResiliate
+ * @return Return mail model
+ */
+ function getMailOnResiliate()
+ {
+ global $conf;
+
+ if (! empty($this->mail_resiliate)) // Not yet developped
+ {
+ return $this->mail_resiliate;
+ }
+ else
+ {
+ return $conf->global->ADHERENT_MAIL_RESIL;
+ }
+ }
}
?>
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 7ca3f123ab1..372393769a1 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -541,17 +541,10 @@ if ($user->rights->adherent->creer && $_POST["action"] == 'confirm_valid' && $_P
if ($result >= 0 && ! sizeof($adh->errors))
{
- // Envoi mail validation (selon param du type adherent sinon generique)
+ // Send confirmation Email (selon param du type adherent sinon generique)
if ($adh->email && $_POST["send_mail"])
{
- if (isset($adht->mail_valid) && $adht->mail_valid)
- {
- $result=$adh->send_an_email($adht->mail_valid,$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
- }
- else
- {
- $result=$adh->send_an_email($conf->global->ADHERENT_MAIL_VALID,$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
- }
+ $result=$adh->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
if ($result < 0)
{
$errmsg.=$adh->error;
@@ -595,7 +588,7 @@ if ($user->rights->adherent->supprimer && $_POST["action"] == 'confirm_resign' &
{
if ($adh->email && $_POST["send_mail"])
{
- $result=$adh->send_an_email($conf->global->ADHERENT_MAIL_RESIL,$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
+ $result=$adh->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
}
if ($result < 0)
{
@@ -665,6 +658,180 @@ $adho->fetch_name_optionals_label();
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+if ($action == 'create')
+{
+ /* ************************************************************************** */
+ /* */
+ /* Fiche creation */
+ /* */
+ /* ************************************************************************** */
+ $adh->fk_departement = $_POST["departement_id"];
+
+ // We set pays_id, pays_code and label for the selected country
+ $adh->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
+ if ($adh->pays_id)
+ {
+ $sql = "SELECT rowid, code, libelle";
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+ $sql.= " WHERE rowid = ".$adh->pays_id;
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $obj = $db->fetch_object($resql);
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ $adh->pays_id=$obj->rowid;
+ $adh->pays_code=$obj->code;
+ $adh->pays=$obj->libelle;
+ }
+
+ $adht = new AdherentType($db);
+
+ print_fiche_titre($langs->trans("NewMember"));
+
+ if ($errmsg)
+ {
+ print '
'.$errmsg.'
';
+ }
+ if ($mesg) print '
'.$mesg.'
';
+
+ print '\n";
+
+}
if ($action == 'edit')
{
@@ -871,181 +1038,6 @@ if ($action == 'edit')
print '';
}
-if ($action == 'create')
-{
- /* ************************************************************************** */
- /* */
- /* Fiche creation */
- /* */
- /* ************************************************************************** */
- $adh->fk_departement = $_POST["departement_id"];
-
- // We set pays_id, pays_code and label for the selected country
- $adh->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$mysoc->pays_id;
- if ($adh->pays_id)
- {
- $sql = "SELECT rowid, code, libelle";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
- $sql.= " WHERE rowid = ".$adh->pays_id;
- $resql=$db->query($sql);
- if ($resql)
- {
- $obj = $db->fetch_object($resql);
- }
- else
- {
- dol_print_error($db);
- }
- $adh->pays_id=$obj->rowid;
- $adh->pays_code=$obj->code;
- $adh->pays=$obj->libelle;
- }
-
- $adht = new AdherentType($db);
-
- print_fiche_titre($langs->trans("NewMember"));
-
- if ($errmsg)
- {
- print '
'.$errmsg.'
';
- }
- if ($mesg) print '
'.$mesg.'
';
-
- print '\n";
-
-}
-
if ($rowid && $action != 'edit')
{
/* ************************************************************************** */
@@ -1118,11 +1110,27 @@ if ($rowid && $action != 'edit')
{
$langs->load("mails");
- // Cree un tableau formulaire
- $formquestion=array();
- $label=$langs->trans("SendAnEMailToMember");
- $label.=' ('.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.', ';
- $label.=$langs->trans("MailRecipient").': '.$adh->email.')';
+ $adht = new AdherentType($db);
+ $adht->fetch($adh->typeid);
+
+ $subjecttosend=$adh->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
+ $texttosend=$adh->makeSubstitution($adht->getMailOnValid());
+
+ $tmp=$langs->trans("SendAnEMailToMember");
+ $tmp.=' ('.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.', ';
+ $tmp.=$langs->trans("MailRecipient").': '.$adh->email.')';
+ $helpcontent='';
+ $helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.' '."\n";
+ $helpcontent.=''.$langs->trans("MailRecipient").': '.$adh->email.' '."\n";
+ $helpcontent.=''.$langs->trans("Subject").': '."\n";
+ $helpcontent.=$subjecttosend."\n";
+ $helpcontent.=" ";
+ $helpcontent.=''.$langs->trans("Content").': ';
+ $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+ $label=$html->textwithpicto($tmp,$helpcontent,1,'help');
+
+ // Cree un tableau formulaire
+ $formquestion=array();
if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
$ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion);
if ($ret == 'html') print ' ';
@@ -1131,7 +1139,7 @@ if ($rowid && $action != 'edit')
// Confirm send card by mail
if ($action == 'sendinfo')
{
- $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail"),"confirm_sendinfo",'',0,1);
+ $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$adh->email),"confirm_sendinfo",'',0,1);
if ($ret == 'html') print ' ';
}
@@ -1140,13 +1148,28 @@ if ($rowid && $action != 'edit')
{
$langs->load("mails");
- // Cree un tableau formulaire
- $formquestion=array();
- $label=$langs->trans("SendAnEMailToMember").' ('.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.', ';
- $label.=$langs->trans("MailRecipient").': '.$adh->email.'';
- $label.=')';
- if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?'true':'false'));
+ $adht = new AdherentType($db);
+ $adht->fetch($adh->typeid);
+ $subjecttosend=$adh->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
+ $texttosend=$adh->makeSubstitution($adht->getMailOnResiliate());
+
+ $tmp=$langs->trans("SendAnEMailToMember");
+ $tmp.=' ('.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.', ';
+ $tmp.=$langs->trans("MailRecipient").': '.$adh->email.')';
+ $helpcontent='';
+ $helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.' '."\n";
+ $helpcontent.=''.$langs->trans("MailRecipient").': '.$adh->email.' '."\n";
+ $helpcontent.=''.$langs->trans("Subject").': '."\n";
+ $helpcontent.=$subjecttosend."\n";
+ $helpcontent.=" ";
+ $helpcontent.=''.$langs->trans("Content").': ';
+ $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+ $label=$html->textwithpicto($tmp,$helpcontent,1,'help');
+
+ // Cree un tableau formulaire
+ $formquestion=array();
+ if ($adh->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?'true':'false'));
$ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
if ($ret == 'html') print ' ';
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2623c1e5d48..7b4e5b3b001 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -121,8 +121,8 @@ class Form
}
/**
- * \brief Old version of textwithtooltip. Kept for backward compatibility with modules for 2.6.
- * \deprecated
+ * Old version of textwithtooltip. Kept for backward compatibility with modules for 2.6.
+ * @deprecated
*/
function textwithhelp($text,$htmltext,$tooltipon=1)
{
@@ -130,17 +130,17 @@ class Form
}
/**
- * \brief Show a text and picto with tooltip on text or picto
- * \param text Texte to show
- * \param htmltext Contenu html du tooltip, code en Html / UTF8
- * \param tooltipon 1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2, 4=tooltip sur les 2 et force en Ajax
- * \param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
- * \param img Code img du picto
- * \param i Numero of tooltip
- * \param width Width of tooltip
- * \param shiftX Shift of tooltip
- * \return string Code html du tooltip (texte+picto)
- * \remarks Use function textwithpicto if you can.
+ * Show a text and picto with tooltip on text or picto
+ * @param text Texte to show
+ * @param htmltext Contenu html du tooltip, code en Html / UTF8
+ * @param tooltipon 1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2, 4=tooltip sur les 2 et force en Ajax
+ * @param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
+ * @param img Code img du picto (use img_xxx() function to get it)
+ * @param i Numero of tooltip
+ * @param width Width of tooltip
+ * @param shiftX Shift of tooltip
+ * @return string Code html du tooltip (texte+picto)
+ * @see Use function textwithpicto if you can.
*/
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$i=1,$width='200',$shiftX='10')
{
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f99731c98b4..95e2c73ef40 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -112,7 +112,7 @@ AddActionDone=Add action done
Close=Close
Close2=Close
Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send this card by mail ?
+ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ?
Delete=Delete
Remove=Remove
Resiliate=Resiliate
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 62dadffafe0..77cb556a7a9 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -111,7 +111,7 @@ AddActionDone=Ajouter action faite
Close=Clôturer
Close2=Fermer
Confirm=Confirmer
-ConfirmSendCardByMail=Voulez vous envoyer cette fiche par mail ?
+ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par mail à l'adresse %s ?
Delete=Supprimer
Remove=Enlever
Resiliate=Résilier
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index fbea16d1785..1770ee65a4d 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -2853,15 +2853,16 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1)
/**
- * \brief Replace CRLF in string with a HTML BR tag.
- * \param string2encode String to encode
- * \param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
- * \param forxml false=Use , true=Use
- * \return string String encoded
+ * Replace CRLF in string with a HTML BR tag.
+ * @param string2encode String to encode
+ * @param nl2brmode 0=Adding br before \n, 1=Replacing \n by br
+ * @param forxml false=Use , true=Use
+ * @return string String encoded
*/
function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
{
- if (! $nl2brmode) return nl2br($stringtoencode,$forxml);
+ // We use @ to avoid warning on PHP4 that does not support entity encoding from UTF8;
+ if (! $nl2brmode) return @nl2br($stringtoencode,$forxml);
else
{
$ret=str_replace("\r","",$stringtoencode);
@@ -2887,7 +2888,7 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8')
{
if (dol_textishtml($stringtoencode))
{
- $newstring=preg_replace('//i',' ',$stringtoencode); // Replace " " by " ". It's same and avoid pb with FPDF.
+ $newstring=preg_replace('//i',' ',$stringtoencode); // Replace " " by " ". It's same and avoid pb with FPDF.
$newstring=preg_replace('/ $/i','',$newstring); // Replace " " by " ". It's same and avoid pb with FPDF.
$newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__'));
$newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding
@@ -2895,7 +2896,6 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8')
// If already HTML, CR should be so we don't change \n
}
else {
- // We use @ to avoid warning on PHP4 that does not support entity encoding from UTF8;
$newstring=dol_nl2br(dol_htmlentities($stringtoencode,ENT_COMPAT,$pagecodefrom),$nl2brmode);
}
// Other substitutions that htmlentities does not do
@@ -3083,33 +3083,37 @@ function dol_textishtml($msg,$option=0)
}
/**
- * \brief Add substitution required by external modules then make substitutions.
+ * Add substitution required by external modules then make substitutions.
* There is two type of substitions:
- * From substitutionarray (oldval=>newval)
- * From special constants (__XXX__=>f(objet->xxx))
- * \param chaine Source string in which we must do substitution
- * \param substitutionarray Array substitution old value => new value value
- * \param outputlangs If we want substitution from special constants, we provide a language
- * \param object If we want substitution from special constants, we provide data in a source object
- * \return string Output string after subsitutions
+ * - From $substitutionarray (oldval=>newval)
+ * - From special constants (__XXX__=>f(objet->xxx)) by substitutions modules
+ * @param chaine Source string in which we must do substitution
+ * @param substitutionarray Array substitution old value => new value value
+ * @param outputlangs If we want substitution from special constants, we provide a language
+ * @param object If we want substitution from special constants, we provide data in a source object
+ * @return string Output string after subsitutions
*/
function make_substitutions($chaine,$substitutionarray,$outputlangs,$object='')
{
global $conf,$user;
- // Check if there is external substitution to do asked by plugins
- // We look files into the includes/modules/substitutions directory
- // By default, there is no such external plugins.
- foreach ($conf->file->dol_document_root as $dirroot)
- {
- $dir=$dirroot."/includes/modules/substitutions";
- $fonc='numberwords'; // For the moment only one file scan
- if ($conf->$fonc->enabled && file_exists($dir.'/functions_'.$fonc.'.lib.php'))
- {
- dol_syslog("Library functions_".$fonc.".lib.php found into ".$dir);
- require_once($dir."/functions_".$fonc.".lib.php");
- numberwords_completesubstitutionarray($substitutionarray,$outputlangs,$object);
- break;
+ $dir=$dirroot."/includes/modules/substitutions";
+ $listfonc=array('numberwords'); // For the moment only one substitution module to search
+ foreach($listfonc as $fonc)
+ {
+ // Check if there is external substitution to do asked by plugins
+ // We look files into the includes/modules/substitutions directory
+ // By default, there is no such external plugins.
+ foreach ($conf->file->dol_document_root as $dirroot)
+ {
+ // If module enabled and complete
+ if (! empty($conf->$fonc->enabled) && file_exists($dir.'/functions_'.$fonc.'.lib.php'))
+ {
+ dol_syslog("Library functions_".$fonc.".lib.php found into ".$dir);
+ require_once($dir."/functions_".$fonc.".lib.php");
+ numberwords_completesubstitutionarray($substitutionarray,$outputlangs,$object);
+ break;
+ }
}
}
@@ -3123,12 +3127,10 @@ function make_substitutions($chaine,$substitutionarray,$outputlangs,$object='')
/**
- * \brief Format output for start and end date
- * \param date_start Start date
- * \param date_end End date
- * \param format Output format
- * \remarks Updated by Matelli : added format paramter
- * \remarks See http://matelli.fr/showcases/patchs-dolibarr/update-date-range-format.html for details
+ * Format output for start and end date
+ * @param date_start Start date
+ * @param date_end End date
+ * @param format Output format
*/
function print_date_range($date_start,$date_end,$format = '',$outputlangs='')
{