alxarafe / alixar

dolibarr/dev/initdata/import-products.php

Indentation +37 added lines, -37 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -164,56 +164,56 @@ 
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else
-	{
-	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
-	}
+    else
+    {
+        print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
+    }
 
-	dol_syslog("Add prices");
+    dol_syslog("Add prices");
 
     // If we use price level, insert price for each level
-	if (! $errorrecord && 1)
-	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
-	    if ($ret1 < 0 || $ret2 < 0)
+    if (! $errorrecord && 1)
+    {
+        $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+        $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - updatePrice OK";
-    	}
-	}
+        else
+        {
+            print " - updatePrice OK";
+        }
+    }
 
-	dol_syslog("Add multilangs");
+    dol_syslog("Add multilangs");
 
-	// Add alternative languages
-	if (! $errorrecord && 1)
-	{
-    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
-	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+    // Add alternative languages
+    if (! $errorrecord && 1)
+    {
+        $produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+        $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
 
-    	$ret=$produit->setMultiLangs($user);
+        $ret=$produit->setMultiLangs($user);
         if ($ret < 0)
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - setMultiLangs OK";
-    	}
-	}
-
-	print "\n";
-
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+        else
+        {
+            print " - setMultiLangs OK";
+        }
+    }
+
+    print "\n";
+
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

Spacing +34 added lines, -34 removed lines

@@ -28,27 +28,27 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
     exit;
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
+$path = preg_replace('/import-products.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -57,29 +57,29 @@ 
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
-$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[4])?1:$argv[4];
-$endlinenb = empty($argv[5])?0:$argv[5];
+$defaultlang = empty($argv[3]) ? 'en_US' : $argv[3];
+$startlinenb = empty($argv[4]) ? 1 : $argv[4];
+$endlinenb = empty($argv[5]) ? 0 : $argv[5];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || !in_array($mode, array('test', 'confirm', 'confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
     print "\n";
     exit(-1);
 }
-if (! file_exists($filepath)) {
+if (!file_exists($filepath)) {
     print "Error: File ".$filepath." not found.\n";
     print "\n";
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -87,7 +87,7 @@ 
 $user->getrights();
 
 // Ask confirmation
-if (! $confirmed)
+if (!$confirmed)
 {
     print "Hit Enter to continue or CTRL+C to stop...\n";
     $input = trim(fgets(STDIN));
@@ -95,13 +95,13 @@ 
 
 // Open input and ouput files
 $fhandle = fopen($filepath, 'r');
-if (! $fhandle)
+if (!$fhandle)
 {
     print 'Error: Failed to open file '.$filepath."\n";
     exit(1);
 }
 $fhandleerr = fopen($filepatherr, 'w');
-if (! $fhandleerr)
+if (!$fhandleerr)
 {
     print 'Error: Failed to open file '.$filepatherr."\n";
     exit(1);
@@ -112,12 +112,12 @@ 
 
 $db->begin();
 
-$i=0;
+$i = 0;
 $nboflines++;
-while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
+while ($fields = fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
-    $errorrecord=0;
+    $errorrecord = 0;
 
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
@@ -135,7 +135,7 @@ 
     $produit->volume = price2num($fields[8]);
     $produit->volume_unit = 0;
     $produit->weight = price2num($fields[9]);
-    $produit->weight_units = 0;          // -3 = g
+    $produit->weight_units = 0; // -3 = g
 
     $produit->customcode = $fields[10];
     $produit->barcode = $fields[1];
@@ -156,9 +156,9 @@ 
     $produit->cost_price = price2num($fields[16]);
 
     // Extrafields
-    $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
+    $produit->array_options['options_ecotaxdeee'] = price2num($fields[17]);
 
-    $ret=$produit->create($user);
+    $ret = $produit->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
@@ -172,10 +172,10 @@ 
 	dol_syslog("Add prices");
 
     // If we use price level, insert price for each level
-	if (! $errorrecord && 1)
+	if (!$errorrecord && 1)
 	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+	    $ret1 = $produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+	    $ret2 = $produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
 	    if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
@@ -190,12 +190,12 @@ 
 	dol_syslog("Add multilangs");
 
 	// Add alternative languages
-	if (! $errorrecord && 1)
+	if (!$errorrecord && 1)
 	{
-    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
-	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+    	$produit->multilangs['fr_FR'] = array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+	    $produit->multilangs['en_US'] = array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
 
-    	$ret=$produit->setMultiLangs($user);
+    	$ret = $produit->setMultiLangs($user);
         if ($ret < 0)
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
@@ -212,7 +212,7 @@ 
 	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
+	    $error++; // $errorrecord will be reset
 	}
 }
 

Braces +10 added lines, -10 removed lines

@@ -119,8 +119,12 @@ 
     $i++;
     $errorrecord=0;
 
-    if ($startlinenb && $i < $startlinenb) continue;
-    if ($endlinenb && $i > $endlinenb) continue;
+    if ($startlinenb && $i < $startlinenb) {
+        continue;
+    }
+    if ($endlinenb && $i > $endlinenb) {
+        continue;
+    }
 
     $nboflines++;
 
@@ -163,8 +167,7 @@ 
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    }
-	else
+    } else
 	{
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
@@ -180,8 +183,7 @@ 
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - updatePrice OK";
     	}
@@ -200,8 +202,7 @@ 
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
+        } else
     	{
     	    print " - setMultiLangs OK";
     	}
@@ -227,8 +228,7 @@ 
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
+} else
 {
     print "Commit all changes.\n";
     $db->commit();

dolibarr/dev/initdata/generate-product.php

Indentation +7 added lines, -7 removed lines

@@ -52,8 +52,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -61,21 +61,21 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-  $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+    $num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
@@ -94,7 +94,7 @@ 
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";
-	else print " OK with ref ".$produit->ref."\n";
+    else print " OK with ref ".$produit->ref."\n";
 }
 
 

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -49,8 +49,8 @@ 
 define(GEN_NUMBER_PRODUIT, 100000);
 
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -59,40 +59,40 @@ 
 
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
   $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+  while ($i < $num) {      $row = $db->fetch_row($resql); $productsid[$i] = $row[0]; $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql); $i = 0;
-    while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
+    while ($i < $num) { $row = $db->fetch_row($resql); $societesid[$i] = $row[0]; $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql); $i = 0;
-    while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
+    while ($i < $num) { $row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++; }
 } else { print "err"; }
 
 
 print "Generates ".GEN_NUMBER_PRODUIT." products\n";
-for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
+for ($s = 0; $s < GEN_NUMBER_PRODUIT; $s++)
 {
     print "Product ".$s;
     $produit = new Product($db);
-    $produit->type = mt_rand(0,1);
+    $produit->type = mt_rand(0, 1);
     $produit->status = 1;
-    $produit->ref = ($produit->type?'S':'P').time().$s;
+    $produit->ref = ($produit->type ? 'S' : 'P').time().$s;
     $produit->label = 'Label '.time().$s;
     $produit->description = 'Description '.time().$s;
-    $produit->price = mt_rand(1,1000);
+    $produit->price = mt_rand(1, 1000);
     $produit->tva_tx = "19.6";
-    $ret=$produit->create($user);
+    $ret = $produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";
 	else print " OK with ref ".$produit->ref."\n";
 }

Braces +6 added lines, -3 removed lines

@@ -93,8 +93,11 @@
     $produit->price = mt_rand(1,1000);
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
-    if ($ret < 0) print "Error $ret - ".$produit->error."\n";
-	else print " OK with ref ".$produit->ref."\n";
-}
+    if ($ret < 0) {
+        print "Error $ret - ".$produit->error."\n";
+    } else {
+	    print " OK with ref ".$produit->ref."\n";
+	}
+	}
 
 

dolibarr/dev/initdata/generate-proposal.php

Indentation +74 added lines, -74 removed lines

@@ -27,8 +27,8 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-	exit;
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
 }
 
 // Recupere root dolibarr
@@ -100,8 +100,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -111,14 +111,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$socids[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $socids[$i] = $row[0];
+    }
 }
 
 $contids = array();
@@ -126,14 +126,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_conts = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_conts)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$contids[$row[1]][0] = $row[0]; // A ameliorer
-	}
+    $num_conts = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_conts)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $contids[$row[1]][0] = $row[0]; // A ameliorer
+    }
 }
 
 $prodids = array();
@@ -141,14 +141,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_prods = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_prods)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$prodids[$i] = $row[0];
-	}
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
+    }
 }
 
 $user->rights->propal->creer=1;
@@ -157,65 +157,65 @@ 
 
 if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
+    require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
 }
 
 $i=0;
 $result=0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
-	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
-	print "Proposal ".$i." for socid ".$socid;
+    $i++;
+    $socid = mt_rand(1, $num_thirdparties);
+    print "Proposal ".$i." for socid ".$socid;
 
-	$soc = new Societe($db);
+    $soc = new Societe($db);
 
 
-	$object = new Propal($db);
+    $object = new Propal($db);
 
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1,2));
     $fuser->getRights();
     
-	$object->contactid = $contids[$socids[$socid]][0];
-	$object->socid = $socids[$socid];
-	$object->datep = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
-
-	$result=$object->create($fuser);
-	if ($result >= 0)
-	{
-		$nbp = mt_rand(2, 5);
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
-			if ($result < 0)
-			{
-				dol_print_error($db,$object->error);
-			}
-			$xnbp++;
-		}
+    $object->contactid = $contids[$socids[$socid]][0];
+    $object->socid = $socids[$socid];
+    $object->datep = $dates[mt_rand(1, count($dates)-1)];
+    $object->cond_reglement_id = 3;
+    $object->mode_reglement_id = 3;
+
+    $result=$object->create($fuser);
+    if ($result >= 0)
+    {
+        $nbp = mt_rand(2, 5);
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $prodid = mt_rand(1, $num_prods);
+            $product=new Product($db);
+            $result=$product->fetch($prodids[$prodid]);
+            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+            if ($result < 0)
+            {
+                dol_print_error($db,$object->error);
+            }
+            $xnbp++;
+        }
 		
