alxarafe / alixar

scripts/cron/cron_run_jobs.php

Spacing +34 added lines, -34 removed lines

@@ -55,17 +55,17 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // Error if Web 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";
+    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";
-require_once DOL_DOCUMENT_ROOT . "/cron/class/cronjob.class.php";
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 // Check parameters
 if (!isset($argv[1]) || !$argv[1]) {
@@ -96,7 +96,7 @@ 
 $now = dol_now();
 
 @set_time_limit(0);
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " - userlogin=" . $userlogin . " - " . dol_print_date($now, 'dayhourrfc') . " - " . gethostname() . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." - userlogin=".$userlogin." - ".dol_print_date($now, 'dayhourrfc')." - ".gethostname()." *****\n";
 
 // Check module cron is activated
 if (!isModEnabled('cron')) {
@@ -117,13 +117,13 @@ 
 
 // 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';
+    $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);
         if ($obj) {
             $userlogin = $obj->login;
-            echo "First admin user found is login '" . $userlogin . "', entity " . $obj->entity . "\n";
+            echo "First admin user found is login '".$userlogin."', entity ".$obj->entity."\n";
         }
     } else {
         dol_print_error($db);
@@ -134,13 +134,13 @@ 
 $user = new User($db);
 $result = $user->fetch('', $userlogin, '', 1);
 if ($result < 0) {
-    echo "User Error: " . $user->error;
-    dol_syslog("cron_run_jobs.php:: User Error:" . $user->error, LOG_ERR);
+    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\n";
-        dol_syslog("User login:" . $userlogin . " does not exists", LOG_ERR);
+        echo "User login: ".$userlogin." does not exists\n";
+        dol_syslog("User login:".$userlogin." does not exists", LOG_ERR);
         exit(-1);
     }
 }
@@ -182,8 +182,8 @@ 
 
 $result = $object->fetchAll('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);
+    echo "Error: ".$object->error;
+    dol_syslog("cron_run_jobs.php fetch Error ".$object->error, LOG_ERR);
     exit(-1);
 }
 
@@ -198,12 +198,12 @@ 
 
     // Loop over job
     foreach ($object->lines 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;
+        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;
 
         // Force reload of setup for the current entity
         if ((empty($line->entity) ? 1 : $line->entity) != $conf->entity) {
-            dol_syslog("cron_run_jobs.php: we work on another entity conf than " . $conf->entity . " so we reload mysoc, langs, user and conf", LOG_DEBUG);
+            dol_syslog("cron_run_jobs.php: we work on another entity conf than ".$conf->entity." so we reload mysoc, langs, user and conf", LOG_DEBUG);
             echo " -> we change entity so we reload mysoc, langs, user and conf";
 
             $conf->entity = (empty($line->entity) ? 1 : $line->entity);
@@ -214,13 +214,13 @@ 
             if ($conf->entity != $user->entity) {
                 $result = $user->fetch('', $userlogin, '', 1);
                 if ($result < 0) {
-                    echo "\nUser Error: " . $user->error . "\n";
-                    dol_syslog("cron_run_jobs.php: User Error:" . $user->error, LOG_ERR);
+                    echo "\nUser Error: ".$user->error."\n";
+                    dol_syslog("cron_run_jobs.php: User Error:".$user->error, LOG_ERR);
                     exit(-1);
                 } else {
                     if ($result == 0) {
-                        echo "\nUser login: " . $userlogin . " does not exist for entity " . $conf->entity . "\n";
-                        dol_syslog("cron_run_jobs.php: User login: " . $userlogin . " does not exist", LOG_ERR);
+                        echo "\nUser login: ".$userlogin." does not exist for entity ".$conf->entity."\n";
+                        dol_syslog("cron_run_jobs.php: User login: ".$userlogin." does not exist", LOG_ERR);
                         exit(-1);
                     }
                 }
@@ -247,23 +247,23 @@ 
         if ($forcequalified || (($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'));
+            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);
+                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 " - 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);
+                dol_syslog("cron_run_jobs.php::run_jobs Error ".$cronjob->error, LOG_ERR);
                 $nbofjobslaunchedko++;
                 $resultstring = 'KO';
             } else {
@@ -271,14 +271,14 @@ 
                 $resultstring = 'OK';
             }
 
-            echo " - run_jobs " . $resultstring . " result = " . $result;
+            echo " - run_jobs ".$resultstring." result = ".$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 " - 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);
+                dol_syslog("cron_run_jobs.php::reprogram_jobs Error ".$cronjob->error, LOG_ERR);
                 exit(-1);
             }
 
@@ -286,7 +286,7 @@ 
         } 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'));
+            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'));
         }
     }
 
@@ -311,14 +311,14 @@ 
  */
 function usage($path, $script_file)
 {
-    print "Usage: " . $script_file . " securitykey userlogin|'firstadmin' [cronjobid] [--force]\n";
+    print "Usage: ".$script_file." securitykey userlogin|'firstadmin' [cronjobid] [--force]\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 "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";
+    print "*/5 * * * * ".$path.$script_file." securitykey userlogin > ".DOL_DATA_ROOT."/".$script_file.".log\n";
     print "\n";
     print "The option --force allow to bypass the check on date of execution so job will be executed even if date is not yet reached.\n";
 }

scripts/withdrawals/build_withdrawal_file.php

