alxarafe / alixar

dolibarr/scripts/company/export-contacts-xls-example.php

Spacing +13 added lines, -13 removed lines

@@ -26,7 +26,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,11 +34,11 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: $script_file now\n";
 	exit(-1);
 }
-$now=$argv[1];
+$now = $argv[1];
 
 
 require_once $path."../../htdocs/master.inc.php";
@@ -50,8 +50,8 @@ 
 require_once PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php";
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -60,7 +60,7 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 $fname = DOL_DATA_ROOT.'/export-contacts.xls';
 
@@ -80,10 +80,10 @@ 
 //$page->set_column(0,4,18); // A
 
 $sql = "SELECT distinct c.lastname, c.firstname, c.email, s.nom as name";
-$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = c.fk_soc";
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = c.fk_soc";
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -102,10 +102,10 @@ 
 	{
 		$obj = $db->fetch_object($resql);
 
-    	$objPHPExcel->getActiveSheet()->SetCellValue('A'.($i+2), $obj->firstname);
-    	$objPHPExcel->getActiveSheet()->SetCellValue('B'.($i+2), $obj->lastname);
-    	$objPHPExcel->getActiveSheet()->SetCellValue('C'.($i+2), $obj->email);
-    	$objPHPExcel->getActiveSheet()->SetCellValue('D'.($i+2), $obj->name);
+    	$objPHPExcel->getActiveSheet()->SetCellValue('A'.($i + 2), $obj->firstname);
+    	$objPHPExcel->getActiveSheet()->SetCellValue('B'.($i + 2), $obj->lastname);
+    	$objPHPExcel->getActiveSheet()->SetCellValue('C'.($i + 2), $obj->email);
+    	$objPHPExcel->getActiveSheet()->SetCellValue('D'.($i + 2), $obj->name);
 
 		$j++;
 		$i++;

dolibarr/scripts/modulebuilder/builddoc.php

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -39,11 +39,11 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." ModuleName\n";
 	exit(-1);
 }
-$modulename=$argv[1];
+$modulename = $argv[1];
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -57,31 +57,31 @@ 
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 // Dir for custom dirs
-$tmp=explode(',', $dolibarr_main_document_root_alt);
+$tmp = explode(',', $dolibarr_main_document_root_alt);
 $dirins = $tmp[0];
 $dirread = $dirins;
 $forceddirread = 0;
 
 $tmpdir = explode('@', $module);
-if (! empty($tmpdir[1]))
+if (!empty($tmpdir[1]))
 {
-	$module=$tmpdir[0];
-	$dirread=$tmpdir[1];
-	$forceddirread=1;
+	$module = $tmpdir[0];
+	$dirread = $tmpdir[1];
+	$forceddirread = 1;
 }
 
-$FILEFLAG='modulebuilder.txt';
+$FILEFLAG = 'modulebuilder.txt';
 
-$now=dol_now();
+$now = dol_now();
 $newmask = 0;
-if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 if (empty($newmask))	// This should no happen
 {
-	$newmask='0664';
+	$newmask = '0664';
 }
 
 
@@ -94,7 +94,7 @@ 
 print "modulename=".$modulename."\n";
 print "dirins=".$dirins."\n";
 
-$FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
+$FILENAMEDOC = strtolower($module).'.html'; // TODO Use/text PDF
 $dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
 $outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 

dolibarr/scripts/modulebuilder/initmodule.php

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -35,11 +35,11 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." ModuleName\n";
 	exit(-1);
 }
-$modulename=$argv[1];
+$modulename = $argv[1];
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -52,31 +52,31 @@ 
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 // Dir for custom dirs
-$tmp=explode(',', $dolibarr_main_document_root_alt);
+$tmp = explode(',', $dolibarr_main_document_root_alt);
 $dirins = $tmp[0];
 $dirread = $dirins;
 $forceddirread = 0;
 
 $tmpdir = explode('@', $module);
-if (! empty($tmpdir[1]))
+if (!empty($tmpdir[1]))
 {
-	$module=$tmpdir[0];
-	$dirread=$tmpdir[1];
-	$forceddirread=1;
+	$module = $tmpdir[0];
+	$dirread = $tmpdir[1];
+	$forceddirread = 1;
 }
 
-$FILEFLAG='modulebuilder.txt';
+$FILEFLAG = 'modulebuilder.txt';
 
-$now=dol_now();
+$now = dol_now();
 $newmask = 0;
-if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 if (empty($newmask))	// This should no happen
 {
-	$newmask='0664';
+	$newmask = '0664';
 }
 
 
@@ -96,12 +96,12 @@ 
 	exit(1);
 }
 