-		$result=$object->valid($fuser);
-		if ($result > 0)
-		{
-		    $db->commit();
-		    print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
-		    print " KO\n";
-		    $db->rollback();
-		    dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+        $result=$object->valid($fuser);
+        if ($result > 0)
+        {
+            $db->commit();
+            print " OK with ref ".$object->ref."\n";
+        }
+        else
+        {
+            print " KO\n";
+            $db->rollback();
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }

Spacing +69 added lines, -69 removed lines

@@ -33,7 +33,7 @@ 
 
 // Recupere root dolibarr
 //$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
-require __DIR__. '/../../htdocs/master.inc.php';
+require __DIR__.'/../../htdocs/master.inc.php';
 require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
 require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
@@ -45,60 +45,60 @@ 
 
 define(GEN_NUMBER_PROPAL, 10);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
-    mktime(12,0,0,1,9,$year),
-    mktime(12,0,0,2,13,$year),
-    mktime(12,0,0,2,23,$year),
-    mktime(12,0,0,3,30,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,4,3,$year),
-    mktime(12,0,0,5,9,$year),
-    mktime(12,0,0,5,1,$year),
-    mktime(12,0,0,5,13,$year),
-    mktime(12,0,0,5,19,$year),
-    mktime(12,0,0,5,23,$year),
-    mktime(12,0,0,6,3,$year),
-    mktime(12,0,0,6,19,$year),
-    mktime(12,0,0,6,24,$year),
-    mktime(12,0,0,7,3,$year),
-    mktime(12,0,0,7,9,$year),
-    mktime(12,0,0,7,23,$year),
-    mktime(12,0,0,7,30,$year),
-    mktime(12,0,0,8,9,$year),
-    mktime(12,0,0,9,23,$year),
-    mktime(12,0,0,10,3,$year),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,1,3,($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
-    mktime(12,0,0,11,12,$year),
-    mktime(12,0,0,11,13,$year),
-    mktime(12,0,0,12,12,$year),
-    mktime(12,0,0,12,13,$year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
+    mktime(12, 0, 0, 1, 9, $year),
+    mktime(12, 0, 0, 2, 13, $year),
+    mktime(12, 0, 0, 2, 23, $year),
+    mktime(12, 0, 0, 3, 30, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 4, 3, $year),
+    mktime(12, 0, 0, 5, 9, $year),
+    mktime(12, 0, 0, 5, 1, $year),
+    mktime(12, 0, 0, 5, 13, $year),
+    mktime(12, 0, 0, 5, 19, $year),
+    mktime(12, 0, 0, 5, 23, $year),
+    mktime(12, 0, 0, 6, 3, $year),
+    mktime(12, 0, 0, 6, 19, $year),
+    mktime(12, 0, 0, 6, 24, $year),
+    mktime(12, 0, 0, 7, 3, $year),
+    mktime(12, 0, 0, 7, 9, $year),
+    mktime(12, 0, 0, 7, 23, $year),
+    mktime(12, 0, 0, 7, 30, $year),
+    mktime(12, 0, 0, 8, 9, $year),
+    mktime(12, 0, 0, 9, 23, $year),
+    mktime(12, 0, 0, 10, 3, $year),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
+    mktime(12, 0, 0, 11, 12, $year),
+    mktime(12, 0, 0, 11, 13, $year),
+    mktime(12, 0, 0, 12, 12, $year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
-if (! $ret > 0)
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -151,17 +151,17 @@ 
 	}
 }
 
-$user->rights->propal->creer=1;
-$user->rights->propal->propal_advance->validate=1;
+$user->rights->propal->creer = 1;
+$user->rights->propal->propal_advance->validate = 1;
 
 
-if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
+if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 {
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
+	require_once DOL_DOCUMENT_ROOT."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
 }
 
-$i=0;
-$result=0;
+$i = 0;
+$result = 0;
 while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 {
 	$i++;
@@ -174,16 +174,16 @@ 
 	$object = new Propal($db);
 
     $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
+    $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
     
 	$object->contactid = $contids[$socids[$socid]][0];
 	$object->socid = $socids[$socid];
-	$object->datep = $dates[mt_rand(1, count($dates)-1)];
+	$object->datep = $dates[mt_rand(1, count($dates) - 1)];
 	$object->cond_reglement_id = 3;
 	$object->mode_reglement_id = 3;
 
-	$result=$object->create($fuser);
+	$result = $object->create($fuser);
 	if ($result >= 0)
 	{
 		$nbp = mt_rand(2, 5);
@@ -191,17 +191,17 @@ 
 		while ($xnbp < $nbp)
 		{
 			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$product = new Product($db);
+			$result = $product->fetch($prodids[$prodid]);
+			$result = $object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
-				dol_print_error($db,$object->error);
+				dol_print_error($db, $object->error);
 			}
 			$xnbp++;
 		}
 		
-		$result=$object->valid($fuser);
+		$result = $object->valid($fuser);
 		if ($result > 0)
 		{
 		    $db->commit();
@@ -211,11 +211,11 @@ 
 		{
 		    print " KO\n";
 		    $db->rollback();
-		    dol_print_error($db,$object->error);
+		    dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -206,15 +206,13 @@
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		}
-		else
+		} else
 		{
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db,$object->error);
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db,$object->error);
 	}

dolibarr/scripts/emailings/mailing-send.php

Indentation +297 added lines, -297 removed lines

@@ -32,13 +32,13 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
-	print "Usage: ".$script_file." (ID_MAILING|all)\n";
-	exit(-1);
+    print "Usage: ".$script_file." (ID_MAILING|all)\n";
+    exit(-1);
 }
 $id=$argv[1];
 if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
@@ -76,206 +76,206 @@ 
 $sql.= " WHERE m.statut IN (1,2)";
 if ($id != 'all')
 {
-	$sql.= " AND m.rowid= ".$id;
-	$sql.= " LIMIT 1";
+    $sql.= " AND m.rowid= ".$id;
+    $sql.= " LIMIT 1";
 }
 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$j = 0;