Spacing +10 added lines, -10 removed lines

@@ -33,19 +33,19 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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";
-require_once DOL_DOCUMENT_ROOT . "/compta/prelevement/class/bonprelevement.class.php";
-require_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php";
-require_once DOL_DOCUMENT_ROOT . "/societe/class/societe.class.php";
-require_once DOL_DOCUMENT_ROOT . "/compta/paiement/class/paiement.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php";
+require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
+require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php";
 
 // Global variables
 $version = constant('DOL_VERSION');
@@ -59,8 +59,8 @@ 
  */
 
 @set_time_limit(0);
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 $datetimeprev = dol_now();
 
@@ -73,7 +73,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);
 }
 

scripts/doc/regenerate_docs.php

Spacing +25 added lines, -25 removed lines

@@ -33,11 +33,11 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
@@ -45,10 +45,10 @@ 
 define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
-require_once $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/product/class/product.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/images.lib.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/images.lib.php";
 // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
 // $user is created but empty.
 
@@ -67,8 +67,8 @@ 
  * Main
  */
 
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " - dir=" . DOL_DATA_ROOT . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." - dir=".DOL_DATA_ROOT." *****\n";
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (empty($argv[1])) {
     print "Usage:    $script_file  subdirtoscan (test|confirm)\n";
@@ -76,7 +76,7 @@ 
     exit(-1);
 }
 
-print '--- start' . "\n";
+print '--- start'."\n";
 
 $dir = DOL_DATA_ROOT;
 $subdir = $argv[1];
@@ -84,47 +84,47 @@ 
     dol_print_error(null, 'dir not defined');
     exit(1);
 }
-if (!dol_is_dir($dir . '/' . $subdir)) {
-    print 'Directory ' . $dir . '/' . $subdir . ' not found.' . "\n";
+if (!dol_is_dir($dir.'/'.$subdir)) {
+    print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
     exit(2);
 }
 
-print 'Scan directory ' . $dir . '/' . $subdir . "\n";
+print 'Scan directory '.$dir.'/'.$subdir."\n";
 
-$filearray = dol_dir_list($dir . '/' . $subdir, "directories", 0, '', 'temp$');
+$filearray = dol_dir_list($dir.'/'.$subdir, "directories", 0, '', 'temp$');
 
 $nbok = $nbko = 0;
 
 $tmpobject = null;
 if ($subdir == 'propale' || $subdir == 'proposal') {
     if (isModEnabled('propal')) {
-        require_once DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php";
+        require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
         $tmpobject = new Propal($db);
     } else {
-        print 'Error, module not enabled' . "\n";
+        print 'Error, module not enabled'."\n";
     }
 } elseif ($subdir == 'commande' || $subdir == 'order') {
     if (isModEnabled('commande')) {
-        require_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php";
+        require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
         $tmpobject = new Commande($db);
     } else {
-        print 'Error, module not enabled' . "\n";
+        print 'Error, module not enabled'."\n";
     }
 } elseif ($subdir == 'facture' || $subdir == 'invoice') {
     if (isModEnabled('facture')) {
-        require_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php";
+        require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
         $tmpobject = new Facture($db);
     } else {
-        print 'Error, module not enabled' . "\n";
+        print 'Error, module not enabled'."\n";
     }
 } else {
-    print 'Dir ' . $subdir . ' not yet supported' . "\n";
+    print 'Dir '.$subdir.' not yet supported'."\n";
 }
 
 if ($tmpobject) {
     foreach ($filearray as $keyf => $valf) {
         $ref = basename($valf['name']);
-        print 'Process document for dir = ' . $subdir . ', ref ' . $ref . "\n";
+        print 'Process document for dir = '.$subdir.', ref '.$ref."\n";
 
         $ret1 = $tmpobject->fetch(0, $ref);
         $ret2 = $tmpobject->fetch_thirdparty();
@@ -153,10 +153,10 @@ 
                 $nbko++;
             }
             if ($result == 0) {
-                print 'File for ref ' . $tmpobject->ref . ' returned 0 during regeneration with template ' . $tmpobject->model_pdf . "\n";
+                print 'File for ref '.$tmpobject->ref.' returned 0 during regeneration with template '.$tmpobject->model_pdf."\n";
                 $nbok++;
             } else {
-                print 'File for ref ' . $tmpobject->ref . ' regenerated with template ' . $tmpobject->model_pdf . "\n";
+                print 'File for ref '.$tmpobject->ref.' regenerated with template '.$tmpobject->model_pdf."\n";
                 $nbok++;
             }
         } else {
@@ -165,8 +165,8 @@ 
     }
 }
 
-print $nbok . " objects processed\n";
-print $nbko . " objects with errors\n";
+print $nbok." objects processed\n";
+print $nbko." objects with errors\n";
 
 $db->close(); // Close $db database opened handler
 

scripts/product/regenerate_thumbs.php

Spacing +15 added lines, -15 removed lines

@@ -33,11 +33,11 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
@@ -45,10 +45,10 @@ 
 define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
-require_once $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/product/class/product.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/images.lib.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/images.lib.php";
 // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
 // $user is created but empty.
 
@@ -66,8 +66,8 @@ 
  * Main
  */
 
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (empty($argv[1])) {
     print "Usage:    $script_file  subdirtoscan\n";
@@ -75,7 +75,7 @@ 
     exit(-1);
 }
 