-if (! $error)
+if (!$error)
 {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$destdir = $dirins.'/'.strtolower($modulename);
 
-	$arrayreplacement=array(
+	$arrayreplacement = array(
 	'mymodule'=>strtolower($modulename),
 	'MyModule'=>$modulename
 	);
@@ -141,13 +141,13 @@ 
 }
 
 // Edit PHP files
-if (! $error)
+if (!$error)
 {
 	$listofphpfilestoedit = dol_dir_list($destdir, 'files', 1, '\.(php|MD|js|sql|txt|xml|lang)$', '', 'fullname', SORT_ASC, 0, 1);
-	foreach($listofphpfilestoedit as $phpfileval)
+	foreach ($listofphpfilestoedit as $phpfileval)
 	{
 		//var_dump($phpfileval['fullname']);
-		$arrayreplacement=array(
+		$arrayreplacement = array(
 		'mymodule'=>strtolower($modulename),
 		'MyModule'=>$modulename,
 		'MYMODULE'=>strtoupper($modulename),
@@ -156,11 +156,11 @@ 
 		'Mon module'=>$modulename,
 		'mon module'=>$modulename,
 		'htdocs/modulebuilder/template'=>strtolower($modulename),
-		'---Put here your own copyright and developer email---'=>dol_print_date($now,'%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':'')
+		'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
 
 
-		$result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+		$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 		//var_dump($result);
 		if ($result < 0)
 		{

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

Spacing +146 added lines, -146 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -49,8 +49,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 
@@ -60,51 +60,51 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-if (! isset($argv[3]) || ! $argv[3]) {
+if (!isset($argv[3]) || !$argv[3]) {
 	print "Usage: ".$script_file." bank_ref [bank_receipt_number|all] (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
 	exit(-1);
 }
-$bankref=$argv[1];
-$num=$argv[2];
-$model=$argv[3];
-$newlangid='en_EN';	// To force a new lang id
+$bankref = $argv[1];
+$num = $argv[2];
+$model = $argv[3];
+$newlangid = 'en_EN'; // To force a new lang id
 
 
-$invoicestatic=new Facture($db);
-$invoicesupplierstatic=new FactureFournisseur($db);
-$societestatic=new Societe($db);
-$chargestatic=new ChargeSociales($db);
-$memberstatic=new Adherent($db);
-$paymentstatic=new Paiement($db);
-$paymentsupplierstatic=new PaiementFourn($db);
-$paymentsocialcontributionstatic=new PaymentSocialContribution($db);
-$paymentvatstatic=new Tva($db);
-$bankstatic=new Account($db);
-$banklinestatic=new AccountLine($db);
+$invoicestatic = new Facture($db);
+$invoicesupplierstatic = new FactureFournisseur($db);
+$societestatic = new Societe($db);
+$chargestatic = new ChargeSociales($db);
+$memberstatic = new Adherent($db);
+$paymentstatic = new Paiement($db);
+$paymentsupplierstatic = new PaiementFourn($db);
+$paymentsocialcontributionstatic = new PaymentSocialContribution($db);
+$paymentvatstatic = new Tva($db);
+$bankstatic = new Account($db);
+$banklinestatic = new AccountLine($db);
 
 
 // Parse parameters
 foreach ($argv as $key => $value)
 {
-	$found=false;
+	$found = false;
 
 	// Define options
-	if (preg_match('/^lang=/i',$value))
+	if (preg_match('/^lang=/i', $value))
 	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$newlangid=$valarray[1];
+		$found = true;
+		$valarray = explode('=', $value);
+		$newlangid = $valarray[1];
 		print 'Use language '.$newlangid.".\n";
 	}
 }
 $outputlangs = $langs;
-if (! empty($newlangid))
+if (!empty($newlangid))
 {
 	if ($outputlangs->defaultlang != $newlangid)
 	{
-		$outputlangs = new Translate("",$conf);
+		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlangid);
 	}
 }
@@ -112,8 +112,8 @@ 
 // Load translation files required by the page
 $outputlangs->loadLangs(array("main", "companies", "bills", "banks", "members", "compta"));
 
-$acct=new Account($db);
-$result=$acct->fetch('',$bankref);
+$acct = new Account($db);
+$result = $acct->fetch('', $bankref);
 if ($result <= 0)
 {
 	print "Failed to find bank account with ref ".$bankref.".\n";
@@ -126,10 +126,10 @@ 
 
 
 // Creation de la classe d'export du model ExportXXX
-$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 $file = "export_".$model.".modules.php";
 $classname = "Export".$model;
-if (! dol_is_file($dir.$file))
+if (!dol_is_file($dir.$file))
 {
 	print "No driver to export with format ".$model."\n";
 	exit(-1);
@@ -143,61 +143,61 @@ 
 $filename = 'export-bank-receipts-'.$bankref.'-'.$num.'.'.$objmodel->extension;
 
 
-$array_fields=array(
+$array_fields = array(
 'bankreceipt'=>$outputlangs->transnoentitiesnoconv("AccountStatementShort"), 'bankaccount'=>$outputlangs->transnoentitiesnoconv("BankAccount"),
-'dateop'=>$outputlangs->transnoentitiesnoconv("DateOperationShort"),'dateval'=>$outputlangs->transnoentitiesnoconv("DateValueShort"),'type'=>$outputlangs->transnoentitiesnoconv("Type"),
+'dateop'=>$outputlangs->transnoentitiesnoconv("DateOperationShort"), 'dateval'=>$outputlangs->transnoentitiesnoconv("DateValueShort"), 'type'=>$outputlangs->transnoentitiesnoconv("Type"),
 'description'=>$outputlangs->transnoentitiesnoconv("Description"), 'thirdparty'=>$outputlangs->transnoentitiesnoconv("Tiers"), 'accountelem'=>$outputlangs->transnoentitiesnoconv("Piece"),
 'debit'=>$outputlangs->transnoentitiesnoconv("Debit"), 'credit'=>$outputlangs->transnoentitiesnoconv("Credit"),
 'soldbefore'=>$outputlangs->transnoentitiesnoconv("BankBalanceBefore"), 'soldafter'=>$outputlangs->transnoentitiesnoconv("BankBalanceAfter"),
 'comment'=>$outputlangs->transnoentitiesnoconv("Comment")
 );
-$array_selected=array(
+$array_selected = array(
 'bankreceipt'=>'bankreceipt', 'bankaccount'=>'bankaccount',
-'dateop'=>'dateop','dateval'=>'dateval','type'=>'type',
+'dateop'=>'dateop', 'dateval'=>'dateval', 'type'=>'type',
 'description'=>'description', 'thirdparty'=>'thirdparty', 'accountelem'=>'accountelem',
 'debit'=>'debit', 'credit'=>'credit',
-'soldbefore'=>'soldbefore','soldafter'=>'soldafter',
+'soldbefore'=>'soldbefore', 'soldafter'=>'soldafter',
 'comment'=>'comment'
 );
-$array_export_TypeFields=array(
+$array_export_TypeFields = array(
 'bankreceipt'=>'Text', 'bankaccount'=>'Text',
-'dateop'=>'Date','dateval'=>'Date','type'=>'Text',
+'dateop'=>'Date', 'dateval'=>'Date', 'type'=>'Text',
 'description'=>'Text', 'thirdparty'=>'Text', 'accountelem'=>'Text',
 'debit'=>'Number', 'credit'=>'Number',
-'soldbefore'=>'Number','soldafter'=>'Number',
+'soldbefore'=>'Number', 'soldafter'=>'Number',
 'comment'=>'Text'
 );
 
 
 // Build request to find records for a bank account/receipt
-$listofnum="";
-if (! empty($num) && $num != "all")
+$listofnum = "";
+if (!empty($num) && $num != "all")
 {
-	$listofnum.="'";
-	$arraynum=explode(',',$num);
-	foreach($arraynum as $val)
+	$listofnum .= "'";
+	$arraynum = explode(',', $num);
+	foreach ($arraynum as $val)
 	{
-		if ($listofnum != "'") $listofnum.="','";
-		$listofnum.=$val;
+		if ($listofnum != "'") $listofnum .= "','";
+		$listofnum .= $val;
 	}
-	$listofnum.="'";
+	$listofnum .= "'";
 }
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv,";
-$sql.= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
-$sql.= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
-$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";
-$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
+$sql .= " b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type,";
+$sql .= " ba.rowid as bankid, ba.ref as bankref, ba.label as banklabel";
+$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";
+$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;
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
-	$balancebefore=array();
+	$balancebefore = array();
 
 	$numrows = $db->num_rows($resql);
 
@@ -206,7 +206,7 @@ 
 		// Open file
 		print 'Open file '.$filename.' into directory '.$dirname."\n";
 		dol_mkdir($dirname);
-		$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+		$result = $objmodel->open_file($dirname."/".$filename, $outputlangs);
 
 		if ($result < 0)
 		{
@@ -218,32 +218,32 @@ 
 		$objmodel->write_header($outputlangs);
 
 		// Genere ligne de titre
-		$objmodel->write_title($array_fields,$array_selected,$outputlangs,$array_export_TypeFields);
+		$objmodel->write_title($array_fields, $array_selected, $outputlangs, $array_export_TypeFields);
 	}
 
-	$i=0;
+	$i = 0;
 	while ($i < $numrows)
 	{
-		$thirdparty='';
-		$accountelem='';
-		$comment='';
+		$thirdparty = '';
+		$accountelem = '';
+		$comment = '';
 
 		$objp = $db->fetch_object($resql);
 
 		// Calculate start balance
-		if (! isset($balancebefore[$objp->num_releve]))
+		if (!isset($balancebefore[$objp->num_releve]))
 		{
 			print 'Calculate start balance for receipt '.$objp->num_releve."\n";
 
 			$sql2 = "SELECT sum(b.amount) as amount";
-			$sql2.= " FROM ".MAIN_DB_PREFIX."bank as b";
-			$sql2.= " WHERE b.num_releve < '".$db->escape($objp->num_releve)."'";
-			$sql2.= " AND b.fk_account = ".$objp->bankid;
-			$resql2=$db->query($sql2);
+			$sql2 .= " FROM ".MAIN_DB_PREFIX."bank as b";
+			$sql2 .= " WHERE b.num_releve < '".$db->escape($objp->num_releve)."'";
+			$sql2 .= " AND b.fk_account = ".$objp->bankid;
+			$resql2 = $db->query($sql2);
 			if ($resql2)
 			{
-				$obj2=$db->fetch_object($resql2);
-				$balancebefore[$objp->num_releve] = ($obj2->amount?$obj2->amount:0);
+				$obj2 = $db->fetch_object($resql2);
+				$balancebefore[$objp->num_releve] = ($obj2->amount ? $obj2->amount : 0);
 				$db->free($resql2);
 			}
 			else
@@ -261,109 +261,109 @@ 
 
 
 		// Date operation
-		$dateop=$db->jdate($objp->do);
+		$dateop = $db->jdate($objp->do);
 
 		// Date de valeur
-		$datevalue=$db->jdate($objp->dv);
+		$datevalue = $db->jdate($objp->dv);
 
 		// Num cheque
-		$numchq=($objp->num_chq?$objp->num_chq:'');
+		$numchq = ($objp->num_chq ? $objp->num_chq : '');
 
 		// 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;
+		$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;
 
 		/*
 		 * Ajout les liens (societe, company...)
 		 */
 		$links = $acct->get_url($objp->rowid);
-		foreach($links as $key=>$val)
+		foreach ($links as $key=>$val)
 		{
-			if ($links[$key]['type']=='payment')
+			if ($links[$key]['type'] == 'payment')
 			{
 				$paymentstatic->fetch($links[$key]['url_id']);
-				$tmparray=$paymentstatic->getBillsArray('');
+				$tmparray = $paymentstatic->getBillsArray('');
 				if (is_array($tmparray))
 				{
-					foreach($tmparray as $key => $val)
+					foreach ($tmparray as $key => $val)
 					{
 						$invoicestatic->fetch($val);
-						if ($accountelem) $accountelem.= ', ';
-						$accountelem.=$invoicestatic->ref;
+						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('');
+				$tmparray = $paymentsupplierstatic->getBillsArray('');
 				if (is_array($tmparray))
 				{
-					foreach($tmparray as $key => $val)
+					foreach ($tmparray as $key => $val)
 					{
 						$invoicesupplierstatic->fetch($val);
-						if ($accountelem) $accountelem.= ', ';
-						$accountelem.=$invoicesupplierstatic->ref;
+						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.= ', ';
-				$accountelem.=$langs->transnoentitiesnoconv("SocialContribution").' '.$paymentsocialcontributionstatic->ref;
+				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.= ', ';
-				$accountelem.=$langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
+				if ($accountelem) $accountelem .= ', ';
+				$accountelem .= $langs->transnoentitiesnoconv("VATPayments").' '.$paymentvatstatic->ref;
 			}
-			elseif ($links[$key]['type']=='banktransfert')
+			elseif ($links[$key]['type'] == 'banktransfert')
 			{
-				$comment=$outputlangs->transnoentitiesnoconv("Transfer");
+				$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;
-					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
-					$comment.= $bankstatic->getNomUrl(1,'transactions');
-					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
-					$bankstatic->id=$objp->bankid;
-					$bankstatic->label=$objp->bankref;
-					$comment.= $bankstatic->getNomUrl(1,'');
-					$comment.= ')';
+					$bankstatic->id = $banklinestatic->fk_account;
+					$bankstatic->label = $banklinestatic->bank_account_label;
+					$comment .= ' ('.$langs->transnoentitiesnoconv("from").' ';
+					$comment .= $bankstatic->getNomUrl(1, 'transactions');
+					$comment .= ' '.$langs->transnoentitiesnoconv("toward").' ';
+					$bankstatic->id = $objp->bankid;
+					$bankstatic->label = $objp->bankref;
+					$comment .= $bankstatic->getNomUrl(1, '');
+					$comment .= ')';
 				}
 				else
 				{
-					if ($comment) $comment.= ' ';
-					$bankstatic->id=$objp->bankid;
-					$bankstatic->label=$objp->bankref;
-					$comment.= ' ('.$langs->transnoentitiesnoconv("from").' ';
-					$comment.= $bankstatic->getNomUrl(1,'');
-					$comment.= ' '.$langs->transnoentitiesnoconv("toward").' ';
+					if ($comment) $comment .= ' ';
+					$bankstatic->id = $objp->bankid;
+					$bankstatic->label = $objp->bankref;
+					$comment .= ' ('.$langs->transnoentitiesnoconv("from").' ';
+					$comment .= $bankstatic->getNomUrl(1, '');
+					$comment .= ' '.$langs->transnoentitiesnoconv("toward").' ';
 					$banklinestatic->fetch($links[$key]['url_id']);
-					$bankstatic->id=$banklinestatic->fk_account;
-					$bankstatic->label=$banklinestatic->bank_account_label;
-					$comment.= $bankstatic->getNomUrl(1,'transactions');
-					$comment.= ')';
+					$bankstatic->id = $banklinestatic->fk_account;
+					$bankstatic->label = $banklinestatic->bank_account_label;
+					$comment .= $bankstatic->getNomUrl(1, 'transactions');
+					$comment .= ')';
 				}
 			}
-			elseif ($links[$key]['type']=='company')
+			elseif ($links[$key]['type'] == 'company')
 			{
-				if ($thirdparty) $thirdparty.= ', ';
-				$thirdparty.= dol_trunc($links[$key]['label'],24);
-				$newline=0;
+				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.= ', ';
-				$thirdparty.= $links[$key]['label'];
-				$newline=0;
+				if ($thirdparty) $accountelem .= ', ';
+				$thirdparty .= $links[$key]['label'];
+				$newline = 0;
 			}
 			/*elseif ($links[$key]['type']=='sc')
 				{
@@ -384,37 +384,37 @@ 
 			}*/
 		}
 
-		$debit=$credit='';
+		$debit = $credit = '';
 		if ($objp->amount < 0)
 		{
 			$totald = $totald + abs($objp->amount);
-			$debit=price2num($objp->amount * -1);
+			$debit = price2num($objp->amount * -1);
 		}
 		else
 		{
 			$totalc = $totalc + abs($objp->amount);
-			$credit=price2num($objp->amount);
+			$credit = price2num($objp->amount);
 		}
 
 		$i++;
 
-		$rec=new stdClass();
-		$rec->bankreceipt=$objp->num_releve;
-		$rec->bankaccount=$objp->banklabel;
-		$rec->dateop=dol_print_date($dateop,'dayrfc');
-		$rec->dateval=dol_print_date($datevalue,'dayrfc');
-		$rec->type=$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'');
-		$rec->description=$description;
-		$rec->thirdparty=$thirdparty;
-		$rec->accountelem=$accountelem;
-		$rec->debit=$debit;
-		$rec->credit=$credit;
-		$rec->comment=$comment;
-		$rec->soldbefore=price2num($totalbefore);
-		$rec->soldafter=price2num($total);
+		$rec = new stdClass();
+		$rec->bankreceipt = $objp->num_releve;
+		$rec->bankaccount = $objp->banklabel;
+		$rec->dateop = dol_print_date($dateop, 'dayrfc');
+		$rec->dateval = dol_print_date($datevalue, 'dayrfc');
+		$rec->type = $objp->fk_type.' '.($objp->num_chq ? $objp->num_chq : '');
+		$rec->description = $description;
+		$rec->thirdparty = $thirdparty;
+		$rec->accountelem = $accountelem;
+		$rec->debit = $debit;
+		$rec->credit = $credit;
+		$rec->comment = $comment;
+		$rec->soldbefore = price2num($totalbefore);
+		$rec->soldafter = price2num($total);
 
 		// end of special operation processing
-		$objmodel->write_record($array_selected,$rec,$outputlangs,$array_export_TypeFields);
+		$objmodel->write_record($array_selected, $rec, $outputlangs, $array_export_TypeFields);
 	}
 
 	if ($numrows > 0)
@@ -429,19 +429,19 @@ 
 
 		print 'File '.$filename.' was generated into dir '.$dirname.'.'."\n";
 
-		$ret=0;
+		$ret = 0;
 	}
 	else
 	{
 		print "No records found for receipt ".$num."\n";
 
-		$ret=0;
+		$ret = 0;
 	}
 }
 else
 {
 	dol_print_error($db);
-	$ret=-1;
+	$ret = -1;
 }
 
 $db->close();

dolibarr/scripts/contracts/email_expire_services_to_customers.php

Spacing +63 added lines, -63 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -36,7 +36,7 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')) || ! in_array($argv[2],array('thirdparties','contacts')))
+if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm')) || !in_array($argv[2], array('thirdparties', 'contacts')))
 {
 	print "Usage: $script_file (test|confirm) (thirdparties|contacts) [delay] [after]\n";
 	print "\n";
@@ -46,8 +46,8 @@ 
 	print "If you add param after (nb of days), only services with expired date >= today + delay are included.\n";
 	exit(-1);
 }
-$mode=$argv[1];
-$targettype=$argv[2];
+$mode = $argv[1];
+$targettype = $argv[2];
 
 
 require $path."../../htdocs/master.inc.php";
@@ -56,8 +56,8 @@ 
 $langs->loadLangs(array('main', 'contracts'));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -66,46 +66,46 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-$now=dol_now('tzserver');
-$duration_value=isset($argv[3])?$argv[3]:'none';
-$duration_value2=isset($argv[4])?$argv[4]:'none';
+$now = dol_now('tzserver');
+$duration_value = isset($argv[3]) ? $argv[3] : 'none';
+$duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 
 $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";
+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";
+$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";
 $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";
-$sql.= " ORDER BY";
-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
+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,";
+$sql .= " s.email ASC, s.rowid ASC, cd.date_fin_validite ASC"; // Order by email to allow one message per email
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $oldemail = 'none'; $oldsid = 0; $oldcid = 0; $oldlang='';
+    $oldemail = 'none'; $oldsid = 0; $oldcid = 0; $oldlang = '';
     $total = 0; $foundtoprocess = 0;
     $trackthirdpartiessent = array();
 
     print "We found ".$num." couples (services to expire-".$targettype.") qualified\n";
     dol_syslog("We found ".$num." couples (services to expire-".$targettype.") qualified");
-	$message='';
+	$message = '';
 
     if ($num)
     {
@@ -113,21 +113,21 @@ 
         {
             $obj = $db->fetch_object($resql);
 
-            $newemail=empty($obj->cemail)?$obj->email:$obj->cemail;
+            $newemail = empty($obj->cemail) ? $obj->email : $obj->cemail;
 
             // 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;
+            $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 ($startbreak)
             {
                 // Break onto sales representative (new email or cid)
                 if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget,$duration_value);
-                   	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+                   	envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget, $duration_value);
+                   	$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
                 }
                 else
 				{
@@ -141,28 +141,28 @@ 
                 $oldsid  = $obj->sid;
                 $oldcid  = $obj->cid;
                 $oldlang = $obj->lang;
-                $oldtarget=(empty($obj->cfirstname) && empty($obj->clastname))?$obj->name:($obj->clastname." ".$obj->cfirstname);
+                $oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
                 $message = '';
                 $total   = 0;
                 $foundtoprocess = 0;
-                $target=(empty($obj->cfirstname) && empty($obj->clastname))?$obj->name:($obj->clastname." ".$obj->cfirstname);
+                $target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
                 //if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
             }
 
             // Define line content
-            $outputlangs=new Translate('',$conf);
-            $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang);	// By default language of customer
+            $outputlangs = new Translate('', $conf);
+            $outputlangs->setDefaultLang(empty($obj->default_lang) ? $langs->defaultlang : $obj->default_lang); // By default language of customer
 
             // Load translation files required by the page
             $outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
 
             if (dol_strlen($newemail))
             {
-            	$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$outputlangs->trans("Service")." ".dol_concatdesc($obj->plabel,$obj->description)." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."), ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
+            	$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$outputlangs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)."), ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
             	dol_syslog("email_expire_services_to_customers.php: ".$newemail." ".$message);
             	$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.": ";
+            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).";
 			print "\n";
@@ -179,8 +179,8 @@ 
         {
             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;
+       			envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget, $duration_value);
+       			$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
             }
             else
 			{
@@ -220,26 +220,26 @@ 
  *  @param  int		$duration_value	duration value
  * 	@return	int						<0 if KO, >0 if OK
  */
-function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget,$duration_value)
+function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget, $duration_value)
 {
-    global $conf,$langs;
+    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);
+    $newlangs = new Translate('', $conf);
+    $newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
     $newlangs->load("main");
     $newlangs->load("contracts");
 
     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");
+    	$title = $newlangs->transnoentities("ListOfServicesToExpire");
 
-    $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT)?$title:$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
+    $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
@@ -248,26 +248,26 @@ 
     print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
     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;
+    $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;
 
-    $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER))
+    $allmessage = '';
+    if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER;
     }
     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");
+    	$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");
     }
-    $allmessage.= $message.($usehtml?"<br>\n":"\n");
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
     //$allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
-    if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER))
+    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;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) $usehtml += 1;
     }
 
     $mail = new CMailFile(
@@ -289,8 +289,8 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
+    	$result = $mail->sendfile();
+    	if (!$result)
     	{
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
@@ -301,7 +301,7 @@ 
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
     	$mail->dump_mail();
-    	$result=1;
+    	$result = 1;
     }
 
     unset($newlangs);

dolibarr/scripts/contracts/email_expire_services_to_representatives.php

Spacing +53 added lines, -53 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -36,7 +36,7 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
+if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm')))
 {
 	print "Usage: $script_file (test|confirm) [delay]\n";
 	print "\n";
@@ -45,7 +45,7 @@ 
 	print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
 	exit(-1);
 }
-$mode=$argv[1];
+$mode = $argv[1];
 
 
 require $path."../../htdocs/master.inc.php";
@@ -54,8 +54,8 @@ 
 $langs->loadLangs(array('main', 'contracts'));
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -64,35 +64,35 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-$now=dol_now('tzserver');
-$duration_value=isset($argv[2])?$argv[2]:'none';
+$now = dol_now('tzserver');
+$duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
-print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
+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";
+$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"))."'";
-$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
+$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
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $oldemail = 'none'; $olduid = 0; $oldlang='';
+    $oldemail = 'none'; $olduid = 0; $oldlang = '';
     $total = 0; $foundtoprocess = 0;
 	print "We found ".$num." couples (services to expire - sale representative) qualified\n";
     dol_syslog("We found ".$num." couples (services to expire - sale representative) qualified");
-	$message='';
+	$message = '';
 
     if ($num)
     {
@@ -105,7 +105,7 @@ 
                 // Break onto sales representative (new email or uid)
                 if (dol_strlen($oldemail) && $oldemail != 'none')
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
+                   	envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative, $duration_value);
                 }
                 else
 				{
@@ -114,28 +114,28 @@ 
                 $oldemail = $obj->email;
                 $olduid = $obj->uid;
                 $oldlang = $obj->lang;
-                $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
+                $oldsalerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 $message = '';
                 $total = 0;
                 $foundtoprocess = 0;
-                $salerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
+                $salerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
             }
 
             // Define line content
