alxarafe / alixar

dolibarr/htdocs/core/modules/modBlockedLog.class.php

Indentation +92 added lines, -92 removed lines

@@ -30,21 +30,21 @@ 
 class modBlockedLog extends DolibarrModules
 {
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs, $conf, $mysoc;
+        global $langs, $conf, $mysoc;
 
         $this->db = $db;
         $this->numero = 3200;
         // Key text used to identify module (for permissions, menus, etc...)
         $this->rights_class = 'blockedlog';
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "base";
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '75';
@@ -67,10 +67,10 @@ 
 
         // Dependancies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array('always'=>'modFacture');	   // List of modules id that must be enabled if this module is enabled
+        $this->hidden = false;	// A condition to disable module
+        $this->depends = array('always'=>'modFacture');	   // List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	                   // List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	                   // List of modules id this module is in conflict with
+        $this->conflictwith = array();	                   // List of modules id this module is in conflict with
         $this->langfiles = array('blockedlog');
 
         $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
@@ -91,14 +91,14 @@ 
         //var_dump($this->automatic_activation);
 
         $this->always_enabled = (!empty($conf->blockedlog->enabled)
-        	&& !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
-        	&& in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
-        	&& $this->alreadyUsed(1));
+            && !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
+            && in_array($mysoc->country_code, explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+            && $this->alreadyUsed(1));
 
         // Constants
         //-----------
         $this->const = array(
-        	1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
+            1=>array('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', 'chaine', 'FR', 'This is list of country code where the module may be mandatory', 0, 'current', 0)
         );
 
         // New pages on tabs
@@ -148,9 +148,9 @@ 
     function alreadyUsed()
     {
 
-    	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-    	$b=new BlockedLog($this->db);
-    	return $b->alreadyUsed(1);
+        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+        $b=new BlockedLog($this->db);
+        return $b->alreadyUsed(1);
     }
 
 
@@ -164,87 +164,87 @@ 
      */
     function init($options='')
     {
-    	global $conf, $user;
-
-    	$sql = array();
-
-    	// If already used, we add an entry to show we enable module
-   		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-
-   		$object=new stdClass();
-    	$object->id = 1;
-    	$object->element = 'module';
-    	$object->ref = 'systemevent';
-    	$object->entity = $conf->entity;
-    	$object->date = dol_now();
-
-    	$b=new BlockedLog($this->db);
-    	$result = $b->setObjectData($object, 'MODULE_SET', 0);
-    	if ($result < 0)
-    	{
-    		$this->error = $b->error;
-    		$this->errors = $b->erros;
-    		return 0;
-    	}
-
-    	$res = $b->create($user);
-    	if ($res<=0) {
-    		$this->error = $b->error;
-    		$this->errors = $b->errors;
-    		return $res;
-    	}
-
-    	return $this->_init($sql, $options);
+        global $conf, $user;
+
+        $sql = array();
+
+        // If already used, we add an entry to show we enable module
+            require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+
+            $object=new stdClass();
+        $object->id = 1;
+        $object->element = 'module';
+        $object->ref = 'systemevent';
+        $object->entity = $conf->entity;
+        $object->date = dol_now();
+
+        $b=new BlockedLog($this->db);
+        $result = $b->setObjectData($object, 'MODULE_SET', 0);
+        if ($result < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->erros;
+            return 0;
+        }
+
+        $res = $b->create($user);
+        if ($res<=0) {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return $res;
+        }
+
+        return $this->_init($sql, $options);
     }
 
     /**
-	 * Function called when module is disabled.
-	 * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             		1 if OK, 0 if KO
-	 */
+     * Function called when module is disabled.
+     * The remove function removes tabs, constants, boxes, permissions and menus from Dolibarr database.
+     * Data directories are not deleted
+     *
+     * @param      string	$options    Options when enabling module ('', 'noboxes')
+     * @return     int             		1 if OK, 0 if KO
+     */
     function remove($options = '')
     {
 
-    	global $conf, $user;
-
-    	$sql = array();
-
-		// If already used, we add an entry to show we enable module
-		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-
-		$object=new stdClass();
-    	$object->id = 1;
-    	$object->element = 'module';
-    	$object->ref = 'systemevent';
-    	$object->entity = $conf->entity;
-    	$object->date = dol_now();
-
-    	$b=new BlockedLog($this->db);
-    	$result = $b->setObjectData($object, 'MODULE_RESET', 0);
-    	if ($result < 0)
-    	{
-    		$this->error = $b->error;
-    		$this->errors = $b->erros;
-    		return 0;
-    	}
-
-    	if ($b->alreadyUsed(1))
-    	{
-    		$res = $b->create($user, '0000000000');		// If already used for something else than SET or UNSET, we log with error
-    	}
-    	else
-    	{
-    		$res = $b->create($user);
-    	}
-	    if ($res<=0) {
-	    	$this->error = $b->error;
-	    	$this->errors = $b->errors;
-	    	return $res;
-    	}
-
-    	return $this->_remove($sql, $options);
+        global $conf, $user;
+
+        $sql = array();
+
+        // If already used, we add an entry to show we enable module
+        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+
+        $object=new stdClass();
+        $object->id = 1;
+        $object->element = 'module';
+        $object->ref = 'systemevent';
+        $object->entity = $conf->entity;
+        $object->date = dol_now();
+
+        $b=new BlockedLog($this->db);
+        $result = $b->setObjectData($object, 'MODULE_RESET', 0);
+        if ($result < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->erros;
+            return 0;
+        }
+
+        if ($b->alreadyUsed(1))
+        {
+            $res = $b->create($user, '0000000000');		// If already used for something else than SET or UNSET, we log with error
+        }
+        else
+        {
+            $res = $b->create($user);
+        }
+        if ($res<=0) {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return $res;
+        }
+
+        return $this->_remove($sql, $options);
     }
 }

Spacing +32 added lines, -32 removed lines

@@ -22,7 +22,7 @@ 
  *  \ingroup    blockedlog
  *  \brief      Description and activation file for module BlockedLog
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a BlockedLog module
@@ -49,14 +49,14 @@ 
         // Module position in the family on 2 digits ('01', '10', '20', ...)
         $this->module_position = '75';
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
         // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -67,14 +67,14 @@ 
 
         // Dependancies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array('always'=>'modFacture');	   // List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	                   // List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	                   // List of modules id this module is in conflict with
+	    $this->hidden = false; // A condition to disable module
+	    $this->depends = array('always'=>'modFacture'); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+	    $this->conflictwith = array(); // List of modules id this module is in conflict with
         $this->langfiles = array('blockedlog');
 
-        $this->warnings_activation = array();                     // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array();                 // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
         $this->warnings_unactivation = array('FR'=>'BlockedLogAreRequiredByYourCountryLegislation');
 
         // Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
@@ -111,31 +111,31 @@ 
 
         // Permissions
         // -----------------
-        $this->rights = array();		// Permission array used by this module
+        $this->rights = array(); // Permission array used by this module
 
-        $r=0;
-        $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read archived events and fingerprints';	// Permission label
-        $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
+        $r = 0;
+        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+        $this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
+        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
         $this->rights[$r][5] = '';
 
         // Main menu entries
         // -----------------
-        $r=0;
-        $this->menu[$r]=array(
-        'fk_menu'=>'fk_mainmenu=tools',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        $r = 0;
+        $this->menu[$r] = array(
+        'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
         'mainmenu'=>'tools',
         'leftmenu'=>'blockedlogbrowser',
-        'type'=>'left',			                // This is a Left menu entry
+        'type'=>'left', // This is a Left menu entry
         'titre'=>'BrowseBlockedLog',
         'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
-        'langs'=>'blockedlog',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
         'position'=>200,
-        'enabled'=>'$conf->blockedlog->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        'perms'=>'$user->rights->blockedlog->read',			    // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+        'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+        'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
         'target'=>'',
-        'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
         $r++;
     }
 
@@ -149,7 +149,7 @@ 
     {
 
     	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-    	$b=new BlockedLog($this->db);
+    	$b = new BlockedLog($this->db);
     	return $b->alreadyUsed(1);
     }
 
@@ -162,7 +162,7 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
      *      @return     int             	1 if OK, 0 if KO
      */
-    function init($options='')
+    function init($options = '')
     {
     	global $conf, $user;
 
@@ -171,14 +171,14 @@ 
     	// If already used, we add an entry to show we enable module
    		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-   		$object=new stdClass();
+   		$object = new stdClass();
     	$object->id = 1;
     	$object->element = 'module';
     	$object->ref = 'systemevent';
     	$object->entity = $conf->entity;
     	$object->date = dol_now();
 
-    	$b=new BlockedLog($this->db);
+    	$b = new BlockedLog($this->db);
     	$result = $b->setObjectData($object, 'MODULE_SET', 0);
     	if ($result < 0)
     	{
@@ -188,7 +188,7 @@ 
     	}
 
     	$res = $b->create($user);
-    	if ($res<=0) {
+    	if ($res <= 0) {
     		$this->error = $b->error;
     		$this->errors = $b->errors;
     		return $res;
@@ -215,14 +215,14 @@ 
 		// If already used, we add an entry to show we enable module
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
-		$object=new stdClass();
+		$object = new stdClass();
     	$object->id = 1;
     	$object->element = 'module';
     	$object->ref = 'systemevent';
     	$object->entity = $conf->entity;
     	$object->date = dol_now();
 
-    	$b=new BlockedLog($this->db);
+    	$b = new BlockedLog($this->db);
     	$result = $b->setObjectData($object, 'MODULE_RESET', 0);
     	if ($result < 0)
     	{
@@ -233,13 +233,13 @@ 
 
     	if ($b->alreadyUsed(1))
     	{
-    		$res = $b->create($user, '0000000000');		// If already used for something else than SET or UNSET, we log with error
+    		$res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
     	}
     	else
     	{
     		$res = $b->create($user);
     	}
-	    if ($res<=0) {
+	    if ($res <= 0) {
 	    	$this->error = $b->error;
 	    	$this->errors = $b->errors;
 	    	return $res;

Braces +1 added lines, -2 removed lines

@@ -234,8 +234,7 @@
     	if ($b->alreadyUsed(1))
     	{
     		$res = $b->create($user, '0000000000');		// If already used for something else than SET or UNSET, we log with error
-    	}
-    	else
+    	} else
     	{
     		$res = $b->create($user);
     	}

dolibarr/htdocs/core/modules/mailings/fraise.modules.php

Indentation +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
 class mailing_fraise extends MailingTargets
 {
     var $name='FundationMembers';                    // Identifiant du module mailing
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
     var $desc='Foundation members with emails';
     // Set to 1 if selector is available for admin users only
     var $require_admin=0;
@@ -175,24 +175,24 @@ 
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	$num = $this->db->num_rows($resql);
+            $num = $this->db->num_rows($resql);
 
-        	$s.='<option value="0">&nbsp;</option>';
-        	if (! $num) $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+            $s.='<option value="0">&nbsp;</option>';
+            if (! $num) $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
 
-        	$i = 0;
-        	while ($i < $num)
-        	{
-        		$obj = $this->db->fetch_object($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
 
-        		$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-        		$s.='</option>';
-        		$i++;
-        	}
+                $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
+                $s.='</option>';
+                $i++;
+            }
         }
         else
         {
-        	dol_print_error($this->db);
+            dol_print_error($this->db);
         }
 
         $s.='</select>';
@@ -230,9 +230,9 @@ 
     function add_to_target($mailing_id)
     {
         // phpcs:enable
-    	global $langs,$_POST;
+        global $langs,$_POST;
 
-    	// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array("members","companies"));
 
         $cibles = array();
@@ -248,8 +248,8 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         if ($_POST['filter_category'])
         {
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
         }
         $sql.= " , ".MAIN_DB_PREFIX."adherent_type as ta";
         $sql.= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''";     // Note that null != '' is false

Spacing +75 added lines, -75 removed lines

@@ -33,14 +33,14 @@ 
  */
 class mailing_fraise extends MailingTargets
 {
-    var $name='FundationMembers';                    // Identifiant du module mailing
+    var $name = 'FundationMembers'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    var $desc='Foundation members with emails';
+    var $desc = 'Foundation members with emails';
     // Set to 1 if selector is available for admin users only
-    var $require_admin=0;
+    var $require_admin = 0;
 
-    var $require_module=array('adherent');
-    var $picto='user';
+    var $require_module = array('adherent');
+    var $picto = 'user';
 
     /**
      * @var DoliDB Database handler.
@@ -73,10 +73,10 @@ 
         $langs->load("members");
 
         // Array for requests for statistics board
-        $statssql=array();
+        $statssql = array();
 
-        $statssql[0] ="SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
-        $statssql[0].=" FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
+        $statssql[0] = "SELECT '".$this->db->escape($langs->trans("FundationMembers"))."' as label, count(*) as nb";
+        $statssql[0] .= " FROM ".MAIN_DB_PREFIX."adherent where statut = 1 and entity IN (".getEntity('member').")";
 
         return $statssql;
     }
@@ -90,7 +90,7 @@ 
      *  @param    string    $sql        Requete sql de comptage
      *    @return        int            Nb of recipients
      */
-    function getNbOfRecipients($sql='')
+    function getNbOfRecipients($sql = '')
     {
         $sql  = "SELECT count(distinct(a.email)) as nb";
         $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
@@ -112,42 +112,42 @@ 
         global $conf, $langs;
 
         // Load translation files required by the page
-        $langs->loadLangs(array("members","companies","categories"));
+        $langs->loadLangs(array("members", "companies", "categories"));
 
-        $form=new Form($this->db);
+        $form = new Form($this->db);
 
-        $s='';
+        $s = '';
 
         // Status
-        $s.=$langs->trans("Status").': ';
-        $s.='<select name="filter" class="flat">';
-        $s.='<option value="none">&nbsp;</option>';
-        $s.='<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
-        $s.='<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
-        $s.='<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
-        $s.='<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
-        $s.='</select> ';
-        $s.=$langs->trans("Type").': ';
-        $s.='<select name="filter_type" class="flat">';
+        $s .= $langs->trans("Status").': ';
+        $s .= '<select name="filter" class="flat">';
+        $s .= '<option value="none">&nbsp;</option>';
+        $s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
+        $s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
+        $s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
+        $s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
+        $s .= '</select> ';
+        $s .= $langs->trans("Type").': ';
+        $s .= '<select name="filter_type" class="flat">';
         $sql = "SELECT rowid, libelle, statut";
-        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
-        $sql.= " WHERE entity IN (".getEntity('member_type').")";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
+        $sql .= " WHERE entity IN (".getEntity('member_type').")";
+        $sql .= " ORDER BY rowid";
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $num = $this->db->num_rows($resql);
 
-            $s.='<option value="0">&nbsp;</option>';
-            if (! $num) $s.='<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+            $s .= '<option value="0">&nbsp;</option>';
+            if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
 
             $i = 0;
             while ($i < $num)
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->libelle,38,'middle');
-                $s.='</option>';
+                $s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->libelle, 38, 'middle');
+                $s .= '</option>';
                 $i++;
             }
         }
@@ -156,20 +156,20 @@ 
             dol_print_error($this->db);
         }
 
-        $s.='</select>';
+        $s .= '</select>';
 
-        $s.=' ';
+        $s .= ' ';
 
-        $s.=$langs->trans("Category").': ';
-        $s.='<select name="filter_category" class="flat">';
+        $s .= $langs->trans("Category").': ';
+        $s .= '<select name="filter_category" class="flat">';
 
         // Show categories
         $sql = "SELECT rowid, label, type, visible";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-        $sql.= " WHERE type = 3";	// We keep only categories for members
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql .= " WHERE type = 3"; // We keep only categories for members
         // $sql.= " AND visible > 0";	// We ignore the property visible because member's categories does not use this property (only products categories use it).
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY label";
+        $sql .= " AND entity = ".$conf->entity;
+        $sql .= " ORDER BY label";
 
         //print $sql;
         $resql = $this->db->query($sql);
@@ -177,16 +177,16 @@ 
         {
         	$num = $this->db->num_rows($resql);
 
-        	$s.='<option value="0">&nbsp;</option>';
-        	if (! $num) $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+        	$s .= '<option value="0">&nbsp;</option>';
+        	if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
 
         	$i = 0;
         	while ($i < $num)
         	{
         		$obj = $this->db->fetch_object($resql);
 
-        		$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-        		$s.='</option>';
+        		$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+        		$s .= '</option>';
         		$i++;
         	}
         }
@@ -195,14 +195,14 @@ 
         	dol_print_error($this->db);
         }
 
-        $s.='</select>';
+        $s .= '</select>';
 
 
-        $s.='<br>';
-        $s.=$langs->trans("DateEndSubscription").': &nbsp;';
-        $s.=$langs->trans("After").' > '.$form->selectDate(-1,'subscriptionafter',0,0,1,'fraise',1,0,0);
-        $s.=' &nbsp; ';
-        $s.=$langs->trans("Before").' < '.$form->selectDate(-1,'subscriptionbefore',0,0,1,'fraise',1,0,0);
+        $s .= '<br>';
+        $s .= $langs->trans("DateEndSubscription").': &nbsp;';
+        $s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
+        $s .= ' &nbsp; ';
+        $s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
 
         return $s;
     }
@@ -216,7 +216,7 @@ 
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('',"user").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('', "user").'</a>';
     }
 
 
@@ -230,49 +230,49 @@ 
     function add_to_target($mailing_id)
     {
         // phpcs:enable
-    	global $langs,$_POST;
+    	global $langs, $_POST;
 
     	// Load translation files required by the page
-        $langs->loadLangs(array("members","companies"));
+        $langs->loadLangs(array("members", "companies"));
 
         $cibles = array();
-        $now=dol_now();
+        $now = dol_now();
 
-        $dateendsubscriptionafter=dol_mktime($_POST['subscriptionafterhour'],$_POST['subscriptionaftermin'],$_POST['subscriptionaftersec'],$_POST['subscriptionaftermonth'],$_POST['subscriptionafterday'],$_POST['subscriptionafteryear']);
-        $dateendsubscriptionbefore=dol_mktime($_POST['subscriptionbeforehour'],$_POST['subscriptionbeforemin'],$_POST['subscriptionbeforesec'],$_POST['subscriptionbeforemonth'],$_POST['subscriptionbeforeday'],$_POST['subscriptionbeforeyear']);
+        $dateendsubscriptionafter = dol_mktime($_POST['subscriptionafterhour'], $_POST['subscriptionaftermin'], $_POST['subscriptionaftersec'], $_POST['subscriptionaftermonth'], $_POST['subscriptionafterday'], $_POST['subscriptionafteryear']);
+        $dateendsubscriptionbefore = dol_mktime($_POST['subscriptionbeforehour'], $_POST['subscriptionbeforemin'], $_POST['subscriptionbeforesec'], $_POST['subscriptionbeforemonth'], $_POST['subscriptionbeforeday'], $_POST['subscriptionbeforeyear']);
 
         // La requete doit retourner: id, email, fk_contact, name, firstname
         $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
-        $sql.= " a.lastname, a.firstname,";
-        $sql.= " a.datefin, a.civility as civility_id, a.login, a.societe";    // Other fields
-        $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
+        $sql .= " a.lastname, a.firstname,";
+        $sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
         if ($_POST['filter_category'])
         {
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
+        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
         }
-        $sql.= " , ".MAIN_DB_PREFIX."adherent_type as ta";
-        $sql.= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''";     // Note that null != '' is false
-        $sql.= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
+        $sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
+        $sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
+        $sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
         // Filter on status
-        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') $sql.= " AND a.statut=-1";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql.= " AND a.statut=1 AND a.datefin >= '".$this->db->idate($now)."'";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql.= " AND a.statut=1 AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql.= " AND a.statut=0";
+        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') $sql .= " AND a.statut=-1";
+        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql .= " AND a.statut=1 AND a.datefin >= '".$this->db->idate($now)."'";
+        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql .= " AND a.statut=1 AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
+        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql .= " AND a.statut=0";
         // Filter on date
-        if ($dateendsubscriptionafter > 0)  $sql.=" AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
-        if ($dateendsubscriptionbefore > 0) $sql.=" AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
-        $sql.= " AND a.fk_adherent_type = ta.rowid";
+        if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
+        if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+        $sql .= " AND a.fk_adherent_type = ta.rowid";
         // Filter on type
-        if ($_POST['filter_type']) $sql.= " AND ta.rowid='".$_POST['filter_type']."'";
+        if ($_POST['filter_type']) $sql .= " AND ta.rowid='".$_POST['filter_type']."'";
         // Filter on category
-        if ($_POST['filter_category']) $sql.= " AND c.rowid='".$_POST['filter_category']."'";
-        $sql.= " ORDER BY a.email";
+        if ($_POST['filter_category']) $sql .= " AND c.rowid='".$_POST['filter_category']."'";
+        $sql .= " ORDER BY a.email";
         //print $sql;
 
         // Add targets into table
         dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -294,8 +294,8 @@ 
                                 'firstname' => $obj->firstname,
                                 'other' =>
                                 ($langs->transnoentities("Login").'='.$obj->login).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id?$langs->transnoentities("Civility".$obj->civility_id):'')).';'.
