From 990b34bcb2aa71e1205ecddab6c9c56cdb5bf32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 6 Oct 2018 10:51:36 +0200
Subject: [PATCH] reduce lines length

---
 .../datapolicies/class/datapolicies.class.php | 34 ++++++++++---------
 .../class/datapoliciescron.class.php          | 12 +++----
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/datapolicies/class/datapolicies.class.php b/htdocs/datapolicies/class/datapolicies.class.php
index d4efc7e6303..71dd5ed53ce 100644
--- a/htdocs/datapolicies/class/datapolicies.class.php
+++ b/htdocs/datapolicies/class/datapolicies.class.php
@@ -243,8 +243,8 @@ Class DataPolicies extends Contact
 
 
      	$substitutionarray = array(
-     	'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&c='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
-     	'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&c='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
+            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&c='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
+            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&c='.$societe->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
      	);
      	$subject = make_substitutions($subject, $substitutionarray);
      	$message = make_substitutions($message, $substitutionarray);
@@ -252,17 +252,18 @@ Class DataPolicies extends Contact
      	$actiontypecode = 'AC_EMAIL';
      	$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
      	if ($message) {
-     		if ($sendtocc)
-     			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
-     			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-     			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-     			$actionmsg = dol_concatdesc($actionmsg, $message);
-     	}
+     		if ($sendtocc) {
+                 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+             }
+            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+            $actionmsg .= dol_concatdesc($actionmsg, $message);
+        }
 
 
 
      	// Send mail
-     	require_once(DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php');
+     	require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
      	$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1);
      	if ($mailfile->error) {
      		$resultmasssend .= '<div class="error">' . $mailfile->error . '</div>';
@@ -309,8 +310,8 @@ Class DataPolicies extends Contact
 
 
     	$substitutionarray = array(
-    	'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&c='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
-    	'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&c='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
+            '__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=1&c='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linka.'</a>',
+            '__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicies/public/index.php?action=2&c='.$adherent->id.'&l='.$l.'&key='.$code,3).'" target="_blank">'.$linkr.'</a>',
     	);
     	$subject = make_substitutions($subject, $substitutionarray);
     	$message = make_substitutions($message, $substitutionarray);
@@ -318,11 +319,12 @@ Class DataPolicies extends Contact
     	$actiontypecode = 'AC_EMAIL';
     	$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
     	if ($message) {
-    		if ($sendtocc)
-    			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
-    			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
-    			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
-    			$actionmsg = dol_concatdesc($actionmsg, $message);
+    		if ($sendtocc) {
+                $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
+            }
+            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
+            $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
+            $actionmsg .= dol_concatdesc($actionmsg, $message);
     	}
 
 