-
-	if ($num)
-	{
-		for ($j=0; $j<$num; $j++)
-		{
-			$obj = $db->fetch_object($resql);
-
-			dol_syslog("Process mailing with id ".$obj->rowid);
-			print "Process mailing with id ".$obj->rowid."\n";
-
-			$emailing = new Mailing($db);
-			$emailing->fetch($obj->rowid);
-
-			$id       = $emailing->id;
-			$subject  = $emailing->sujet;
-			$message  = $emailing->body;
-			$from     = $emailing->email_from;
-			$replyto  = $emailing->email_replyto;
-			$errorsto = $emailing->email_errorsto;
-			// Le message est-il en html
-			$msgishtml=-1;  // Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
-
-			$nbok=0; $nbko=0;
-
-			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
-			// ou envoyes en erreur (statut=-1)
-			$sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
-			$sql2.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-			$sql2.= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
-			if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0)
-			{
-				$sql2.= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
-			}
-
-			$resql2=$db->query($sql2);
-			if ($resql2)
-			{
-				$num2 = $db->num_rows($resql2);
-				dol_syslog("Nb of targets = ".$num2, LOG_DEBUG);
-				print "Nb of targets = ".$num2."\n";
-
-				if ($num2)
-				{
-					$now=dol_now();
-
-					// Positionne date debut envoi
-					$sqlstartdate="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
-					$resqlstartdate=$db->query($sqlstartdate);
-					if (! $resqlstartdate)
-					{
-						dol_print_error($db);
-						$error++;
-					}
-
-					// Look on each email and sent message
-					$i = 0;
-					while ($i < $num2)
-					{
-						// Here code is common with same loop ino card.php
-						$res=1;
-						$now=dol_now();
-
-						$obj = $db->fetch_object($resql2);
-
-						// sendto en RFC2822
-						$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname) ." <".$obj->email.">");
-
-						// Make subtsitutions on topic and body
-						$other=explode(';',$obj->other);
-						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
-
-						$object = null;		// Not defined with mass emailing
-						$parameters=array('mode'=>'emailing');
-						$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $object);			// Note: On mass emailing, this is null because we don't know object
-
-						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-						$substitutionarray['__ID__'] = $obj->source_id;
-						$substitutionarray['__EMAIL__'] = $obj->email;
-						$substitutionarray['__LASTNAME__'] = $obj->lastname;
-						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
-						$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
-						$substitutionarray['__OTHER1__'] = $other1;
-						$substitutionarray['__OTHER2__'] = $other2;
-						$substitutionarray['__OTHER3__'] = $other3;
-						$substitutionarray['__OTHER4__'] = $other4;
-						$substitutionarray['__OTHER5__'] = $other5;
-						$substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
-
-						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-						{
-							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
-							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
-							}
-						}
-						/* For backward compatibility */
-						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-						{
-							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
-						}
-
-						complete_substitutions_array($substitutionarray,$langs);
-						$newsubject=make_substitutions($subject,$substitutionarray);
-						$newmessage=make_substitutions($message,$substitutionarray);
-
-						$substitutionisok=true;
-
-						// Fabrication du mail
-						$trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
-						$mail = new CMailFile(
-							$newsubject,
-							$sendto,
-							$from,
-							$newmessage,
-							array(),
-							array(),
-							array(),
-							'',
-							'',
-							0,
-							$msgishtml,
-							$errorsto,
-							'',
-							$trackid,
-							'',
-							'emailing'
-						);
-
-						if ($mail->error)
-						{
-							$res=0;
-						}
-						if (! $substitutionisok)
-						{
-							$mail->error='Some substitution failed';
-							$res=0;
-						}
-
-						// Send Email
-						if ($res)
-						{
-							$res=$mail->sendfile();
-						}
-
-						if ($res)
-						{
-							// Mail successful
-							$nbok++;
-
-							dol_syslog("ok for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
-							// Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
-							// We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
-							// Run trigger
-							/*
+    $num = $db->num_rows($resql);
+    $j = 0;
+
+    if ($num)
+    {
+        for ($j=0; $j<$num; $j++)
+        {
+            $obj = $db->fetch_object($resql);
+
+            dol_syslog("Process mailing with id ".$obj->rowid);
+            print "Process mailing with id ".$obj->rowid."\n";
+
+            $emailing = new Mailing($db);
+            $emailing->fetch($obj->rowid);
+
+            $id       = $emailing->id;
+            $subject  = $emailing->sujet;
+            $message  = $emailing->body;
+            $from     = $emailing->email_from;
+            $replyto  = $emailing->email_replyto;
+            $errorsto = $emailing->email_errorsto;
+            // Le message est-il en html
+            $msgishtml=-1;  // Unknown by default
+            if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+
+            $nbok=0; $nbko=0;
+
+            // On choisit les mails non deja envoyes pour ce mailing (statut=0)
+            // ou envoyes en erreur (statut=-1)
+            $sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
+            $sql2.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+            $sql2.= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
+            if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0)
+            {
+                $sql2.= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
+            }
+
+            $resql2=$db->query($sql2);
+            if ($resql2)
+            {
+                $num2 = $db->num_rows($resql2);
+                dol_syslog("Nb of targets = ".$num2, LOG_DEBUG);
+                print "Nb of targets = ".$num2."\n";
+
+                if ($num2)
+                {
+                    $now=dol_now();
+
+                    // Positionne date debut envoi
+                    $sqlstartdate="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
+                    $resqlstartdate=$db->query($sqlstartdate);
+                    if (! $resqlstartdate)
+                    {
+                        dol_print_error($db);
+                        $error++;
+                    }
+
+                    // Look on each email and sent message
+                    $i = 0;
+                    while ($i < $num2)
+                    {
+                        // Here code is common with same loop ino card.php
+                        $res=1;
+                        $now=dol_now();
+
+                        $obj = $db->fetch_object($resql2);
+
+                        // sendto en RFC2822
+                        $sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname) ." <".$obj->email.">");
+
+                        // Make subtsitutions on topic and body
+                        $other=explode(';',$obj->other);
+                        $tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+
+                        $object = null;		// Not defined with mass emailing
+                        $parameters=array('mode'=>'emailing');
+                        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $object);			// Note: On mass emailing, this is null because we don't know object
+
+                        // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+                        $substitutionarray['__ID__'] = $obj->source_id;
+                        $substitutionarray['__EMAIL__'] = $obj->email;
+                        $substitutionarray['__LASTNAME__'] = $obj->lastname;
+                        $substitutionarray['__FIRSTNAME__'] = $obj->firstname;
+                        $substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
+                        $substitutionarray['__OTHER1__'] = $other1;
+                        $substitutionarray['__OTHER2__'] = $other2;
+                        $substitutionarray['__OTHER3__'] = $other3;
+                        $substitutionarray['__OTHER4__'] = $other4;
+                        $substitutionarray['__OTHER5__'] = $other5;
+                        $substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
+                        $substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
+                        $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+                        $substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+
+                        $onlinepaymentenabled = 0;
+                        if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
+                        if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
+                        if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+                        if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+                        {
+                            $substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+                            {
+                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                            }
+                            else
+                            {
+                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+                            }
+                        }
+                        /* For backward compatibility */
+                        if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+                        {
+                            $substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+                        }
+
+                        complete_substitutions_array($substitutionarray,$langs);
+                        $newsubject=make_substitutions($subject,$substitutionarray);
+                        $newmessage=make_substitutions($message,$substitutionarray);
+
+                        $substitutionisok=true;
+
+                        // Fabrication du mail
+                        $trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
+                        $mail = new CMailFile(
+                            $newsubject,
+                            $sendto,
+                            $from,
+                            $newmessage,
+                            array(),
+                            array(),
+                            array(),
+                            '',
+                            '',
+                            0,
+                            $msgishtml,
+                            $errorsto,
+                            '',
+                            $trackid,
+                            '',
+                            'emailing'
+                        );
+
+                        if ($mail->error)
+                        {
+                            $res=0;
+                        }
+                        if (! $substitutionisok)
+                        {
+                            $mail->error='Some substitution failed';
+                            $res=0;
+                        }
+
+                        // Send Email
+                        if ($res)
+                        {
+                            $res=$mail->sendfile();
+                        }
+
+                        if ($res)
+                        {
+                            // Mail successful
+                            $nbok++;
+
+                            dol_syslog("ok for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+                            // Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
+                            // We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
+                            // Run trigger
+                            /*
 							if ($obj->source_type == 'contact')
 							{
 							    $emailing->sendtoid = $obj->source_id;
@@ -290,107 +290,107 @@ 
                             // End call triggers
 						    */
 
-							$sqlok ="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sqlok.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resqlok=$db->query($sqlok);
-							if (! $resqlok)
-							{
-								dol_print_error($db);
-								$error++;
-							}
-							else
-							{
-								//if cheack read is use then update prospect contact status
-								if (strpos($message, '__CHECK_READ__') !== false)
-								{
-									//Update status communication of thirdparty prospect
-									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
-									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
-									$resqlx=$db->query($sqlx);
-									if (! $resqlx)
-									{
-										dol_print_error($db);
-										$error++;
-									}
-
-									//Update status communication of contact prospect
-									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
-									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
-
-									$resqlx=$db->query($sqlx);
-									if (! $resqlx)
-									{
-										dol_print_error($db);
-										$error++;
-									}
-								}
-
-								if (!empty($conf->global->MAILING_DELAY)) {
-									sleep($conf->global->MAILING_DELAY);
-								}
-							}
-						}
-						else
-						{
-							// Mail failed
-							$nbko++;
-
-							dol_syslog("error for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
-							$sqlerror="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sqlerror.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
-							$resqlerror=$db->query($sqlerror);
-							if (! $resqlerror)
-							{
-								dol_print_error($db);
-								$error++;
-							}
-						}
-
-						$i++;
-					}
-				}
-				else
-				{
-					$mesg="Emailing id ".$id." has no recipient to target";
-					print $mesg."\n";
-					dol_syslog($mesg,LOG_ERR);
-				}
-
-				// Loop finished, set global statut of mail
-				$statut=2;
-				if (! $nbko) $statut=3;
-
-				$sqlenddate="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
-
-				dol_syslog("update global status", LOG_DEBUG);
-				print "Update status of emailing id ".$id." to ".$statut."\n";
-				$resqlenddate=$db->query($sqlenddate);
-				if (! $resqlenddate)
-				{
-					dol_print_error($db);
-					$error++;
-				}
-			}
-			else
-			{
-				dol_print_error($db);
-				$error++;
-			}
-		}
-	}
-	else
-	{
-		$mesg="No validated emailing id to send found.";
-		print $mesg."\n";
-		dol_syslog($mesg,LOG_ERR);
-		$error++;
-	}
+                            $sqlok ="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sqlok.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+                            $resqlok=$db->query($sqlok);
+                            if (! $resqlok)
+                            {
+                                dol_print_error($db);
+                                $error++;
+                            }
+                            else
+                            {
+                                //if cheack read is use then update prospect contact status
+                                if (strpos($message, '__CHECK_READ__') !== false)
+                                {
+                                    //Update status communication of thirdparty prospect
+                                    $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
+                                    dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
+                                    $resqlx=$db->query($sqlx);
+                                    if (! $resqlx)
+                                    {
+                                        dol_print_error($db);
+                                        $error++;
+                                    }
+
+                                    //Update status communication of contact prospect
+                                    $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+                                    dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
+
+                                    $resqlx=$db->query($sqlx);
+                                    if (! $resqlx)
+                                    {
+                                        dol_print_error($db);
+                                        $error++;
+                                    }
+                                }
+
+                                if (!empty($conf->global->MAILING_DELAY)) {
+                                    sleep($conf->global->MAILING_DELAY);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // Mail failed
+                            $nbko++;
+
+                            dol_syslog("error for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+                            $sqlerror="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sqlerror.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
+                            $resqlerror=$db->query($sqlerror);
+                            if (! $resqlerror)
+                            {
+                                dol_print_error($db);
+                                $error++;
+                            }
+                        }
+
+                        $i++;
+                    }
+                }
+                else
+                {
+                    $mesg="Emailing id ".$id." has no recipient to target";
+                    print $mesg."\n";
+                    dol_syslog($mesg,LOG_ERR);
+                }
+
+                // Loop finished, set global statut of mail
+                $statut=2;
+                if (! $nbko) $statut=3;
+
+                $sqlenddate="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
+
+                dol_syslog("update global status", LOG_DEBUG);
+                print "Update status of emailing id ".$id." to ".$statut."\n";
+                $resqlenddate=$db->query($sqlenddate);
+                if (! $resqlenddate)
+                {
+                    dol_print_error($db);
+                    $error++;
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+                $error++;
+            }
+        }
+    }
+    else
+    {
+        $mesg="No validated emailing id to send found.";
+        print $mesg."\n";
+        dol_syslog($mesg,LOG_ERR);
+        $error++;
+    }
 }
 else
 {
-	dol_print_error($db);
-	$error++;
+    dol_print_error($db);
+    $error++;
 }
 
 

Spacing +95 added lines, -95 removed lines

@@ -28,7 +28,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') {
@@ -36,11 +36,11 @@ 
 	exit(-1);
 }
 