-                                ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin),'day')).';'.
+                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+                                ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin), 'day')).';'.
                                 ($langs->transnoentities("Company").'='.$obj->societe),
                                 'source_url' => $this->url($obj->id),
                                 'source_id' => $obj->id,
@@ -311,7 +311,7 @@ 
         else
         {
             dol_syslog($this->db->error());
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
 

Braces +33 added lines, -16 removed lines

@@ -139,7 +139,9 @@ 
             $num = $this->db->num_rows($resql);
 
             $s.='<option value="0">&nbsp;</option>';
-            if (! $num) $s.='<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+            if (! $num) {
+                $s.='<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+            }
 
             $i = 0;
             while ($i < $num)
@@ -150,8 +152,7 @@ 
                 $s.='</option>';
                 $i++;
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -178,7 +179,9 @@ 
         	$num = $this->db->num_rows($resql);
 
         	$s.='<option value="0">&nbsp;</option>';
-        	if (! $num) $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+        	if (! $num) {
+        	    $s.='<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+        	}
 
         	$i = 0;
         	while ($i < $num)
@@ -189,8 +192,7 @@ 
         		$s.='</option>';
         		$i++;
         	}
-        }
-        else
+        } else
         {
         	dol_print_error($this->db);
         }
@@ -255,18 +257,34 @@ 
         $sql.= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''";     // Note that null != '' is false
         $sql.= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
         // Filter on status
-        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') $sql.= " AND a.statut=-1";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql.= " AND a.statut=1 AND a.datefin >= '".$this->db->idate($now)."'";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql.= " AND a.statut=1 AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql.= " AND a.statut=0";
+        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') {
+            $sql.= " AND a.statut=-1";
+        }
+        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') {
+            $sql.= " AND a.statut=1 AND a.datefin >= '".$this->db->idate($now)."'";
+        }
+        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') {
+            $sql.= " AND a.statut=1 AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')";
+        }
+        if (isset($_POST["filter"]) && $_POST["filter"] == '0') {
+            $sql.= " AND a.statut=0";
+        }
         // Filter on date
-        if ($dateendsubscriptionafter > 0)  $sql.=" AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
-        if ($dateendsubscriptionbefore > 0) $sql.=" AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+        if ($dateendsubscriptionafter > 0) {
+            $sql.=" AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
+        }
+        if ($dateendsubscriptionbefore > 0) {
+            $sql.=" AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+        }
         $sql.= " AND a.fk_adherent_type = ta.rowid";
         // Filter on type
-        if ($_POST['filter_type']) $sql.= " AND ta.rowid='".$_POST['filter_type']."'";
+        if ($_POST['filter_type']) {
+            $sql.= " AND ta.rowid='".$_POST['filter_type']."'";
+        }
         // Filter on category
-        if ($_POST['filter_category']) $sql.= " AND c.rowid='".$_POST['filter_category']."'";
+        if ($_POST['filter_category']) {
+            $sql.= " AND c.rowid='".$_POST['filter_category']."'";
+        }
         $sql.= " ORDER BY a.email";
         //print $sql;
 
@@ -307,8 +325,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
         {
             dol_syslog($this->db->error());
             $this->error=$this->db->error();

dolibarr/htdocs/core/modules/mailings/modules_mailings.php

Indentation +51 added lines, -51 removed lines

@@ -37,22 +37,22 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     public $tooltip='';
 
 
     /**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
         $this->db = $db;
-	}
+    }
 
     /**
      * Return description of email selector
@@ -76,7 +76,7 @@ 
     }
 
     /**
-	 *	Return number of records for email selector
+     *	Return number of records for email selector
      *
      *  @return     integer      Example
      */
@@ -101,7 +101,7 @@ 
         }
         else
         {
-        	$this->error=$this->db->lasterror();
+            $this->error=$this->db->lasterror();
             return -1;
         }
     }