diff --git a/htdocs/datapolicies/class/datapoliciescron.class.php b/htdocs/datapolicies/class/datapoliciescron.class.php
index c02497b9744..b85626f8c2a 100644
--- a/htdocs/datapolicies/class/datapoliciescron.class.php
+++ b/htdocs/datapolicies/class/datapoliciescron.class.php
@@ -42,7 +42,7 @@ class DataPoliciesCron
             'DATAPOLICIES_TIERS_CLIENT' => array(
                 'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique = 19 OR s.fk_forme_juridique = 11 OR s.fk_forme_juridique = 12 OR s.fk_forme_juridique = 13 OR s.fk_forme_juridique = 15 OR s.fk_forme_juridique = 17 OR s.fk_forme_juridique = 18 OR s.fk_forme_juridique = 35 OR s.fk_forme_juridique = 60 OR s.fk_forme_juridique = 312 OR s.fk_forme_juridique = 316 OR s.fk_forme_juridique = 401 OR s.fk_forme_juridique = 600 OR s.fk_forme_juridique = 700 OR s.fk_forme_juridique = 1005 OR s.fk_typent = 8)
+                    WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
                     AND s.client = 1
                     AND s.fournisseur = 0
@@ -77,7 +77,7 @@ class DataPoliciesCron
             'DATAPOLICIES_TIERS_PROSPECT' => array(
                 'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique = 19 OR s.fk_forme_juridique = 11 OR s.fk_forme_juridique = 12 OR s.fk_forme_juridique = 13 OR s.fk_forme_juridique = 15 OR s.fk_forme_juridique = 17 OR s.fk_forme_juridique = 18 OR s.fk_forme_juridique = 35 OR s.fk_forme_juridique = 60 OR s.fk_forme_juridique = 312 OR s.fk_forme_juridique = 316 OR s.fk_forme_juridique = 401 OR s.fk_forme_juridique = 600 OR s.fk_forme_juridique = 700 OR s.fk_forme_juridique = 1005 OR s.fk_typent = 8)
+                    WHERE (s.fk_forme_juridique IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
                     AND s.client = 2
                     AND s.fournisseur = 0
@@ -112,7 +112,7 @@ class DataPoliciesCron
             'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
                 'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique = 19 OR s.fk_forme_juridique = 11 OR s.fk_forme_juridique = 12 OR s.fk_forme_juridique = 13 OR s.fk_forme_juridique = 15 OR s.fk_forme_juridique = 17 OR s.fk_forme_juridique = 18 OR s.fk_forme_juridique = 35 OR s.fk_forme_juridique = 60 OR s.fk_forme_juridique = 312 OR s.fk_forme_juridique = 316 OR s.fk_forme_juridique = 401 OR s.fk_forme_juridique = 600 OR s.fk_forme_juridique = 700 OR s.fk_forme_juridique = 1005 OR s.fk_typent = 8)
+                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
                     AND s.client = 3
                     AND s.fournisseur = 0
@@ -147,7 +147,7 @@ class DataPoliciesCron
             'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
                 'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique = 19 OR s.fk_forme_juridique = 11 OR s.fk_forme_juridique = 12 OR s.fk_forme_juridique = 13 OR s.fk_forme_juridique = 15 OR s.fk_forme_juridique = 17 OR s.fk_forme_juridique = 18 OR s.fk_forme_juridique = 35 OR s.fk_forme_juridique = 60 OR s.fk_forme_juridique = 312 OR s.fk_forme_juridique = 316 OR s.fk_forme_juridique = 401 OR s.fk_forme_juridique = 600 OR s.fk_forme_juridique = 700 OR s.fk_forme_juridique = 1005 OR s.fk_typent = 8)
+                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
                     AND s.client = 0
                     AND s.fournisseur = 0
@@ -182,7 +182,7 @@ class DataPoliciesCron
             'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
                 'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
-                    WHERE (s.fk_forme_juridique = 19 OR s.fk_forme_juridique = 11 OR s.fk_forme_juridique = 12 OR s.fk_forme_juridique = 13 OR s.fk_forme_juridique = 15 OR s.fk_forme_juridique = 17 OR s.fk_forme_juridique = 18 OR s.fk_forme_juridique = 35 OR s.fk_forme_juridique = 60 OR s.fk_forme_juridique = 312 OR s.fk_forme_juridique = 316 OR s.fk_forme_juridique = 401 OR s.fk_forme_juridique = 600 OR s.fk_forme_juridique = 700 OR s.fk_forme_juridique = 1005 OR s.fk_typent = 8)
+                    WHERE (s.fk_forme_juridique  IN (11, 12, 13, 15, 17, 18, 19, 35, 60, 312, 316, 401, 600, 700, 1005) OR s.fk_typent = 8)
                     AND s.entity = %d
                     AND s.fournisseur = 1
                     AND s.tms < DATE_SUB(NOW(), INTERVAL %d MONTH)
@@ -511,7 +511,7 @@ class DataPoliciesCron
 
         $langs->load('datapolicies@datapolicies');
 
-        dol_include_once('/datapolicies/class/datapolicies.class.php');
+        require_once DOL_DOCUMENT_ROOT . '/datapolicies/class/datapolicies.class.php';
 
         $contacts = new DataPolicies($db);
         $contacts->getAllContactNotInformed();