-            $outputlangs=new Translate('',$conf);
-            $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang);	// By default language of sale representative
+            $outputlangs = new Translate('', $conf);
+            $outputlangs->setDefaultLang(empty($obj->lang) ? $langs->defaultlang : $obj->lang); // By default language of sale representative
 
             // Load translation files required by the page
             $outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
 
             if (dol_strlen($obj->email))
             {
-            	$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel,$obj->description)." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n";
+            	$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
             	dol_syslog("email_expire_services_to_representatives.php: ".$obj->email);
             	$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."): ";
+            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).";
 			print "\n";
@@ -151,7 +151,7 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none')	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative,$duration_value);
+       			envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative, $duration_value);
             }
             else
 			{
@@ -187,26 +187,26 @@ 
  *  @param  int		$duration_value			duration value
  * 	@return	int						<0 if KO, >0 if OK
  */
-function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresentative,$duration_value)
+function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepresentative, $duration_value)
 {
-    global $conf,$langs;
+    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);
+    $newlangs = new Translate('', $conf);
+	$newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
     $newlangs->load("main");
     $newlangs->load("contracts");
 
     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");
+    	$title = $newlangs->transnoentities("ListOfServicesToExpire");
 
-    $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT)?$title:$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
+    $subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
@@ -215,26 +215,26 @@ 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     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;
+    $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;
 