@@ -162,51 +162,51 @@ 
     function add_to_target($mailing_id, $cibles)
     {
         // phpcs:enable
-    	global $conf;
+        global $conf;
 
-    	$this->db->begin();
+        $this->db->begin();
 
         // Insert emailing targets from array into database
         $j = 0;
         $num = count($cibles);
         foreach ($cibles as $targetarray)
         {
-        	if (! empty($targetarray['email'])) // avoid empty email address
-        	{
-        		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
-        		$sql.= " (fk_mailing,";
-        		$sql.= " fk_contact,";
-        		$sql.= " lastname, firstname, email, other, source_url, source_id,";
-       			$sql.= " tag,";
-        		$sql.= " source_type)";
-        		$sql.= " VALUES (".$mailing_id.",";
-        		$sql.= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'") .",";
-        		$sql.= "'".$this->db->escape($targetarray['lastname'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['firstname'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['email'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['other'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['source_url'])."',";
-        		$sql.= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
-       			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
-        		$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
-        		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-        		$result=$this->db->query($sql);
-        		if ($result)
-        		{
-        			$j++;
-        		}
-        		else
-        		{
-        			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
-        			{
-        				// Si erreur autre que doublon
-        				dol_syslog($this->db->error());
-        				$this->error=$this->db->error();
-        				$this->db->rollback();
-        				return -1;
-        			}
-        		}
-        	}
+            if (! empty($targetarray['email'])) // avoid empty email address
+            {
+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+                $sql.= " (fk_mailing,";
+                $sql.= " fk_contact,";
+                $sql.= " lastname, firstname, email, other, source_url, source_id,";
+                    $sql.= " tag,";
+                $sql.= " source_type)";
+                $sql.= " VALUES (".$mailing_id.",";
+                $sql.= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'") .",";
+                $sql.= "'".$this->db->escape($targetarray['lastname'])."',";
+                $sql.= "'".$this->db->escape($targetarray['firstname'])."',";
+                $sql.= "'".$this->db->escape($targetarray['email'])."',";
+                $sql.= "'".$this->db->escape($targetarray['other'])."',";
+                $sql.= "'".$this->db->escape($targetarray['source_url'])."',";
+                $sql.= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
+                    $sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+                $sql .= "'".$this->db->escape($targetarray['source_type'])."')";
+                dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
+                $result=$this->db->query($sql);
+                if ($result)
+                {
+                    $j++;
+                }
+                else
+                {
+                    if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                    {
+                        // Si erreur autre que doublon
+                        dol_syslog($this->db->error());
+                        $this->error=$this->db->error();
+                        $this->db->rollback();
+                        return -1;
+                    }
+                }
+            }
         }
 
         dol_syslog(get_class($this)."::".__METHOD__.": mailing ".$j." targets added");
@@ -237,7 +237,7 @@ 
         $result=$this->db->query($sql);
         if (! $result)
         {
-        	dol_print_error($this->db);
+            dol_print_error($this->db);
         }
 
         $this->update_nb($mailing_id);

Spacing +33 added lines, -33 removed lines

@@ -39,9 +39,9 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-    public $tooltip='';
+    public $tooltip = '';
 
 
     /**
@@ -64,12 +64,12 @@ 
         global $langs, $form;
 
         $langs->load("mails");
-        $transstring="MailingModuleDesc".$this->name;
-        $s='';
+        $transstring = "MailingModuleDesc".$this->name;
+        $s = '';
 
-        if ($langs->trans($this->name) != $this->name) $s=$langs->trans($this->name);
-        elseif ($langs->trans($transstring) != $transstring) $s=$langs->trans($transstring);
-        else $s=$this->desc;
+        if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
+        elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
+        else $s = $this->desc;
 
         if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
         return $s;
@@ -93,7 +93,7 @@ 
      */
     function getNbOfRecipients($sql)
     {
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $obj = $this->db->fetch_object($result);
@@ -101,7 +101,7 @@ 
         }
         else
         {
-        	$this->error=$this->db->lasterror();
+        	$this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -130,18 +130,18 @@ 
         // Mise a jour nombre de destinataire dans table des mailings
         $sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
         $sql .= " WHERE fk_mailing = ".$mailing_id;
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
-            $obj=$this->db->fetch_object($result);
-            $nb=$obj->nb;
+            $obj = $this->db->fetch_object($result);
+            $nb = $obj->nb;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
             $sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
             if (!$this->db->query($sql))
             {
                 dol_syslog($this->db->error());
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         }
@@ -171,26 +171,26 @@ 
         $num = count($cibles);
         foreach ($cibles as $targetarray)
         {
-        	if (! empty($targetarray['email'])) // avoid empty email address
+        	if (!empty($targetarray['email'])) // avoid empty email address
         	{
         		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
-        		$sql.= " (fk_mailing,";
-        		$sql.= " fk_contact,";
-        		$sql.= " lastname, firstname, email, other, source_url, source_id,";
-       			$sql.= " tag,";
-        		$sql.= " source_type)";
-        		$sql.= " VALUES (".$mailing_id.",";
-        		$sql.= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'") .",";
-        		$sql.= "'".$this->db->escape($targetarray['lastname'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['firstname'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['email'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['other'])."',";
-        		$sql.= "'".$this->db->escape($targetarray['source_url'])."',";
-        		$sql.= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
+        		$sql .= " (fk_mailing,";
+        		$sql .= " fk_contact,";
+        		$sql .= " lastname, firstname, email, other, source_url, source_id,";
+       			$sql .= " tag,";
+        		$sql .= " source_type)";
+        		$sql .= " VALUES (".$mailing_id.",";
+        		$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'").",";
+        		$sql .= "'".$this->db->escape($targetarray['lastname'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['email'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['other'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
+        		$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
        			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
         		$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
-        		dol_syslog(get_class($this)."::".__METHOD__,LOG_DEBUG);
-        		$result=$this->db->query($sql);
+        		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        		$result = $this->db->query($sql);
         		if ($result)
         		{
         			$j++;
@@ -201,7 +201,7 @@ 
         			{
         				// Si erreur autre que doublon
         				dol_syslog($this->db->error());
-        				$this->error=$this->db->error();
+        				$this->error = $this->db->error();
         				$this->db->rollback();
         				return -1;
         			}
@@ -234,8 +234,8 @@ 
         $sql .= " WHERE fk_mailing=".$mailing_id." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
 
         dol_syslog(get_class($this)."::".__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if (! $result)
+        $result = $this->db->query($sql);
+        if (!$result)
         {
         	dol_print_error($this->db);
         }
@@ -260,7 +260,7 @@ 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
         $sql .= " WHERE fk_mailing = ".$mailing_id;
 
-        if (! $this->db->query($sql))
+        if (!$this->db->query($sql))
         {
             dol_syslog($this->db->error());
         }

Braces +16 added lines, -11 removed lines

@@ -67,11 +67,17 @@ 
         $transstring="MailingModuleDesc".$this->name;
         $s='';
 
-        if ($langs->trans($this->name) != $this->name) $s=$langs->trans($this->name);
-        elseif ($langs->trans($transstring) != $transstring) $s=$langs->trans($transstring);
-        else $s=$this->desc;
+        if ($langs->trans($this->name) != $this->name) {
+            $s=$langs->trans($this->name);
+        } elseif ($langs->trans($transstring) != $transstring) {
+            $s=$langs->trans($transstring);
+        } else {
+            $s=$this->desc;
+        }
 
-        if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+        if ($this->tooltip && is_object($form)) {
+            $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+        }
         return $s;
     }
 
@@ -98,8 +104,7 @@ 
         {
             $obj = $this->db->fetch_object($result);
             return $obj->nb;
-        }
-        else
+        } else
         {
         	$this->error=$this->db->lasterror();
             return -1;
@@ -144,8 +149,7 @@ 
                 $this->error=$this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -1;
         }
         return $nb;
@@ -171,9 +175,11 @@ 
         $num = count($cibles);
         foreach ($cibles as $targetarray)
         {
-        	if (! empty($targetarray['email'])) // avoid empty email address
+        	if (! empty($targetarray['email'])) {
+        	    // avoid empty email address
         	{
         		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
+        	}
         		$sql.= " (fk_mailing,";
         		$sql.= " fk_contact,";
         		$sql.= " lastname, firstname, email, other, source_url, source_id,";
@@ -194,8 +200,7 @@ 
         		if ($result)
         		{
         			$j++;
-        		}
-        		else
+        		} else
         		{
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{

dolibarr/htdocs/core/modules/mailings/thirdparties.modules.php

Indentation +204 added lines, -204 removed lines

@@ -24,77 +24,77 @@ 
  */
 class mailing_thirdparties extends MailingTargets
 {
-	var $name='ThirdPartiesByCategories';
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc="Third parties (by categories)";
-	var $require_admin=0;
+    var $name='ThirdPartiesByCategories';
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    var $desc="Third parties (by categories)";
+    var $require_admin=0;
 
-	var $require_module=array("societe");	// This module allows to select by categories must be also enabled if category module is not activated
-	var $picto='company';
+    var $require_module=array("societe");	// This module allows to select by categories must be also enabled if category module is not activated
+    var $picto='company';
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
         $langs->load("companies");
 
-		$this->db=$db;
-	}
+        $this->db=$db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    This is the main function that returns the array of emails
-	 *
-	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *    @return   int 					<0 if error, number of emails added if ok
-	 */
-	function add_to_target($mailing_id)
-	{
+    /**
+     *    This is the main function that returns the array of emails
+     *
+     *    @param	int		$mailing_id    	Id of mailing. No need to use it.
+     *    @return   int 					<0 if error, number of emails added if ok
+     */
+    function add_to_target($mailing_id)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		$cibles = array();
-
-		// Select the third parties from category
-		if (empty($_POST['filter']))
-		{
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		}
-		else
-		{
-		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_soc = s.rowid";
-		    $sql.= " AND c.rowid = cs.fk_categorie";
-		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-		    $sql.= " UNION ";
-		    $sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_soc = s.rowid";
-		    $sql.= " AND c.rowid = cs.fk_categorie";
-		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-		}
+        global $conf, $langs;
+
+        $cibles = array();
+
+        // Select the third parties from category
+        if (empty($_POST['filter']))
+        {
+            $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= " WHERE s.email <> ''";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
+            $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+        }
+        else
+        {
+            $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
+            $sql.= " WHERE s.email <> ''";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
+            $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+            $sql.= " AND cs.fk_soc = s.rowid";
+            $sql.= " AND c.rowid = cs.fk_categorie";
+            $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+            $sql.= " UNION ";
+            $sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
+            $sql.= " WHERE s.email <> ''";
+            $sql.= " AND s.entity IN (".getEntity('societe').")";
+            $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+            $sql.= " AND cs.fk_soc = s.rowid";
+            $sql.= " AND c.rowid = cs.fk_categorie";
+            $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+        }
 
         $addDescription= "";
         if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
@@ -143,149 +143,149 @@ 
         $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;
-			$j = 0;
-
-			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
-
-			$old = '';
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
-					$otherTxt= ($obj->label?$langs->transnoentities("Category").'='.$obj->label:'');
-					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0)
-					{
-						$otherTxt.= ";";
-					}
-					$otherTxt.= $addDescription;
-					$cibles[$j] = array(
-                    			'email' => $obj->email,
-                    			'fk_contact' => $obj->fk_contact,
-                    			'lastname' => $obj->name,	// For a thirdparty, we must use name
-                    			'firstname' => '',			// For a thirdparty, lastname is ''
-                    			'other' => $otherTxt,
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            $j = 0;
+
+            dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+
+            $old = '';
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                if ($old <> $obj->email)
+                {
+                    $otherTxt= ($obj->label?$langs->transnoentities("Category").'='.$obj->label:'');
+                    if (strlen($addDescription) > 0 && strlen($otherTxt) > 0)
+                    {
+                        $otherTxt.= ";";
+                    }
+                    $otherTxt.= $addDescription;
+                    $cibles[$j] = array(
+                                'email' => $obj->email,
+                                'fk_contact' => $obj->fk_contact,
+                                'lastname' => $obj->name,	// For a thirdparty, we must use name
+                                'firstname' => '',			// For a thirdparty, lastname is ''
+                                'other' => $otherTxt,
                                 'source_url' => $this->url($obj->id),
                                 'source_id' => $obj->id,
                                 'source_type' => 'thirdparty'
-					);
-					$old = $obj->email;
-					$j++;
-				}
+                    );
+                    $old = $obj->email;
+                    $j++;
+                }
+
+                $i++;
+            }
+        }
+        else
+        {
+            dol_syslog($this->db->error());
+            $this->error=$this->db->error();
+            return -1;
+        }
+
+        return parent::add_to_target($mailing_id, $cibles);
+    }
+
 
-				$i++;
-			}
-		}
-		else
-		{
-			dol_syslog($this->db->error());
-			$this->error=$this->db->error();
-			return -1;
-		}
+    /**
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        // CHANGE THIS: Optionnal
+
+        //var $statssql=array();
+        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+        return array();
+    }
+
+
+    /**
+     *	Return here number of distinct emails returned by your selector.
+     *	For example if this selector is used to extract 500 different
+     *	emails from a text file, this function must return 500.
+     *
+     *  @param      string	$sql        Requete sql de comptage
+     *	@return		int					Nb of recipients
+     */
+    function getNbOfRecipients($sql='')
+    {
+        global $conf;
 
-		return parent::add_to_target($mailing_id, $cibles);
-	}
+        $sql = "SELECT count(distinct(s.email)) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE s.email != ''";
+        $sql.= " AND s.entity IN (".getEntity('societe').")";
 
+        // La requete doit retourner un champ "nb" pour etre comprise
+        // par parent::getNbOfRecipients
+        return parent::getNbOfRecipients($sql);
+    }
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-		// CHANGE THIS: Optionnal
-
-		//var $statssql=array();
-		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
-		return array();
-	}
-
-
-	/**
-	 *	Return here number of distinct emails returned by your selector.
-	 *	For example if this selector is used to extract 500 different
-	 *	emails from a text file, this function must return 500.
-	 *
-	 *  @param      string	$sql        Requete sql de comptage
-	 *	@return		int					Nb of recipients
-	 */
-	function getNbOfRecipients($sql='')
-	{
-		global $conf;
-
-		$sql = "SELECT count(distinct(s.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe').")";
-
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
-		return parent::getNbOfRecipients($sql);
-	}
-
-	/**
-	 *  This is to add a form filter to provide variant of selector
-	 *	If used, the HTML select must be called "filter"
-	 *
-	 *  @return     string      A html select zone
-	 */
-	function formFilter()
-	{
-		global $conf, $langs;
-
-		$langs->load("companies");
-
-		$s=$langs->trans("Categories").': ';
-		$s.='<select name="filter" class="flat">';
-
-		// Show categories
-		$sql = "SELECT rowid, label, type, visible";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
-		// $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
-		$sql.= " AND entity = ".$conf->entity;
-		$sql.= " ORDER BY label";
-
-		//print $sql;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
-
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
-				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
-				$s.='</option>';
-				$i++;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		$s.='</select> ';
+     *  This is to add a form filter to provide variant of selector
+     *	If used, the HTML select must be called "filter"
+     *
+     *  @return     string      A html select zone
+     */
+    function formFilter()
+    {
+        global $conf, $langs;
+
+        $langs->load("companies");
+
+        $s=$langs->trans("Categories").': ';
+        $s.='<select name="filter" class="flat">';
+
+        // Show categories
+        $sql = "SELECT rowid, label, type, visible";
+        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
+        // $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
+        $sql.= " AND entity = ".$conf->entity;
+        $sql.= " ORDER BY label";
+
+        //print $sql;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+
+            if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+
+            if ($num) $s.='<option value="0">&nbsp;</option>';
+            else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $type='';
+                if ($obj->type == 1) $type=$langs->trans("Supplier");
+                if ($obj->type == 2) $type=$langs->trans("Customer");
+                $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
+                if ($type) $s.=' ('.$type.')';
+                $s.='</option>';
+                $i++;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        $s.='</select> ';
                 $s.= $langs->trans('ProspectCustomer');
                 $s.=': <select name="filter_client" class="flat">';
                 $s.= '<option value="-1">&nbsp;</option>';
@@ -308,19 +308,19 @@ 
                 $s.='<option value="-1">&nbsp;</option>';
                 $s.='<option value="1" selected>'.$langs->trans("Enabled").'</option>';
                 $s.='<option value="0">'.$langs->trans("Disabled").'</option>';
-		$s.='</select>';
-		return $s;
-	}
+        $s.='</select>';
+        return $s;
+    }
 
 
     /**
-	 *  Can include an URL link on each record provided by selector shown on target page.
-	 *
+     *  Can include an URL link on each record provided by selector shown on target page.
+     *
      *  @param	int		$id		ID
-	 *  @return string      	Url link
-	 */
-	function url($id)
-	{
-		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
-	}
+     *  @return string      	Url link
+     */
+    function url($id)
+    {
+        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -24,13 +24,13 @@ 
  */
 class mailing_thirdparties extends MailingTargets
 {
-	var $name='ThirdPartiesByCategories';
+	var $name = 'ThirdPartiesByCategories';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc="Third parties (by categories)";
-	var $require_admin=0;
+	var $desc = "Third parties (by categories)";
+	var $require_admin = 0;
 
-	var $require_module=array("societe");	// This module allows to select by categories must be also enabled if category module is not activated
-	var $picto='company';
+	var $require_module = array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
+	var $picto = 'company';
 
 	/**
      * @var DoliDB Database handler.
@@ -48,7 +48,7 @@ 
 		global $conf, $langs;
         $langs->load("companies");
 
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -70,80 +70,80 @@ 
 		if (empty($_POST['filter']))
 		{
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		    $sql .= " WHERE s.email <> ''";
+		    $sql .= " AND s.entity IN (".getEntity('societe').")";
+		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		}
 		else
 		{
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_soc = s.rowid";
-		    $sql.= " AND c.rowid = cs.fk_categorie";
-		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
-		    $sql.= " UNION ";
-		    $sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
-		    $sql.= " WHERE s.email <> ''";
-		    $sql.= " AND s.entity IN (".getEntity('societe').")";
-		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		    $sql.= " AND cs.fk_soc = s.rowid";
-		    $sql.= " AND c.rowid = cs.fk_categorie";
-		    $sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
+		    $sql .= " WHERE s.email <> ''";
+		    $sql .= " AND s.entity IN (".getEntity('societe').")";
+		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		    $sql .= " AND cs.fk_soc = s.rowid";
+		    $sql .= " AND c.rowid = cs.fk_categorie";
+		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+		    $sql .= " UNION ";
+		    $sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
+		    $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
+		    $sql .= " WHERE s.email <> ''";
+		    $sql .= " AND s.entity IN (".getEntity('societe').")";
+		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		    $sql .= " AND cs.fk_soc = s.rowid";
+		    $sql .= " AND c.rowid = cs.fk_categorie";
+		    $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
 		}
 
-        $addDescription= "";
+        $addDescription = "";
         if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
         {
-            $sql.= " AND s.client=" . $_POST["filter_client"];
-            $addDescription= $langs->trans('ProspectCustomer')."=";
+            $sql .= " AND s.client=".$_POST["filter_client"];
+            $addDescription = $langs->trans('ProspectCustomer')."=";
             if ($_POST["filter_client"] == 0)
             {
-                $addDescription.= $langs->trans('NorProspectNorCustomer');
+                $addDescription .= $langs->trans('NorProspectNorCustomer');
             }
             elseif ($_POST["filter_client"] == 1)
             {
-                $addDescription.= $langs->trans('Customer');
+                $addDescription .= $langs->trans('Customer');
             }
             elseif ($_POST["filter_client"] == 2)
             {
-                $addDescription.= $langs->trans('Prospect');
+                $addDescription .= $langs->trans('Prospect');
             }
             elseif ($_POST["filter_client"] == 3)
             {
-                $addDescription.= $langs->trans('ProspectCustomer');
+                $addDescription .= $langs->trans('ProspectCustomer');
             }
             else
             {
-                $addDescription.= "Unknown status ".$_POST["filter_client"];
+                $addDescription .= "Unknown status ".$_POST["filter_client"];
             }
         }
         if (isset($_POST["filter_status"]))
         {
             if (strlen($addDescription) > 0)
             {
-                $addDescription.= ";";
+                $addDescription .= ";";
             }
-            $addDescription.= $langs->trans("Status")."=";
+            $addDescription .= $langs->trans("Status")."=";
             if ($_POST["filter_status"] == '1')
             {
-                $sql.= " AND s.status=1";
-                $addDescription.= $langs->trans("Enabled");
+                $sql .= " AND s.status=1";
+                $addDescription .= $langs->trans("Enabled");
             }
             else
             {
-                $sql.= " AND s.status=0";
-                $addDescription.= $langs->trans("Disabled");
+                $sql .= " AND s.status=0";
+                $addDescription .= $langs->trans("Disabled");
             }
         }
-        $sql.= " ORDER BY email";
+        $sql .= " ORDER BY email";
 
         // Stock recipients emails into targets table
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
@@ -158,17 +158,17 @@ 
 				$obj = $this->db->fetch_object($result);
 				if ($old <> $obj->email)
 				{
-					$otherTxt= ($obj->label?$langs->transnoentities("Category").'='.$obj->label:'');
+					$otherTxt = ($obj->label ? $langs->transnoentities("Category").'='.$obj->label : '');
 					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0)
 					{
-						$otherTxt.= ";";
+						$otherTxt .= ";";
 					}
-					$otherTxt.= $addDescription;
+					$otherTxt .= $addDescription;
 					$cibles[$j] = array(
                     			'email' => $obj->email,
                     			'fk_contact' => $obj->fk_contact,
-                    			'lastname' => $obj->name,	// For a thirdparty, we must use name
-                    			'firstname' => '',			// For a thirdparty, lastname is ''
+                    			'lastname' => $obj->name, // For a thirdparty, we must use name
+                    			'firstname' => '', // For a thirdparty, lastname is ''
                     			'other' => $otherTxt,
                                 'source_url' => $this->url($obj->id),
                                 'source_id' => $obj->id,
@@ -184,7 +184,7 @@ 
 		else
 		{
 			dol_syslog($this->db->error());
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 
@@ -218,14 +218,14 @@ 
 	 *  @param      string	$sql        Requete sql de comptage
 	 *	@return		int					Nb of recipients
 	 */
-	function getNbOfRecipients($sql='')
+	function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
 		$sql = "SELECT count(distinct(s.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.email != ''";
+		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
@@ -244,16 +244,16 @@ 
 
 		$langs->load("companies");
 
-		$s=$langs->trans("Categories").': ';
-		$s.='<select name="filter" class="flat">';
+		$s = $langs->trans("Categories").': ';
+		$s .= '<select name="filter" class="flat">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type in (1,2)"; // We keep only categories for suppliers and customers/prospects
 		// $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
-		$sql.= " AND entity = ".$conf->entity;
-		$sql.= " ORDER BY label";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY label";
 
 		//print $sql;
 		$resql = $this->db->query($sql);
@@ -261,22 +261,22 @@ 
 		{
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) $num = 0; // Force empty list if category module is not enabled
 
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) $s .= '<option value="0">&nbsp;</option>';
+			else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
 
 			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
-				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
-				$s.='</option>';
+				$type = '';
+				if ($obj->type == 1) $type = $langs->trans("Supplier");
+				if ($obj->type == 2) $type = $langs->trans("Customer");
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				if ($type) $s .= ' ('.$type.')';
+				$s .= '</option>';
 				$i++;
 			}
 		}
@@ -285,30 +285,30 @@ 
 			dol_print_error($this->db);
 		}
 
-		$s.='</select> ';
-                $s.= $langs->trans('ProspectCustomer');
-                $s.=': <select name="filter_client" class="flat">';
-                $s.= '<option value="-1">&nbsp;</option>';
+		$s .= '</select> ';
+                $s .= $langs->trans('ProspectCustomer');
+                $s .= ': <select name="filter_client" class="flat">';
+                $s .= '<option value="-1">&nbsp;</option>';
                 if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
                 {
-                    $s.= '<option value="2">'.$langs->trans('Prospect').'</option>';
+                    $s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
                 }
                 if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
-                    $s.= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
+                    $s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
                 }
                 if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-                    $s.= '<option value="1">'.$langs->trans('Customer').'</option>';
+                    $s .= '<option value="1">'.$langs->trans('Customer').'</option>';
                 }
-                $s.= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
+                $s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
 
-                $s.='</select> ';
+                $s .= '</select> ';
 
-                $s.=$langs->trans("Status");
-                $s.=': <select name="filter_status" class="flat">';
-                $s.='<option value="-1">&nbsp;</option>';
-                $s.='<option value="1" selected>'.$langs->trans("Enabled").'</option>';
-                $s.='<option value="0">'.$langs->trans("Disabled").'</option>';
-		$s.='</select>';
+                $s .= $langs->trans("Status");
+                $s .= ': <select name="filter_status" class="flat">';
+                $s .= '<option value="-1">&nbsp;</option>';
+                $s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
+                $s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
+		$s .= '</select>';
 		return $s;
 	}
 
@@ -321,6 +321,6 @@ 
 	 */
 	function url($id)
 	{
-		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
 	}
 }

Braces +26 added lines, -22 removed lines

@@ -74,8 +74,7 @@ 
 		    $sql.= " WHERE s.email <> ''";
 		    $sql.= " AND s.entity IN (".getEntity('societe').")";
 		    $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		}
-		else
+		} else
 		{
 		    $sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 		    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
@@ -104,20 +103,16 @@ 
             if ($_POST["filter_client"] == 0)
             {
                 $addDescription.= $langs->trans('NorProspectNorCustomer');
-            }
-            elseif ($_POST["filter_client"] == 1)
+            } elseif ($_POST["filter_client"] == 1)
             {
                 $addDescription.= $langs->trans('Customer');
-            }
-            elseif ($_POST["filter_client"] == 2)
+            } elseif ($_POST["filter_client"] == 2)
             {
                 $addDescription.= $langs->trans('Prospect');
-            }
-            elseif ($_POST["filter_client"] == 3)
+            } elseif ($_POST["filter_client"] == 3)
             {
                 $addDescription.= $langs->trans('ProspectCustomer');
-            }
-            else
+            } else
             {
                 $addDescription.= "Unknown status ".$_POST["filter_client"];
             }