-print '--- start' . "\n";
+print '--- start'."\n";
 
 $dir = DOL_DATA_ROOT;
 $subdir = $argv[1];
@@ -83,12 +83,12 @@ 
     dol_print_error(null, 'dir not defined');
     exit(1);
 }
-if (!dol_is_dir($dir . '/' . $subdir)) {
-    print 'Directory ' . $dir . '/' . $subdir . ' not found.' . "\n";
+if (!dol_is_dir($dir.'/'.$subdir)) {
+    print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
     exit(2);
 }
 
-$filearray = dol_dir_list($dir . '/' . $subdir, "directories", 0, '', 'temp$');
+$filearray = dol_dir_list($dir.'/'.$subdir, "directories", 0, '', 'temp$');
 
 global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 
@@ -96,20 +96,20 @@ 
     $ref = basename($valf['name']);
     $filearrayimg = dol_dir_list($valf['fullname'], "files", 0, '(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp)$', '(\.meta|_preview.*\.png)$');
     foreach ($filearrayimg as $keyi => $vali) {
-        print 'Process image for ref ' . $ref . ' : ' . $vali['name'] . "\n";
+        print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
 
         // Create small thumbs for image
         // Used on logon for example
         $imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
         if (preg_match('/Error/', $imgThumbSmall)) {
-            print $imgThumbSmall . "\n";
+            print $imgThumbSmall."\n";
         }
 
         // Create mini thumbs for image (Ratio is near 16/9)
         // Used on menu or for setup page for example
         $imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
         if (preg_match('/Error/', $imgThumbMini)) {
-            print $imgThumbMini . "\n";
+            print $imgThumbMini."\n";
         }
     }
 }

scripts/product/migrate_picture_path.php

Spacing +19 added lines, -19 removed lines

@@ -34,11 +34,11 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
@@ -46,9 +46,9 @@ 
 define('EVEN_IF_ONLY_LOGIN_ALLOWED', 1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only".
 
 // Include and load Dolibarr environment variables
-require_once $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/product/class/product.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file).
 // $user is created but empty.
 
@@ -67,30 +67,30 @@ 
  * Main
  */
 
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 if (!isset($argv[1]) || $argv[1] != 'product') {
     print "Usage:  $script_file product\n";
     exit(-1);
 }
 
-print '--- start' . "\n";
+print '--- start'."\n";
 
 // Case to migrate products path
 if ($argv[1] == 'product') {
     $product = new Product($db);
 
-    $sql = "SELECT rowid as pid from " . MAIN_DB_PREFIX . "product"; // Get list of all products
+    $sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product"; // Get list of all products
     $resql = $db->query($sql);
     if ($resql) {
         while ($obj = $db->fetch_object($resql)) {
             $product->fetch($obj->pid);
-            print " migrating product id=" . $product->id . " ref=" . $product->ref . "\n";
+            print " migrating product id=".$product->id." ref=".$product->ref."\n";
             migrate_product_photospath($product);
         }
     } else {
-        print "\n sql error " . $sql;
+        print "\n sql error ".$sql;
         exit();
     }
 }
@@ -111,8 +111,8 @@ 
 
     $dir = $conf->product->multidir_output[$product->entity];
     $conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
-    $origin = $dir . '/' . get_exdir($product->id, 2, 0, 0, $product, 'product') . $product->id . "/photos";
-    $destin = $dir . '/' . dol_sanitizeFileName($product->ref);
+    $origin = $dir.'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
+    $destin = $dir.'/'.dol_sanitizeFileName($product->ref);
 
     $error = 0;
 