-    $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
+    $allmessage = '';
+    if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
     }
     else
     {
-    	$allmessage.= $title.($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
+    	$allmessage .= $title.($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+    	$allmessage .= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage.= $message.($usehtml?"<br>\n":"\n");
-    $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
-    if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER))
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+    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;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) $usehtml += 1;
     }
 
     $mail = new CMailFile(
@@ -256,8 +256,8 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
+    	$result = $mail->sendfile();
+    	if (!$result)
     	{
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
@@ -268,7 +268,7 @@ 
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
     	$mail->dump_mail();
-    	$result=1;
+    	$result = 1;
     }
 
     if ($result)

dolibarr/scripts/invoices/rebuild_merge_pdf.php

Spacing +74 added lines, -74 removed lines

@@ -25,7 +25,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -46,8 +46,8 @@ 
 $langs->load("main");
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 
@@ -57,162 +57,162 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // Check parameters
-if (! isset($argv[1]))
+if (!isset($argv[1]))
 {
 	usage();
 	exit(-1);
 }
 
-$diroutputpdf=$conf->facture->dir_output . '/temp';
-$newlangid='en_EN';	// To force a new lang id
-$filter=array();
-$regenerate='';		// Ask regenerate (contains name of model to use)
-$option='';
-$fileprefix='mergedpdf';
+$diroutputpdf = $conf->facture->dir_output.'/temp';
+$newlangid = 'en_EN'; // To force a new lang id
+$filter = array();
+$regenerate = ''; // Ask regenerate (contains name of model to use)
+$option = '';
+$fileprefix = 'mergedpdf';
 
 foreach ($argv as $key => $value)
 {
-	$found=false;
+	$found = false;
 
 	// Define options
-	if (preg_match('/^lang=/i',$value))
+	if (preg_match('/^lang=/i', $value))
 	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$newlangid=$valarray[1];
+		$found = true;
+		$valarray = explode('=', $value);
+		$newlangid = $valarray[1];
 		print 'Use language '.$newlangid.".\n";
 	}
-	if (preg_match('/^prefix=/i',$value))
+	if (preg_match('/^prefix=/i', $value))
 	{
-		$found=true;
-		$valarray=explode('=',$value);
-		$fileprefix=$valarray[1];
+		$found = true;
+		$valarray = explode('=', $value);
+		$fileprefix = $valarray[1];
 		print 'Use prefix for filename '.$fileprefix.".\n";
 	}
 
-	if (preg_match('/^regenerate=(.*)/i',$value,$reg))
+	if (preg_match('/^regenerate=(.*)/i', $value, $reg))
 	{
-	    if (! in_array($reg[1],array('','0','no')))
+	    if (!in_array($reg[1], array('', '0', 'no')))
 	    {
-		    $found=true;
-		    $regenerate=$reg[1];
+		    $found = true;
+		    $regenerate = $reg[1];
 		    print 'Regeneration of PDF is requested with template '.$regenerate."\n";
 	    }
 	}
 
 	if ($value == 'filter=all')
 	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'all';
-		$filter[]='all';
+		$found = true;
+		$option .= (empty($option) ? '' : '_').'all';
+		$filter[] = 'all';
 
 		print 'Rebuild PDF for all invoices'."\n";
 	}
 
 	if ($value == 'filter=date')
 	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'date_'.$argv[$key+1].'_'.$argv[$key+2];