@@ -133,8 +128,7 @@ 
             {
                 $sql.= " AND s.status=1";
                 $addDescription.= $langs->trans("Enabled");
-            }
-            else
+            } else
             {
                 $sql.= " AND s.status=0";
                 $addDescription.= $langs->trans("Disabled");
@@ -180,8 +174,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog($this->db->error());
 			$this->error=$this->db->error();
@@ -261,10 +254,16 @@ 
 		{
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) {
+			    $num=0;
+			}
+			// Force empty list if category module is not enabled
 
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+			    $s.='<option value="0">&nbsp;</option>';
+			} else {
+			    $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 
 			$i = 0;
 			while ($i < $num)
@@ -272,15 +271,20 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
+				if ($obj->type == 1) {
+				    $type=$langs->trans("Supplier");
+				}
+				if ($obj->type == 2) {
+				    $type=$langs->trans("Customer");
+				}
 				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
+				if ($type) {
+				    $s.=' ('.$type.')';
+				}
 				$s.='</option>';
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/core/modules/mailings/advthirdparties.modules.php

Indentation +263 added lines, -263 removed lines

@@ -25,278 +25,278 @@
  */
 class mailing_advthirdparties extends MailingTargets
 {
-	var $name='ThirdPartyAdvancedTargeting';
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc="Third parties";
-	var $require_admin=0;
+    var $name='ThirdPartyAdvancedTargeting';
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    var $desc="Third parties";
+    var $require_admin=0;
 
-	var $require_module=array("none");	// This module should not be displayed as Selector in mailling
-	var $picto='company';
+    var $require_module=array("none");	// This module should not be displayed as Selector in mailling
+    var $picto='company';
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    This is the main function that returns the array of emails
-	 *
-	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *    @param	array	$socid  		Array of id soc to add
-	 *    @param	int		$type_of_target	Defined in advtargetemailing.class.php
-	 *    @param	array	$contactid 		Array of contact id to add
-	 *    @return   int 					<0 if error, number of emails added if ok
-	 */
-	function add_to_target_spec($mailing_id,$socid,$type_of_target, $contactid)
-	{
+    /**
+     *    This is the main function that returns the array of emails
+     *
+     *    @param	int		$mailing_id    	Id of mailing. No need to use it.
+     *    @param	array	$socid  		Array of id soc to add
+     *    @param	int		$type_of_target	Defined in advtargetemailing.class.php
+     *    @param	array	$contactid 		Array of contact id to add
+     *    @return   int 					<0 if error, number of emails added if ok
+     */
+    function add_to_target_spec($mailing_id,$socid,$type_of_target, $contactid)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		dol_syslog(get_class($this)."::add_to_target socid=".var_export($socid,true).' contactid='.var_export($contactid,true));
-
-		$cibles = array();
-
-		if (($type_of_target==1) || ($type_of_target==3)) {
-			// Select the third parties from category
-			if (count($socid)>0)
-			{
-				$sql= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
-				$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-				$sql.= " AND s.rowid 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", 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(
-    								'email' => $obj->email,
-    								'fk_contact' => $obj->fk_contact,
-    								'name' => $obj->name,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id,'thirdparty'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'thirdparty'
-    							);
-    						}
-    					}
-
-    					$i++;
-    				}
-    			}
-    			else
-    			{
-    				dol_syslog($this->db->error());
-    				$this->error=$this->db->error();
-    				return -1;
-    			}
-			}
-		}
-
-		if  (($type_of_target==1) || ($type_of_target==2) || ($type_of_target==4)) {
-			// Select the third parties from category
-			if (count($socid)>0 || count($contactid)>0)
-			{
-				$sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
-				$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql.= " WHERE socp.entity IN (".getEntity('socpeople').")";
-				if (count($contactid)>0) {
-					$sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
-				}
-				if (count($socid)>0) {
-					$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(
-    								'email' => $obj->email,
-    								'fk_contact' =>$obj->id,
-    								'lastname' => $obj->lastname,
-    								'firstname' => $obj->firstname,
-    								'other' => '',
-    								'source_url' => $this->url($obj->id,'contact'),
-    								'source_id' => $obj->id,
-    								'source_type' => 'contact'
-    							);
-    						}
-    					}
-
-    					$i++;
-    				}
-    			}
-    			else
-    			{
-    				dol_syslog($this->db->error());
-    				$this->error=$this->db->error();
-    				return -1;
-    			}
-			}
-		}
-
-
-		dol_syslog(get_class($this)."::add_to_target mailing cibles=".var_export($cibles,true), LOG_DEBUG);
-		return parent::add_to_target($mailing_id, $cibles);
-	}
-
-
-	/**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-		// CHANGE THIS: Optionnal
-
-		//var $statssql=array();
-		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
-		return array();
-	}
-
-
-	/**
-	 *	Return here number of distinct emails returned by your selector.
-	 *	For example if this selector is used to extract 500 different
-	 *	emails from a text file, this function must return 500.
-	 *
-	 *  @param	string	$sql 		Not use here
-	 *	@return	    int			          Nb of recipients
-	 */
-	function getNbOfRecipients($sql='')
-	{
-		global $conf;
-
-		$sql = "SELECT count(distinct(s.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe').")";
-
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
-		return parent::getNbOfRecipients($sql);
-	}
-
-	/**
-	 *  This is to add a form filter to provide variant of selector
-	 *	If used, the HTML select must be called "filter"
-	 *
-	 *  @return     string      A html select zone
-	 */
-	function formFilter()
-	{
-		global $conf, $langs;
-
-		$langs->load("companies");
-
-		$s='';
-		$s.='<select name="filter" class="flat">';
-
-		// Show categories
-		$sql = "SELECT rowid, label, type, visible";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
-		// $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
-		$sql.= " AND entity = ".$conf->entity;
-		$sql.= " ORDER BY label";
-
-		//print $sql;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
-
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
-				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
-				$s.='</option>';
-				$i++;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		$s.='</select>';
-		return $s;
-	}
-
-
-	/**
-	 *  Can include an URL link on each record provided by selector shown on target page.
-	 *
-	 *  @param	int		$id		ID
-	 *  @param	string		$type	type
-	 *  @return string      	Url link
-	 */
-	function url($id,$type)
-	{
-		if ($type=='thirdparty') {
-			$companystatic=new Societe($this->db);
-			$companystatic->fetch($id);
-			return $companystatic->getNomUrl(0, '', 0, 1);
-		} elseif ($type=='contact') {
-			$contactstatic=new Contact($this->db);
-			$contactstatic->fetch($id);
-			return $contactstatic->getNomUrl(0, '', 0, '', -1, 1);
-		}
-	}
+        global $conf, $langs;
+
+        dol_syslog(get_class($this)."::add_to_target socid=".var_export($socid,true).' contactid='.var_export($contactid,true));
+
+        $cibles = array();
+
+        if (($type_of_target==1) || ($type_of_target==3)) {
+            // Select the third parties from category
+            if (count($socid)>0)
+            {
+                $sql= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
+                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
+                $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+                $sql.= " AND s.rowid 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", 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(
+                                    'email' => $obj->email,
+                                    'fk_contact' => $obj->fk_contact,
+                                    'name' => $obj->name,
+                                    'firstname' => $obj->firstname,
+                                    'other' => '',
+                                    'source_url' => $this->url($obj->id,'thirdparty'),
+                                    'source_id' => $obj->id,
+                                    'source_type' => 'thirdparty'
+                                );
+                            }
+                        }
+
+                        $i++;
+                    }
+                }
+                else
+                {
+                    dol_syslog($this->db->error());
+                    $this->error=$this->db->error();
+                    return -1;
+                }
+            }
+        }
+
+        if  (($type_of_target==1) || ($type_of_target==2) || ($type_of_target==4)) {
+            // Select the third parties from category
+            if (count($socid)>0 || count($contactid)>0)
+            {
+                $sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
+                $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
+                $sql.= " WHERE socp.entity IN (".getEntity('socpeople').")";
+                if (count($contactid)>0) {
+                    $sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
+                }
+                if (count($socid)>0) {
+                    $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(
+                                    'email' => $obj->email,
+                                    'fk_contact' =>$obj->id,
+                                    'lastname' => $obj->lastname,
+                                    'firstname' => $obj->firstname,
+                                    'other' => '',
+                                    'source_url' => $this->url($obj->id,'contact'),
+                                    'source_id' => $obj->id,
+                                    'source_type' => 'contact'
+                                );
+                            }
+                        }
+
+                        $i++;
+                    }
+                }
+                else
+                {
+                    dol_syslog($this->db->error());
+                    $this->error=$this->db->error();
+                    return -1;
+                }
+            }
+        }
+
+
+        dol_syslog(get_class($this)."::add_to_target mailing cibles=".var_export($cibles,true), LOG_DEBUG);
+        return parent::add_to_target($mailing_id, $cibles);
+    }
+
+
+    /**
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        // CHANGE THIS: Optionnal
+
+        //var $statssql=array();
+        //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+        return array();
+    }
+
+
+    /**
+     *	Return here number of distinct emails returned by your selector.
+     *	For example if this selector is used to extract 500 different
+     *	emails from a text file, this function must return 500.
+     *
+     *  @param	string	$sql 		Not use here
+     *	@return	    int			          Nb of recipients
+     */
+    function getNbOfRecipients($sql='')
+    {
+        global $conf;
+
+        $sql = "SELECT count(distinct(s.email)) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE s.email != ''";
+        $sql.= " AND s.entity IN (".getEntity('societe').")";
+
+        // La requete doit retourner un champ "nb" pour etre comprise
+        // par parent::getNbOfRecipients
+        return parent::getNbOfRecipients($sql);
+    }
+
+    /**
+     *  This is to add a form filter to provide variant of selector
+     *	If used, the HTML select must be called "filter"
+     *
+     *  @return     string      A html select zone
+     */
+    function formFilter()
+    {
+        global $conf, $langs;
+
+        $langs->load("companies");
+
+        $s='';
+        $s.='<select name="filter" class="flat">';
+
+        // Show categories
+        $sql = "SELECT rowid, label, type, visible";
+        $sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+        $sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
+        // $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
+        $sql.= " AND entity = ".$conf->entity;
+        $sql.= " ORDER BY label";
+
+        //print $sql;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+
+            if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+
+            if ($num) $s.='<option value="0">&nbsp;</option>';
+            else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $type='';
+                if ($obj->type == 1) $type=$langs->trans("Supplier");
+                if ($obj->type == 2) $type=$langs->trans("Customer");
+                $s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
+                if ($type) $s.=' ('.$type.')';
+                $s.='</option>';
+                $i++;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        $s.='</select>';
+        return $s;
+    }
+
+
+    /**
+     *  Can include an URL link on each record provided by selector shown on target page.
+     *
+     *  @param	int		$id		ID
+     *  @param	string		$type	type
+     *  @return string      	Url link
+     */
+    function url($id,$type)
+    {
+        if ($type=='thirdparty') {
+            $companystatic=new Societe($this->db);
+            $companystatic->fetch($id);
+            return $companystatic->getNomUrl(0, '', 0, 1);
+        } elseif ($type=='contact') {
+            $contactstatic=new Contact($this->db);
+            $contactstatic->fetch($id);
+            return $contactstatic->getNomUrl(0, '', 0, '', -1, 1);
+        }
+    }
 }