@@ -124,18 +124,18 @@ 
         $handle = opendir($origin_osencoded);
         if (is_resource($handle)) {
             while (($file = readdir($handle)) !== false) {
-                if ($file != '.' && $file != '..' && is_dir($origin_osencoded . '/' . $file)) {
-                    $thumbs = opendir($origin_osencoded . '/' . $file);
+                if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file)) {
+                    $thumbs = opendir($origin_osencoded.'/'.$file);
                     if (is_resource($thumbs)) {
-                        dol_mkdir($destin . '/' . $file);
+                        dol_mkdir($destin.'/'.$file);
                         while (($thumb = readdir($thumbs)) !== false) {
-                            dol_move($origin . '/' . $file . '/' . $thumb, $destin . '/' . $file . '/' . $thumb);
+                            dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
                         }
                         // dol_delete_dir($origin.'/'.$file);
                     }
                 } else {
-                    if (dol_is_file($origin . '/' . $file)) {
-                        dol_move($origin . '/' . $file, $destin . '/' . $file);
+                    if (dol_is_file($origin.'/'.$file)) {
+                        dol_move($origin.'/'.$file, $destin.'/'.$file);
                     }
                 }
             }

scripts/emailings/reset-invalid-emails.php

Spacing +17 added lines, -17 removed lines

@@ -35,16 +35,16 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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[3]) || !$argv[3]) {
-    print "Usage: " . $script_file . " inputfile-with-invalid-emails type [test|confirm]\n";
+    print "Usage: ".$script_file." inputfile-with-invalid-emails type [test|confirm]\n";
     print "- inputfile-with-invalid-emails is a file with list of invalid email\n";
     print "- type can be 'all' or 'thirdparties', 'contacts', 'members', 'users'\n";
     exit(-1);
@@ -53,9 +53,9 @@ 
 $type = $argv[2];
 $mode = $argv[3];
 
-require_once $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/CMailFile.class.php";
-require_once DOL_DOCUMENT_ROOT . "/comm/mailing/class/mailing.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
+require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 
 // Global variables
 $version = DOL_VERSION;
@@ -76,7 +76,7 @@ 
 $user = new User($db);
 
 @set_time_limit(0);
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
 if (!in_array($type, array('all', 'thirdparties', 'contacts', 'users', 'members'))) {
     print "Bad value for parameter type.\n";
@@ -114,21 +114,21 @@ 
     // Generate the string tp allow a mass update (with a limit of MAXEMAILS per request).
     $emailsin = '';
     foreach ($groupofemails as $email) {
-        $emailsin .= ($emailsin ? ", " : "") . "'" . $db->escape($email) . "'";
+        $emailsin .= ($emailsin ? ", " : "")."'".$db->escape($email)."'";
     }
 
     // For each groupofemail, we update tables to set email field to empty
     $nbingroup = count($groupofemails);
 
-    print "Process group of " . $nbingroup . " emails (" . $counter . " - " . ($counter + $nbingroup - 1) . "), type = " . $type . "\n";
+    print "Process group of ".$nbingroup." emails (".$counter." - ".($counter + $nbingroup - 1)."), type = ".$type."\n";
 
     $numerased = 0;
 
-    $sql_base = "UPDATE " . MAIN_DB_PREFIX;
+    $sql_base = "UPDATE ".MAIN_DB_PREFIX;
 
     if ($type == 'all' || $type == 'users') {
         // Loop on each record and update the email to null if email into $groupofemails
-        $sql = $sql_base . "user as u SET u.email = NULL WHERE u.email IN (" . $db->sanitize($emailsin, 1) . ");";
+        $sql = $sql_base."user as u SET u.email = NULL WHERE u.email IN (".$db->sanitize($emailsin, 1).");";
         print "Try to update users, ";
         $resql = $db->query($sql);
         if (!$resql) {
@@ -139,7 +139,7 @@ 
 
     if ($type == 'all' || $type == 'thirdparties') {
         // Loop on each record and update the email to null if email into $groupofemails
-        $sql = $sql_base . "societe as s SET s.email = NULL WHERE s.email IN (" . $db->sanitize($emailsin, 1) . ");";
+        $sql = $sql_base."societe as s SET s.email = NULL WHERE s.email IN (".$db->sanitize($emailsin, 1).");";
         print "Try to update thirdparties, ";
         $resql = $db->query($sql);
         if (!$resql) {
@@ -151,7 +151,7 @@ 
     if ($type == 'all' || $type == 'contacts') {
         // Loop on each record and update the email to null if email into $groupofemails
 
-        $sql = $sql_base . "socpeople as s SET s.email = NULL WHERE s.email IN (" . $db->sanitize($emailsin, 1) . ");";
+        $sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email IN (".$db->sanitize($emailsin, 1).");";
         print "Try to update contacts, ";
         $resql = $db->query($sql);
         if (!$resql) {
@@ -163,7 +163,7 @@ 
     if ($type == 'all' || $type == 'members') {
         // Loop on each record and update the email to null if email into $groupofemails
 
-        $sql = $sql_base . "adherent as a SET a.email = NULL WHERE a.email IN (" . $db->sanitize($emailsin, 1) . ");";
+        $sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email IN (".$db->sanitize($emailsin, 1).");";
         print "Try to update members, ";
         $resql = $db->query($sql);
         if (!$resql) {
@@ -174,15 +174,15 @@ 
 
     $numerasedtotal += $numerased;
 
-    print $numerased . " emails cleared.\n";
+    print $numerased." emails cleared.\n";
     $counter = $counter + $nbingroup;
 }
 
 if (!$error && $mode == 'confirm') {
-    print "Commit - " . $numerasedtotal . " operations validated.\n";
+    print "Commit - ".$numerasedtotal." operations validated.\n";
     $db->commit();
 } else {
-    print "Rollback - " . $numerasedtotal . " Operations canceled.\n";
+    print "Rollback - ".$numerasedtotal." Operations canceled.\n";
     $db->rollback();
 }
 

scripts/website/migrate-news-joomla2dolibarr.php

Spacing +33 added lines, -33 removed lines

@@ -32,11 +32,11 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
@@ -55,17 +55,17 @@ 
 $forcelang = (empty($argv[6]) ? '' : $argv[6]);
 
 if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) {
-    print '***** ' . $script_file . ' *****' . "\n";
+    print '***** '.$script_file.' *****'."\n";
     print "Usage: $script_file (test|confirm) website login:pass@serverjoomla/tableprefix/databasejoomla [nbmaxrecord]\n";
     print "\n";
     print "Load joomla news and create them into Dolibarr database (if they don't already exist).\n";
     exit(-1);
 }
 
-require $path . "../../htdocs/master.inc.php";
-include_once DOL_DOCUMENT_ROOT . '/website/class/website.class.php';
-include_once DOL_DOCUMENT_ROOT . '/website/class/websitepage.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/website2.lib.php';
+require $path."../../htdocs/master.inc.php";
+include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
 $hookmanager->initHooks(array('cli'));
 
@@ -93,7 +93,7 @@ 
 $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {
-    print 'Error, web site ' . $websiteref . ' not found' . "\n";
+    print 'Error, web site '.$websiteref.' not found'."\n";
     exit(-1);
 }
 $websiteid = $website->id;
@@ -101,14 +101,14 @@ 
 
 $dbjoomla = getDoliDBInstance('mysqli', $joomlahost, $joomlalogin, $joomlapass, $joomladatabase, $joomlaport);
 if ($dbjoomla->error) {
-    dol_print_error($dbjoomla, "host=" . $joomlahost . ", port=" . $joomlaport . ", user=" . $joomlalogin . ", databasename=" . $joomladatabase . ", " . $dbjoomla->error);
+    dol_print_error($dbjoomla, "host=".$joomlahost.", port=".$joomlaport.", user=".$joomlalogin.", databasename=".$joomladatabase.", ".$dbjoomla->error);
     exit(-1);
 }
 
-$sql = 'SELECT c.id, c.title, c.alias, c.created, c.introtext, `fulltext`, c.metadesc, c.metakey, c.language, c.created, c.publish_up, u.username FROM ' . $joomlaprefix . '_content as c';
-$sql .= ' LEFT JOIN ' . $joomlaprefix . '_users as u ON u.id = c.created_by';
+$sql = 'SELECT c.id, c.title, c.alias, c.created, c.introtext, `fulltext`, c.metadesc, c.metakey, c.language, c.created, c.publish_up, u.username FROM '.$joomlaprefix.'_content as c';
+$sql .= ' LEFT JOIN '.$joomlaprefix.'_users as u ON u.id = c.created_by';
 $sql .= ' WHERE featured = 1';
-$sql .= ' AND c.id NOT IN (' . $excludeid . ')';
+$sql .= ' AND c.id NOT IN ('.$excludeid.')';
 $sql .= ' ORDER BY publish_up ASC';
 $resql = $dbjoomla->query($sql);
 
@@ -117,12 +117,12 @@ 
     exit;
 }
 
-$blogpostheader = file_get_contents($path . 'blogpost-header.txt');
+$blogpostheader = file_get_contents($path.'blogpost-header.txt');
 if ($blogpostheader === false) {
     print "Error: Failed to load file content of 'blogpost-header.txt'\n";
     exit(-1);
 }
-$blogpostfooter = file_get_contents($path . 'blogpost-footer.txt');
+$blogpostfooter = file_get_contents($path.'blogpost-footer.txt');
 if ($blogpostfooter === false) {
     print "Error: Failed to load file content of 'blogpost-footer.txt'\n";
     exit(-1);
@@ -149,19 +149,19 @@ 
 
         $htmltext = "";
         if ($blogpostheader) {
-            $htmltext .= $blogpostheader . "\n";
+            $htmltext .= $blogpostheader."\n";
         }
-        $htmltext .= '<section id="mysectionnewsintro" contenteditable="true">' . "\n";
+        $htmltext .= '<section id="mysectionnewsintro" contenteditable="true">'."\n";
         $htmltext .= $obj->introtext;
-        $htmltext .= '</section>' . "\n";
+        $htmltext .= '</section>'."\n";
         if ($obj->fulltext) {
-            $htmltext .= '<section id="mysectionnewscontent" contenteditable="true">' . "\n";
-            $htmltext .= '<br>' . "\n" . '<hr>' . "\n" . '<br>' . "\n";
+            $htmltext .= '<section id="mysectionnewscontent" contenteditable="true">'."\n";
+            $htmltext .= '<br>'."\n".'<hr>'."\n".'<br>'."\n";
             $htmltext .= $obj->fulltext;
             $htmltext .= "</section>";
         }
         if ($blogpostfooter) {
-            $htmltext .= "\n" . $blogpostfooter;
+            $htmltext .= "\n".$blogpostfooter;
         }
 
         $language = ($forcelang ? $forcelang : ($obj->language && $obj->language != '*' ? $obj->language : 'en'));
@@ -170,39 +170,39 @@ 
 
         $date_creation = $dbjoomla->jdate($obj->publish_up);
 
-        print '#' . $i . ' id=' . $id . ' ' . $title . ' lang=' . $language . ' keywords=' . $keywords . ' importid=' . $importid . "\n";
+        print '#'.$i.' id='.$id.' '.$title.' lang='.$language.' keywords='.$keywords.' importid='.$importid."\n";
 
-        $sqlinsert = 'INSERT INTO ' . MAIN_DB_PREFIX . 'website_page(fk_website, pageurl, aliasalt, title, description, keywords, content, status, type_container, lang, import_key, image, date_creation, author_alias)';
-        $sqlinsert .= " VALUES(" . $websiteid . ", '" . $db->escape($alias) . "', '', '" . $db->escape($title) . "', '" . $db->escape($description) . "', '" . $db->escape($keywords) . "', ";
-        $sqlinsert .= " '" . $db->escape($htmltext) . "', '1', 'blogpost', '" . $db->escape($language) . "', '" . $db->escape($importid) . "', '" . $db->escape($image) . "', '" . $db->idate($date_creation) . "', '" . $db->escape($author_alias) . "')";
-        print $sqlinsert . "\n";
+        $sqlinsert = 'INSERT INTO '.MAIN_DB_PREFIX.'website_page(fk_website, pageurl, aliasalt, title, description, keywords, content, status, type_container, lang, import_key, image, date_creation, author_alias)';
+        $sqlinsert .= " VALUES(".$websiteid.", '".$db->escape($alias)."', '', '".$db->escape($title)."', '".$db->escape($description)."', '".$db->escape($keywords)."', ";
+        $sqlinsert .= " '".$db->escape($htmltext)."', '1', 'blogpost', '".$db->escape($language)."', '".$db->escape($importid)."', '".$db->escape($image)."', '".$db->idate($date_creation)."', '".$db->escape($author_alias)."')";
+        print $sqlinsert."\n";
 
         $result = $db->query($sqlinsert);
         if ($result <= 0) {
-            print 'ERROR: ' . $db->lasterrno . ": " . $sqlinsert . "\n";
+            print 'ERROR: '.$db->lasterrno.": ".$sqlinsert."\n";
             if ($db->lasterrno != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 $error++;
             } else {
                 $nbalreadyexists++;
             }
         } else {
-            $pageid = $db->last_insert_id(MAIN_DB_PREFIX . 'website_page');
+            $pageid = $db->last_insert_id(MAIN_DB_PREFIX.'website_page');
 
             if ($pageid > 0) {  // We must also regenerate page on disk
                 global $dolibarr_main_data_root;
-                $pathofwebsite = $dolibarr_main_data_root . '/website/' . $websiteref;
-                $filetpl = $pathofwebsite . '/page' . $pageid . '.tpl.php';
+                $pathofwebsite = $dolibarr_main_data_root.'/website/'.$websiteref;
+                $filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
                 $websitepage = new WebsitePage($db);
                 $websitepage->fetch($pageid);
                 dolSavePageContent($filetpl, $website, $websitepage);
             }
 
-            print "Insert done - pageid = " . $pageid . "\n";
+            print "Insert done - pageid = ".$pageid."\n";
             $nbimported++;
         }
 
         if ($max && $i >= $max) {
-            print 'Nb max of record (' . $max . ') reached. We stop now.' . "\n";
+            print 'Nb max of record ('.$max.') reached. We stop now.'."\n";
             break;
         }
     }
@@ -210,8 +210,8 @@ 
 
 if ($mode == 'confirm' && !$error) {
     print "Commit\n";
-    print $nbalreadyexists . " page(s) already exists.\n";
-    print $nbimported . " page(s) imported with importid=" . $importid . "\n";
+    print $nbalreadyexists." page(s) already exists.\n";
+    print $nbimported." page(s) imported with importid=".$importid."\n";
     $db->commit();
 } else {
     print "Rollback (mode=test)\n";

scripts/website/regenerate-pages.php

Spacing +15 added lines, -15 removed lines

@@ -32,11 +32,11 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
@@ -50,17 +50,17 @@ 
 $max = (!isset($argv[3]) || (empty($argv[3]) && $argv[3] !== '0')) ? '10' : $argv[3];
 
 if (empty($argv[2]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) {
-    print '***** ' . $script_file . ' *****' . "\n";
+    print '***** '.$script_file.' *****'."\n";
     print "Usage: $script_file (test|confirm) website [nbmaxrecord]\n";
     print "\n";
     print "Regenerate all pages of a web site.\n";
     exit(-1);
 }
 
-require $path . "../../htdocs/master.inc.php";
-include_once DOL_DOCUMENT_ROOT . '/website/class/website.class.php';
-include_once DOL_DOCUMENT_ROOT . '/website/class/websitepage.class.php';
-include_once DOL_DOCUMENT_ROOT . '/core/lib/website2.lib.php';
+require $path."../../htdocs/master.inc.php";
+include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
 $hookmanager->initHooks(array('cli'));
 
@@ -79,7 +79,7 @@ 
 $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {
-    print 'Error, web site ' . $websiteref . ' not found' . "\n";
+    print 'Error, web site '.$websiteref.' not found'."\n";
     exit(-1);
 }
 
@@ -90,29 +90,29 @@ 
 $listofpages = $websitepagestatic->fetchAll($website->id, '', '', $max);
 
 global $dolibarr_main_data_root;
-$pathofwebsite = $dolibarr_main_data_root . '/website/' . $websiteref;
+$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websiteref;
 
 $nbgenerated = 0;
 foreach ($listofpages as $websitepage) {
-    $filealias = $pathofwebsite . '/' . $websitepage->pageurl . '.php';
-    $filetpl = $pathofwebsite . '/page' . $websitepage->id . '.tpl.php';
+    $filealias = $pathofwebsite.'/'.$websitepage->pageurl.'.php';
+    $filetpl = $pathofwebsite.'/page'.$websitepage->id.'.tpl.php';
     if ($mode == 'confirm') {
         dolSavePageAlias($filealias, $website, $websitepage);
         dolSavePageContent($filetpl, $website, $websitepage);
     }
-    print "Generation of page done - pageid = " . $websitepage->id . " - " . $websitepage->pageurl . "\n";
+    print "Generation of page done - pageid = ".$websitepage->id." - ".$websitepage->pageurl."\n";
     $nbgenerated++;
 
     if ($max && $nbgenerated >= $max) {
-        print 'Nb max of record (' . $max . ') reached. We stop now.' . "\n";
+        print 'Nb max of record ('.$max.') reached. We stop now.'."\n";
         break;
     }
 }
 
 if ($mode == 'confirm') {
-    print $nbgenerated . " page(s) generated into " . $pathofwebsite . "\n";
+    print $nbgenerated." page(s) generated into ".$pathofwebsite."\n";
 } else {
-    print $nbgenerated . " page(s) found but not generated (test mode)\n";
+    print $nbgenerated." page(s) found but not generated (test mode)\n";
 }
 
 exit($error);

scripts/invoices/rebuild_merge_pdf.php

Spacing +46 added lines, -46 removed lines

@@ -33,21 +33,21 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // 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";
+    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);
 }
 
 // Include Dolibarr environment
-require_once $path . "../../htdocs/master.inc.php";
+require_once $path."../../htdocs/master.inc.php";
 // After this $db is an opened handler to database. We close it at end of file.
-require_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/modules/facture/modules_facture.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";
-require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice2.lib.php';
+require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice2.lib.php';
 
 // Load main language strings
 $langs->load("main");
@@ -64,8 +64,8 @@ 
  */
 
 @set_time_limit(0);
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
-dol_syslog($script_file . " launched with arg " . join(',', $argv));
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // Check parameters
 if (!isset($argv[1])) {
@@ -78,7 +78,7 @@ 
     exit(-1);
 }
 
-$diroutputpdf = $conf->facture->dir_output . '/temp';
+$diroutputpdf = $conf->facture->dir_output.'/temp';
 $newlangid = 'en_EN'; // To force a new lang id
 $filter = array();
 $regenerate = ''; // Ask regenerate (contains name of model to use)
@@ -99,99 +99,99 @@ 
         $found = true;
         $valarray = explode('=', $value);
         $newlangid = $valarray[1];
-        print 'Use language ' . $newlangid . ".\n";
+        print 'Use language '.$newlangid.".\n";
     }
     if (preg_match('/^prefix=/i', $value)) {
         $found = true;
         $valarray = explode('=', $value);
         $fileprefix = $valarray[1];
-        print 'Use prefix for filename ' . $fileprefix . ".\n";
+        print 'Use prefix for filename '.$fileprefix.".\n";
     }
 
     if (preg_match('/^regenerate=(.*)/i', $value, $reg)) {
         if (!in_array($reg[1], array('', '0', 'no'))) {
             $found = true;
             $regenerate = $reg[1];
-            print 'Regeneration of PDF is requested with template ' . $regenerate . "\n";
+            print 'Regeneration of PDF is requested with template '.$regenerate."\n";
         }
     }
 
     if ($value == 'filter=all') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'all';
+        $option .= (empty($option) ? '' : '_').'all';
         $filter[] = 'all';
 
-        print 'Rebuild PDF for all invoices' . "\n";
+        print 'Rebuild PDF for all invoices'."\n";
     }
 
     if ($value == 'filter=date') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'date_' . $argv[$key + 1] . '_' . $argv[$key + 2];
+        $option .= (empty($option) ? '' : '_').'date_'.$argv[$key + 1].'_'.$argv[$key + 2];
         $filter[] = 'date';
 
         $dateafterdate = dol_stringtotime($argv[$key + 1]);
         $datebeforedate = dol_stringtotime($argv[$key + 2]);
-        print 'Rebuild PDF for invoices validated between ' . dol_print_date($dateafterdate, 'day', 'gmt') . " and " . dol_print_date($datebeforedate, 'day', 'gmt') . ".\n";
+        print 'Rebuild PDF for invoices validated between '.dol_print_date($dateafterdate, 'day', 'gmt')." and ".dol_print_date($datebeforedate, 'day', 'gmt').".\n";
     }
 
     if ($value == 'filter=payments') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'payments_' . $argv[$key + 1] . '_' . $argv[$key + 2];
+        $option .= (empty($option) ? '' : '_').'payments_'.$argv[$key + 1].'_'.$argv[$key + 2];
         $filter[] = 'payments';
 
-        $paymentdateafter = dol_stringtotime($argv[$key + 1] . '000000');
-        $paymentdatebefore = dol_stringtotime($argv[$key + 2] . '235959');
+        $paymentdateafter = dol_stringtotime($argv[$key + 1].'000000');
+        $paymentdatebefore = dol_stringtotime($argv[$key + 2].'235959');
         if (empty($paymentdateafter) || empty($paymentdatebefore)) {
-            print 'Error: Bad date format or value' . "\n";
+            print 'Error: Bad date format or value'."\n";
             exit(-1);
         }
-        print 'Rebuild PDF for invoices with at least one payment between ' . dol_print_date($paymentdateafter, 'day', 'gmt') . " and " . dol_print_date($paymentdatebefore, 'day', 'gmt') . ".\n";
+        print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter, 'day', 'gmt')." and ".dol_print_date($paymentdatebefore, 'day', 'gmt').".\n";
     }
 
     if ($value == 'filter=nopayment') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'nopayment';
+        $option .= (empty($option) ? '' : '_').'nopayment';
         $filter[] = 'nopayment';
 
-        print 'Rebuild PDF for invoices with no payment done yet.' . "\n";
+        print 'Rebuild PDF for invoices with no payment done yet.'."\n";
     }
 
     if ($value == 'filter=bank') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'bank_' . $argv[$key + 1];
+        $option .= (empty($option) ? '' : '_').'bank_'.$argv[$key + 1];
         $filter[] = 'bank';
 
         $paymentonbankref = $argv[$key + 1];
         $bankaccount = new Account($db);
         $result = $bankaccount->fetch(0, $paymentonbankref);
         if ($result <= 0) {
-            print 'Error: Bank account with ref "' . $paymentonbankref . '" not found' . "\n";
+            print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
             exit(-1);
         }
         $paymentonbankid = $bankaccount->id;
-        print 'Rebuild PDF for invoices with at least one payment on financial account ' . $bankaccount->ref . "\n";
+        print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
     }
 
     if ($value == 'filter=nodeposit') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'nodeposit';
