alxarafe / alixar

dolibarr/scripts/accountancy/export-thirdpartyaccount.php

Braces +21 added lines, -12 removed lines

@@ -32,8 +32,9 @@ 
 $langs->loadLangs(array("companies", "compta", "main", "accountancy"));
 
 // Security check
-if (!$user->admin)
+if (!$user->admin) {
     accessforbidden();
+}
 
 // Date range
 $year = GETPOST("year");
@@ -50,9 +51,11 @@ 
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+    // We define date_start and date_end
 {
 	$q = GETPOST("q") ? GETPOST("q") : 0;
+}
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start;
@@ -63,12 +66,14 @@ 
 				$year_end --;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1)
-				$month_end = 12;
-			else
-				$year_end ++;
-		} else
-			$month_end = $month_start;
+			if ($month_end < 1) {
+							$month_end = 12;
+			} else {
+							$year_end ++;
+			}
+		} else {
+					$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false);
 		$date_end = dol_get_last_day($year_end, $month_end, false);
 	}
@@ -126,11 +131,13 @@ 
 $sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
 $sql .= " WHERE f.fk_soc = s.rowid";
 $sql .= " AND s.fk_pays = cp.rowid";
-if (! empty($date_start) && ! empty($date_end))
+if (! empty($date_start) && ! empty($date_end)) {
 	$sql .= " AND f.datec >= '" . $db->idate($date_start) . "' AND f.datec <= '" . $db->idate($date_end) . "'";
+}
 $sql .= " AND f.entity = " . $conf->entity;
-if ($socid)
+if ($socid) {
 	$sql .= " AND f.fk_soc = " . $socid;
+}
 $sql .= " GROUP BY name";
 $sql .= ")";
 $sql .= "UNION (SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta_fournisseur as compta , ";
@@ -140,11 +147,13 @@ 
 $sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
 $sql .= " WHERE ff.fk_soc = s.rowid";
 $sql .= " AND s.fk_pays = cp.rowid";
-if (! empty($date_start) && ! empty($date_end))
+if (! empty($date_start) && ! empty($date_end)) {
 	$sql .= " AND ff.datec >= '" . $db->idate($date_start) . "' AND ff.datec <= '" . $db->idate($date_end) . "'";
+}
 $sql .= " AND ff.entity = " . $conf->entity;
-if ($socid)
+if ($socid) {
 	$sql .= " AND f.fk_soc = " . $socid;
+}
 $sql .= " GROUP BY name";
 $sql .= ")";
 

dolibarr/scripts/cron/cron_run_jobs.php

Braces +29 added lines, -17 removed lines

@@ -23,11 +23,22 @@ 
  *  \ingroup    cron
  *  \brief      Execute pendings jobs
  */
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN'))        define('NOLOGIN','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOLOGIN')) {
+    define('NOLOGIN','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 
@@ -109,9 +120,10 @@ 
             $userlogin = $obj->login;
             echo "First admin user found is login '".$userlogin."', entity ".$obj->entity."\n";
         }
+    } else {
+        dol_print_error($db);
+    }
     }
-    else dol_print_error($db);
-}
 
 // Check user login
 $user=new User($db);
@@ -121,8 +133,7 @@ 
 	echo "User Error: ".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit(-1);
-}
-else
+} else
 {
 	if (empty($user->id))
 	{
@@ -164,7 +175,9 @@ 
 $qualifiedjobs = array();
 foreach($object->lines as $val)
 {
-	if (! verifCond($val->test)) continue;
+	if (! verifCond($val->test)) {
+	    continue;
+	}
 	$qualifiedjobs[] = $val;
 }
 
@@ -208,8 +221,7 @@ 
 				echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
 				dol_syslog("cron_run_jobs.php::run_jobs Error ".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
-			}
-			else
+			} else
 			{
 				$nbofjobslaunchedok++;
 			}
@@ -227,23 +239,23 @@ 
 			}
 
 			echo " - reprogrammed\n";