Spacing +57 added lines, -57 removed lines

@@ -25,13 +25,13 @@ 
  */
 class mailing_advthirdparties extends MailingTargets
 {
-	var $name='ThirdPartyAdvancedTargeting';
+	var $name = 'ThirdPartyAdvancedTargeting';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc="Third parties";
-	var $require_admin=0;
+	var $desc = "Third parties";
+	var $require_admin = 0;
 
-	var $require_module=array("none");	// This module should not be displayed as Selector in mailling
-	var $picto='company';
+	var $require_module = array("none"); // This module should not be displayed as Selector in mailling
+	var $picto = 'company';
 
 	/**
      * @var DoliDB Database handler.
@@ -46,7 +46,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -60,27 +60,27 @@ 
 	 *    @param	array	$contactid 		Array of contact id to add
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-	function add_to_target_spec($mailing_id,$socid,$type_of_target, $contactid)
+	function add_to_target_spec($mailing_id, $socid, $type_of_target, $contactid)
 	{
         // phpcs:enable
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::add_to_target socid=".var_export($socid,true).' contactid='.var_export($contactid,true));
+		dol_syslog(get_class($this)."::add_to_target socid=".var_export($socid, true).' contactid='.var_export($contactid, true));
 
 		$cibles = array();
 
-		if (($type_of_target==1) || ($type_of_target==3)) {
+		if (($type_of_target == 1) || ($type_of_target == 3)) {
 			// Select the third parties from category
-			if (count($socid)>0)
+			if (count($socid) > 0)
 			{
-				$sql= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
-				$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-				$sql.= " AND s.rowid IN (".implode(',',$socid).")";
-				$sql.= " ORDER BY email";
+				$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
+				$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+				$sql .= " AND s.rowid IN (".implode(',', $socid).")";
+				$sql .= " ORDER BY email";
 
     			// Stock recipients emails into targets table
-    			$result=$this->db->query($sql);
+    			$result = $this->db->query($sql);
     			if ($result)
     			{
     				$num = $this->db->num_rows($result);
@@ -101,7 +101,7 @@ 
     								'name' => $obj->name,
     								'firstname' => $obj->firstname,
     								'other' => '',
-    								'source_url' => $this->url($obj->id,'thirdparty'),
+    								'source_url' => $this->url($obj->id, 'thirdparty'),
     								'source_id' => $obj->id,
     								'source_type' => 'thirdparty'
     							);
@@ -114,29 +114,29 @@ 
     			else
     			{
     				dol_syslog($this->db->error());
-    				$this->error=$this->db->error();
+    				$this->error = $this->db->error();
     				return -1;
     			}
 			}
 		}
 
-		if  (($type_of_target==1) || ($type_of_target==2) || ($type_of_target==4)) {
+		if (($type_of_target == 1) || ($type_of_target == 2) || ($type_of_target == 4)) {
 			// Select the third parties from category
-			if (count($socid)>0 || count($contactid)>0)
+			if (count($socid) > 0 || count($contactid) > 0)
 			{
-				$sql= "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
-				$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql.= " WHERE socp.entity IN (".getEntity('socpeople').")";
-				if (count($contactid)>0) {
-					$sql.= " AND socp.rowid IN (".implode(',',$contactid).")";
+				$sql = "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
+				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
+				$sql .= " WHERE socp.entity IN (".getEntity('socpeople').")";
+				if (count($contactid) > 0) {
+					$sql .= " AND socp.rowid IN (".implode(',', $contactid).")";
 				}
-				if (count($socid)>0) {
-					$sql.= " AND socp.fk_soc IN (".implode(',',$socid).")";
+				if (count($socid) > 0) {
+					$sql .= " AND socp.fk_soc IN (".implode(',', $socid).")";
 				}
-				$sql.= " ORDER BY email";
+				$sql .= " ORDER BY email";
 
     			// Stock recipients emails into targets table
-    			$result=$this->db->query($sql);
+    			$result = $this->db->query($sql);
     			if ($result)
     			{
     				$num = $this->db->num_rows($result);
@@ -157,7 +157,7 @@ 
     								'lastname' => $obj->lastname,
     								'firstname' => $obj->firstname,
     								'other' => '',
-    								'source_url' => $this->url($obj->id,'contact'),
+    								'source_url' => $this->url($obj->id, 'contact'),
     								'source_id' => $obj->id,
     								'source_type' => 'contact'
     							);
@@ -170,14 +170,14 @@ 
     			else
     			{
     				dol_syslog($this->db->error());
-    				$this->error=$this->db->error();
+    				$this->error = $this->db->error();
     				return -1;
     			}
 			}
 		}
 
 
-		dol_syslog(get_class($this)."::add_to_target mailing cibles=".var_export($cibles,true), LOG_DEBUG);
+		dol_syslog(get_class($this)."::add_to_target mailing cibles=".var_export($cibles, true), LOG_DEBUG);
 		return parent::add_to_target($mailing_id, $cibles);
 	}
 
@@ -208,14 +208,14 @@ 
 	 *  @param	string	$sql 		Not use here
 	 *	@return	    int			          Nb of recipients
 	 */
-	function getNbOfRecipients($sql='')
+	function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
 		$sql = "SELECT count(distinct(s.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE s.email != ''";
-		$sql.= " AND s.entity IN (".getEntity('societe').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.email != ''";
+		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
 		// par parent::getNbOfRecipients
@@ -234,16 +234,16 @@ 
 
 		$langs->load("companies");
 
-		$s='';
-		$s.='<select name="filter" class="flat">';
+		$s = '';
+		$s .= '<select name="filter" class="flat">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE type in (1,2)";	// We keep only categories for suppliers and customers/prospects
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE type in (1,2)"; // We keep only categories for suppliers and customers/prospects
 		// $sql.= " AND visible > 0";	// We ignore the property visible because third party's categories does not use this property (only products categories use it).
-		$sql.= " AND entity = ".$conf->entity;
-		$sql.= " ORDER BY label";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY label";
 
 		//print $sql;
 		$resql = $this->db->query($sql);
@@ -251,22 +251,22 @@ 
 		{
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) $num = 0; // Force empty list if category module is not enabled
 
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) $s .= '<option value="0">&nbsp;</option>';
+			else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
 
 			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
-				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
-				$s.='</option>';
+				$type = '';
+				if ($obj->type == 1) $type = $langs->trans("Supplier");
+				if ($obj->type == 2) $type = $langs->trans("Customer");
+				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
+				if ($type) $s .= ' ('.$type.')';
+				$s .= '</option>';
 				$i++;
 			}
 		}
@@ -275,7 +275,7 @@ 
 			dol_print_error($this->db);
 		}
 
-		$s.='</select>';
+		$s .= '</select>';
 		return $s;
 	}
 
@@ -287,14 +287,14 @@ 
 	 *  @param	string		$type	type
 	 *  @return string      	Url link
 	 */
-	function url($id,$type)
+	function url($id, $type)
 	{
-		if ($type=='thirdparty') {
-			$companystatic=new Societe($this->db);
+		if ($type == 'thirdparty') {
+			$companystatic = new Societe($this->db);
 			$companystatic->fetch($id);
 			return $companystatic->getNomUrl(0, '', 0, 1);
-		} elseif ($type=='contact') {
-			$contactstatic=new Contact($this->db);
+		} elseif ($type == 'contact') {
+			$contactstatic = new Contact($this->db);
 			$contactstatic->fetch($id);
 			return $contactstatic->getNomUrl(0, '', 0, '', -1, 1);
 		}

Braces +21 added lines, -12 removed lines

@@ -110,8 +110,7 @@ 
 
     					$i++;
     				}
-    			}
-    			else
+    			} else
     			{
     				dol_syslog($this->db->error());
     				$this->error=$this->db->error();
@@ -166,8 +165,7 @@ 
 
     					$i++;
     				}