-if (! isset($argv[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
 	print "Usage: ".$script_file." (ID_MAILING|all)\n";
 	exit(-1);
 }
-$id=$argv[1];
+$id = $argv[1];
 if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
 else $login = '';
 
@@ -50,8 +50,8 @@ 
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 
@@ -68,19 +68,19 @@ 
 
 $user = new User($db);
 // for signature, we use user send as parameter
-if (! empty($login)) $user->fetch('',$login);
+if (!empty($login)) $user->fetch('', $login);
 
 // We get list of emailing id to process
 $sql = "SELECT m.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-$sql.= " WHERE m.statut IN (1,2)";
+$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+$sql .= " WHERE m.statut IN (1,2)";
 if ($id != 'all')
 {
-	$sql.= " AND m.rowid= ".$id;
-	$sql.= " LIMIT 1";
+	$sql .= " AND m.rowid= ".$id;
+	$sql .= " LIMIT 1";
 }
 
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -88,7 +88,7 @@ 
 
 	if ($num)
 	{
-		for ($j=0; $j<$num; $j++)
+		for ($j = 0; $j < $num; $j++)
 		{
 			$obj = $db->fetch_object($resql);
 
@@ -105,22 +105,22 @@ 
 			$replyto  = $emailing->email_replyto;
 			$errorsto = $emailing->email_errorsto;
 			// Le message est-il en html
-			$msgishtml=-1;  // Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+			$msgishtml = -1; // Unknown by default
+			if (preg_match('/[\s\t]*<html>/i', $message)) $msgishtml = 1;
 
-			$nbok=0; $nbko=0;
+			$nbok = 0; $nbko = 0;
 
 			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
 			// ou envoyes en erreur (statut=-1)
 			$sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
-			$sql2.= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-			$sql2.= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
+			$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+			$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$id;
 			if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0)
 			{
-				$sql2.= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
+				$sql2 .= " LIMIT ".$conf->global->MAILING_LIMIT_SENDBYCLI;
 			}
 
-			$resql2=$db->query($sql2);
+			$resql2 = $db->query($sql2);
 			if ($resql2)
 			{
 				$num2 = $db->num_rows($resql2);
@@ -129,12 +129,12 @@ 
 
 				if ($num2)
 				{
-					$now=dol_now();
+					$now = dol_now();
 
 					// Positionne date debut envoi
-					$sqlstartdate="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
-					$resqlstartdate=$db->query($sqlstartdate);
-					if (! $resqlstartdate)
+					$sqlstartdate = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$id;
+					$resqlstartdate = $db->query($sqlstartdate);
+					if (!$resqlstartdate)
 					{
 						dol_print_error($db);
 						$error++;
@@ -145,26 +145,26 @@ 
 					while ($i < $num2)
 					{
 						// Here code is common with same loop ino card.php
-						$res=1;
-						$now=dol_now();
+						$res = 1;
+						$now = dol_now();
 
 						$obj = $db->fetch_object($resql2);
 
 						// sendto en RFC2822
-						$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname) ." <".$obj->email.">");
+						$sendto = str_replace(',', ' ', dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">");
 
 						// Make subtsitutions on topic and body
-						$other=explode(';',$obj->other);
-						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
-
-						$object = null;		// Not defined with mass emailing
-						$parameters=array('mode'=>'emailing');
-						$substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $object);			// Note: On mass emailing, this is null because we don't know object
+						$other = explode(';', $obj->other);
+						$tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+
+						$object = null; // Not defined with mass emailing
+						$parameters = array('mode'=>'emailing');
+						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $object); // Note: On mass emailing, this is null because we don't know object
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
@@ -177,59 +177,59 @@ 
 						$substitutionarray['__OTHER3__'] = $other3;
 						$substitutionarray['__OTHER4__'] = $other4;
 						$substitutionarray['__OTHER5__'] = $other5;
-						$substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
+						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
+						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
 						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
 						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+						if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
+						if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
+						if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
-							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							}
 							else
 							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 							}
 						}
 						/* For backward compatibility */
-						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN))
 						{
-							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 						}
 
-						complete_substitutions_array($substitutionarray,$langs);
-						$newsubject=make_substitutions($subject,$substitutionarray);
-						$newmessage=make_substitutions($message,$substitutionarray);
+						complete_substitutions_array($substitutionarray, $langs);
+						$newsubject = make_substitutions($subject, $substitutionarray);
+						$newmessage = make_substitutions($message, $substitutionarray);
 
-						$substitutionisok=true;
+						$substitutionisok = true;
 
 						// Fabrication du mail
-						$trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
+						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
 						$mail = new CMailFile(
 							$newsubject,
 							$sendto,
@@ -251,18 +251,18 @@ 
 
 						if ($mail->error)
 						{
-							$res=0;
+							$res = 0;
 						}
-						if (! $substitutionisok)
+						if (!$substitutionisok)
 						{
-							$mail->error='Some substitution failed';
-							$res=0;
+							$mail->error = 'Some substitution failed';
+							$res = 0;
 						}
 
 						// Send Email
 						if ($res)
 						{
-							$res=$mail->sendfile();
+							$res = $mail->sendfile();
 						}
 
 						if ($res)
@@ -270,7 +270,7 @@ 
 							// Mail successful
 							$nbok++;
 
-							dol_syslog("ok for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+							dol_syslog("ok for emailing id ".$id." #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
 							// Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
 							// We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
@@ -290,10 +290,10 @@ 
                             // End call triggers
 						    */
 
-							$sqlok ="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sqlok.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resqlok=$db->query($sqlok);
-							if (! $resqlok)
+							$sqlok = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+							$sqlok .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$resqlok = $db->query($sqlok);
+							if (!$resqlok)
 							{
 								dol_print_error($db);
 								$error++;
@@ -306,8 +306,8 @@ 
 									//Update status communication of thirdparty prospect
 									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
 									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
-									$resqlx=$db->query($sqlx);
-									if (! $resqlx)
+									$resqlx = $db->query($sqlx);
+									if (!$resqlx)
 									{
 										dol_print_error($db);
 										$error++;
@@ -317,8 +317,8 @@ 
 									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
-									$resqlx=$db->query($sqlx);
-									if (! $resqlx)
+									$resqlx = $db->query($sqlx);
+									if (!$resqlx)
 									{
 										dol_print_error($db);
 										$error++;
@@ -335,12 +335,12 @@ 
 							// Mail failed
 							$nbko++;
 
-							dol_syslog("error for emailing id ".$id." #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+							dol_syslog("error for emailing id ".$id." #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
-							$sqlerror="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sqlerror.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
-							$resqlerror=$db->query($sqlerror);
-							if (! $resqlerror)
+							$sqlerror = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+							$sqlerror .= " SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
+							$resqlerror = $db->query($sqlerror);
+							if (!$resqlerror)
 							{
 								dol_print_error($db);
 								$error++;
@@ -352,21 +352,21 @@ 
 				}
 				else
 				{
-					$mesg="Emailing id ".$id." has no recipient to target";
+					$mesg = "Emailing id ".$id." has no recipient to target";
 					print $mesg."\n";
-					dol_syslog($mesg,LOG_ERR);
+					dol_syslog($mesg, LOG_ERR);
 				}
 
 				// Loop finished, set global statut of mail
-				$statut=2;
-				if (! $nbko) $statut=3;
+				$statut = 2;
+				if (!$nbko) $statut = 3;
 
-				$sqlenddate="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
+				$sqlenddate = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
 
 				dol_syslog("update global status", LOG_DEBUG);
 				print "Update status of emailing id ".$id." to ".$statut."\n";
-				$resqlenddate=$db->query($sqlenddate);
-				if (! $resqlenddate)
+				$resqlenddate = $db->query($sqlenddate);
+				if (!$resqlenddate)
 				{
 					dol_print_error($db);
 					$error++;
@@ -381,9 +381,9 @@ 
 	}
 	else
 	{
-		$mesg="No validated emailing id to send found.";
+		$mesg = "No validated emailing id to send found.";
 		print $mesg."\n";
-		dol_syslog($mesg,LOG_ERR);
+		dol_syslog($mesg, LOG_ERR);
 		$error++;
 	}
 }

Braces +50 added lines, -30 removed lines

@@ -41,8 +41,11 @@ 
 	exit(-1);
 }
 $id=$argv[1];
-if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2];
-else $login = '';
+if (isset($argv[2]) || !empty($argv[2])) {
+    $login = $argv[2];
+} else {
+    $login = '';
+}
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
@@ -68,7 +71,9 @@ 
 
 $user = new User($db);
 // for signature, we use user send as parameter
-if (! empty($login)) $user->fetch('',$login);
+if (! empty($login)) {
+    $user->fetch('',$login);
+}
 
 // We get list of emailing id to process
 $sql = "SELECT m.rowid";
@@ -106,7 +111,9 @@ 
 			$errorsto = $emailing->email_errorsto;
 			// Le message est-il en html
 			$msgishtml=-1;  // Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+			if (preg_match('/[\s\t]*<html>/i',$message)) {
+			    $msgishtml=1;
+			}
 
 			$nbok=0; $nbko=0;
 
@@ -183,9 +190,15 @@ 
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
 						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+						if (! empty($conf->paypal->enabled)) {
+						    $onlinepaymentenabled++;
+						}
+						if (! empty($conf->paybox->enabled)) {
+						    $onlinepaymentenabled++;
+						}
+						if (! empty($conf->stripe->enabled)) {
+						    $onlinepaymentenabled++;
+						}
 						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
@@ -195,8 +208,7 @@ 
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
+							} else
 							{
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
@@ -209,17 +221,29 @@ 
 						{
 							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							}
 						}
 
 						complete_substitutions_array($substitutionarray,$langs);
@@ -297,8 +321,7 @@ 
 							{
 								dol_print_error($db);
 								$error++;
-							}
-							else
+							} else
 							{
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
@@ -329,8 +352,7 @@ 
 									sleep($conf->global->MAILING_DELAY);
 								}
 							}