-		}
-		else
+		} else
 		{
 			echo " - not qualified\n";
 
 			dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun,'dayhourrfc')." line->datestart:".dol_print_date($line->datestart,'dayhourrfc')." line->dateend:".dol_print_date($line->dateend,'dayhourrfc')." now:".dol_print_date($now,'dayhourrfc'));
 		}
 	}
-}
-else
+} else
 {
 	echo "cron_run_jobs.php no qualified job found\n";
 }
 
 $db->close();
 
-if ($nbofjobslaunchedko) exit(1);
+if ($nbofjobslaunchedko) {
+    exit(1);
+}
 exit(0);
 
 

dolibarr/scripts/company/sync_contacts_dolibarr2ldap.php

Braces +6 added lines, -6 removed lines

@@ -61,8 +61,10 @@ 
 
 foreach($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
-}
+	if (preg_match('/-y$/',$val,$reg)) {
+	    $confirmed=1;
+	}
+	}
 
 $now=$argv[1];
 
@@ -140,8 +142,7 @@ 
 		if ($result > 0)
 		{
 			print " - ".$langs->trans("OK");
-		}
-		else
+		} else
 		{
 			$error++;
 			print " - ".$langs->trans("KO").' - '.$ldap->error;
@@ -153,8 +154,7 @@ 
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/scripts/modulebuilder/builddoc.php

Braces +6 added lines, -2 removed lines

@@ -78,11 +78,15 @@
 
 $now=dol_now();
 $newmask = 0;
-if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-if (empty($newmask))	// This should no happen
+if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+    $newmask=$conf->global->MAIN_UMASK;
+}
+if (empty($newmask)) {
+    // This should no happen
 {
 	$newmask='0664';
 }
+}
 
 
 /*

dolibarr/scripts/modulebuilder/initmodule.php

Braces +7 added lines, -4 removed lines

@@ -73,11 +73,15 @@ 
 
 $now=dol_now();
 $newmask = 0;
-if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-if (empty($newmask))	// This should no happen
+if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) {
+    $newmask=$conf->global->MAIN_UMASK;
+}
+if (empty($newmask)) {
+    // This should no happen
 {
 	$newmask='0664';
 }
+}
 
 
 /*
@@ -116,8 +120,7 @@ 
 			$langs->load("errors");
 			print $langs->trans("ErrorFailToCopyDir", $srcdir, $destdir)."\n";
 			exit(2);
-		}
-		else	// $result == 0
+		} else	// $result == 0
 		{
 			print $langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir)."\n";
 		}

dolibarr/scripts/bank/export-bank-receipts.php

Braces +50 added lines, -37 removed lines

@@ -118,8 +118,7 @@ 
 {
 	print "Failed to find bank account with ref ".$bankref.".\n";
 	exit(-1);
-}
-else
+} else
 {
 	print "Export for bank account ".$acct->ref." (".$acct->label.").\n";
 }
@@ -177,7 +176,9 @@ 
 	$arraynum=explode(',',$num);
 	foreach($arraynum as $val)
 	{
-		if ($listofnum != "'") $listofnum.="','";
+		if ($listofnum != "'") {
+		    $listofnum.="','";
+		}
 		$listofnum.=$val;
 	}
 	$listofnum.="'";
@@ -188,8 +189,12 @@ 
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= ", ".MAIN_DB_PREFIX."bank as b";
 $sql.= " WHERE b.fk_account = ".$acct->id;
-if ($listofnum) $sql.= " AND b.num_releve IN (".$listofnum.")";
-if (!isset($num)) $sql.= " OR b.num_releve is null";
+if ($listofnum) {
+    $sql.= " AND b.num_releve IN (".$listofnum.")";
+}
+if (!isset($num)) {
+    $sql.= " OR b.num_releve is null";
+}
 $sql.= " AND b.fk_account = ba.rowid";
 $sql.= $db->order("b.num_releve, b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
 //print $sql;
@@ -245,8 +250,7 @@ 
 				$obj2=$db->fetch_object($resql2);
 				$balancebefore[$objp->num_releve] = ($obj2->amount?$obj2->amount:0);
 				$db->free($resql2);
-			}
-			else
+			} else
 			{
 				dol_print_error($db);
 				exit(-1);
@@ -272,8 +276,11 @@ 
 		// Libelle
 		$reg=array();
 		preg_match('/\((.+)\)/i',$objp->label,$reg);	// Si texte entoure de parenthese on tente recherche de traduction
-		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1])!=$reg[1]) $description=$langs->transnoentitiesnoconv($reg[1]);
-		else $description=$objp->label;
+		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1])!=$reg[1]) {
+		    $description=$langs->transnoentitiesnoconv($reg[1]);
+		} else {
+		    $description=$objp->label;
+		}
 
 		/*
 		 * Ajout les liens (societe, company...)
@@ -290,12 +297,13 @@ 
 					foreach($tmparray as $key => $val)
 					{
 						$invoicestatic->fetch($val);
-						if ($accountelem) $accountelem.= ', ';
+						if ($accountelem) {
+						    $accountelem.= ', ';
+						}
 						$accountelem.=$invoicestatic->ref;
 					}
 				}
-			}
-			elseif ($links[$key]['type']=='payment_supplier')
+			} elseif ($links[$key]['type']=='payment_supplier')
 			{
 				$paymentsupplierstatic->fetch($links[$key]['url_id']);
 				$tmparray=$paymentsupplierstatic->getBillsArray('');
@@ -304,29 +312,34 @@ 
 					foreach($tmparray as $key => $val)
 					{
 						$invoicesupplierstatic->fetch($val);
-						if ($accountelem) $accountelem.= ', ';
+						if ($accountelem) {
+						    $accountelem.= ', ';
+						}
 						$accountelem.=$invoicesupplierstatic->ref;
 					}
 				}
-			}
-			elseif ($links[$key]['type']=='payment_sc')
+			} elseif ($links[$key]['type']=='payment_sc')
 			{
 				$paymentsocialcontributionstatic->fetch($links[$key]['url_id']);
-				if ($accountelem) $accountelem.= ', ';
+				if ($accountelem) {
+				    $accountelem.= ', ';
+				}
 				$accountelem.=$langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
-			}
-			elseif ($links[$key]['type']=='payment_vat')
+			} elseif ($links[$key]['type']=='payment_vat')
 			{
 				$paymentvatstatic->fetch($links[$key]['url_id']);
-				if ($accountelem) $accountelem.= ', ';
+				if ($accountelem) {
+				    $accountelem.= ', ';
+				}
 				$accountelem.=$langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
-			}
-			elseif ($links[$key]['type']=='banktransfert')
+			} elseif ($links[$key]['type']=='banktransfert')
 			{
 				$comment=$outputlangs->transnoentitiesnoconv("Transfer");
 				if ($objp->amount > 0)
 				{
-					if ($comment) $comment.= ' ';
+					if ($comment) {
+					    $comment.= ' ';
+					}
 					$banklinestatic->fetch($links[$key]['url_id']);
 					$bankstatic->id=$banklinestatic->fk_account;
 					$bankstatic->label=$banklinestatic->bank_account_label;
@@ -337,10 +350,11 @@ 
 					$bankstatic->label=$objp->bankref;
 					$comment.= $bankstatic->getNomUrl(1,'');
 					$comment.= ')';
-				}
-				else
+				} else
 				{
-					if ($comment) $comment.= ' ';
+					if ($comment) {
+					    $comment.= ' ';
+					}
 					$bankstatic->id=$objp->bankid;
 					$bankstatic->label=$objp->bankref;
 					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
@@ -352,16 +366,18 @@ 
 					$comment.= $bankstatic->getNomUrl(1,'transactions');
 					$comment.= ')';
 				}
-			}
-			elseif ($links[$key]['type']=='company')
+			} elseif ($links[$key]['type']=='company')
 			{
-				if ($thirdparty) $thirdparty.= ', ';
+				if ($thirdparty) {
+				    $thirdparty.= ', ';
+				}
 				$thirdparty.= dol_trunc($links[$key]['label'],24);
 				$newline=0;
-			}
-			elseif ($links[$key]['type']=='member')
+			} elseif ($links[$key]['type']=='member')
 			{
-				if ($thirdparty) $accountelem.= ', ';
+				if ($thirdparty) {
+				    $accountelem.= ', ';
+				}
 				$thirdparty.= $links[$key]['label'];
 				$newline=0;
 			}
@@ -389,8 +405,7 @@ 
 		{
 			$totald = $totald + abs($objp->amount);
 			$debit=price2num($objp->amount * -1);
-		}
-		else
+		} else
 		{
 			$totalc = $totalc + abs($objp->amount);
 			$credit=price2num($objp->amount);
@@ -430,15 +445,13 @@ 
 		print 'File '.$filename.' was generated into dir '.$dirname.'.'."\n";
 
 		$ret=0;
-	}
-	else
+	} else
 	{
 		print "No records found for receipt ".$num."\n";
 
 		$ret=0;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	$ret=-1;

dolibarr/scripts/contracts/email_expire_services_to_customers.php

Braces +74 added lines, -39 removed lines

@@ -75,22 +75,36 @@ 
 $error = 0;
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"").(is_numeric($duration_value2)?" after=".$duration_value2:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') {
+    $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+}
 
 $sql  = "SELECT c.ref, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel,";
 $sql.= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
-if ($targettype == 'contacts') $sql.= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail";
+if ($targettype == 'contacts') {
+    $sql.= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe AS s";
-if ($targettype == 'contacts') $sql.= ", ".MAIN_DB_PREFIX."socpeople as sp";
+if ($targettype == 'contacts') {
+    $sql.= ", ".MAIN_DB_PREFIX."socpeople as sp";
+}
 $sql .= ", ".MAIN_DB_PREFIX."contrat AS c";
 $sql .= ", ".MAIN_DB_PREFIX."contratdet AS cd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product";
 $sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 AND cd.statut < 5";
-if (is_numeric($duration_value2)) $sql.= " AND cd.date_fin_validite >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
-if (is_numeric($duration_value)) $sql.= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
-if ($targettype == 'contacts') $sql.= " AND s.rowid = sp.fk_soc";
+if (is_numeric($duration_value2)) {
+    $sql.= " AND cd.date_fin_validite >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
+}
+if (is_numeric($duration_value)) {
+    $sql.= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
+}
+if ($targettype == 'contacts') {
+    $sql.= " AND s.rowid = sp.fk_soc";
+}
 $sql.= " ORDER BY";
-if ($targettype == 'contacts') $sql.= " sp.email, sp.rowid,";
+if ($targettype == 'contacts') {
+    $sql.= " sp.email, sp.rowid,";
+}
 $sql.= " s.email ASC, s.rowid ASC, cd.date_fin_validite ASC";	// Order by email to allow one message per email
 
 //print $sql;
@@ -117,9 +131,15 @@ 
 
             // Check if this record is a break after previous one
             $startbreak=false;
-			if ($newemail <> $oldemail || $oldemail == 'none') $startbreak=true;
-			if ($obj->sid && $obj->sid <> $oldsid) $startbreak=true;
-			if ($obj->cid && $obj->cid <> $oldcid) $startbreak=true;
+			if ($newemail <> $oldemail || $oldemail == 'none') {
+			    $startbreak=true;
+			}
+			if ($obj->sid && $obj->sid <> $oldsid) {
+			    $startbreak=true;
+			}
+			if ($obj->cid && $obj->cid <> $oldcid) {
+			    $startbreak=true;
+			}
 
             if ($startbreak)
             {
@@ -128,13 +148,15 @@ 
                 {
                    	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget,$duration_value);
                    	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
-                }
-                else
+                } else
 				{
                 	if ($oldemail != 'none')
                 	{
-                		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-                		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                		    print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+                		} else {
+                		    print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+                		}
                 	}
                 }
                 $oldemail = $newemail;
@@ -163,8 +185,11 @@ 
             	$foundtoprocess++;
             }
             print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel,$obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite),'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", ":"")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
-            if (dol_strlen($newemail)) print "qualified.";
-            else print "disqualified (no email).";
+            if (dol_strlen($newemail)) {
+                print "qualified.";
+            } else {
+                print "disqualified (no email).";
+            }
 			print "\n";
 
             unset($outputlangs);
@@ -177,29 +202,31 @@ 
         // Si il reste des envois en buffer
         if ($foundtoprocess)
         {
-            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))	// Break onto email (new email)
+            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                // Break onto email (new email)
             {
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget,$duration_value);
-       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
             }
-            else
+       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+            } else
 			{
             	if ($oldemail != 'none')
             	{
-            		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-            		else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+            		if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+            		    print "- No email sent for '".$oldtarget."', total: ".$total."\n";
+            		} else {
+            		    print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+            		}
             	}
             }
         }
-    }
-    else
+    } else
 	{
         print "No services to expire found\n";
     }
 
     exit(0);
-}
-else
+} else
 {
     dol_print_error($db);
     dol_syslog("email_expire_services_to_customers.php: Error");
@@ -224,7 +251,9 @@ 
 {
     global $conf,$langs;
 
-    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    if (getenv('DOL_FORCE_EMAIL_TO')) {
+        $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    }
 
     $newlangs=new Translate('',$conf);
     $newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
@@ -233,11 +262,14 @@ 
 
     if ($duration_value)
     {
-    	if ($duration_value > 0) $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
-    	else $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
+    	if ($duration_value > 0) {
+    	    $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
+    	} else {
+    	    $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
+    	}
+    } else {
+        	$title= $newlangs->transnoentities("ListOfServicesToExpire");
     }
-    else
-    	$title= $newlangs->transnoentities("ListOfServicesToExpire");
 
     $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT)?$title:$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
     $sendto = $oldemail;
@@ -249,15 +281,18 @@ 
     dol_syslog("email_expire_services_to_customers.php: send mail to ".$oldemail);
 
     $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) {
+        $usehtml+=1;
+    }
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER)) {
+        $usehtml+=1;
+    }
 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER;
-    }
-    else
+    } else
 	{
     	$allmessage.= "Dear customer".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
     	$allmessage.= "Please, find a summary of the services contracted by you that are about to expire.".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
@@ -267,7 +302,9 @@ 
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) $usehtml+=1;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) {
+    	    $usehtml+=1;
+    	}
     }
 
     $mail = new CMailFile(
@@ -295,8 +332,7 @@ 
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
     	}
-    }
-    else
+    } else
     {
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
@@ -308,8 +344,7 @@ 
     if ($result)
     {
         return 1;
-    }
-    else
+    } else
     {
         return -1;
     }

dolibarr/scripts/contracts/email_expire_services_to_representatives.php

Braces +48 added lines, -29 removed lines

@@ -71,14 +71,18 @@ 
 
 print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
 
-if ($mode != 'confirm') $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+if ($mode != 'confirm') {
+    $conf->global->MAIN_DISABLE_ALL_MAILS=1;
+}
 
 $sql  = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.rowid, s.nom as name, s.email, s.default_lang,";
 $sql.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."contrat AS c, ".MAIN_DB_PREFIX."contratdet AS cd";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product, ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ".MAIN_DB_PREFIX."user AS u";
 $sql.= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 AND cd.statut<5";
-if (is_numeric($duration_value)) $sql .= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
+if (is_numeric($duration_value)) {
+    $sql .= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
+}
 $sql.= " AND sc.fk_soc = s.rowid AND sc.fk_user = u.rowid";
 $sql .= " ORDER BY u.email ASC, s.rowid ASC, c.ref ASC";	// Order by email to allow one message per email
 
@@ -106,10 +110,11 @@ 
                 if (dol_strlen($oldemail) && $oldemail != 'none')
                 {
                    	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
-                }
-                else
+                } else
 				{
-					if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+					if ($oldemail != 'none') {
+					    print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+					}
                 }
                 $oldemail = $obj->email;
                 $olduid = $obj->uid;
@@ -119,7 +124,9 @@ 
                 $total = 0;
                 $foundtoprocess = 0;
                 $salerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
-                if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
+                if (empty($obj->email)) {
+                    print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
+                }
             }
 
             // Define line content
@@ -136,8 +143,11 @@ 
             	$foundtoprocess++;
             }
             print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel,$obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite),'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
-            if (dol_strlen($obj->email)) print "qualified.";
-            else print "disqualified (no email).";
+            if (dol_strlen($obj->email)) {
+                print "qualified.";
+            } else {
+                print "disqualified (no email).";
+            }
 			print "\n";
 
 			unset($outputlangs);
@@ -149,24 +159,25 @@ 
         // Si il reste des envois en buffer
         if ($foundtoprocess)
         {
-            if (dol_strlen($oldemail) && $oldemail != 'none')	// Break onto email (new email)
+            if (dol_strlen($oldemail) && $oldemail != 'none') {
+                // Break onto email (new email)
             {
        			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
             }
-            else
+            } else
 			{
-            	if ($oldemail != 'none') print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+            	if ($oldemail != 'none') {
+            	    print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
+            	}
             }
         }
-    }
-    else
+    } else
 	{
         print "No services to expire (for companies linked to a particular commercial dolibarr user) found\n";
     }
 
     exit(0);
-}
-else
+} else
 {
     dol_print_error($db);
     dol_syslog("email_expire_services_to_representatives.php: Error");
@@ -191,7 +202,9 @@ 
 {
     global $conf,$langs;
 
-    if (getenv('DOL_FORCE_EMAIL_TO')) $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    if (getenv('DOL_FORCE_EMAIL_TO')) {
+        $oldemail=getenv('DOL_FORCE_EMAIL_TO');
+    }
 
     $newlangs=new Translate('',$conf);
 	$newlangs->setDefaultLang(empty($userlang)?(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT):$userlang);
@@ -200,11 +213,14 @@ 
 
     if ($duration_value)
     {
-    	if ($duration_value > 0) $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
-    	else $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
+    	if ($duration_value > 0) {
+    	    $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
+    	} else {
+    	    $title=$newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg",$duration_value);
+    	}
+    } else {
+        	$title= $newlangs->transnoentities("ListOfServicesToExpire");
     }
-    else
-    	$title= $newlangs->transnoentities("ListOfServicesToExpire");
 
     $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT)?$title:$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
     $sendto = $oldemail;
@@ -216,15 +232,18 @@ 
     dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
 
     $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) $usehtml+=1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
+        $usehtml+=1;
+    }
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
+        $usehtml+=1;
+    }
 
     $allmessage='';
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
-    }
-    else
+    } else
     {
     	$allmessage.= $title.($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
     	$allmessage.= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
@@ -234,7 +253,9 @@ 
     if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER))
     {
     	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
+    	    $usehtml+=1;
+    	}
     }
 
     $mail = new CMailFile(
@@ -262,8 +283,7 @@ 
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
     	}
-    }
-    else
+    } else
     {
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
@@ -274,8 +294,7 @@ 
     if ($result)
     {
         return 1;
-    }
-    else
+    } else
     {
         return -1;
     }

dolibarr/scripts/invoices/rebuild_merge_pdf.php

Braces +1 added lines, -2 removed lines

@@ -250,8 +250,7 @@
 {
 	$error=0;
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	$error=$result;
 	print '--- end error code='.$error."\n";