-    			}
-    			else
+    			} else
     			{
     				dol_syslog($this->db->error());
     				$this->error=$this->db->error();
@@ -251,10 +249,16 @@ 
 		{
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num=0;	// Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) {
+			    $num=0;
+			}
+			// Force empty list if category module is not enabled
 
-			if ($num) $s.='<option value="0">&nbsp;</option>';
-			else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+			    $s.='<option value="0">&nbsp;</option>';
+			} else {
+			    $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 
 			$i = 0;
 			while ($i < $num)
@@ -262,15 +266,20 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 				$type='';
-				if ($obj->type == 1) $type=$langs->trans("Supplier");
-				if ($obj->type == 2) $type=$langs->trans("Customer");
+				if ($obj->type == 1) {
+				    $type=$langs->trans("Supplier");
+				}
+				if ($obj->type == 2) {
+				    $type=$langs->trans("Customer");
+				}
 				$s.='<option value="'.$obj->rowid.'">'.dol_trunc($obj->label,38,'middle');
-				if ($type) $s.=' ('.$type.')';
+				if ($type) {
+				    $s.=' ('.$type.')';
+				}
 				$s.='</option>';
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/core/modules/mailings/xinputuser.modules.php

Indentation +112 added lines, -112 removed lines

@@ -30,133 +30,133 @@
  */
 class mailing_xinputuser extends MailingTargets
 {
-	var $name='EmailsFromUser';              // Identifiant du module mailing
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='EMails input by user';        // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-	var $require_module=array();            // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                    // Module mailing actif pour user admin ou non
-	var $picto='generic';
-	var $tooltip='UseFormatInputEmailToTarget';
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    var $name='EmailsFromUser';              // Identifiant du module mailing
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    var $desc='EMails input by user';        // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+    var $require_module=array();            // Module mailing actif si modules require_module actifs
+    var $require_admin=0;                    // Module mailing actif pour user admin ou non
+    var $picto='generic';
+    var $tooltip='UseFormatInputEmailToTarget';
 
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-		global $langs;
-		$langs->load("users");
-
-		$statssql=array();
-		return $statssql;
-	}
-
-
-	/**
-	 *	Return here number of distinct emails returned by your selector.
-	 *	For example if this selector is used to extract 500 different
-	 *	emails from a text file, this function must return 500.
-	 *
-	 *  @param      string	$sql   	Sql request to count
-	 *	@return		string			'' means NA
-	 */
-	function getNbOfRecipients($sql='')
-	{
-		return '';
-	}
-
-
-	/**
-	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
-	 *
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
+
+
+    /**
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        global $langs;
+        $langs->load("users");
+
+        $statssql=array();
+        return $statssql;
+    }
+
+
+    /**
+     *	Return here number of distinct emails returned by your selector.
+     *	For example if this selector is used to extract 500 different
+     *	emails from a text file, this function must return 500.
+     *
+     *  @param      string	$sql   	Sql request to count
+     *	@return		string			'' means NA
+     */
+    function getNbOfRecipients($sql='')
+    {
+        return '';
+    }
+
+
+    /**
+     *  Renvoie url lien vers fiche de la source du destinataire du mailing
+     *
      *  @param	int		$id		ID
-	 *  @return string      	Url lien
-	 */
-	function url($id)
-	{
-		return '';
-	}
-
-
-	/**
-	 *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
-	 *
-	 *   @return     string      Retourne zone select
-	 */
-	function formFilter()
-	{
-		global $langs;
-
-		$s='';
-		$s.='<input type="text" name="xinputuser" class="flat minwidth300" value="'.GETPOST("xinputuser").'">';
-		return $s;
-	}
+     *  @return string      	Url lien
+     */
+    function url($id)
+    {
+        return '';
+    }
+
+
+    /**
+     *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+     *
+     *   @return     string      Retourne zone select
+     */
+    function formFilter()
+    {
+        global $langs;
+
+        $s='';
+        $s.='<input type="text" name="xinputuser" class="flat minwidth300" value="'.GETPOST("xinputuser").'">';
+        return $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Ajoute destinataires dans table des cibles
-	 *
-	 *  @param	int		$mailing_id    	Id of emailing
-	 *  @return int           			< 0 si erreur, nb ajout si ok
-	 */
-	function add_to_target($mailing_id)
-	{
+    /**
+     *  Ajoute destinataires dans table des cibles
+     *
+     *  @param	int		$mailing_id    	Id of emailing
+     *  @return int           			< 0 si erreur, nb ajout si ok
+     */
+    function add_to_target($mailing_id)
+    {
         // phpcs:enable
-		global $conf,$langs,$_FILES;
+        global $conf,$langs,$_FILES;
 
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$tmparray=explode(';',GETPOST('xinputuser'));
-		$email=$tmparray[0];
-		$lastname=$tmparray[1];
-		$firstname=$tmparray[2];
-		$other=$tmparray[3];
+        $tmparray=explode(';',GETPOST('xinputuser'));
+        $email=$tmparray[0];
+        $lastname=$tmparray[1];
+        $firstname=$tmparray[2];
+        $other=$tmparray[3];
 
-		$cibles=array();
+        $cibles=array();
         if (! empty($email))
         {
-			if (isValidEMail($email))
-			{
-				$cibles[] = array(
-           			'email' => $email,
-           			'lastname' => $lastname,
-           			'firstname' => $firstname,
-					'other' => $other,
+            if (isValidEMail($email))
+            {
+                $cibles[] = array(
+                        'email' => $email,
+                        'lastname' => $lastname,
+                        'firstname' => $firstname,
+                    'other' => $other,
                     'source_url' => '',
                     'source_id' => '',
                     'source_type' => 'file'
-				);
-
-				return parent::add_to_target($mailing_id, $cibles);
-			}
-			else
-			{
-				$langs->load("errors");
-				$this->error = $langs->trans("ErrorBadEMail",$email);
-				return -1;
-			}
-		}
-		else
-		{
+                );
+
+                return parent::add_to_target($mailing_id, $cibles);
+            }
+            else
+            {
+                $langs->load("errors");
+                $this->error = $langs->trans("ErrorBadEMail",$email);
+                return -1;
+            }
+        }
+        else
+        {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorBadEmail",$email);
-			return -1;
-		}
-	}
+            return -1;
+        }
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -30,13 +30,13 @@ 
  */
 class mailing_xinputuser extends MailingTargets
 {
-	var $name='EmailsFromUser';              // Identifiant du module mailing
+	var $name = 'EmailsFromUser'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='EMails input by user';        // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
-	var $require_module=array();            // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                    // Module mailing actif pour user admin ou non
-	var $picto='generic';
-	var $tooltip='UseFormatInputEmailToTarget';
+	var $desc = 'EMails input by user'; // Libelle utilise si aucune traduction pour MailingModuleDescXXX ou XXX=name trouv�e
+	var $require_module = array(); // Module mailing actif si modules require_module actifs
+	var $require_admin = 0; // Module mailing actif pour user admin ou non
+	var $picto = 'generic';
+	var $tooltip = 'UseFormatInputEmailToTarget';
 
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -63,7 +63,7 @@ 
 		global $langs;
 		$langs->load("users");
 
-		$statssql=array();
+		$statssql = array();
 		return $statssql;
 	}
 
@@ -76,7 +76,7 @@ 
 	 *  @param      string	$sql   	Sql request to count
 	 *	@return		string			'' means NA
 	 */
-	function getNbOfRecipients($sql='')
+	function getNbOfRecipients($sql = '')
 	{
 		return '';
 	}
@@ -103,8 +103,8 @@ 
 	{
 		global $langs;
 
-		$s='';
-		$s.='<input type="text" name="xinputuser" class="flat minwidth300" value="'.GETPOST("xinputuser").'">';
+		$s = '';
+		$s .= '<input type="text" name="xinputuser" class="flat minwidth300" value="'.GETPOST("xinputuser").'">';
 		return $s;
 	}
 
@@ -118,18 +118,18 @@ 
 	function add_to_target($mailing_id)
 	{
         // phpcs:enable
-		global $conf,$langs,$_FILES;
+		global $conf, $langs, $_FILES;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$tmparray=explode(';',GETPOST('xinputuser'));
-		$email=$tmparray[0];
-		$lastname=$tmparray[1];
-		$firstname=$tmparray[2];
-		$other=$tmparray[3];
+		$tmparray = explode(';', GETPOST('xinputuser'));
+		$email = $tmparray[0];
+		$lastname = $tmparray[1];
+		$firstname = $tmparray[2];
+		$other = $tmparray[3];
 
-		$cibles=array();
-        if (! empty($email))
+		$cibles = array();
+        if (!empty($email))
         {
 			if (isValidEMail($email))
 			{
@@ -148,14 +148,14 @@ 
 			else
 			{
 				$langs->load("errors");
-				$this->error = $langs->trans("ErrorBadEMail",$email);
+				$this->error = $langs->trans("ErrorBadEMail", $email);
 				return -1;
 			}
 		}
 		else
 		{
             $langs->load("errors");
-            $this->error = $langs->trans("ErrorBadEmail",$email);
+            $this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
 		}
 	}

Braces +2 added lines, -4 removed lines

@@ -144,15 +144,13 @@
 				);
 
 				return parent::add_to_target($mailing_id, $cibles);
-			}
-			else
+			} else
 			{
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorBadEMail",$email);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
             $langs->load("errors");
             $this->error = $langs->trans("ErrorBadEmail",$email);

dolibarr/htdocs/core/modules/mailings/contacts1.modules.php

Indentation +394 added lines, -394 removed lines

@@ -32,421 +32,421 @@
  */
 class mailing_contacts1 extends MailingTargets
 {
-	var $name='ContactCompanies';                     // Identifiant du module mailing
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='Contacts of thirdparties (prospects, customers, suppliers...)';
-	var $require_module=array("societe");               // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                               // Module mailing actif pour user admin ou non
-	var $picto='contact';
-
-	/**
+    var $name='ContactCompanies';                     // Identifiant du module mailing
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    var $desc='Contacts of thirdparties (prospects, customers, suppliers...)';
+    var $require_module=array("societe");               // Module mailing actif si modules require_module actifs
+    var $require_admin=0;                               // Module mailing actif pour user admin ou non
+    var $picto='contact';
+
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		string[]		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-		global $conf, $langs;
-
-		$langs->load("commercial");
-
-		$statssql=array();
-		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
-		$statssql[0].= " count(distinct(c.email)) as nb";
-		$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0].= " WHERE c.entity IN (".getEntity('socpeople').")";
-		$statssql[0].= " AND c.email != ''";      // Note that null != '' is false
-		$statssql[0].= " AND c.no_email = 0";
-		$statssql[0].= " AND c.statut = 1";
-
-		return $statssql;
-	}
-
-
-	/**
-	 *	Return here number of distinct emails returned by your selector.
-	 *	For example if this selector is used to extract 500 different
-	 *	emails from a text file, this function must return 500.
-	 *
-	 *  @param		string	$sql		Requete sql de comptage
-	 *	@return		int
-	 */
-	function getNbOfRecipients($sql='')
-	{
-		global $conf;
-
-		$sql  = "SELECT count(distinct(c.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND c.email != ''"; // Note that null != '' is false
-		$sql.= " AND c.no_email = 0";
-		$sql.= " AND c.statut = 1";
-
-		// The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
-		return parent::getNbOfRecipients($sql);
-	}
-
-
-	/**
-	 *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
-	 *
-	 *   @return     string      Retourne zone select
-	 */
-	function formFilter()
-	{
-		global $langs;
-
-		// Load translation files required by the page
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		string[]		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        global $conf, $langs;
+
+        $langs->load("commercial");
+
+        $statssql=array();
+        $statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
+        $statssql[0].= " count(distinct(c.email)) as nb";
+        $statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+        $statssql[0].= " WHERE c.entity IN (".getEntity('socpeople').")";
+        $statssql[0].= " AND c.email != ''";      // Note that null != '' is false
+        $statssql[0].= " AND c.no_email = 0";
+        $statssql[0].= " AND c.statut = 1";
+
+        return $statssql;
+    }
+
+
+    /**
+     *	Return here number of distinct emails returned by your selector.
+     *	For example if this selector is used to extract 500 different
+     *	emails from a text file, this function must return 500.
+     *
+     *  @param		string	$sql		Requete sql de comptage
+     *	@return		int
+     */
+    function getNbOfRecipients($sql='')
+    {
+        global $conf;
+
+        $sql  = "SELECT count(distinct(c.email)) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
+        $sql.= " WHERE c.entity IN (".getEntity('socpeople').")";
+        $sql.= " AND c.email != ''"; // Note that null != '' is false
+        $sql.= " AND c.no_email = 0";
+        $sql.= " AND c.statut = 1";
+
+        // The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
+        return parent::getNbOfRecipients($sql);
+    }
+
+
+    /**
+     *   Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+     *
+     *   @return     string      Retourne zone select
+     */
+    function formFilter()
+    {
+        global $langs;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("commercial","companies","suppliers","categories"));
 
-		$s='';
+        $s='';
 
-		// Add filter on job position
-		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		/*$sql.= " AND sp.email != ''";    // Note that null != '' is false
+        // Add filter on job position
+        $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+        $sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
+        /*$sql.= " AND sp.email != ''";    // Note that null != '' is false
 		 $sql.= " AND sp.no_email = 0";
 		 $sql.= " AND sp.statut = 1";*/
-		$sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
-		$sql.= " GROUP BY sp.poste";
-		$sql.= " ORDER BY sp.poste";
-		$resql = $this->db->query($sql);
-
-		$s.=$langs->trans("PostOrFunction").': ';
-		$s.='<select name="filter_jobposition" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$s.='<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
-				$i++;
-			}
-		}
-		else dol_print_error($this->db);
-		$s.='</select>';
-
-		$s.=' ';
-
-		// Filter on contact category
-		$s .= $langs->trans("ContactCategoriesShort").': ';
-		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_contact as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
-		//$sql.= " AND sp.no_email = 0";
-		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_socpeople = sp.rowid";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
-		$resql = $this->db->query($sql);
-
-		$s.='<select name="filter_category" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$i = 0;
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
-					$i++;
-				}
-			}
-			else
-			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
-			}
-		}
-		else dol_print_error($this->db);
-		$s.='</select>';
-
-		$s.='<br>';
-
-		// Add prospect of a particular level
-		$s.=$langs->trans("NatureOfThirdParty").': ';
-		$s.='<select name="filter" class="flat">';
-		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY label";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num) $s.='<option value="all">&nbsp;</option>';
-			else $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
-			$s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
-
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$level=$langs->trans($obj->code);
-				if ($level == $obj->code) $level=$langs->trans($obj->label);
-				$s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
-				$i++;
-			}
-		}
-		else dol_print_error($this->db);
-		$s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
-		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
-		$s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
-		$s.='</select>';
-
-		$s.= ' ';
-
-		// Filter on thirdparty category
-		$s .= $langs->trans("CustomersProspectsCategoriesShort").': ';
-		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
-		//$sql.= " AND sp.no_email = 0";
-		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_soc = sp.fk_soc";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
-		$resql = $this->db->query($sql);
-
-		$s.='<select name="filter_category_customer" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$i = 0;
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
-					$i++;
-				}
-			}
-			else
-			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
-			}
-		}
-		else dol_print_error($this->db);
-		$s.='</select>';
-
-		$s.= ' ';
-
-		// Filter on thirdparty category
-		$s .= $langs->trans("SuppliersCategoriesShort").': ';
-		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
-		//$sql.= " AND sp.no_email = 0";
-		//$sql.= " AND sp.email != ''";
-		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_soc = sp.fk_soc";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
-		$resql = $this->db->query($sql);
-
-		$s.='<select name="filter_category_supplier" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$i = 0;
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
-					$i++;
-				}
-			}
-			else
-			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
-			}
-		}
-		else dol_print_error($this->db);
-		$s.='</select>';
-
-		return $s;
-	}
-
-
-	/**
-	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
-	 *
+        $sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
+        $sql.= " GROUP BY sp.poste";
+        $sql.= " ORDER BY sp.poste";
+        $resql = $this->db->query($sql);
+
+        $s.=$langs->trans("PostOrFunction").': ';
+        $s.='<select name="filter_jobposition" class="flat">';
+        $s.='<option value="all">&nbsp;</option>';
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $s.='<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
+                $i++;
+            }
+        }
+        else dol_print_error($this->db);
+        $s.='</select>';
+
+        $s.=' ';
+
+        // Filter on contact category
+        $s .= $langs->trans("ContactCategoriesShort").': ';
+        $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
+        $sql.= " FROM ";
+        $sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie_contact as cs";
+        $sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+        //$sql.= " AND sp.no_email = 0";
+        //$sql.= " AND sp.email != ''";
+        //$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
+        $sql.= " AND cs.fk_categorie = c.rowid";
+        $sql.= " AND cs.fk_socpeople = sp.rowid";
+        $sql.= " GROUP BY c.label";
+        $sql.= " ORDER BY c.label";
+        $resql = $this->db->query($sql);
+
+        $s.='<select name="filter_category" class="flat">';
+        $s.='<option value="all">&nbsp;</option>';
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $i = 0;
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+                    $i++;
+                }
+            }
+            else
+            {
+                $s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
+            }
+        }
+        else dol_print_error($this->db);
+        $s.='</select>';
+
+        $s.='<br>';
+
+        // Add prospect of a particular level
+        $s.=$langs->trans("NatureOfThirdParty").': ';
+        $s.='<select name="filter" class="flat">';
+        $sql = "SELECT code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+        $sql.= " WHERE active > 0";
+        $sql.= " ORDER BY label";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num) $s.='<option value="all">&nbsp;</option>';
+            else $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+            $s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
+
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $level=$langs->trans($obj->code);
+                if ($level == $obj->code) $level=$langs->trans($obj->label);
+                $s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
+                $i++;
+            }
+        }
+        else dol_print_error($this->db);
+        $s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
+        //$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
+        $s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
+        $s.='</select>';
+
+        $s.= ' ';
+
+        // Filter on thirdparty category
+        $s .= $langs->trans("CustomersProspectsCategoriesShort").': ';
+        $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
+        $sql.= " FROM ";
+        $sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
+        $sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+        //$sql.= " AND sp.no_email = 0";
+        //$sql.= " AND sp.email != ''";
+        //$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
+        $sql.= " AND cs.fk_categorie = c.rowid";
+        $sql.= " AND cs.fk_soc = sp.fk_soc";
+        $sql.= " GROUP BY c.label";
+        $sql.= " ORDER BY c.label";
+        $resql = $this->db->query($sql);
+
+        $s.='<select name="filter_category_customer" class="flat">';
+        $s.='<option value="all">&nbsp;</option>';
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $i = 0;
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+                    $i++;
+                }
+            }
+            else
+            {
+                $s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
+            }
+        }
+        else dol_print_error($this->db);
+        $s.='</select>';
+
+        $s.= ' ';
+
+        // Filter on thirdparty category
+        $s .= $langs->trans("SuppliersCategoriesShort").': ';
+        $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
+        $sql.= " FROM ";
+        $sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie as c,";
+        $sql.= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
+        $sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+        //$sql.= " AND sp.no_email = 0";
+        //$sql.= " AND sp.email != ''";
+        //$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
+        $sql.= " AND cs.fk_categorie = c.rowid";
+        $sql.= " AND cs.fk_soc = sp.fk_soc";
+        $sql.= " GROUP BY c.label";
+        $sql.= " ORDER BY c.label";
+        $resql = $this->db->query($sql);
+
+        $s.='<select name="filter_category_supplier" class="flat">';
+        $s.='<option value="all">&nbsp;</option>';
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $i = 0;
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+                    $i++;
+                }
+            }
+            else
+            {
+                $s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
+            }
+        }
+        else dol_print_error($this->db);
+        $s.='</select>';
+
+        return $s;
+    }
+
+
+    /**
+     *  Renvoie url lien vers fiche de la source du destinataire du mailing
+     *
      *  @param	int		$id		ID
-	 *  @return string      	Url lien
-	 */
-	function url($id)
-	{
-		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
-	}
+     *  @return string      	Url lien
+     */
+    function url($id)
+    {
+        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Ajoute destinataires dans table des cibles
-	 *
-	 *  @param  int		$mailing_id    	Id of emailing
-	 *  @return int           			<0 si erreur, nb ajout si ok
-	 */
-	function add_to_target($mailing_id)
-	{
+    /**
+     *  Ajoute destinataires dans table des cibles
+     *
+     *  @param  int		$mailing_id    	Id of emailing
+     *  @return int           			<0 si erreur, nb ajout si ok
+     */
+    function add_to_target($mailing_id)
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		$filter = GETPOST('filter','alpha');
-		$filter_jobposition = GETPOST('filter_jobposition','alpha');
-		$filter_category = GETPOST('filter_category','alpha');
-		$filter_category_customer = GETPOST('filter_category_customer','alpha');
-		$filter_category_supplier = GETPOST('filter_category_supplier','alpha');
-
-		$cibles = array();
-
-		// List prospects levels
-		$prospectlevel=array();
-		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY label";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$prospectlevel[$obj->code]=$obj->label;
-				$i++;
-			}
-		}
-		else dol_print_error($this->db);
-
-		// Request must return: id, email, fk_contact, lastname, firstname, other
-		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
-		$sql.= " s.nom as companyname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c2";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
-    	$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND sp.email <> ''";
-		$sql.= " AND sp.no_email = 0";
-		$sql.= " AND sp.statut = 1";
-		$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		// Filter on category
-		if ($filter_category <> 'all') $sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-    	if ($filter_category <> 'all') $sql.= " AND c.label = '".$this->db->escape($filter_category)."'";
-		if ($filter_category_customer <> 'all') $sql.= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-    	if ($filter_category_customer <> 'all') $sql.= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
-		if ($filter_category_supplier <> 'all') $sql.= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-    	if ($filter_category_supplier <> 'all') $sql.= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
-    	// Filter on nature
-		$key = $filter;
-		{
-			//print "xx".$key;
-			if ($key == 'prospects') $sql.= " AND s.client=2";
-			foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
-			if ($key == 'customers') $sql.= " AND s.client=1";
-			if ($key == 'suppliers') $sql.= " AND s.fournisseur=1";
-		}
-		// Filter on job position
-		$key = $filter_jobposition;
-		if (! empty($key) && $key != 'all') $sql.= " AND sp.poste ='".$this->db->escape($key)."'";
-		$sql.= " ORDER BY sp.email";
-		//print "wwwwwwx".$sql;
-
-		// Stocke destinataires dans cibles
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			$j = 0;
-
-			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
-
-			$old = '';
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
-					$cibles[$j] = array(
-                    		'email' => $obj->email,
-                    		'fk_contact' => $obj->fk_contact,
-                    		'lastname' => $obj->lastname,
-                    		'firstname' => $obj->firstname,
-                    		'other' =>
+        global $conf, $langs;
+
+        $filter = GETPOST('filter','alpha');
+        $filter_jobposition = GETPOST('filter_jobposition','alpha');
+        $filter_category = GETPOST('filter_category','alpha');
+        $filter_category_customer = GETPOST('filter_category_customer','alpha');
+        $filter_category_supplier = GETPOST('filter_category_supplier','alpha');
+
+        $cibles = array();
+
+        // List prospects levels
+        $prospectlevel=array();
+        $sql = "SELECT code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+        $sql.= " WHERE active > 0";
+        $sql.= " ORDER BY label";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $prospectlevel[$obj->code]=$obj->label;
+                $i++;
+            }
+        }
+        else dol_print_error($this->db);
+
+        // Request must return: id, email, fk_contact, lastname, firstname, other
+        $sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
+        $sql.= " s.nom as companyname";
+        $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
+        if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c";
+        if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+        if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c2";
+        if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+        if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
+        if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+        $sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
+        $sql.= " AND sp.email <> ''";
+        $sql.= " AND sp.no_email = 0";
+        $sql.= " AND sp.statut = 1";
+        $sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+        // Filter on category
+        if ($filter_category <> 'all') $sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
+        if ($filter_category <> 'all') $sql.= " AND c.label = '".$this->db->escape($filter_category)."'";
+        if ($filter_category_customer <> 'all') $sql.= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
+        if ($filter_category_customer <> 'all') $sql.= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+        if ($filter_category_supplier <> 'all') $sql.= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
+        if ($filter_category_supplier <> 'all') $sql.= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+        // Filter on nature
+        $key = $filter;
+        {
+            //print "xx".$key;
+            if ($key == 'prospects') $sql.= " AND s.client=2";
+            foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
+            if ($key == 'customers') $sql.= " AND s.client=1";
+            if ($key == 'suppliers') $sql.= " AND s.fournisseur=1";
+        }
+        // Filter on job position
+        $key = $filter_jobposition;
+        if (! empty($key) && $key != 'all') $sql.= " AND sp.poste ='".$this->db->escape($key)."'";
+        $sql.= " ORDER BY sp.email";
+        //print "wwwwwwx".$sql;
+
+        // Stocke destinataires dans cibles
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            $j = 0;
+
+            dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+
+            $old = '';
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                if ($old <> $obj->email)
+                {
+                    $cibles[$j] = array(
+                            'email' => $obj->email,
+                            'fk_contact' => $obj->fk_contact,
+                            'lastname' => $obj->lastname,
+                            'firstname' => $obj->firstname,
+                            'other' =>
                                 ($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
                                 ($langs->transnoentities("UserTitle").'='.($obj->civility_id?$langs->transnoentities("Civility".$obj->civility_id):'')).';'.
                                 ($langs->transnoentities("JobPosition").'='.$obj->jobposition),
-							'source_url' => $this->url($obj->id),
+                            'source_url' => $this->url($obj->id),
                             'source_id' => $obj->id,
                             'source_type' => 'contact'
-					);
-					$old = $obj->email;
-					$j++;
-				}
-
-				$i++;
-			}
-		}
-		else
-		{
-			dol_syslog($this->db->error());
-			$this->error=$this->db->error();
-			return -1;
-		}
-
-		return parent::add_to_target($mailing_id, $cibles);
-	}
+                    );
+                    $old = $obj->email;
+                    $j++;
+                }
+
+                $i++;
+            }
+        }
+        else
+        {
+            dol_syslog($this->db->error());
+            $this->error=$this->db->error();
+            return -1;
+        }
+
+        return parent::add_to_target($mailing_id, $cibles);
+    }
 }