-		$filter[]='date';
+		$found = true;
+		$option .= (empty($option) ? '' : '_').'date_'.$argv[$key + 1].'_'.$argv[$key + 2];
+		$filter[] = 'date';
 
-		$dateafterdate=dol_stringtotime($argv[$key+1]);
-		$datebeforedate=dol_stringtotime($argv[$key+2]);
-		print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate,'day','gmt')." and ".dol_print_date($datebeforedate,'day','gmt').".\n";
+		$dateafterdate = dol_stringtotime($argv[$key + 1]);
+		$datebeforedate = dol_stringtotime($argv[$key + 2]);
+		print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate, 'day', 'gmt')." and ".dol_print_date($datebeforedate, 'day', 'gmt').".\n";
 	}
 
 	if ($value == 'filter=payments')
 	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'payments_'.$argv[$key+1].'_'.$argv[$key+2];
-		$filter[]='payments';
+		$found = true;
+		$option .= (empty($option) ? '' : '_').'payments_'.$argv[$key + 1].'_'.$argv[$key + 2];
+		$filter[] = 'payments';
 
-		$paymentdateafter=dol_stringtotime($argv[$key+1].'000000');
-		$paymentdatebefore=dol_stringtotime($argv[$key+2].'235959');
+		$paymentdateafter = dol_stringtotime($argv[$key + 1].'000000');
+		$paymentdatebefore = dol_stringtotime($argv[$key + 2].'235959');
 		if (empty($paymentdateafter) || empty($paymentdatebefore))
 		{
 			print 'Error: Bad date format or value'."\n";
 			exit(-1);
 		}