-						}
-						else
+						} else
 						{
 							// Mail failed
 							$nbko++;
@@ -349,8 +371,7 @@ 
 
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					$mesg="Emailing id ".$id." has no recipient to target";
 					print $mesg."\n";
@@ -359,7 +380,9 @@ 
 
 				// Loop finished, set global statut of mail
 				$statut=2;
-				if (! $nbko) $statut=3;
+				if (! $nbko) {
+				    $statut=3;
+				}
 
 				$sqlenddate="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
 
@@ -371,23 +394,20 @@ 
 					dol_print_error($db);
 					$error++;
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($db);
 				$error++;
 			}
 		}
-	}
-	else
+	} else
 	{
 		$mesg="No validated emailing id to send found.";
 		print $mesg."\n";
 		dol_syslog($mesg,LOG_ERR);
 		$error++;
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 	$error++;

dolibarr/scripts/accountancy/export-thirdpartyaccount.php

Indentation +112 added lines, -112 removed lines

@@ -38,13 +38,13 @@ 
 // Date range
 $year = GETPOST("year");
 if (empty($year)) {
-	$year_current = strftime("%Y", dol_now());
-	$month_current = strftime("%m", dol_now());
-	$year_start = $year_current;
+    $year_current = strftime("%Y", dol_now());
+    $month_current = strftime("%m", dol_now());
+    $year_start = $year_current;
 } else {
-	$year_current = $year;
-	$month_current = strftime("%m", dol_now());
-	$year_start = $year;
+    $year_current = $year;
+    $month_current = strftime("%m", dol_now());
+    $year_start = $year;
 }
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
@@ -52,42 +52,42 @@ 
 // Quarter
 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;
-		$month_start = GETPOST("month") ? GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		if (! GETPOST('month')) {
-			if (! GETPOST("year") && $month_start > $month_current) {
-				$year_start --;
-				$year_end --;
-			}
-			$month_end = $month_start - 1;
-			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);
-	}
-	if ($q == 1) {
-		$date_start = dol_get_first_day($year_start, 1, false);
-		$date_end = dol_get_last_day($year_start, 3, false);
-	}
-	if ($q == 2) {
-		$date_start = dol_get_first_day($year_start, 4, false);
-		$date_end = dol_get_last_day($year_start, 6, false);
-	}
-	if ($q == 3) {
-		$date_start = dol_get_first_day($year_start, 7, false);
-		$date_end = dol_get_last_day($year_start, 9, false);
-	}
-	if ($q == 4) {
-		$date_start = dol_get_first_day($year_start, 10, false);
-		$date_end = dol_get_last_day($year_start, 12, false);
-	}
+    $q = GETPOST("q") ? GETPOST("q") : 0;
+    if ($q == 0) {
+        // We define date_start and date_end
+        $year_end = $year_start;
+        $month_start = GETPOST("month") ? GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+        if (! GETPOST('month')) {
+            if (! GETPOST("year") && $month_start > $month_current) {
+                $year_start --;
+                $year_end --;
+            }
+            $month_end = $month_start - 1;
+            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);
+    }
+    if ($q == 1) {
+        $date_start = dol_get_first_day($year_start, 1, false);
+        $date_end = dol_get_last_day($year_start, 3, false);
+    }
+    if ($q == 2) {
+        $date_start = dol_get_first_day($year_start, 4, false);
+        $date_end = dol_get_last_day($year_start, 6, false);
+    }
+    if ($q == 3) {
+        $date_start = dol_get_first_day($year_start, 7, false);
+        $date_end = dol_get_last_day($year_start, 9, false);
+    }
+    if ($q == 4) {
+        $date_start = dol_get_first_day($year_start, 10, false);
+        $date_end = dol_get_last_day($year_start, 12, false);
+    }
 } else {
 }
 
@@ -127,10 +127,10 @@ 
 $sql .= " WHERE f.fk_soc = s.rowid";
 $sql .= " AND s.fk_pays = cp.rowid";
 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.datec >= '" . $db->idate($date_start) . "' AND f.datec <= '" . $db->idate($date_end) . "'";
 $sql .= " AND f.entity = " . $conf->entity;
 if ($socid)
-	$sql .= " AND f.fk_soc = " . $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 , ";
@@ -141,10 +141,10 @@ 
 $sql .= " WHERE ff.fk_soc = s.rowid";
 $sql .= " AND s.fk_pays = cp.rowid";
 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.datec >= '" . $db->idate($date_start) . "' AND ff.datec <= '" . $db->idate($date_end) . "'";
 $sql .= " AND ff.entity = " . $conf->entity;
 if ($socid)
-	$sql .= " AND f.fk_soc = " . $socid;
+    $sql .= " AND f.fk_soc = " . $socid;
 $sql .= " GROUP BY name";
 $sql .= ")";
 
@@ -153,81 +153,81 @@ 
 dol_syslog('accountancy/admin/thirdpartyaccount.php:: $sql=' . $sql);
 $resql = $db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	// export csv
-	if (GETPOST('action','aZ09') == 'export_csv') {
+    // export csv
+    if (GETPOST('action','aZ09') == 'export_csv') {
 
-		header('Content-Type: text/csv');
-		header('Content-Disposition: attachment;filename=export_csv.csv');
+        header('Content-Type: text/csv');
+        header('Content-Disposition: attachment;filename=export_csv.csv');
 
-		$obj = $db->fetch_object($resql);
+        $obj = $db->fetch_object($resql);
 
-		print '"' . $obj->compta . '",';
-		print '"' . $obj->address . '",';
-		print '"' . $obj->zip . '",';
-		print '"' . $obj->town . '",';
-		print '"' . $obj->country . '",';
-		print '"' . $obj->phone . '",';
-		print '"' . $obj->fax . '",';
-		print "\n";
-		$i ++;
-	}
+        print '"' . $obj->compta . '",';
+        print '"' . $obj->address . '",';
+        print '"' . $obj->zip . '",';
+        print '"' . $obj->town . '",';
+        print '"' . $obj->country . '",';
+        print '"' . $obj->phone . '",';
+        print '"' . $obj->fax . '",';
+        print "\n";
+        $i ++;
+    }
 
-	/*
+    /*
 	 * View
 	 */
 
-	$thirdpartystatic = new Societe($db);
-
-	print '<br><br>';
-
-	print '<table class="noborder" width="100%">';
-	print "</table>\n";
-	print '</td><td valign="top" width="70%" class="notopnoleftnoright"></td>';
-	print '</tr><tr><td colspan=2>';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td align="left">' . $langs->trans("ThirdParties") . '</td>';
-	print '<td align="left">' . $langs->trans("AccountNumber") . '</td>';
-	print '<td align="left">' . $langs->trans("RaisonSociale") . '</td>';
-	print '<td align="left">' . $langs->trans("Address") . '</td>';
-	print '<td align="left">' . $langs->trans("Zip") . '</td>';
-	print '<td align="left">' . $langs->trans("Town") . '</td>';
-	print '<td align="left">' . $langs->trans("Country") . '</td>';
-	print '<td align="left">' . $langs->trans("Contact") . '</td>';
-	print '<td align="left">' . $langs->trans("Phone") . '</td>';
-	print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
-
-	while ($obj = $db->fetch_object($resql))
-	{
-		print '<tr class="oddeven">';
-		print '<td>';
-		$thirdpartystatic->id = $obj->rowid;
-		$thirdpartystatic->name = $obj->name;
-		$thirdpartystatic->client = $obj->client;
-		$thirdpartystatic->canvas = $obj->canvas;
-		$thirdpartystatic->status = $obj->status;
-		print $thirdpartystatic->getNomUrl(1);
-		print '</td>';
-		print '<td align="left">' . $obj->compta . '</td>' . "\n";
-		print '<td align="left"></td>';
-		print '<td align="left">' . $obj->address . '</td>';
-		print '<td align="left">' . $obj->zip . '</td>';
-		print '<td align="left">' . $obj->town . '</td>';
-		print '<td align="left">' . $obj->country . '</td>';
-		print '<td align="left"></td>';
-		print '<td align="left">' . $obj->phone . '</td>';
-		print '<td align="left">' . $obj->fax . '</td>';
-		print "</tr>\n";
-
-		$i ++;
-	}
-
-	print "</table>";
-	$db->free($resql);
+    $thirdpartystatic = new Societe($db);
+
+    print '<br><br>';
+
+    print '<table class="noborder" width="100%">';
+    print "</table>\n";
+    print '</td><td valign="top" width="70%" class="notopnoleftnoright"></td>';
+    print '</tr><tr><td colspan=2>';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td align="left">' . $langs->trans("ThirdParties") . '</td>';
+    print '<td align="left">' . $langs->trans("AccountNumber") . '</td>';
+    print '<td align="left">' . $langs->trans("RaisonSociale") . '</td>';
+    print '<td align="left">' . $langs->trans("Address") . '</td>';
+    print '<td align="left">' . $langs->trans("Zip") . '</td>';
+    print '<td align="left">' . $langs->trans("Town") . '</td>';
+    print '<td align="left">' . $langs->trans("Country") . '</td>';
+    print '<td align="left">' . $langs->trans("Contact") . '</td>';
+    print '<td align="left">' . $langs->trans("Phone") . '</td>';
+    print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
+
+    while ($obj = $db->fetch_object($resql))
+    {
+        print '<tr class="oddeven">';
+        print '<td>';
+        $thirdpartystatic->id = $obj->rowid;
+        $thirdpartystatic->name = $obj->name;
+        $thirdpartystatic->client = $obj->client;
+        $thirdpartystatic->canvas = $obj->canvas;
+        $thirdpartystatic->status = $obj->status;
+        print $thirdpartystatic->getNomUrl(1);
+        print '</td>';
+        print '<td align="left">' . $obj->compta . '</td>' . "\n";
+        print '<td align="left"></td>';
+        print '<td align="left">' . $obj->address . '</td>';
+        print '<td align="left">' . $obj->zip . '</td>';
+        print '<td align="left">' . $obj->town . '</td>';
+        print '<td align="left">' . $obj->country . '</td>';
+        print '<td align="left"></td>';
+        print '<td align="left">' . $obj->phone . '</td>';
+        print '<td align="left">' . $obj->fax . '</td>';
+        print "</tr>\n";
+
+        $i ++;
+    }
+
+    print "</table>";
+    $db->free($resql);
 } else {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 llxFooter();

Spacing +50 added lines, -50 removed lines

@@ -57,16 +57,16 @@ 
 		// We define date_start and date_end
 		$year_end = $year_start;
 		$month_start = GETPOST("month") ? GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		if (! GETPOST('month')) {
-			if (! GETPOST("year") && $month_start > $month_current) {
-				$year_start --;
-				$year_end --;
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
+				$year_start--;
+				$year_end--;
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1)
 				$month_end = 12;
 			else
-				$year_end ++;
+				$year_end++;
 		} else
 			$month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false);