Spacing +133 added lines, -133 removed lines

@@ -32,12 +32,12 @@ 
  */
 class mailing_contacts1 extends MailingTargets
 {
-	var $name='ContactCompanies';                     // Identifiant du module mailing
+	var $name = 'ContactCompanies'; // Identifiant du module mailing
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-	var $desc='Contacts of thirdparties (prospects, customers, suppliers...)';
-	var $require_module=array("societe");               // Module mailing actif si modules require_module actifs
-	var $require_admin=0;                               // Module mailing actif pour user admin ou non
-	var $picto='contact';
+	var $desc = 'Contacts of thirdparties (prospects, customers, suppliers...)';
+	var $require_module = array("societe"); // Module mailing actif si modules require_module actifs
+	var $require_admin = 0; // Module mailing actif pour user admin ou non
+	var $picto = 'contact';
 
 	/**
      * @var DoliDB Database handler.
@@ -52,7 +52,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -70,14 +70,14 @@ 
 
 		$langs->load("commercial");
 
-		$statssql=array();
+		$statssql = array();
 		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
-		$statssql[0].= " count(distinct(c.email)) as nb";
-		$statssql[0].= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0].= " WHERE c.entity IN (".getEntity('socpeople').")";
-		$statssql[0].= " AND c.email != ''";      // Note that null != '' is false
-		$statssql[0].= " AND c.no_email = 0";
-		$statssql[0].= " AND c.statut = 1";
+		$statssql[0] .= " count(distinct(c.email)) as nb";
+		$statssql[0] .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+		$statssql[0] .= " WHERE c.entity IN (".getEntity('socpeople').")";
+		$statssql[0] .= " AND c.email != ''"; // Note that null != '' is false
+		$statssql[0] .= " AND c.no_email = 0";
+		$statssql[0] .= " AND c.statut = 1";
 
 		return $statssql;
 	}
@@ -91,17 +91,17 @@ 
 	 *  @param		string	$sql		Requete sql de comptage
 	 *	@return		int
 	 */
-	function getNbOfRecipients($sql='')
+	function getNbOfRecipients($sql = '')
 	{
 		global $conf;
 
-		$sql  = "SELECT count(distinct(c.email)) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql.= " WHERE c.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND c.email != ''"; // Note that null != '' is false
-		$sql.= " AND c.no_email = 0";
-		$sql.= " AND c.statut = 1";
+		$sql = "SELECT count(distinct(c.email)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
+		$sql .= " WHERE c.entity IN (".getEntity('socpeople').")";
+		$sql .= " AND c.email != ''"; // Note that null != '' is false
+		$sql .= " AND c.no_email = 0";
+		$sql .= " AND c.statut = 1";
 
 		// The request must return a field called "nb" to be understandable by parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
@@ -118,25 +118,25 @@ 
 		global $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("commercial","companies","suppliers","categories"));
+        $langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
 
-		$s='';
+		$s = '';
 
 		// Add filter on job position
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		/*$sql.= " AND sp.email != ''";    // Note that null != '' is false
 		 $sql.= " AND sp.no_email = 0";
 		 $sql.= " AND sp.statut = 1";*/
-		$sql.= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
-		$sql.= " GROUP BY sp.poste";
-		$sql.= " ORDER BY sp.poste";
+		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste != '')";
+		$sql .= " GROUP BY sp.poste";
+		$sql .= " ORDER BY sp.poste";
 		$resql = $this->db->query($sql);
 
-		$s.=$langs->trans("PostOrFunction").': ';
-		$s.='<select name="filter_jobposition" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
+		$s .= $langs->trans("PostOrFunction").': ';
+		$s .= '<select name="filter_jobposition" class="flat">';
+		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -144,34 +144,34 @@ 
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$s.='<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
+				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
 		}
 		else dol_print_error($this->db);
-		$s.='</select>';
+		$s .= '</select>';
 
-		$s.=' ';
+		$s .= ' ';
 
 		// Filter on contact category
 		$s .= $langs->trans("ContactCategoriesShort").': ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_contact as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+		$sql .= " FROM ";
+		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
+		$sql .= " WHERE sp.statut = 1"; // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
 		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_socpeople = sp.rowid";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
+		$sql .= " AND cs.fk_categorie = c.rowid";
+		$sql .= " AND cs.fk_socpeople = sp.rowid";
+		$sql .= " GROUP BY c.label";
+		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s.='<select name="filter_category" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
+		$s .= '<select name="filter_category" class="flat">';
+		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -181,72 +181,72 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
 			}
 			else
 			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
+				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
 		}
 		else dol_print_error($this->db);
-		$s.='</select>';
+		$s .= '</select>';
 
-		$s.='<br>';
+		$s .= '<br>';
 
 		// Add prospect of a particular level
-		$s.=$langs->trans("NatureOfThirdParty").': ';
-		$s.='<select name="filter" class="flat">';
+		$s .= $langs->trans("NatureOfThirdParty").': ';
+		$s .= '<select name="filter" class="flat">';
 		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY label";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			if ($num) $s.='<option value="all">&nbsp;</option>';
-			else $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
-			$s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
+			if ($num) $s .= '<option value="all">&nbsp;</option>';
+			else $s .= '<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+			$s .= '<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
 
 			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$level=$langs->trans($obj->code);
-				if ($level == $obj->code) $level=$langs->trans($obj->label);
-				$s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
+				$level = $langs->trans($obj->code);
+				if ($level == $obj->code) $level = $langs->trans($obj->label);
+				$s .= '<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
 		}
 		else dol_print_error($this->db);
-		$s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
+		$s .= '<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
-		$s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
-		$s.='</select>';
+		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
+		$s .= '</select>';
 
-		$s.= ' ';
+		$s .= ' ';
 
 		// Filter on thirdparty category
 		$s .= $langs->trans("CustomersProspectsCategoriesShort").': ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_societe as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+		$sql .= " FROM ";
+		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
+		$sql .= " WHERE sp.statut = 1"; // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
 		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_soc = sp.fk_soc";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
+		$sql .= " AND cs.fk_categorie = c.rowid";
+		$sql .= " AND cs.fk_soc = sp.fk_soc";
+		$sql .= " GROUP BY c.label";
+		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s.='<select name="filter_category_customer" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
+		$s .= '<select name="filter_category_customer" class="flat">';
+		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -256,39 +256,39 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
 			}
 			else
 			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
+				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
 		}
 		else dol_print_error($this->db);
-		$s.='</select>';
+		$s .= '</select>';
 
-		$s.= ' ';
+		$s .= ' ';
 
 		// Filter on thirdparty category
 		$s .= $langs->trans("SuppliersCategoriesShort").': ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
-		$sql.= " FROM ";
-		$sql.= " ".MAIN_DB_PREFIX."socpeople as sp,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie as c,";
-		$sql.= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
-		$sql.= " WHERE sp.statut = 1";     // Note that null != '' is false
+		$sql .= " FROM ";
+		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
+		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
+		$sql .= " WHERE sp.statut = 1"; // Note that null != '' is false
 		//$sql.= " AND sp.no_email = 0";
 		//$sql.= " AND sp.email != ''";
 		//$sql.= " AND sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND cs.fk_categorie = c.rowid";
-		$sql.= " AND cs.fk_soc = sp.fk_soc";
-		$sql.= " GROUP BY c.label";
-		$sql.= " ORDER BY c.label";
+		$sql .= " AND cs.fk_categorie = c.rowid";
+		$sql .= " AND cs.fk_soc = sp.fk_soc";
+		$sql .= " GROUP BY c.label";
+		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s.='<select name="filter_category_supplier" class="flat">';
-		$s.='<option value="all">&nbsp;</option>';
+		$s .= '<select name="filter_category_supplier" class="flat">';
+		$s .= '<option value="all">&nbsp;</option>';
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -298,17 +298,17 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
+					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
 			}
 			else
 			{
-				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
+				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
 		}
 		else dol_print_error($this->db);
-		$s.='</select>';
+		$s .= '</select>';
 
 		return $s;
 	}
@@ -322,7 +322,7 @@ 
 	 */
 	function url($id)
 	{
-		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('', "contact").'</a>';
 	}
 
 
@@ -338,20 +338,20 @@ 
         // phpcs:enable
 		global $conf, $langs;
 
-		$filter = GETPOST('filter','alpha');
-		$filter_jobposition = GETPOST('filter_jobposition','alpha');
-		$filter_category = GETPOST('filter_category','alpha');
-		$filter_category_customer = GETPOST('filter_category_customer','alpha');
-		$filter_category_supplier = GETPOST('filter_category_supplier','alpha');
+		$filter = GETPOST('filter', 'alpha');
+		$filter_jobposition = GETPOST('filter_jobposition', 'alpha');
+		$filter_category = GETPOST('filter_category', 'alpha');
+		$filter_category_customer = GETPOST('filter_category_customer', 'alpha');
+		$filter_category_supplier = GETPOST('filter_category_supplier', 'alpha');
 
 		$cibles = array();
 
 		// List prospects levels
-		$prospectlevel=array();
+		$prospectlevel = array();
 		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY label";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -360,7 +360,7 @@ 
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$prospectlevel[$obj->code]=$obj->label;
+				$prospectlevel[$obj->code] = $obj->label;
 				$i++;
 			}
 		}
@@ -368,44 +368,44 @@ 
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
-		$sql.= " s.nom as companyname";
-		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c2";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
-    	$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
-		$sql.= " AND sp.email <> ''";
-		$sql.= " AND sp.no_email = 0";
-		$sql.= " AND sp.statut = 1";
-		$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+		$sql .= " s.nom as companyname";
+		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
+    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
+    	if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
+    	if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
+    	if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+    	$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " AND sp.email <> ''";
+		$sql .= " AND sp.no_email = 0";
+		$sql .= " AND sp.statut = 1";
+		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category
-		if ($filter_category <> 'all') $sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-    	if ($filter_category <> 'all') $sql.= " AND c.label = '".$this->db->escape($filter_category)."'";
-		if ($filter_category_customer <> 'all') $sql.= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-    	if ($filter_category_customer <> 'all') $sql.= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
-		if ($filter_category_supplier <> 'all') $sql.= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-    	if ($filter_category_supplier <> 'all') $sql.= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		if ($filter_category <> 'all') $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
+    	if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
+		if ($filter_category_customer <> 'all') $sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
+    	if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+		if ($filter_category_supplier <> 'all') $sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
+    	if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
     	// Filter on nature
 		$key = $filter;
 		{
 			//print "xx".$key;
-			if ($key == 'prospects') $sql.= " AND s.client=2";
-			foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
-			if ($key == 'customers') $sql.= " AND s.client=1";
-			if ($key == 'suppliers') $sql.= " AND s.fournisseur=1";
+			if ($key == 'prospects') $sql .= " AND s.client=2";
+			foreach ($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql .= " AND s.fk_prospectlevel='".$codelevel."'";
+			if ($key == 'customers') $sql .= " AND s.client=1";
+			if ($key == 'suppliers') $sql .= " AND s.fournisseur=1";
 		}
 		// Filter on job position
 		$key = $filter_jobposition;
-		if (! empty($key) && $key != 'all') $sql.= " AND sp.poste ='".$this->db->escape($key)."'";
-		$sql.= " ORDER BY sp.email";
+		if (!empty($key) && $key != 'all') $sql .= " AND sp.poste ='".$this->db->escape($key)."'";
+		$sql .= " ORDER BY sp.email";
 		//print "wwwwwwx".$sql;
 
 		// Stocke destinataires dans cibles
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
@@ -427,7 +427,7 @@ 
                     		'firstname' => $obj->firstname,
                     		'other' =>
                                 ($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id?$langs->transnoentities("Civility".$obj->civility_id):'')).';'.
+                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
                                 ($langs->transnoentities("JobPosition").'='.$obj->jobposition),
 							'source_url' => $this->url($obj->id),
                             'source_id' => $obj->id,