-		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day','gmt')." and ".dol_print_date($paymentdatebefore,'day','gmt').".\n";
+		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter, 'day', 'gmt')." and ".dol_print_date($paymentdatebefore, 'day', 'gmt').".\n";
 	}
 
 	if ($value == 'filter=nopayment')
 	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'nopayment';
-		$filter[]='nopayment';
+		$found = true;
+		$option .= (empty($option) ? '' : '_').'nopayment';
+		$filter[] = 'nopayment';
 
 		print 'Rebuild PDF for invoices with no payment done yet.'."\n";
 	}
 
 	if ($value == 'filter=bank')
 	{
-		$found=true;
-		$option.=(empty($option)?'':'_').'bank_'.$argv[$key+1];
-		$filter[]='bank';
+		$found = true;
+		$option .= (empty($option) ? '' : '_').'bank_'.$argv[$key + 1];
+		$filter[] = 'bank';
 
-		$paymentonbankref=$argv[$key+1];
-		$bankaccount=new Account($db);
-		$result=$bankaccount->fetch(0,$paymentonbankref);
+		$paymentonbankref = $argv[$key + 1];
+		$bankaccount = new Account($db);
+		$result = $bankaccount->fetch(0, $paymentonbankref);
 		if ($result <= 0)
 		{
 			print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
 			exit(-1);
 		}
-		$paymentonbankid=$bankaccount->id;
+		$paymentonbankid = $bankaccount->id;
 		print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
 	}
 
 	if ($value == 'filter=nodeposit')
     {
-        $found=true;
-        $option.=(empty($option)?'':'_').'nodeposit';
-        $filter[]='nodeposit';
+        $found = true;
+        $option .= (empty($option) ? '' : '_').'nodeposit';
+        $filter[] = 'nodeposit';
 
         print 'Exclude deposit invoices'."\n";
     }
     if ($value == 'filter=noreplacement')
     {
-        $found=true;
-        $option.=(empty($option)?'':'_').'noreplacement';
-        $filter[]='noreplacement';
+        $found = true;
+        $option .= (empty($option) ? '' : '_').'noreplacement';
+        $filter[] = 'noreplacement';
 
         print 'Exclude replacement invoices'."\n";
     }
     if ($value == 'filter=nocreditnote')
     {
-        $found=true;
-        $option.=(empty($option)?'':'_').'nocreditnote';
-        $filter[]='nocreditnote';
+        $found = true;
+        $option .= (empty($option) ? '' : '_').'nocreditnote';
+        $filter[] = 'nocreditnote';
 
         print 'Exclude credit note invoices'."\n";
     }
 
     if ($value == 'filter=excludethirdparties')
     {
-    	$found=true;
-    	$filter[]='excludethirdparties';
+    	$found = true;
+    	$filter[] = 'excludethirdparties';
 
-    	$thirdpartiesid=explode(',',$argv[$key+1]);
-    	print 'Exclude thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
+    	$thirdpartiesid = explode(',', $argv[$key + 1]);
+    	print 'Exclude thirdparties with id in list ('.join(',', $thirdpartiesid).").\n";
 
-    	$option.=(empty($option)?'':'_').'excludethirdparties'.join('-',$thirdpartiesid);
+    	$option .= (empty($option) ? '' : '_').'excludethirdparties'.join('-', $thirdpartiesid);
     }
     if ($value == 'filter=onlythirdparties')
     {
-    	$found=true;
-    	$filter[]='onlythirdparties';
+    	$found = true;
+    	$filter[] = 'onlythirdparties';
 
-    	$thirdpartiesid=explode(',',$argv[$key+1]);
-    	print 'Only thirdparties with id in list ('.join(',',$thirdpartiesid).").\n";
+    	$thirdpartiesid = explode(',', $argv[$key + 1]);
+    	print 'Only thirdparties with id in list ('.join(',', $thirdpartiesid).").\n";
 
-    	$option.=(empty($option)?'':'_').'onlythirdparty'.join('-',$thirdpartiesid);
+    	$option .= (empty($option) ? '' : '_').'onlythirdparty'.join('-', $thirdpartiesid);
     }
 