@@ -100,11 +100,11 @@ 
 $exportlink = '';
 
 $nom = $langs->trans("ReportThirdParty");
-$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0) . ' - ' . $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 $description = $langs->trans("DescThirdPartyReport");
-$builddate=dol_now();
+$builddate = dol_now();
 
-$moreparam=array('action' => '');
+$moreparam = array('action' => '');
 report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam);
 
 print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
@@ -121,58 +121,58 @@ 
 
 $sql = "(SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta as compta , ";
 $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   f.datec , f.fk_soc , cp.label as country ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-$sql .= ", " . MAIN_DB_PREFIX . "facture as f";
-$sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$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))
-	$sql .= " AND f.datec >= '" . $db->idate($date_start) . "' AND f.datec <= '" . $db->idate($date_end) . "'";
-$sql .= " AND f.entity = " . $conf->entity;
+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)
-	$sql .= " AND f.fk_soc = " . $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 , ";
 $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   ff.datec , ff.fk_soc , cp.label as country ";
-$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-$sql .= ", " . MAIN_DB_PREFIX . "facture_fourn as ff";
-$sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as ff";
+$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))
-	$sql .= " AND ff.datec >= '" . $db->idate($date_start) . "' AND ff.datec <= '" . $db->idate($date_end) . "'";
-$sql .= " AND ff.entity = " . $conf->entity;
+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)
-	$sql .= " AND f.fk_soc = " . $socid;
+	$sql .= " AND f.fk_soc = ".$socid;
 $sql .= " GROUP BY name";
 $sql .= ")";
 
 $sql .= "ORDER BY name ASC";
 