+        $option .= (empty($option) ? '' : '_').'nodeposit';
         $filter[] = 'nodeposit';
 
-        print 'Exclude deposit invoices' . "\n";
+        print 'Exclude deposit invoices'."\n";
     }
     if ($value == 'filter=noreplacement') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'noreplacement';
+        $option .= (empty($option) ? '' : '_').'noreplacement';
         $filter[] = 'noreplacement';
 
-        print 'Exclude replacement invoices' . "\n";
+        print 'Exclude replacement invoices'."\n";
     }
     if ($value == 'filter=nocreditnote') {
         $found = true;
-        $option .= (empty($option) ? '' : '_') . 'nocreditnote';
+        $option .= (empty($option) ? '' : '_').'nocreditnote';
         $filter[] = 'nocreditnote';
 
-        print 'Exclude credit note invoices' . "\n";
+        print 'Exclude credit note invoices'."\n";
     }
 
     if ($value == 'filter=excludethirdparties') {
@@ -199,18 +199,18 @@ 
         $filter[] = 'excludethirdparties';
 
         $thirdpartiesid = explode(',', $argv[$key + 1]);
-        print 'Exclude thirdparties with id in list (' . join(',', $thirdpartiesid) . ").\n";
+        print 'Exclude thirdparties with id in list ('.join(',', $thirdpartiesid).").\n";
 
-        $option .= (empty($option) ? '' : '_') . 'excludethirdparties' . join('-', $thirdpartiesid);
+        $option .= (empty($option) ? '' : '_').'excludethirdparties'.join('-', $thirdpartiesid);
     }
     if ($value == 'filter=onlythirdparties') {
         $found = true;
         $filter[] = 'onlythirdparties';
 
         $thirdpartiesid = explode(',', $argv[$key + 1]);
-        print 'Only thirdparties with id in list (' . join(',', $thirdpartiesid) . ").\n";
+        print 'Only thirdparties with id in list ('.join(',', $thirdpartiesid).").\n";
 
-        $option .= (empty($option) ? '' : '_') . 'onlythirdparty' . join('-', $thirdpartiesid);
+        $option .= (empty($option) ? '' : '_').'onlythirdparty'.join('-', $thirdpartiesid);
     }
 
     if (!$found && preg_match('/filter=/i', $value)) {
@@ -242,10 +242,10 @@ 
 
 if ($result >= 0) {
     $error = 0;
-    print '--- end ok' . "\n";
+    print '--- end ok'."\n";
 } else {
     $error = $result;
-    print '--- end error code=' . $error . "\n";
+    print '--- end error code='.$error."\n";
 }
 
 $db->close();
@@ -264,15 +264,15 @@ 
     print "Rebuild PDF files for some invoices and merge PDF files into one.\n";
     print "\n";
     print "To build/merge PDF for invoices in a date range:\n";
-    print "Usage:   " . $script_file . " filter=date dateafter datebefore\n";
+    print "Usage:   ".$script_file." filter=date dateafter datebefore\n";
     print "To build/merge PDF for invoices with at least one payment in a date range:\n";
-    print "Usage:   " . $script_file . " filter=payments dateafter datebefore\n";
+    print "Usage:   ".$script_file." filter=payments dateafter datebefore\n";
     print "To build/merge PDF for invoices with at least one payment onto a bank account:\n";
-    print "Usage:   " . $script_file . " filter=bank bankref\n";
+    print "Usage:   ".$script_file." filter=bank bankref\n";
     print "To build/merge PDF for all invoices, use filter=all\n";
-    print "Usage:   " . $script_file . " filter=all\n";
+    print "Usage:   ".$script_file." filter=all\n";
     print "To build/merge PDF for invoices with no payments, use filter=nopayment\n";
-    print "Usage:   " . $script_file . " filter=nopayment\n";
+    print "Usage:   ".$script_file." filter=nopayment\n";
     print "To exclude credit notes, use filter=nocreditnote\n";
     print "To exclude replacement invoices, use filter=noreplacement\n";
     print "To exclude deposit invoices, use filter=nodeposit\n";
@@ -282,8 +282,8 @@ 
     print "To generate invoices in a language, use lang=xx_XX\n";
     print "To set prefix of generated file name, use prefix=myfileprefix\n";
     print "\n";
-    print "Example: " . $script_file . " filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
-    print "Example: " . $script_file . " filter=all lang=en_US\n";
+    print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
+    print "Example: ".$script_file." filter=all lang=en_US\n";
     print "\n";
     print "Note that some filters can be cumulated.\n";
 }