fix 4672

Dolibarr · Jun 30, 2016 · 37ee64a · 37ee64a
1 parent 388bd5c
commit 37ee64a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
@@ -221,7 +221,7 @@
 	if ((count($advTarget->thirdparty_lines) > 0) || (count($advTarget->contact_lines) > 0)) {
 		// Add targets into database
 		$obj = new mailing_advthirdparties($db);
-		$result = $obj->add_to_target($id, $advTarget->thirdparty_lines, $array_query['type_of_target'], $advTarget->contact_lines);
+		$result = $obj->add_to_target_spec($id, $advTarget->thirdparty_lines, $array_query['type_of_target'], $advTarget->contact_lines);
 	} else {
 		$result = 0;
 	}
@@ -967,11 +967,11 @@
 		print '</form>';
 		print '<br>';
 	}
-
 
-	if (empty($conf->mailchimp->enabled) || (! empty($conf->mailchimp->enabled) && $object->statut != 3)) 
+
+	if (empty($conf->mailchimp->enabled) || (! empty($conf->mailchimp->enabled) && $object->statut != 3))
 	{
-	    // List of recipients (TODO Move code of page cibles.php into a .tpl.php file and make an include here to avoid duplicate content) 
+	    // List of recipients (TODO Move code of page cibles.php into a .tpl.php file and make an include here to avoid duplicate content)
 	}
 }
 

diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
@@ -39,22 +39,22 @@ function emailing_prepare_head(Mailing $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient)) 
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
 	{
     	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
     	$head[$h][1] = $langs->trans("MailRecipients");
     	$head[$h][2] = 'targets';
     	$h++;
-    
-    	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))    // Still need debug
+
+    	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
     	{
         	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
         	$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
         	$head[$h][2] = 'advtargets';
         	$h++;
     	}
 	}
-	
+
 	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/info.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';

diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -56,7 +56,7 @@ function __construct($db)
 	 *    @param	array	$contactid 		Array of contact id to add
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-	function add_to_target($mailing_id,$socid,$type_of_target, $contactid)
+	function add_to_target_spec($mailing_id,$socid,$type_of_target, $contactid)
 	{
 		global $conf, $langs;
 
@@ -80,14 +80,14 @@ function add_to_target($mailing_id,$socid,$type_of_target, $contactid)
     			{
     				$num = $this->db->num_rows($result);
     				$i = 0;
-    
+
     				dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found", LOG_DEBUG);
-    
+
     				$old = '';
     				while ($i < $num)
     				{
     					$obj = $this->db->fetch_object($result);
-    
+
     					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
     						if (!array_key_exists($obj->email, $cibles)) {
     							$cibles[$obj->email] = array(
@@ -102,7 +102,7 @@ function add_to_target($mailing_id,$socid,$type_of_target, $contactid)
     						);
     						}
     					}
-    
+
     					$i++;
     				}
     			}
@@ -129,21 +129,21 @@ function add_to_target($mailing_id,$socid,$type_of_target, $contactid)
 					$sql.= " AND socp.fk_soc IN (".implode(',',$socid).")";
 				}
 				$sql.= " ORDER BY email";
-    
+
     			// Stock recipients emails into targets table
     			$result=$this->db->query($sql);
     			if ($result)
     			{
     				$num = $this->db->num_rows($result);
     				$i = 0;
-    
+
     				dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
-    
+
     				$old = '';
     				while ($i < $num)
     				{
     					$obj = $this->db->fetch_object($result);
-    
+
     					if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
     						if (!array_key_exists($obj->email, $cibles)) {
     							$cibles[$obj->email] = array(
@@ -158,7 +158,7 @@ function add_to_target($mailing_id,$socid,$type_of_target, $contactid)
     							);
     						}
     					}
-    
+
     					$i++;
     				}
     			}
@@ -202,7 +202,7 @@ function getSqlArrayForStats()
 	 *
 	 *	@return		int			Nb of recipients
 	 */
-	function getNbOfRecipients()
+	function getNbOfRecipients($sql)
 	{
 		global $conf;