-	if (! $found && preg_match('/filter=/i',$value))
+	if (!$found && preg_match('/filter=/i', $value))
 	{
 		usage();
 		exit(-1);
@@ -226,12 +226,12 @@ 
 	exit(-1);
 }
 // Check if there is no uncompatible choice
-if (in_array('payments',$filter) && in_array('nopayment',$filter))
+if (in_array('payments', $filter) && in_array('nopayment', $filter))
 {
 	usage();
 	exit(-1);
 }
-if (in_array('bank',$filter) && in_array('nopayment',$filter))
+if (in_array('bank', $filter) && in_array('nopayment', $filter))
 {
 	usage();
 	exit(-1);
@@ -240,7 +240,7 @@ 
 
 // Define SQL and SQL request to select invoices
 // Use $filter, $dateafterdate, datebeforedate, $paymentdateafter, $paymentdatebefore
-$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid, $fileprefix);
+$result = rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid, $fileprefix);
 
 
 
@@ -248,12 +248,12 @@ 
 
 if ($result >= 0)
 {
-	$error=0;
+	$error = 0;
 	print '--- end ok'."\n";
 }
 else
 {
-	$error=$result;
+	$error = $result;
 	print '--- end error code='.$error."\n";
 }
 

dolibarr/scripts/invoices/email_unpaid_invoices_to_representatives.php

Spacing +45 added lines, -45 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -36,7 +36,7 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
+if (!isset($argv[1]) || !$argv[1] || !in_array($argv[1], array('test', 'confirm')))
 {
 	print "Usage: $script_file (test|confirm) [delay]\n";
 	print "\n";
@@ -45,7 +45,7 @@ 
 	print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
 	exit(-1);
 }
-$mode=$argv[1];
+$mode = $argv[1];
 
 
 require $path."../../htdocs/master.inc.php";
@@ -55,8 +55,8 @@ 
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 
@@ -66,17 +66,17 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-$now=dol_now('tzserver');
-$duration_value=isset($argv[2])?$argv[2]:'none';
+$now = dol_now('tzserver');
+$duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
-print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value)?" delay=".$duration_value:"")."\n";
+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 f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
-$sql.= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
+$sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 $sql .= " , ".MAIN_DB_PREFIX."societe as s";
 $sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -86,19 +86,19 @@ 
 if (is_numeric($duration_value)) $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
 $sql .= " AND sc.fk_soc = s.rowid";
 $sql .= " AND sc.fk_user = u.rowid";
-$sql .= " ORDER BY u.email ASC, s.rowid ASC, f.ref ASC";	// Order by email to allow one message per email
+$sql .= " ORDER BY u.email ASC, s.rowid ASC, f.ref ASC"; // Order by email to allow one message per email
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $oldemail = 'none'; $olduid = 0; $oldlang='';
+    $oldemail = 'none'; $olduid = 0; $oldlang = '';
     $total = 0; $foundtoprocess = 0;
 	print "We found ".$num." couples (unpayed validated invoice - sale representative) qualified\n";
     dol_syslog("We found ".$num." couples (unpayed validated invoice - sale representative) qualified");
-	$message='';
+	$message = '';
 
     if ($num)
     {
@@ -111,7 +111,7 @@ 
                 // Break onto sales representative (new email or uid)
                 if (dol_strlen($oldemail) && $oldemail != 'none')
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
+                   	envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
                 }
                 else
 				{
@@ -120,28 +120,28 @@ 
                 $oldemail = $obj->email;
                 $olduid = $obj->uid;
                 $oldlang = $obj->lang;
-                $oldsalerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
+                $oldsalerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 $message = '';
                 $total = 0;
                 $foundtoprocess = 0;
-                $salerepresentative=dolGetFirstLastname($obj->firstname, $obj->lastname);
+                $salerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
             }
 
             // Define line content
-            $outputlangs=new Translate('',$conf);
-            $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang);	// By default language of sale representative
+            $outputlangs = new Translate('', $conf);
+            $outputlangs->setDefaultLang(empty($obj->lang) ? $langs->defaultlang : $obj->lang); // By default language of sale representative
 
             // Load translation files required by the page
             $outputlangs->loadLangs(array("main", "bills"));
 
             if (dol_strlen($obj->email))
             {
-            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)." : ".$obj->name."\n";
+            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)." : ".$obj->name."\n";
             	dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email);
             	$foundtoprocess++;
             }
-            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
+            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
             if (dol_strlen($obj->email)) print "qualified.";
             else print "disqualified (no email).";
 			print "\n";
@@ -157,7 +157,7 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none')	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldsalerepresentative);
+       			envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
             }
             else
 			{
@@ -192,18 +192,18 @@ 
  *  @param	string	$oldsalerepresentative	Old sale representative
  * 	@return	int								<0 if KO, >0 if OK
  */
-function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresentative)
+function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepresentative)
 {
-    global $conf,$langs;
+    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);
+    $newlangs = new Translate('', $conf);
+    $newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
     $newlangs->load("main");
     $newlangs->load("bills");
 
-    $subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT)?$newlangs->trans("ListOfYourUnpaidInvoices"):$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT);
+    $subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT);
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
@@ -212,26 +212,26 @@ 
     print "- Send email for ".$oldsalerepresentative." (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
-    $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER)) $usehtml+=1;
+    $usehtml = 0;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml += 1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER)) $usehtml += 1;
 
-    $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
+    $allmessage = '';
+    if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
     }
     else
     {
-    	$allmessage.= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml?"<br>\n":"\n");
+    	$allmessage .= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+    	$allmessage .= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage.= $message.($usehtml?"<br>\n":"\n");
-    $allmessage.= $langs->trans("Total")." = ".price($total,0,$newlangs,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $newlangs, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+    if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml+=1;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) $usehtml += 1;
     }
 
     $mail = new CMailFile(
@@ -253,8 +253,8 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
+    	$result = $mail->sendfile();
+    	if (!$result)
     	{
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
@@ -265,7 +265,7 @@ 
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
     	$mail->dump_mail();
-    	$result=1;
+    	$result = 1;
     }
 
     if ($result)

dolibarr/scripts/invoices/email_unpaid_invoices_to_customers.php

Spacing +65 added lines, -65 removed lines

@@ -27,7 +27,7 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -36,7 +36,7 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[2]) || ! $argv[2] || ! in_array($argv[1],array('test','confirm')) || ! in_array($argv[2],array('thirdparties','contacts')))
+if (!isset($argv[2]) || !$argv[2] || !in_array($argv[1], array('test', 'confirm')) || !in_array($argv[2], array('thirdparties', 'contacts')))
 {
 	print "Usage: $script_file (test|confirm) (thirdparties|contacts) [delay] [after]\n";
 	print "\n";
@@ -46,8 +46,8 @@ 
 	print "If you add param after (nb of days), only invoice with due date >= today + delay are included.\n";
 	exit(-1);
 }