@@ -443,7 +443,7 @@ 
 		else
 		{
 			dol_syslog($this->db->error());
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 

Braces +75 added lines, -34 removed lines

@@ -147,8 +147,9 @@ 
 				$s.='<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		$s.='</select>';
 
 		$s.=' ';
@@ -184,13 +185,13 @@ 
 					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		$s.='</select>';
 
 		$s.='<br>';
@@ -206,8 +207,11 @@ 
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			if ($num) $s.='<option value="all">&nbsp;</option>';
-			else $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+			    $s.='<option value="all">&nbsp;</option>';
+			} else {
+			    $s.='<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 			$s.='<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
 
 			$i = 0;
@@ -215,12 +219,15 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 				$level=$langs->trans($obj->code);
-				if ($level == $obj->code) $level=$langs->trans($obj->label);
+				if ($level == $obj->code) {
+				    $level=$langs->trans($obj->label);
+				}
 				$s.='<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		$s.='<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s.='<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
@@ -259,13 +266,13 @@ 
 					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		$s.='</select>';
 
 		$s.= ' ';
@@ -301,13 +308,13 @@ 
 					$s.='<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				$s.='<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		$s.='</select>';
 
 		return $s;
@@ -363,44 +370,79 @@ 
 				$prospectlevel[$obj->code]=$obj->label;
 				$i++;
 			}
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
 		$sql.= " s.nom as companyname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c";
-    	if ($filter_category <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c2";
-    	if ($filter_category_customer <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
-    	if ($filter_category_supplier <> 'all') $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+    	if ($filter_category <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie as c";
+    	}
+    	if ($filter_category <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+    	}
+    	if ($filter_category_customer <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie as c2";
+    	}
+    	if ($filter_category_customer <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+    	}
+    	if ($filter_category_supplier <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie as c3";
+    	}
+    	if ($filter_category_supplier <> 'all') {
+    	    $sql.= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+    	}
     	$sql.= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql.= " AND sp.email <> ''";
 		$sql.= " AND sp.no_email = 0";
 		$sql.= " AND sp.statut = 1";
 		$sql.= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category
-		if ($filter_category <> 'all') $sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-    	if ($filter_category <> 'all') $sql.= " AND c.label = '".$this->db->escape($filter_category)."'";
-		if ($filter_category_customer <> 'all') $sql.= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-    	if ($filter_category_customer <> 'all') $sql.= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
-		if ($filter_category_supplier <> 'all') $sql.= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-    	if ($filter_category_supplier <> 'all') $sql.= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		if ($filter_category <> 'all') {
+		    $sql.= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
+		}
+    	if ($filter_category <> 'all') {
+    	    $sql.= " AND c.label = '".$this->db->escape($filter_category)."'";
+    	}
+		if ($filter_category_customer <> 'all') {
+		    $sql.= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
+		}
+    	if ($filter_category_customer <> 'all') {
+    	    $sql.= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+    	}
+		if ($filter_category_supplier <> 'all') {
+		    $sql.= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
+		}
+    	if ($filter_category_supplier <> 'all') {
+    	    $sql.= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+    	}
     	// Filter on nature
 		$key = $filter;
 		{
 			//print "xx".$key;
-			if ($key == 'prospects') $sql.= " AND s.client=2";
-			foreach($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
-			if ($key == 'customers') $sql.= " AND s.client=1";
-			if ($key == 'suppliers') $sql.= " AND s.fournisseur=1";
+			if ($key == 'prospects') {
+			    $sql.= " AND s.client=2";
+			}
+			foreach($prospectlevel as $codelevel=>$valuelevel) {
+			    if ($key == 'prospectslevel'.$codelevel) $sql.= " AND s.fk_prospectlevel='".$codelevel."'";
+			}
+			if ($key == 'customers') {
+			    $sql.= " AND s.client=1";
+			}
+			if ($key == 'suppliers') {
+			    $sql.= " AND s.fournisseur=1";
+			}
 		}
 		// Filter on job position
 		$key = $filter_jobposition;
-		if (! empty($key) && $key != 'all') $sql.= " AND sp.poste ='".$this->db->escape($key)."'";
+		if (! empty($key) && $key != 'all') {
+		    $sql.= " AND sp.poste ='".$this->db->escape($key)."'";
+		}
 		$sql.= " ORDER BY sp.email";
 		//print "wwwwwwx".$sql;
 
@@ -439,8 +481,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog($this->db->error());
 			$this->error=$this->db->error();

dolibarr/htdocs/core/modules/mailings/example.modules.php

Indentation +28 added lines, -28 removed lines

@@ -30,7 +30,7 @@ 
     // CHANGE THIS: Put here a description of your selector module.
     // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
     var $desc='Put here a description';
-	// CHANGE THIS: Set to 1 if selector is available for admin users only
+    // CHANGE THIS: Set to 1 if selector is available for admin users only
     var $require_admin=0;
     // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
     var $tooltip='MyTooltipLangKey';
@@ -45,11 +45,11 @@ 
 
 
     // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
     function __construct($db)
     {
         $this->db=$db;
@@ -68,38 +68,38 @@ 
         // phpcs:enable
         $target = array();
 
-	    // CHANGE THIS
-	    // ----- Your code start here -----
+        // CHANGE THIS
+        // ----- Your code start here -----
 
-	    // You must fill the $target array with record like this
-	    // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
-		// ...
-	    // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
+        // You must fill the $target array with record like this
+        // $target[0]=array('email'=>'email_0','name'=>'name_0','firstname'=>'firstname_0', 'other'=>'other_0');
+        // ...
+        // $target[n]=array('email'=>'email_n','name'=>'name_n','firstname'=>'firstname_n', 'other'=>'other_n');
 
-		// Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
+        // Example: $target[0]=array('email'=>'myemail@example.com', 'name'=>'Doe', 'firstname'=>'John', 'other'=>'Other information');
 
-		// ----- Your code end here -----
+        // ----- Your code end here -----
 
         return parent::add_to_target($mailing_id, $target);
     }
 
 
     /**
-	 *	On the main mailing area, there is a box with statistics.
-	 *	If you want to add a line in this report you must provide an
-	 *	array of SQL request that returns two field:
-	 *	One called "label", One called "nb".
-	 *
-	 *	@return		array		Array with SQL requests
-	 */
-	function getSqlArrayForStats()
-	{
-	    // CHANGE THIS: Optionnal
-
-		//var $statssql=array();
+     *	On the main mailing area, there is a box with statistics.
+     *	If you want to add a line in this report you must provide an
+     *	array of SQL request that returns two field:
+     *	One called "label", One called "nb".
+     *
+     *	@return		array		Array with SQL requests
+     */
+    function getSqlArrayForStats()
+    {
+        // CHANGE THIS: Optionnal
+
+        //var $statssql=array();
         //$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
-		return array();
-	}
+        return array();
+    }
 
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -26,17 +26,17 @@ 
 class mailing_example extends MailingTargets
 {
     // CHANGE THIS: Put here a name not already used
-    var $name='example';
+    var $name = 'example';
     // CHANGE THIS: Put here a description of your selector module.
     // This label is used if no translation is found for key MailingModuleDescXXX where XXX=name is found
-    var $desc='Put here a description';
+    var $desc = 'Put here a description';
 	// CHANGE THIS: Set to 1 if selector is available for admin users only
-    var $require_admin=0;
+    var $require_admin = 0;
     // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
-    var $tooltip='MyTooltipLangKey';
+    var $tooltip = 'MyTooltipLangKey';
 
-    var $require_module=array();
-    var $picto='';
+    var $require_module = array();
+    var $picto = '';
 
     /**
      * @var DoliDB Database handler.
@@ -52,7 +52,7 @@ 
 	 */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 
 
@@ -110,7 +110,7 @@ 
      *  @param		string		$sql		Requete sql de comptage
      *	@return		int|string				Number of recipient or '?'
      */
-    function getNbOfRecipients($sql='')
+    function getNbOfRecipients($sql = '')
     {
         // CHANGE THIS: Optionnal
 
@@ -129,7 +129,7 @@ 
     {
         // CHANGE THIS: Optionnal
 
-        $s='';
+        $s = '';
         return $s;
     }
 

dolibarr/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php

Indentation +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
 class mailing_thirdparties_services_expired extends MailingTargets
 {
     var $name='DolibarrContractsLinesExpired';
-	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+    // This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
     var $desc='Third parties with expired contract\'s lines';
     var $require_admin=0;
 
@@ -45,7 +45,7 @@ 
      */
     function __construct($db)
     {
-    	global $conf;
+        global $conf;
 
         $this->db=$db;
 
@@ -95,9 +95,9 @@ 
         $product='';
         if ($key == '0')
         {
-        	$this->error = "Error: You must choose a filter";
-        	$this->errors[] = $this->error;
-        	return $this->error;
+            $this->error = "Error: You must choose a filter";
+            $this->errors[] = $this->error;
+            return $this->error;
         }
 
         $product=$this->arrayofproducts[$key];
@@ -131,17 +131,17 @@ 
                 if ($old <> $obj->email)
                 {
                     $cibles[$j] = array(
-					'email' => $obj->email,
-					'lastname' => $obj->name,	// For thirdparties, lastname must be name
+                    'email' => $obj->email,
+                    'lastname' => $obj->name,	// For thirdparties, lastname must be name
                     'firstname' => '',			// For thirdparties, firstname is ''
-					'other' =>
+                    'other' =>
                     ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
                     ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
                     ('Contract='.$obj->fk_contrat).';'.
                     ('ContactLine='.$obj->cdid),
-					'source_url' => $this->url($obj->id),
-					'source_id' => $obj->id,
-					'source_type' => 'thirdparty'
+                    'source_url' => $this->url($obj->id),
+                    'source_id' => $obj->id,
+                    'source_type' => 'thirdparty'
                     );
                     $old = $obj->email;
                     $j++;

Spacing +49 added lines, -49 removed lines

@@ -22,20 +22,20 @@ 
  */
 class mailing_thirdparties_services_expired extends MailingTargets
 {
-    var $name='DolibarrContractsLinesExpired';
+    var $name = 'DolibarrContractsLinesExpired';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
-    var $desc='Third parties with expired contract\'s lines';
-    var $require_admin=0;
+    var $desc = 'Third parties with expired contract\'s lines';
+    var $require_admin = 0;
 
-    var $require_module=array('contrat');
-    var $picto='company';
+    var $require_module = array('contrat');
+    var $picto = 'company';
 
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-    var $arrayofproducts=array();
+    var $arrayofproducts = array();
 
 
     /**
@@ -47,16 +47,16 @@ 
     {
     	global $conf;
 
-        $this->db=$db;
+        $this->db = $db;
 
-        $this->arrayofproducts=array();
+        $this->arrayofproducts = array();
 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
-        $sql.= " ORDER BY ref";
-        $result=$this->db->query($sql);
+        $sql .= " WHERE entity IN (".getEntity('product').")";
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
+        $sql .= " ORDER BY ref";
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -67,7 +67,7 @@ 
             {
                 $obj = $this->db->fetch_object($result);
                 $i++;
-                $this->arrayofproducts[$i]=$obj->ref;
+                $this->arrayofproducts[$i] = $obj->ref;
             }
         }
         else
@@ -87,12 +87,12 @@ 
     function add_to_target($mailing_id)
     {
         // phpcs:enable
-        $key=GETPOST('filter','int');
+        $key = GETPOST('filter', 'int');
 
         $cibles = array();
         $j = 0;
 
-        $product='';
+        $product = '';
         if ($key == '0')
         {
         	$this->error = "Error: You must choose a filter";
@@ -100,23 +100,23 @@ 
         	return $this->error;
         }
 
-        $product=$this->arrayofproducts[$key];
+        $product = $this->arrayofproducts[$key];
 
-        $now=dol_now();
+        $now = dol_now();
 
         // La requete doit retourner: id, email, name
         $sql = "SELECT s.rowid as id, s.email, s.nom as name, cd.rowid as cdid, cd.date_ouverture, cd.date_fin_validite, cd.fk_contrat";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql.= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-        $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
-        $sql.= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
-        $sql.= " ORDER BY s.email";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
+        $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
+        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid AND p.ref = '".$product."'";
+        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+        $sql .= " ORDER BY s.email";
 
         // Stocke destinataires dans cibles
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -132,11 +132,11 @@ 
                 {
                     $cibles[$j] = array(
 					'email' => $obj->email,
-					'lastname' => $obj->name,	// For thirdparties, lastname must be name
-                    'firstname' => '',			// For thirdparties, firstname is ''
+					'lastname' => $obj->name, // For thirdparties, lastname must be name
+                    'firstname' => '', // For thirdparties, firstname is ''
 					'other' =>
-                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
-                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
+                    ('DateStart='.dol_print_date($this->db->jdate($obj->date_ouverture), 'day')).';'.
+                    ('DateEnd='.dol_print_date($this->db->jdate($obj->date_fin_validite), 'day')).';'.
                     ('Contract='.$obj->fk_contrat).';'.
                     ('ContactLine='.$obj->cdid),
 					'source_url' => $this->url($obj->id),
@@ -153,7 +153,7 @@ 
         else
         {
             dol_syslog($this->db->lasterror());
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
 
@@ -189,22 +189,22 @@ 
      *	@param	string	$sql		SQL request to use to count
      *	@return	int					Number of recipients
      */
-    function getNbOfRecipients($sql='')
+    function getNbOfRecipients($sql = '')
     {
-        $now=dol_now();
+        $now = dol_now();
 
         // Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
         // Example: return 500;
         $sql = "SELECT count(*) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-        $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
-        $sql.= " WHERE s.entity IN (".getEntity('societe').")";
-        $sql.= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
-        $sql.= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
-        $sql.= " AND p.ref IN ('".join("','",$this->arrayofproducts)."')";
-        $sql.= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+        $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."product as p";
+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";
+        $sql .= " AND s.rowid = c.fk_soc AND cd.fk_contrat = c.rowid AND s.email != ''";
+        $sql .= " AND cd.statut= 4 AND cd.fk_product=p.rowid";
+        $sql .= " AND p.ref IN ('".join("','", $this->arrayofproducts)."')";
+        $sql .= " AND cd.date_fin_validite < '".$this->db->idate($now)."'";
 
-        $a=parent::getNbOfRecipients($sql);
+        $a = parent::getNbOfRecipients($sql);
 
         return $a;
     }
@@ -219,15 +219,15 @@ 
     {
         global $langs;
 
-        $s=$langs->trans("ProductOrService");
-        $s.='<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s.='<option value="0">&nbsp;</option>';
-        else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-        foreach($this->arrayofproducts as $key => $val)
+        $s = $langs->trans("ProductOrService");
+        $s .= '<select name="filter" class="flat">';
+        if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
+        else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        foreach ($this->arrayofproducts as $key => $val)
         {
-            $s.='<option value="'.$key.'">'.$val.'</option>';
+            $s .= '<option value="'.$key.'">'.$val.'</option>';
         }
-        $s.='</select>';
+        $s .= '</select>';
         return $s;
     }
 
@@ -240,6 +240,6 @@ 
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('', "company").'</a>';
     }
 }

Braces +11 added lines, -7 removed lines

@@ -54,7 +54,10 @@ 
         // List of services
         $sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
         $sql.= " WHERE entity IN (".getEntity('product').")";
-        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql.= " AND fk_product_type = 1";	// By default, only services
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+            $sql.= " AND fk_product_type = 1";
+        }
+        // By default, only services
         $sql.= " ORDER BY ref";
         $result=$this->db->query($sql);
         if ($result)
@@ -69,8 +72,7 @@ 
                 $i++;
                 $this->arrayofproducts[$i]=$obj->ref;
             }
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -149,8 +151,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
         {
             dol_syslog($this->db->lasterror());
             $this->error=$this->db->lasterror();
@@ -221,8 +222,11 @@ 
 
         $s=$langs->trans("ProductOrService");
         $s.='<select name="filter" class="flat">';
-        if (count($this->arrayofproducts)) $s.='<option value="0">&nbsp;</option>';
-        else $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        if (count($this->arrayofproducts)) {
+            $s.='<option value="0">&nbsp;</option>';
+        } else {
+            $s.='<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+        }
         foreach($this->arrayofproducts as $key => $val)
         {
             $s.='<option value="'.$key.'">'.$val.'</option>';