lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bug #15841

Browse Source
This commit is contained in:
Laurent Destailleur 2006-02-24 23:16:35 +00:00
parent 6036b30f2c
commit 9676eab7cf
2 changed files with 1403 additions and 1403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contact.class.php
View File

@ -479,10 +479,10 @@ class Contact
$this->fullname = $this->firstname . ' ' . $this->name; $this->fullname = $this->firstname . ' ' . $this->name;
$this->phone_pro = dolibarr_print_phone($obj->phone); $this->phone_pro = $obj->phone;
$this->fax = dolibarr_print_phone($obj->fax); $this->fax = $obj->fax;
$this->phone_perso = dolibarr_print_phone($obj->phone_perso); $this->phone_perso = $obj->phone_perso;
$this->phone_mobile = dolibarr_print_phone($obj->phone_mobile); $this->phone_mobile = $obj->phone_mobile;
$this->code = $obj->code; $this->code = $obj->code;
$this->email = $obj->email; $this->email = $obj->email;
@ -730,7 +730,7 @@ class Contact
{ {
$sql = "SELECT count(mc.email) as nb"; $sql = "SELECT count(mc.email) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql.= " WHERE mc.email = '".$this->email."'"; $sql.= " WHERE mc.email = '".addslashes($this->email)."'";
$sql.= " AND mc.statut=1"; // -1 erreur, 0 non envoyé, 1 envoyé avec succès $sql.= " AND mc.statut=1"; // -1 erreur, 0 non envoyé, 1 envoyé avec succès
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)

2
htdocs/contact/fiche.php
View File

@ -553,7 +553,7 @@ elseif ($_GET["id"])
$sql.= " 'AC_EMAILING' as acode,"; $sql.= " 'AC_EMAILING' as acode,";
$sql.= " u.rowid as user_id, u.code"; $sql.= " u.rowid as user_id, u.code";
$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u "; $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u ";
$sql.= " WHERE mc.email = '".$contact->email."'"; $sql.= " WHERE mc.email = '".addslashes($contact->email)."'";
$sql.= " AND mc.statut = 1"; $sql.= " AND mc.statut = 1";
$sql.= " AND u.rowid = m.fk_user_valid"; $sql.= " AND u.rowid = m.fk_user_valid";
$sql.= " AND mc.fk_mailing=m.rowid"; $sql.= " AND mc.fk_mailing=m.rowid";