-dol_syslog('accountancy/admin/thirdpartyaccount.php:: $sql=' . $sql);
+dol_syslog('accountancy/admin/thirdpartyaccount.php:: $sql='.$sql);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	// export csv
-	if (GETPOST('action','aZ09') == 'export_csv') {
+	if (GETPOST('action', 'aZ09') == 'export_csv') {
 
 		header('Content-Type: text/csv');
 		header('Content-Disposition: attachment;filename=export_csv.csv');
 
 		$obj = $db->fetch_object($resql);
 
-		print '"' . $obj->compta . '",';
-		print '"' . $obj->address . '",';
-		print '"' . $obj->zip . '",';
-		print '"' . $obj->town . '",';
-		print '"' . $obj->country . '",';
-		print '"' . $obj->phone . '",';
-		print '"' . $obj->fax . '",';
+		print '"'.$obj->compta.'",';
+		print '"'.$obj->address.'",';
+		print '"'.$obj->zip.'",';
+		print '"'.$obj->town.'",';
+		print '"'.$obj->country.'",';
+		print '"'.$obj->phone.'",';
+		print '"'.$obj->fax.'",';
 		print "\n";
-		$i ++;
+		$i++;
 	}
 
 	/*
@@ -188,16 +188,16 @@ 
 	print '</td><td valign="top" width="70%" class="notopnoleftnoright"></td>';
 	print '</tr><tr><td colspan=2>';
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td align="left">' . $langs->trans("ThirdParties") . '</td>';
-	print '<td align="left">' . $langs->trans("AccountNumber") . '</td>';
-	print '<td align="left">' . $langs->trans("RaisonSociale") . '</td>';
-	print '<td align="left">' . $langs->trans("Address") . '</td>';
-	print '<td align="left">' . $langs->trans("Zip") . '</td>';
-	print '<td align="left">' . $langs->trans("Town") . '</td>';
-	print '<td align="left">' . $langs->trans("Country") . '</td>';
-	print '<td align="left">' . $langs->trans("Contact") . '</td>';
-	print '<td align="left">' . $langs->trans("Phone") . '</td>';
-	print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
+	print '<tr class="liste_titre"><td align="left">'.$langs->trans("ThirdParties").'</td>';
+	print '<td align="left">'.$langs->trans("AccountNumber").'</td>';
+	print '<td align="left">'.$langs->trans("RaisonSociale").'</td>';
+	print '<td align="left">'.$langs->trans("Address").'</td>';
+	print '<td align="left">'.$langs->trans("Zip").'</td>';
+	print '<td align="left">'.$langs->trans("Town").'</td>';
+	print '<td align="left">'.$langs->trans("Country").'</td>';
+	print '<td align="left">'.$langs->trans("Contact").'</td>';
+	print '<td align="left">'.$langs->trans("Phone").'</td>';
+	print '<td align="left">'.$langs->trans("Fax").'</td></tr>';
 
 	while ($obj = $db->fetch_object($resql))
 	{
@@ -210,18 +210,18 @@ 
 		$thirdpartystatic->status = $obj->status;
 		print $thirdpartystatic->getNomUrl(1);
 		print '</td>';
-		print '<td align="left">' . $obj->compta . '</td>' . "\n";
+		print '<td align="left">'.$obj->compta.'</td>'."\n";
 		print '<td align="left"></td>';
-		print '<td align="left">' . $obj->address . '</td>';
-		print '<td align="left">' . $obj->zip . '</td>';
-		print '<td align="left">' . $obj->town . '</td>';
-		print '<td align="left">' . $obj->country . '</td>';
+		print '<td align="left">'.$obj->address.'</td>';
+		print '<td align="left">'.$obj->zip.'</td>';
+		print '<td align="left">'.$obj->town.'</td>';
+		print '<td align="left">'.$obj->country.'</td>';
 		print '<td align="left"></td>';
-		print '<td align="left">' . $obj->phone . '</td>';
-		print '<td align="left">' . $obj->fax . '</td>';
+		print '<td align="left">'.$obj->phone.'</td>';
+		print '<td align="left">'.$obj->fax.'</td>';
 		print "</tr>\n";
 
-		$i ++;
+		$i++;
 	}
 
 	print "</table>";

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/withdrawals/build_withdrawal_file.php

Indentation +3 added lines, -3 removed lines

@@ -30,8 +30,8 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -64,7 +64,7 @@ 
 if (! isset($argv[1])) {	// Check parameters
     print "This script check invoices with a withdrawal request and\n";
     print "then create payment and build a withdraw file.\n";
-	print "Usage: ".$script_file." simu|real\n";
+    print "Usage: ".$script_file." simu|real\n";
     exit(-1);
 }
 

Spacing +7 added lines, -7 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') {
@@ -41,8 +41,8 @@ 
 require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php";
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -51,7 +51,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));
 
 $datetimeprev = dol_now();
 
@@ -61,7 +61,7 @@ 
 $user = new user($db);
 $user->fetch($conf->global->PRELEVEMENT_USER);
 
-if (! isset($argv[1])) {	// Check parameters
+if (!isset($argv[1])) {	// Check parameters
     print "This script check invoices with a withdrawal request and\n";
     print "then create payment and build a withdraw file.\n";
 	print "Usage: ".$script_file." simu|real\n";
@@ -69,9 +69,9 @@ 
 }
 
 
-$withdrawreceipt=new BonPrelevement($db);
+$withdrawreceipt = new BonPrelevement($db);
 // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
-$result=$withdrawreceipt->create($conf->global->PRELEVEMENT_CODE_BANQUE,$conf->global->PRELEVEMENT_CODE_GUICHET,$argv[1]);
+$result = $withdrawreceipt->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $argv[1]);
 
 
 $db->close();

dolibarr/scripts/cron/cron_run_jobs.php

Indentation +104 added lines, -104 removed lines

@@ -37,8 +37,8 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -47,14 +47,14 @@ 
 
 // Check parameters
 if (! isset($argv[1]) || ! $argv[1]) {
-	usage($path,$script_file);
-	exit(-1);
+    usage($path,$script_file);
+    exit(-1);
 }
 $key=$argv[1];
 
 if (! isset($argv[2]) || ! $argv[2]) {
-	usage($path,$script_file);
-	exit(-1);
+    usage($path,$script_file);
+    exit(-1);
 }
 
 $userlogin=$argv[2];
@@ -78,22 +78,22 @@ 
 // Check module cron is activated
 if (empty($conf->cron->enabled))
 {
-	print "Error: module Scheduled jobs (cron) not activated\n";
-	exit(-1);
+    print "Error: module Scheduled jobs (cron) not activated\n";
+    exit(-1);
 }
 
 // Check module cron is activated
 if (empty($conf->cron->enabled))
 {
-	print "Error: module Scheduled jobs (cron) not activated\n";
-	exit(-1);
+    print "Error: module Scheduled jobs (cron) not activated\n";
+    exit(-1);
 }
 
 // Check security key
 if ($key != $conf->global->CRON_KEY)
 {
-	print "Error: securitykey is wrong\n";
-	exit(-1);
+    print "Error: securitykey is wrong\n";
+    exit(-1);
 }
 
 // If param userlogin is reserved word 'firstadmin'
@@ -118,24 +118,24 @@ 
 $result=$user->fetch('',$userlogin);
 if ($result < 0)
 {
-	echo "User Error: ".$user->error;
-	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-	exit(-1);
+    echo "User Error: ".$user->error;
+    dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
+    exit(-1);
 }
 else
 {
-	if (empty($user->id))
-	{
-		echo "User login: ".$userlogin." does not exists";
-		dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
-		exit(-1);
-	}
+    if (empty($user->id))
+    {
+        echo "User login: ".$userlogin." does not exists";
+        dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
+        exit(-1);
+    }
 }
 $user->getrights();
 
 if (isset($argv[3]) || $argv[3])
 {
-	$id = $argv[3];
+    $id = $argv[3];
 }
 
 // create a jobs object
@@ -143,29 +143,29 @@ 
 
 $filter=array();
 if (! empty($id)) {
-	if (! is_numeric($id))
-	{
-		echo "Error: Bad value for parameter job id";
-		dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
-		exit;
-	}
-	$filter['t.rowid']=$id;
+    if (! is_numeric($id))
+    {
+        echo "Error: Bad value for parameter job id";
+        dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
+        exit;
+    }
+    $filter['t.rowid']=$id;
 }
 
 $result = $object->fetch_all('ASC,ASC,ASC','t.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
 if ($result<0)
 {
-	echo "Error: ".$object->error;
-	dol_syslog("cron_run_jobs.php:: fetch Error ".$object->error, LOG_ERR);
-	exit(-1);
+    echo "Error: ".$object->error;
+    dol_syslog("cron_run_jobs.php:: fetch Error ".$object->error, LOG_ERR);
+    exit(-1);
 }
 
 
 $qualifiedjobs = array();
 foreach($object->lines as $val)
 {
-	if (! verifCond($val->test)) continue;
-	$qualifiedjobs[] = $val;
+    if (! verifCond($val->test)) continue;
+    $qualifiedjobs[] = $val;
 }
 
 // TODO Duplicate. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
@@ -176,69 +176,69 @@ 
 
 if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
 {
-	// Loop over job
-	foreach($qualifiedjobs as $line)
-	{
-		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
-
-		echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
-
-		//If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
-		if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
-		{
-			echo " - qualified";
-
-			dol_syslog("cron_run_jobs.php 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'));
-
-			$cronjob=new Cronjob($db);
-			$result=$cronjob->fetch($line->id);
-			if ($result < 0)
-			{
-				echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
-				echo "Failed to fetch job ".$line->id."\n";
-				dol_syslog("cron_run_jobs.php::fetch Error ".$cronjob->error, LOG_ERR);
-				exit(-1);
-			}
-			// Execute job
-			$result=$cronjob->run_jobs($userlogin);
-			if ($result < 0)
-			{
-				echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
-				echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
-				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
-			{
-				$nbofjobslaunchedok++;
-			}
-
-			echo " - result of run_jobs = ".$result;
-
-			// we re-program the next execution and stores the last execution time for this job
-			$result=$cronjob->reprogram_jobs($userlogin, $now);
-			if ($result<0)
-			{
-				echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
-				echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
-				dol_syslog("cron_run_jobs.php::reprogram_jobs Error ".$cronjob->error, LOG_ERR);
-				exit(-1);
-			}
-
-			echo " - reprogrammed\n";
-		}
-		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'));
-		}
-	}
+    // Loop over job
+    foreach($qualifiedjobs as $line)
+    {
+        dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
+
+        echo "cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label;
+
+        //If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database
+        if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now))
+        {
+            echo " - qualified";
+
+            dol_syslog("cron_run_jobs.php 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'));
+
+            $cronjob=new Cronjob($db);
+            $result=$cronjob->fetch($line->id);
+            if ($result < 0)
+            {
+                echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
+                echo "Failed to fetch job ".$line->id."\n";
+                dol_syslog("cron_run_jobs.php::fetch Error ".$cronjob->error, LOG_ERR);
+                exit(-1);
+            }
+            // Execute job
+            $result=$cronjob->run_jobs($userlogin);
+            if ($result < 0)
+            {
+                echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
+                echo "At least one job failed. Go on menu Home-Setup-Admin tools to see result for each job.\n";
+                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
+            {
+                $nbofjobslaunchedok++;
+            }
+
+            echo " - result of run_jobs = ".$result;
+
+            // we re-program the next execution and stores the last execution time for this job
+            $result=$cronjob->reprogram_jobs($userlogin, $now);
+            if ($result<0)
+            {
+                echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
+                echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
+                dol_syslog("cron_run_jobs.php::reprogram_jobs Error ".$cronjob->error, LOG_ERR);
+                exit(-1);
+            }
+
+            echo " - reprogrammed\n";
+        }
+        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
 {
-	echo "cron_run_jobs.php no qualified job found\n";
+    echo "cron_run_jobs.php no qualified job found\n";
 }
 
 $db->close();
@@ -257,14 +257,14 @@ 
  */
 function usage($path,$script_file)
 {
-	global $conf;
-
-	print "Usage: ".$script_file." securitykey userlogin|'firstadmin' [cronjobid]\n";
-	print "The script return 0 when everything worked successfully.\n";
-	print "\n";
-	print "On Linux system, you can have cron jobs ran automatically by adding an entry into cron.\n";
-	print "For example, to run pending tasks each day at 3:30, you can add this line:\n";
-	print "30 3 * * * ".$path.$script_file." securitykey userlogin > ".DOL_DATA_ROOT."/".$script_file.".log\n";
-	print "For example, to run pending tasks every 5mn, you can add this line:\n";
-	print "*/5 * * * * ".$path.$script_file." securitykey userlogin > ".DOL_DATA_ROOT."/".$script_file.".log\n";
+    global $conf;
+
+    print "Usage: ".$script_file." securitykey userlogin|'firstadmin' [cronjobid]\n";
+    print "The script return 0 when everything worked successfully.\n";
+    print "\n";
+    print "On Linux system, you can have cron jobs ran automatically by adding an entry into cron.\n";
+    print "For example, to run pending tasks each day at 3:30, you can add this line:\n";
+    print "30 3 * * * ".$path.$script_file." securitykey userlogin > ".DOL_DATA_ROOT."/".$script_file.".log\n";
+    print "For example, to run pending tasks every 5mn, you can add this line:\n";
+    print "*/5 * * * * ".$path.$script_file." securitykey userlogin > ".DOL_DATA_ROOT."/".$script_file.".log\n";
 }

Spacing +42 added lines, -42 removed lines

@@ -23,17 +23,17 @@ 
  *  \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');
 
 
 $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,23 +46,23 @@ 
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 // Check parameters
-if (! isset($argv[1]) || ! $argv[1]) {
-	usage($path,$script_file);
+if (!isset($argv[1]) || !$argv[1]) {
+	usage($path, $script_file);
 	exit(-1);
 }
-$key=$argv[1];
+$key = $argv[1];
 
-if (! isset($argv[2]) || ! $argv[2]) {
-	usage($path,$script_file);
+if (!isset($argv[2]) || !$argv[2]) {
+	usage($path, $script_file);
 	exit(-1);
 }
 
-$userlogin=$argv[2];
+$userlogin = $argv[2];
 
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
+$version = DOL_VERSION;
+$error = 0;
 
 
 /*
@@ -70,10 +70,10 @@ 
  */
 
 // current date
-$now=dol_now();
+$now = dol_now();
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=" . $userlogin . " ***** " . dol_print_date($now, 'dayhourrfc') . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." ***** userlogin=".$userlogin." ***** ".dol_print_date($now, 'dayhourrfc')." *****\n";
 
 // Check module cron is activated
 if (empty($conf->cron->enabled))
@@ -99,11 +99,11 @@ 
 // If param userlogin is reserved word 'firstadmin'
 if ($userlogin == 'firstadmin')
 {
-    $sql='SELECT login, entity from '.MAIN_DB_PREFIX.'user WHERE admin = 1 and statut = 1 ORDER BY entity LIMIT 1';
-    $resql=$db->query($sql);
+    $sql = 'SELECT login, entity from '.MAIN_DB_PREFIX.'user WHERE admin = 1 and statut = 1 ORDER BY entity LIMIT 1';
+    $resql = $db->query($sql);
     if ($resql)
     {
-        $obj=$db->fetch_object($resql);
+        $obj = $db->fetch_object($resql);
         if ($obj)
         {
             $userlogin = $obj->login;
@@ -114,8 +114,8 @@ 
 }
 
 // Check user login
-$user=new User($db);
-$result=$user->fetch('',$userlogin);
+$user = new User($db);
+$result = $user->fetch('', $userlogin);
 if ($result < 0)
 {
 	echo "User Error: ".$user->error;
@@ -141,19 +141,19 @@ 
 // create a jobs object
 $object = new Cronjob($db);
 
-$filter=array();
-if (! empty($id)) {
-	if (! is_numeric($id))
+$filter = array();
+if (!empty($id)) {
+	if (!is_numeric($id))
 	{
 		echo "Error: Bad value for parameter job id";
 		dol_syslog("cron_run_jobs.php Bad value for parameter job id", LOG_WARNING);
 		exit;
 	}
-	$filter['t.rowid']=$id;
+	$filter['t.rowid'] = $id;
 }
 
-$result = $object->fetch_all('ASC,ASC,ASC','t.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
-if ($result<0)
+$result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
+if ($result < 0)
 {
 	echo "Error: ".$object->error;
 	dol_syslog("cron_run_jobs.php:: fetch Error ".$object->error, LOG_ERR);
@@ -162,22 +162,22 @@ 
 
 
 $qualifiedjobs = array();
-foreach($object->lines as $val)
+foreach ($object->lines as $val)
 {
-	if (! verifCond($val->test)) continue;
+	if (!verifCond($val->test)) continue;
 	$qualifiedjobs[] = $val;
 }
 
 // TODO Duplicate. This sequence of code must be shared with code into public/cron/cron_run_jobs.php php page.
 
-$nbofjobs=count($qualifiedjobs);
-$nbofjobslaunchedok=0;
-$nbofjobslaunchedko=0;
+$nbofjobs = count($qualifiedjobs);
+$nbofjobslaunchedok = 0;
+$nbofjobslaunchedko = 0;
 
-if (is_array($qualifiedjobs) && (count($qualifiedjobs)>0))
+if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 {
 	// Loop over job
-	foreach($qualifiedjobs as $line)
+	foreach ($qualifiedjobs as $line)
 	{
 		dol_syslog("cron_run_jobs.php cronjobid: ".$line->id." priority=".$line->priority." entity=".$line->entity." label=".$line->label, LOG_DEBUG);
 
@@ -188,10 +188,10 @@ 
 		{
 			echo " - qualified";
 
-			dol_syslog("cron_run_jobs.php 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'));
+			dol_syslog("cron_run_jobs.php 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'));
 
-			$cronjob=new Cronjob($db);
-			$result=$cronjob->fetch($line->id);
+			$cronjob = new Cronjob($db);
+			$result = $cronjob->fetch($line->id);
 			if ($result < 0)
 			{
 				echo "Error cronjobid: ".$line->id." cronjob->fetch: ".$cronjob->error."\n";
@@ -200,7 +200,7 @@ 
 				exit(-1);
 			}
 			// Execute job
-			$result=$cronjob->run_jobs($userlogin);
+			$result = $cronjob->run_jobs($userlogin);
 			if ($result < 0)
 			{
 				echo "Error cronjobid: ".$line->id." cronjob->run_job: ".$cronjob->error."\n";
@@ -217,8 +217,8 @@ 
 			echo " - result of run_jobs = ".$result;
 
 			// we re-program the next execution and stores the last execution time for this job
-			$result=$cronjob->reprogram_jobs($userlogin, $now);
-			if ($result<0)
+			$result = $cronjob->reprogram_jobs($userlogin, $now);
+			if ($result < 0)
 			{
 				echo "Error cronjobid: ".$line->id." cronjob->reprogram_job: ".$cronjob->error."\n";
 				echo "Enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
@@ -232,7 +232,7 @@ 
 		{
 			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'));
+			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'));
 		}
 	}
 }
@@ -255,7 +255,7 @@ 
  * @param string $script_file   filename
  * @return void
  */
-function usage($path,$script_file)
+function usage($path, $script_file)
 {
 	global $conf;
 

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

Indentation +43 added lines, -43 removed lines

@@ -31,7 +31,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 
@@ -56,12 +56,12 @@ 
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now [-y]\n";
-	exit(-1);
+    exit(-1);
 }
 
 foreach($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 $now=$argv[1];
@@ -87,12 +87,12 @@ 
 
 if (! $confirmed)
 {
-	print "Press a key to confirm...\n";
-	$input = trim(fgets(STDIN));
-	print "Warning, this operation may result in data loss if it failed.\n";
-	print "Be sure to have a backup of your LDAP database (With OpenLDAP: slapcat > save.ldif).\n";
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Press a key to confirm...\n";
+    $input = trim(fgets(STDIN));
+    print "Warning, this operation may result in data loss if it failed.\n";
+    print "Be sure to have a backup of your LDAP database (With OpenLDAP: slapcat > save.ldif).\n";
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 /*
@@ -109,54 +109,54 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	$ldap=new Ldap();
-	$ldap->connect_bind();
+    $ldap=new Ldap();
+    $ldap->connect_bind();
 
-	while ($i < $num)
-	{
-		$ldap->error="";
+    while ($i < $num)
+    {
+        $ldap->error="";
 
-		$obj = $db->fetch_object($resql);
+        $obj = $db->fetch_object($resql);
 
-		$contact = new Contact($db);
-		$contact->id = $obj->rowid;
-		$contact->fetch($contact->id);
+        $contact = new Contact($db);
+        $contact->id = $obj->rowid;
+        $contact->fetch($contact->id);
 
-		print $langs->trans("UpdateContact")." rowid=".$contact->id." ".$contact->getFullName($langs);
+        print $langs->trans("UpdateContact")." rowid=".$contact->id." ".$contact->getFullName($langs);
 
-		$oldobject=$contact;
+        $oldobject=$contact;
 
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
+        $oldinfo=$oldobject->_load_ldap_info();
+        $olddn=$oldobject->_load_ldap_dn($oldinfo);
 
-		$info=$contact->_load_ldap_info();
-		$dn=$contact->_load_ldap_dn($info);
+        $info=$contact->_load_ldap_info();
+        $dn=$contact->_load_ldap_dn($info);
 
-		$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-		$result=$ldap->update($dn,$info,$user,$olddn);
-		if ($result > 0)
-		{
-			print " - ".$langs->trans("OK");
-		}
-		else
-		{
-			$error++;
-			print " - ".$langs->trans("KO").' - '.$ldap->error;
-		}
-		print "\n";
+        $result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
+        $result=$ldap->update($dn,$info,$user,$olddn);
+        if ($result > 0)
+        {
+            print " - ".$langs->trans("OK");
+        }
+        else
+        {
+            $error++;
+            print " - ".$langs->trans("KO").' - '.$ldap->error;
+        }
+        print "\n";
 
-		$i++;
-	}
+        $i++;
+    }
 
-	$ldap->unbind();
-	$ldap->close();
+    $ldap->unbind();
+    $ldap->close();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

Spacing +21 added lines, -21 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') {
@@ -41,9 +41,9 @@ 
 require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 
 // Global variables
-$version=DOL_VERSION;
-$error=0;
-$confirmed=0;
+$version = DOL_VERSION;
+$error = 0;
+$confirmed = 0;
 
 
 /*
@@ -52,22 +52,22 @@ 
 
 @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[1]) || ! $argv[1]) {
+if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: $script_file now [-y]\n";
 	exit(-1);
 }
 
-foreach($argv as $key => $val)
+foreach ($argv as $key => $val)
 {
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+	if (preg_match('/-y$/', $val, $reg)) $confirmed = 1;
 }
 
-$now=$argv[1];
+$now = $argv[1];
 
 print "Mails sending disabled (useless in batch mode)\n";
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
@@ -81,11 +81,11 @@ 
 print "host=".$conf->global->LDAP_SERVER_HOST."\n";
 print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
-print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN target=".$conf->global->LDAP_CONTACT_DN."\n";
 print "\n";
 
-if (! $confirmed)
+if (!$confirmed)
 {
 	print "Press a key to confirm...\n";
 	$input = trim(fgets(STDIN));
@@ -112,12 +112,12 @@ 
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	$ldap=new Ldap();
+	$ldap = new Ldap();
 	$ldap->connect_bind();
 
 	while ($i < $num)
 	{
-		$ldap->error="";
+		$ldap->error = "";
 
 		$obj = $db->fetch_object($resql);
 
@@ -127,16 +127,16 @@ 
 
 		print $langs->trans("UpdateContact")." rowid=".$contact->id." ".$contact->getFullName($langs);
 
-		$oldobject=$contact;
+		$oldobject = $contact;
 
-	    $oldinfo=$oldobject->_load_ldap_info();
-	    $olddn=$oldobject->_load_ldap_dn($oldinfo);
+	    $oldinfo = $oldobject->_load_ldap_info();
+	    $olddn = $oldobject->_load_ldap_dn($oldinfo);
 
-		$info=$contact->_load_ldap_info();
-		$dn=$contact->_load_ldap_dn($info);
+		$info = $contact->_load_ldap_info();
+		$dn = $contact->_load_ldap_dn($info);
 
-		$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-		$result=$ldap->update($dn,$info,$user,$olddn);
+		$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
+		$result = $ldap->update($dn, $info, $user, $olddn);
 		if ($result > 0)
 		{
 			print " - ".$langs->trans("OK");

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/company/export-contacts-xls-example.php

Indentation +22 added lines, -22 removed lines

@@ -30,13 +30,13 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
-	print "Usage: $script_file now\n";
-	exit(-1);
+    print "Usage: $script_file now\n";
+    exit(-1);
 }
 $now=$argv[1];
 
@@ -86,30 +86,30 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	print "Lines ".$num."\n";
+    print "Lines ".$num."\n";
 
-	$i = 0;
-	$j = 1;
+    $i = 0;
+    $j = 1;
 
-	$objPHPExcel->getActiveSheet()->SetCellValue('A1', $langs->trans("Firstname"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('B1', $langs->trans("Lastname"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('C1', $langs->trans("Email"));
-	$objPHPExcel->getActiveSheet()->SetCellValue('D1', $langs->trans("ThirdPart"));
+    $objPHPExcel->getActiveSheet()->SetCellValue('A1', $langs->trans("Firstname"));
+    $objPHPExcel->getActiveSheet()->SetCellValue('B1', $langs->trans("Lastname"));
+    $objPHPExcel->getActiveSheet()->SetCellValue('C1', $langs->trans("Email"));
+    $objPHPExcel->getActiveSheet()->SetCellValue('D1', $langs->trans("ThirdPart"));
 
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($resql);
+    while ($i < $num)
+    {
+        $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++;
-	}
+        $j++;
+        $i++;
+    }
 }
 
 

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++;