-$mode=$argv[1];
-$targettype=$argv[2];
+$mode = $argv[1];
+$targettype = $argv[2];
 
 
 require $path."../../htdocs/master.inc.php";
@@ -56,8 +56,8 @@ 
 $langs->load('main');
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 
@@ -67,44 +67,44 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".join(',',$argv));
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
-$now=dol_now('tzserver');
-$duration_value=isset($argv[3])?$argv[3]:'none';
-$duration_value2=isset($argv[4])?$argv[4]:'none';
+$now = dol_now('tzserver');
+$duration_value = isset($argv[3]) ? $argv[3] : 'none';
+$duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 
 $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";
+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 f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
-$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";
-$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-if ($targettype == 'contacts') $sql.= ", ".MAIN_DB_PREFIX."socpeople as sp";
-$sql.= " WHERE f.fk_statut = 1 AND f.paye = 0";
-$sql.= " AND f.fk_soc = s.rowid";
-if (is_numeric($duration_value2)) $sql.= " AND f.date_lim_reglement >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
-if (is_numeric($duration_value)) $sql.= " AND f.date_lim_reglement < '".$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,";
-$sql.= " s.email ASC, s.rowid ASC, f.ref ASC";	// Order by email to allow one message per email
+$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";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+if ($targettype == 'contacts') $sql .= ", ".MAIN_DB_PREFIX."socpeople as sp";
+$sql .= " WHERE f.fk_statut = 1 AND f.paye = 0";
+$sql .= " AND f.fk_soc = s.rowid";
+if (is_numeric($duration_value2)) $sql .= " AND f.date_lim_reglement >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
+if (is_numeric($duration_value)) $sql .= " AND f.date_lim_reglement < '".$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,";
+$sql .= " s.email ASC, s.rowid ASC, f.ref ASC"; // Order by email to allow one message per email
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
     $num = $db->num_rows($resql);
     $i = 0;
-    $oldemail = 'none'; $oldsid = 0; $oldcid = 0; $oldlang='';
+    $oldemail = 'none'; $oldsid = 0; $oldcid = 0; $oldlang = '';
     $total = 0; $foundtoprocess = 0;
     $trackthirdpartiessent = array();
 
 	print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
     dol_syslog("We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified");
-	$message='';
+	$message = '';
 
     if ($num)
     {
@@ -112,21 +112,21 @@ 
         {
             $obj = $db->fetch_object($resql);
 
-            $newemail=empty($obj->cemail)?$obj->email:$obj->cemail;
+            $newemail = empty($obj->cemail) ? $obj->email : $obj->cemail;
 
             // 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;
+            $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 ($startbreak)
             {
                 // Break onto sales representative (new email or cid)
                 if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
                 {
-                   	envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
-                   	$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+                   	envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget);
+                   	$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
                 }
                 else
 				{
@@ -140,28 +140,28 @@ 
                 $oldsid  = $obj->sid;
                 $oldcid  = $obj->cid;
                 $oldlang = $obj->lang;
-                $oldtarget=(empty($obj->cfirstname) && empty($obj->clastname))?$obj->name:($obj->clastname." ".$obj->cfirstname);
+                $oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
                 $message = '';
                 $total   = 0;
                 $foundtoprocess = 0;
-                $target=(empty($obj->cfirstname) && empty($obj->clastname))?$obj->name:($obj->clastname." ".$obj->cfirstname);
+                $target = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
                 //if (empty($newemail)) print "Warning: Customer ".$target." has no email. Notice disabled.\n";
             }
 
             // Define line content
-            $outputlangs=new Translate('',$conf);
-            $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang);	// By default language of customer
+            $outputlangs = new Translate('', $conf);
+            $outputlangs->setDefaultLang(empty($obj->default_lang) ? $langs->defaultlang : $obj->default_lang); // By default language of customer
 
             // Load translation files required by the page
             $outputlangs->loadLangs(array("main", "bills"));
 
             if (dol_strlen($newemail))
             {
-            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."\n";
+            	$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)."\n";
             	dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
             	$foundtoprocess++;
             }
-            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date),'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid?"contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", ":"")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
+            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), '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).";
             print "\n";
@@ -178,8 +178,8 @@ 
         {
             if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))	// Break onto email (new email)
             {
-       			envoi_mail($mode,$oldemail,$message,$total,$oldlang,$oldtarget);
-       			$trackthirdpartiessent[$oldsid.'|'.$oldemail]='contact id '.$oldcid;
+       			envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget);
+       			$trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
             }
             else
 			{
@@ -218,18 +218,18 @@ 
  *  @param	string	$oldtarget		Target name
  * 	@return	int						<0 if KO, >0 if OK
  */
-function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget)
+function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 {
-    global $conf,$langs;
+    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);
+    $newlangs = new Translate('', $conf);
+    $newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
     $newlangs->load("main");
     $newlangs->load("bills");
 
-    $subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT)?$newlangs->trans("ListOfYourUnpaidInvoices"):$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT);
+    $subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT);
     $sendto = $oldemail;
     $from = $conf->global->MAIN_MAIL_EMAIL_FROM;
     $errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
@@ -238,27 +238,27 @@ 
     print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
     dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
-    $usehtml=0;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
-    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) $usehtml+=1;
+    $usehtml = 0;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml += 1;
+    if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) $usehtml += 1;
 
-    $allmessage='';
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
+    $allmessage = '';
+    if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
     }
     else
     {
-    	$allmessage.= "Dear customer".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= "Please, find a summary of the bills with pending payments from you.".($usehtml?"<br>\n":"\n").($usehtml?"<br>\n":"\n");
-    	$allmessage.= "Note: This list contains only unpaid invoices.".($usehtml?"<br>\n":"\n");
+    	$allmessage .= "Dear customer".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+    	$allmessage .= "Please, find a summary of the bills with pending payments from you.".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+    	$allmessage .= "Note: This list contains only unpaid invoices.".($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage.= $message.($usehtml?"<br>\n":"\n");
-    $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
-    if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+    if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER))
     {
-    	$allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
-    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml+=1;
+    	$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
+    	if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) $usehtml += 1;
     }
 
     $mail = new CMailFile(
@@ -280,8 +280,8 @@ 
     // Send or not email
     if ($mode == 'confirm')
     {
-    	$result=$mail->sendfile();
-    	if (! $result)
+    	$result = $mail->sendfile();
+    	if (!$result)
     	{
     		print "Error sending email ".$mail->error."\n";
     		dol_syslog("Error sending email ".$mail->error."\n");
@@ -292,7 +292,7 @@ 
     	print "No email sent (test mode)\n";
     	dol_syslog("No email sent (test mode)");
     	$mail->dump_mail();
-    	$result=1;
+    	$result = 1;
     }
 
     unset($newlangs);