alxarafe / alixar

scripts/user/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 . "/user/class/user.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/user.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] != 'user') {
     print "Usage:  $script_file user\n";
     exit(-1);
 }
 
-print '--- start' . "\n";
+print '--- start'."\n";
 
 // Case to migrate products path
 if ($argv[1] == 'user') {
     $u = new User($db);
 
-    $sql = "SELECT rowid as uid from " . MAIN_DB_PREFIX . "user"; // Get list of all products
+    $sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user"; // Get list of all products
     $resql = $db->query($sql);
     if ($resql) {
         while ($obj = $db->fetch_object($resql)) {
             $u->fetch($obj->uid);
-            print " migrating user id=" . $u->id . " ref=" . $u->ref . "\n";
+            print " migrating user id=".$u->id." ref=".$u->ref."\n";
             migrate_user_filespath($u);
         }
     } else {
-        print "\n sql error " . $sql;
+        print "\n sql error ".$sql;
         exit();
     }
 }
@@ -112,8 +112,8 @@ 
 
     // Les fichiers joints des users sont toujours sur l'entité 1
     $dir = $conf->user->dir_output;
-    $origin = $dir . '/' . get_exdir($u->id, 2, 0, 0, $u, 'user');
-    $destin = $dir . '/' . $u->id;
+    $origin = $dir.'/'.get_exdir($u->id, 2, 0, 0, $u, 'user');
+    $destin = $dir.'/'.$u->id;
 
     $error = 0;
 
@@ -125,18 +125,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/invoices/email_unpaid_invoices_to_customers.php

Spacing +36 added lines, -36 removed lines

@@ -35,12 +35,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 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);
 }
 
@@ -56,8 +56,8 @@ 
 $mode = $argv[1];
 $targettype = $argv[2];
 
-require $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/CMailFile.class.php";
+require $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
 
 $langs->load('main');
 
@@ -73,15 +73,15 @@ 
  */
 
 @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));
 
 $now = dol_now('tzserver');
 $duration_value = isset($argv[3]) ? $argv[3] : 'none';
 $duration_value2 = isset($argv[4]) ? $argv[4] : 'none';
 
 $error = 0;
-print $script_file . " launched with mode " . $mode . " default lang=" . $langs->defaultlang . (is_numeric($duration_value) ? " delay=" . $duration_value : "") . (is_numeric($duration_value2) ? " after=" . $duration_value2 : "") . "\n";
+print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "").(is_numeric($duration_value2) ? " after=".$duration_value2 : "")."\n";
 
 if ($mode != 'confirm') {
     $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
@@ -97,17 +97,17 @@ 
 if ($targettype == 'contacts') {
     $sql .= ", sp.rowid as cid, sp.firstname as cfirstname, sp.lastname as clastname, sp.email as cemail";
 }
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f, " . MAIN_DB_PREFIX . "societe as s";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 if ($targettype == 'contacts') {
-    $sql .= ", " . MAIN_DB_PREFIX . "socpeople as sp";
+    $sql .= ", ".MAIN_DB_PREFIX."socpeople as sp";
 }
 $sql .= " WHERE f.fk_statut = 1 AND f.paye = 0";
 $sql .= " AND f.fk_soc = s.rowid";
 if (is_numeric($duration_value2)) {
-    $sql .= " AND f.date_lim_reglement >= '" . $db->idate(dol_time_plus_duree($now, $duration_value2, "d")) . "'";
+    $sql .= " AND f.date_lim_reglement >= '".$db->idate(dol_time_plus_duree($now, $duration_value2, "d"))."'";
 }
 if (is_numeric($duration_value)) {
-    $sql .= " AND f.date_lim_reglement < '" . $db->idate(dol_time_plus_duree($now, $duration_value, "d")) . "'";
+    $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
 }
 if ($targettype == 'contacts') {
     $sql .= " AND s.rowid = sp.fk_soc";
@@ -131,8 +131,8 @@ 
     $foundtoprocess = 0;
     $trackthirdpartiessent = array();
 
-    print "We found " . $num . " couples (unpayed validated invoices-" . $targettype . ") qualified\n";
-    dol_syslog("We found " . $num . " couples (unpayed validated invoices-" . $targettype . ") qualified");
+    print "We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified\n";
+    dol_syslog("We found ".$num." couples (unpayed validated invoices-".$targettype.") qualified");
     $message = '';
     $oldtarget = '';
 
@@ -158,15 +158,15 @@ 
 
             if ($startbreak) {
                 // Break onto sales representative (new email or cid)
-                if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid . '|' . $oldemail])) {
+                if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
                     envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget);
-                    $trackthirdpartiessent[$oldsid . '|' . $oldemail] = 'contact id ' . $oldcid;
+                    $trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
                 } else {
                     if ($oldemail != 'none') {
-                        if (empty($trackthirdpartiessent[$oldsid . '|' . $oldemail])) {
-                            print "- No email sent for '" . $oldtarget . "', total: " . $total . "\n";
+                        if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                            print "- No email sent for '".$oldtarget."', total: ".$total."\n";
                         } else {
-                            print "- No email sent for '" . $oldtarget . "', total: " . $total . " (already sent to " . $trackthirdpartiessent[$oldsid . '|' . $oldemail] . ")\n";
+                            print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
                         }
                     }
                 }
@@ -176,7 +176,7 @@ 
                     $oldcid = $obj->cid;
                 }
                 $oldlang = $obj->default_lang;
-                $oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname . " " . $obj->cfirstname);
+                $oldtarget = (empty($obj->cfirstname) && empty($obj->clastname)) ? $obj->name : ($obj->clastname." ".$obj->cfirstname);
                 $message = '';
                 $total = 0;
                 $foundtoprocess = 0;
@@ -191,11 +191,11 @@ 
             $outputlangs->loadLangs(array("main", "bills"));
 
             if (dol_strlen($newemail)) {
-                $message .= $outputlangs->trans("Invoice") . " " . $obj->ref . " : " . price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) . "\n";
-                dol_syslog("email_unpaid_invoices_to_customers.php: " . $newemail . " " . $message);
+                $message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)."\n";
+                dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
                 $foundtoprocess++;
             }
-            print "Unpaid invoice " . $obj->ref . ", price " . price2num($obj->total_ttc) . ", due date " . dol_print_date($db->jdate($obj->due_date), 'day') . ", customer id " . $obj->sid . " " . $obj->name . ", " . (isset($obj->cid) ? "contact id " . $obj->cid . " " . $obj->clastname . " " . $obj->cfirstname . ", " : "") . "email " . $newemail . ", lang " . $outputlangs->defaultlang . ": ";
+            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".(isset($obj->cid) ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
             if (dol_strlen($newemail)) {
                 print "qualified.";
             } else {
@@ -212,15 +212,15 @@ 
 
         // Si il reste des envois en buffer
         if ($foundtoprocess) {
-            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid . '|' . $oldemail])) { // Break onto email (new email)
+            if (dol_strlen($oldemail) && $oldemail != 'none' && empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) { // Break onto email (new email)
                 envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldtarget);
-                $trackthirdpartiessent[$oldsid . '|' . $oldemail] = 'contact id ' . $oldcid;
+                $trackthirdpartiessent[$oldsid.'|'.$oldemail] = 'contact id '.$oldcid;
             } else {
                 if ($oldemail != 'none') {
-                    if (empty($trackthirdpartiessent[$oldsid . '|' . $oldemail])) {
-                        print "- No email sent for '" . $oldtarget . "', total: " . $total . "\n";
+                    if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail])) {
+                        print "- No email sent for '".$oldtarget."', total: ".$total."\n";
                     } else {
-                        print "- No email sent for '" . $oldtarget . "', total: " . $total . " (already sent to " . $trackthirdpartiessent[$oldsid . '|' . $oldemail] . ")\n";
+                        print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
                     }
                 }
             }
@@ -267,8 +267,8 @@ 
     $errorsto = Functions::getDolGlobalString('MAIN_MAIL_ERRORS_TO');
     $msgishtml = -1;
 
-    print "- Send email to '" . $oldtarget . "' (" . $oldemail . "), total: " . $total . "\n";
-    dol_syslog("email_unpaid_invoices_to_customers.php: send mail to " . $oldemail);
+    print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
+    dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
     $usehtml = 0;
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER') && dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER'))) {
@@ -282,12 +282,12 @@ 
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER')) {
         $allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
     } else {
-        $allmessage .= "Dear customer" . ($usehtml ? "<br>\n" : "\n") . ($usehtml ? "<br>\n" : "\n");
-        $allmessage .= "Please, find a summary of the bills with pending payments from you." . ($usehtml ? "<br>\n" : "\n") . ($usehtml ? "<br>\n" : "\n");
-        $allmessage .= "Note: This list contains only unpaid invoices." . ($usehtml ? "<br>\n" : "\n");
+        $allmessage .= "Dear customer".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+        $allmessage .= "Please, find a summary of the bills with pending payments from you.".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+        $allmessage .= "Note: This list contains only unpaid invoices.".($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage .= $message . ($usehtml ? "<br>\n" : "\n");
-    $allmessage .= $langs->trans("Total") . " = " . price($total, 0, $userlang, 0, 0, -1, $conf->currency) . ($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER')) {
         $allmessage .= Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER');
         if (dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER'))) {
@@ -303,8 +303,8 @@ 
     if ($mode == 'confirm') {
         $result = $mail->sendfile();
         if (!$result) {
-            print "Error sending email " . $mail->error . "\n";
-            dol_syslog("Error sending email " . $mail->error . "\n");
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
         }
     } else {
         print "No email sent (test mode)\n";

scripts/invoices/email_unpaid_invoices_to_representatives.php

Spacing +28 added lines, -28 removed lines

@@ -35,12 +35,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 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);
 }
 
@@ -54,8 +54,8 @@ 
 }
 $mode = $argv[1];
 
-require $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/CMailFile.class.php";
+require $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
 
 $langs->load('main');
 
@@ -71,13 +71,13 @@ 
  */
 
 @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));
 
 $now = dol_now('tzserver');
 $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
-print $script_file . " launched with mode " . $mode . " default lang=" . $langs->defaultlang . (is_numeric($duration_value) ? " delay=" . $duration_value : "") . "\n";
+print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
 if ($mode != 'confirm') {
     $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
@@ -90,14 +90,14 @@ 
 
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
-$sql .= " , " . MAIN_DB_PREFIX . "societe as s";
-$sql .= " , " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
-$sql .= " , " . MAIN_DB_PREFIX . "user as u";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+$sql .= " , ".MAIN_DB_PREFIX."societe as s";
+$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " , ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE f.fk_statut = 1 AND f.paye = 0";
 $sql .= " AND f.fk_soc = s.rowid";
 if (is_numeric($duration_value)) {
-    $sql .= " AND f.date_lim_reglement < '" . $db->idate(dol_time_plus_duree($now, $duration_value, "d")) . "'";
+    $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
 }
 $sql .= " AND sc.fk_soc = s.rowid";
 $sql .= " AND sc.fk_user = u.rowid";
@@ -114,8 +114,8 @@ 
     $total = 0;
     $foundtoprocess = 0;
 
-    print "We found " . $num . " couples (unpayed validated invoice - sale representative) qualified\n";
-    dol_syslog("We found " . $num . " couples (unpayed validated invoice - sale representative) qualified");
+    print "We found ".$num." couples (unpayed validated invoice - sale representative) qualified\n";
+    dol_syslog("We found ".$num." couples (unpayed validated invoice - sale representative) qualified");
     $message = '';
     $oldsalerepresentative = 0;
 
@@ -129,7 +129,7 @@ 
                     envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
                 } else {
                     if ($oldemail != 'none') {
-                        print "- No email sent for " . $oldsalerepresentative . ", total: " . $total . "\n";
+                        print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                     }
                 }
                 $oldemail = $obj->email;
@@ -141,7 +141,7 @@ 
                 $foundtoprocess = 0;
                 $salerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 if (empty($obj->email)) {
-                    print "Warning: Sale representative " . $salerepresentative . " has no email. Notice disabled.\n";
+                    print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
                 }
             }
 
@@ -153,11 +153,11 @@ 
             $outputlangs->loadLangs(array("main", "bills"));
 
             if (dol_strlen($obj->email)) {
-                $message .= $outputlangs->trans("Invoice") . " " . $obj->ref . " : " . price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) . " : " . $obj->name . "\n";
-                dol_syslog("email_unpaid_invoices_to_representatives.php: " . $obj->email);
+                $message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)." : ".$obj->name."\n";
+                dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email);
                 $foundtoprocess++;
             }
-            print "Unpaid invoice " . $obj->ref . ", price " . price2num($obj->total_ttc) . ", due date " . dol_print_date($db->jdate($obj->due_date), 'day') . " (linked to company " . $obj->name . ", sale representative " . dolGetFirstLastname($obj->firstname, $obj->lastname) . ", email " . $obj->email . ", lang " . $outputlangs->defaultlang . "): ";
+            print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
             if (dol_strlen($obj->email)) {
                 print "qualified.";
             } else {
@@ -177,7 +177,7 @@ 
                 envoi_mail($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative);
             } else {
                 if ($oldemail != 'none') {
-                    print "- No email sent for " . $oldsalerepresentative . ", total: " . $total . "\n";
+                    print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                 }
             }
         }
@@ -223,8 +223,8 @@ 
     $errorsto = Functions::getDolGlobalString('MAIN_MAIL_ERRORS_TO');
     $msgishtml = -1;
 
-    print "- Send email for " . $oldtarget . " (" . $oldemail . "), total: " . $total . "\n";
-    dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to " . $oldemail);
+    print "- Send email for ".$oldtarget." (".$oldemail."), total: ".$total."\n";
+    dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
     $usehtml = 0;
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER') && dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER'))) {
@@ -238,11 +238,11 @@ 
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER')) {
         $allmessage .= Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER');
     } else {
-        $allmessage .= $newlangs->transnoentities("ListOfYourUnpaidInvoices") . ($usehtml ? "<br>\n" : "\n") . ($usehtml ? "<br>\n" : "\n");
-        $allmessage .= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices") . ($usehtml ? "<br>\n" : "\n");
+        $allmessage .= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+        $allmessage .= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage .= $message . ($usehtml ? "<br>\n" : "\n");
-    $allmessage .= $langs->trans("Total") . " = " . price($total, 0, $newlangs, 0, 0, -1, $conf->currency) . ($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $newlangs, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER')) {
         $allmessage .= Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER');
         if (dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER'))) {
@@ -258,8 +258,8 @@ 
     if ($mode == 'confirm') {
         $result = $mail->sendfile();
         if (!$result) {
-            print "Error sending email " . $mail->error . "\n";
-            dol_syslog("Error sending email " . $mail->error . "\n");
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
         }
     } else {
         print "No email sent (test mode)\n";

scripts/company/sync_contacts_dolibarr2ldap.php

Spacing +22 added lines, -22 removed lines

@@ -34,18 +34,18 @@ 
 
 $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 . "/contact/class/contact.class.php";
-require_once DOL_DOCUMENT_ROOT . "/user/class/user.class.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/ldap.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
 
 // Global variables
 $version = DOL_VERSION;
@@ -60,8 +60,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));
 
 if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: $script_file now [-y]\n";
@@ -85,19 +85,19 @@ 
 $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";
-print "host=" . $conf->db->host . "\n";
-print "port=" . $conf->db->port . "\n";
-print "login=" . $conf->db->user . "\n";
+print "type=".$conf->db->type."\n";
+print "host=".$conf->db->host."\n";
+print "port=".$conf->db->port."\n";
+print "login=".$conf->db->user."\n";
 // print "pass=".preg_replace('/./i','*',$conf->db->password)."\n"; // Not defined for security reasons
-print "database=" . $conf->db->name . "\n";
+print "database=".$conf->db->name."\n";
 print "\n";
 print "----- To LDAP database:\n";
-print "host=" . Functions::getDolGlobalString('LDAP_SERVER_HOST') . "\n";
-print "port=" . Functions::getDolGlobalString('LDAP_SERVER_PORT') . "\n";
-print "login=" . Functions::getDolGlobalString('LDAP_ADMIN_DN') . "\n";
-print "pass=" . preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS')) . "\n";
-print "DN target=" . Functions::getDolGlobalString('LDAP_CONTACT_DN') . "\n";
+print "host=".Functions::getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".Functions::getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".Functions::getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "pass=".preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
+print "DN target=".Functions::getDolGlobalString('LDAP_CONTACT_DN')."\n";
 print "\n";
 
 if (!$confirmed) {
@@ -117,7 +117,7 @@ 
  */
 
 $sql = "SELECT rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "socpeople";
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -136,7 +136,7 @@ 
         $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;
 
@@ -149,10 +149,10 @@ 
         $result = $ldap->add($dn, $info, $user); // Will fail if already exists
         $result = $ldap->update($dn, $info, $user, $olddn);
         if ($result > 0) {
-            print " - " . $langs->trans("OK");
+            print " - ".$langs->trans("OK");
         } else {
             $error++;
-            print " - " . $langs->trans("KO") . ' - ' . $ldap->error;
+            print " - ".$langs->trans("KO").' - '.$ldap->error;
         }
         print "\n";
 

scripts/members/sync_members_types_dolibarr2ldap.php

Spacing +12 added lines, -12 removed lines

@@ -35,24 +35,24 @@ 
 
 $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[1]) || !$argv[1]) {
-    print "Usage: " . $script_file . " now\n";
+    print "Usage: ".$script_file." now\n";
     exit(-1);
 }
 
 $now = $argv[1];
 
-require_once $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT . "/adherents/class/adherent_type.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 // Global variables
 $version = constant('DOL_VERSION');
@@ -66,8 +66,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));
 
 /*
  * if (Functions::getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
@@ -83,7 +83,7 @@ 
 
 
 $sql = "SELECT rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "adherent_type";
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -103,7 +103,7 @@ 
             $membertype->id = $obj->rowid;
             $membertype->fetch($membertype->id);
 
-            print $langs->trans("UpdateMemberType") . " rowid=" . $membertype->id . " " . $membertype->label;
+            print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype->label;
 
             $oldobject = $membertype;
 
@@ -116,10 +116,10 @@ 
             $result = $ldap->add($dn, $info, $user); // Will fail if already exists
             $result = $ldap->update($dn, $info, $user, $olddn);
             if ($result > 0) {
-                print " - " . $langs->trans("OK");
+                print " - ".$langs->trans("OK");
             } else {
                 $error++;
-                print " - " . $langs->trans("KO") . ' - ' . $ldap->error;
+                print " - ".$langs->trans("KO").' - '.$ldap->error;
             }
             print "\n";
 

scripts/members/sync_members_ldap2dolibarr.php

Spacing +33 added lines, -33 removed lines

@@ -34,19 +34,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 . "/core/lib/date.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php";
-require_once DOL_DOCUMENT_ROOT . "/adherents/class/subscription.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php";
+require_once DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php";
 
 $langs->loadLangs(array("main", "errors"));
 
@@ -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));
 
 // List of fields to get from LDAP
 $required_fields = array(
@@ -122,34 +122,34 @@ 
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . Functions::getDolGlobalString('LDAP_SERVER_HOST') . "\n";
-print "port=" . Functions::getDolGlobalString('LDAP_SERVER_PORT') . "\n";
-print "login=" . Functions::getDolGlobalString('LDAP_ADMIN_DN') . "\n";
-print "pass=" . preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS')) . "\n";
-print "DN to extract=" . Functions::getDolGlobalString('LDAP_MEMBER_DN') . "\n";
+print "host=".Functions::getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".Functions::getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".Functions::getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "pass=".preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
+print "DN to extract=".Functions::getDolGlobalString('LDAP_MEMBER_DN')."\n";
 if (Functions::getDolGlobalString('LDAP_MEMBER_FILTER')) {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_MEMBER_FILTER') . ')' . "\n"; // Note: filter is defined into function getRecords
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_MEMBER_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_KEY_MEMBERS') . '=*)' . "\n";
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_KEY_MEMBERS').'=*)'."\n";
 }
 print "----- To Dolibarr database:\n";
-print "type=" . $conf->db->type . "\n";
-print "host=" . $conf->db->host . "\n";
-print "port=" . $conf->db->port . "\n";
-print "login=" . $conf->db->user . "\n";
-print "database=" . $conf->db->name . "\n";
+print "type=".$conf->db->type."\n";
+print "host=".$conf->db->host."\n";
+print "port=".$conf->db->port."\n";
+print "login=".$conf->db->user."\n";
+print "database=".$conf->db->name."\n";
 print "----- Options:\n";
-print "commitiferror=" . $forcecommit . "\n";
-print "Mapped LDAP fields=" . join(',', $required_fields) . "\n";
+print "commitiferror=".$forcecommit."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
 // Check parameters
 if (!Functions::getDolGlobalString('LDAP_MEMBER_DN')) {
-    print $langs->trans("Error") . ': ' . $langs->trans("LDAP setup for members not defined inside Dolibarr") . "\n";
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
     exit(-1);
 }
 if ($typeid <= 0) {
-    print $langs->trans("Error") . ': Parameter id_member_type is not a valid ref of an existing member type' . "\n";
+    print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
     exit(-2);
 }
 
@@ -167,7 +167,7 @@ 
 $hashlib2rowid = array();
 $countries = array();
 $sql = "SELECT rowid, code, label, active";
-$sql .= " FROM " . MAIN_DB_PREFIX . "c_country";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
 $sql .= " WHERE active = 1";
 $sql .= " ORDER BY code ASC";
 $resql = $db->query($sql);
@@ -246,14 +246,14 @@ 
             $member->typeid = $typeid;
 
             // Creation membre
-            print $langs->transnoentities("MemberCreate") . ' # ' . $key . ': login=' . $member->login . ', fullname=' . $member->getFullName($langs);
-            print ', datec=' . $member->datec;
+            print $langs->transnoentities("MemberCreate").' # '.$key.': login='.$member->login.', fullname='.$member->getFullName($langs);
+            print ', datec='.$member->datec;
             $member_id = $member->create($user);
             if ($member_id > 0) {
-                print ' --> Created member id=' . $member_id . ' login=' . $member->login;
+                print ' --> Created member id='.$member_id.' login='.$member->login;
             } else {
                 $error++;
-                print ' --> ' . $member->error;
+                print ' --> '.$member->error;
             }
             print "\n";
 
@@ -300,13 +300,13 @@ 
 
         if (!$error || $forcecommit) {
             if (!$error) {
-                print $langs->transnoentities("NoErrorCommitIsDone") . "\n";
+                print $langs->transnoentities("NoErrorCommitIsDone")."\n";
             } else {
-                print $langs->transnoentities("ErrorButCommitIsDone") . "\n";
+                print $langs->transnoentities("ErrorButCommitIsDone")."\n";
             }
             $db->commit();
         } else {
-            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error) . "\n";
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
             $db->rollback();
         }
         print "\n";

scripts/members/sync_members_types_ldap2dolibarr.php

Spacing +31 added lines, -31 removed lines

@@ -36,18 +36,18 @@ 
 
 $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 . "/core/lib/date.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT . "/adherents/class/adherent_type.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 $langs->loadLangs(array("main", "errors"));
 
@@ -65,8 +65,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));
 
 // List of fields to get from LDAP
 $required_fields = array(Functions::getDolGlobalString('LDAP_KEY_MEMBERS_TYPES'), Functions::getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_FULLNAME'), Functions::getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_DESCRIPTION'), Functions::getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS'));
@@ -104,21 +104,21 @@ 
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
 print "----- Synchronize all records from LDAP database:\n";
-print "host=" . Functions::getDolGlobalString('LDAP_SERVER_HOST') . "\n";
-print "port=" . Functions::getDolGlobalString('LDAP_SERVER_PORT') . "\n";
-print "login=" . Functions::getDolGlobalString('LDAP_ADMIN_DN') . "\n";
-print "pass=" . preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS')) . "\n";
-print "DN to extract=" . Functions::getDolGlobalString('LDAP_MEMBER_TYPE_DN') . "\n";
-print 'Filter=(' . Functions::getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . '=*)' . "\n";
+print "host=".Functions::getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".Functions::getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".Functions::getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "pass=".preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
+print "DN to extract=".Functions::getDolGlobalString('LDAP_MEMBER_TYPE_DN')."\n";
+print 'Filter=('.Functions::getDolGlobalString('LDAP_KEY_MEMBERS_TYPES').'=*)'."\n";
 print "----- To Dolibarr database:\n";
-print "type=" . $conf->db->type . "\n";
-print "host=" . $conf->db->host . "\n";
-print "port=" . $conf->db->port . "\n";
-print "login=" . $conf->db->user . "\n";
-print "database=" . $conf->db->name . "\n";
+print "type=".$conf->db->type."\n";
+print "host=".$conf->db->host."\n";
+print "port=".$conf->db->port."\n";
+print "login=".$conf->db->user."\n";
+print "database=".$conf->db->name."\n";
 print "----- Options:\n";
-print "commitiferror=" . $forcecommit . "\n";
-print "Mapped LDAP fields=" . join(',', $required_fields) . "\n";
+print "commitiferror=".$forcecommit."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
 if (!$confirmed) {
@@ -127,7 +127,7 @@ 
 }
 
 if (!Functions::getDolGlobalString('LDAP_MEMBER_TYPE_DN')) {
-    print $langs->trans("Error") . ': ' . $langs->trans("LDAP setup for members types not defined inside Dolibarr");
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
     exit(-1);
 }
 
@@ -154,25 +154,25 @@ 
             // print_r($ldapgroup);
 
             if ($membertype->id > 0) { // Member type update
-                print $langs->transnoentities("MemberTypeUpdate") . ' # ' . $key . ': name=' . $membertype->label;
+                print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
                 $res = $membertype->update($user);
 
                 if ($res > 0) {
-                    print ' --> Updated member type id=' . $membertype->id . ' name=' . $membertype->label;
+                    print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
                 } else {
                     $error++;
-                    print ' --> ' . $res . ' ' . $membertype->error;
+                    print ' --> '.$res.' '.$membertype->error;
                 }
                 print "\n";
             } else { // Member type creation
-                print $langs->transnoentities("MemberTypeCreate") . ' # ' . $key . ': name=' . $membertype->label;
+                print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
                 $res = $membertype->create($user);
 
                 if ($res > 0) {
-                    print ' --> Created member type id=' . $membertype->id . ' name=' . $membertype->label;
+                    print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
                 } else {
                     $error++;
-                    print ' --> ' . $res . ' ' . $membertype->error;
+                    print ' --> '.$res.' '.$membertype->error;
                 }
                 print "\n";
             }
@@ -182,13 +182,13 @@ 
 
         if (!$error || $forcecommit) {
             if (!$error) {
-                print $langs->transnoentities("NoErrorCommitIsDone") . "\n";
+                print $langs->transnoentities("NoErrorCommitIsDone")."\n";
             } else {
-                print $langs->transnoentities("ErrorButCommitIsDone") . "\n";
+                print $langs->transnoentities("ErrorButCommitIsDone")."\n";
             }
             $db->commit();
         } else {
-            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error) . "\n";
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
             $db->rollback();
         }
         print "\n";

scripts/members/sync_members_dolibarr2ldap.php

Spacing +21 added lines, -21 removed lines

@@ -34,17 +34,17 @@ 
 
 $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 . "/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php";
 
 $langs->load("main");
 
@@ -61,8 +61,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));
 
 if (!isset($argv[1]) || !$argv[1]) {
     print "Usage: $script_file now [-y]\n";
@@ -86,19 +86,19 @@ 
 $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";
-print "host=" . $conf->db->host . "\n";
-print "port=" . $conf->db->port . "\n";
-print "login=" . $conf->db->user . "\n";
+print "type=".$conf->db->type."\n";
+print "host=".$conf->db->host."\n";
+print "port=".$conf->db->port."\n";
+print "login=".$conf->db->user."\n";
 // print "pass=".preg_replace('/./i','*',$conf->db->password)."\n"; // Not defined for security reasons
-print "database=" . $conf->db->name . "\n";
+print "database=".$conf->db->name."\n";
 print "\n";
 print "----- To LDAP database:\n";
-print "host=" . Functions::getDolGlobalString('LDAP_SERVER_HOST') . "\n";
-print "port=" . Functions::getDolGlobalString('LDAP_SERVER_PORT') . "\n";
-print "login=" . Functions::getDolGlobalString('LDAP_ADMIN_DN') . "\n";
-print "pass=" . preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS')) . "\n";
-print "DN target=" . Functions::getDolGlobalString('LDAP_MEMBER_DN') . "\n";
+print "host=".Functions::getDolGlobalString('LDAP_SERVER_HOST')."\n";
+print "port=".Functions::getDolGlobalString('LDAP_SERVER_PORT')."\n";
+print "login=".Functions::getDolGlobalString('LDAP_ADMIN_DN')."\n";
+print "pass=".preg_replace('/./i', '*', Functions::getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
+print "DN target=".Functions::getDolGlobalString('LDAP_MEMBER_DN')."\n";
 print "\n";
 
 if (!$confirmed) {
@@ -118,7 +118,7 @@ 
  */
 
 $sql = "SELECT rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "adherent";
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -145,7 +145,7 @@ 
             exit(-1);
         }
 
-        print $langs->transnoentities("UpdateMember") . " rowid=" . $member->id . " " . $member->getFullName($langs);
+        print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
 
         $oldobject = $member;
 
@@ -158,10 +158,10 @@ 
         $result = $ldap->add($dn, $info, $user); // Will fail if already exists
         $result = $ldap->update($dn, $info, $user, $olddn);
         if ($result > 0) {
-            print " - " . $langs->transnoentities("OK");
+            print " - ".$langs->transnoentities("OK");
         } else {
             $error++;
-            print " - " . $langs->transnoentities("KO") . ' - ' . $ldap->error;
+            print " - ".$langs->transnoentities("KO").' - '.$ldap->error;
         }
         print "\n";
 

scripts/contracts/email_expire_services_to_representatives.php

Spacing +26 added lines, -26 removed lines

@@ -35,12 +35,12 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = __DIR__ . '/';
+$path = __DIR__.'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 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);
 }
 
@@ -54,8 +54,8 @@ 
 }
 $mode = $argv[1];
 
-require $path . "../../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/CMailFile.class.php";
+require $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
 
 $langs->loadLangs(array('main', 'contracts'));
 
@@ -71,13 +71,13 @@ 
  */
 
 @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));
 
 $now = dol_now('tzserver');
 $duration_value = isset($argv[2]) ? $argv[2] : 'none';
 
-print $script_file . " launched with mode " . $mode . " default lang=" . $langs->defaultlang . (is_numeric($duration_value) ? " delay=" . $duration_value : "") . "\n";
+print $script_file." launched with mode ".$mode." default lang=".$langs->defaultlang.(is_numeric($duration_value) ? " delay=".$duration_value : "")."\n";
 
 if ($mode != 'confirm') {
     $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
@@ -85,11 +85,11 @@ 
 
 $sql = "SELECT DISTINCT c.ref, c.fk_soc, cd.date_fin_validite, cd.total_ttc, cd.description as description, p.label as plabel, s.rowid, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
-$sql .= " FROM " . MAIN_DB_PREFIX . "societe AS s, " . MAIN_DB_PREFIX . "contrat AS c, " . MAIN_DB_PREFIX . "contratdet AS cd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product AS p ON p.rowid = cd.fk_product, " . MAIN_DB_PREFIX . "societe_commerciaux AS sc, " . MAIN_DB_PREFIX . "user AS u";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."contrat AS c, ".MAIN_DB_PREFIX."contratdet AS cd";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product, ".MAIN_DB_PREFIX."societe_commerciaux AS sc, ".MAIN_DB_PREFIX."user AS u";
 $sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 AND cd.statut<5";
 if (is_numeric($duration_value)) {
-    $sql .= " AND cd.date_fin_validite < '" . $db->idate(dol_time_plus_duree($now, $duration_value, "d")) . "'";
+    $sql .= " AND cd.date_fin_validite < '".$db->idate(dol_time_plus_duree($now, $duration_value, "d"))."'";
 }
 $sql .= " AND sc.fk_soc = s.rowid AND sc.fk_user = u.rowid";
 $sql .= " ORDER BY u.email ASC, s.rowid ASC, c.ref ASC"; // Order by email to allow one message per email
@@ -105,8 +105,8 @@ 
     $oldlang = '';
     $total = 0;
     $foundtoprocess = 0;
-    print "We found " . $num . " couples (services to expire - sale representative) qualified\n";
-    dol_syslog("We found " . $num . " couples (services to expire - sale representative) qualified");
+    print "We found ".$num." couples (services to expire - sale representative) qualified\n";
+    dol_syslog("We found ".$num." couples (services to expire - sale representative) qualified");
     $message = '';
 
     if ($num) {
@@ -119,7 +119,7 @@ 
                     sendEmailTo($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative, $duration_value);
                 } else {
                     if ($oldemail != 'none') {
-                        print "- No email sent for " . $oldsalerepresentative . ", total: " . $total . "\n";
+                        print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                     }
                 }
                 $oldemail = $obj->email;
@@ -131,7 +131,7 @@ 
                 $foundtoprocess = 0;
                 $salerepresentative = dolGetFirstLastname($obj->firstname, $obj->lastname);
                 if (empty($obj->email)) {
-                    print "Warning: Sale representative " . $salerepresentative . " has no email. Notice disabled.\n";
+                    print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n";
                 }
             }
 
@@ -143,11 +143,11 @@ 
             $outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
 
             if (dol_strlen($obj->email)) {
-                $message .= $outputlangs->trans("Contract") . " " . $obj->ref . ": " . $langs->trans("Service") . " " . dol_concatdesc($obj->plabel, $obj->description) . " (" . price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) . ") " . $obj->name . ", " . $outputlangs->trans("DateEndPlannedShort") . " " . dol_print_date($db->jdate($obj->date_fin_validite), 'day') . "\n\n";
-                dol_syslog("email_expire_services_to_representatives.php: " . $obj->email);
+                $message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
+                dol_syslog("email_expire_services_to_representatives.php: ".$obj->email);
                 $foundtoprocess++;
             }
-            print "Service to expire " . $obj->ref . ", label " . dol_concatdesc($obj->plabel, $obj->description) . ", due date " . dol_print_date($db->jdate($obj->date_fin_validite), 'day') . " (linked to company " . $obj->name . ", sale representative " . dolGetFirstLastname($obj->firstname, $obj->lastname) . ", email " . $obj->email . "): ";
+            print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
             if (dol_strlen($obj->email)) {
                 print "qualified.";
             } else {
@@ -167,7 +167,7 @@ 
                 sendEmailTo($mode, $oldemail, $message, $total, $oldlang, $oldsalerepresentative, $duration_value);
             } else {
                 if ($oldemail != 'none') {
-                    print "- No email sent for " . $oldsalerepresentative . ", total: " . $total . "\n";
+                    print "- No email sent for ".$oldsalerepresentative.", total: ".$total."\n";
                 }
             }
         }
@@ -224,8 +224,8 @@ 
     $errorsto = Functions::getDolGlobalString('MAIN_MAIL_ERRORS_TO');
     $msgishtml = -1;
 
-    print "- Send email for " . $oldtarget . " (" . $oldemail . "), total: " . $total . "\n";
-    dol_syslog("email_expire_services_to_representatives.php: send mail to " . $oldemail);
+    print "- Send email for ".$oldtarget." (".$oldemail."), total: ".$total."\n";
+    dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
 
     $usehtml = 0;
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER') && dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER'))) {
@@ -239,11 +239,11 @@ 
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER')) {
         $allmessage .= Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER');
     } else {
-        $allmessage .= $title . ($usehtml ? "<br>\n" : "\n") . ($usehtml ? "<br>\n" : "\n");
-        $allmessage .= $newlangs->transnoentities("NoteListOfYourExpiredServices") . ($usehtml ? "<br>\n" : "\n") . ($usehtml ? "<br>\n" : "\n");
+        $allmessage .= $title.($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
+        $allmessage .= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
     }
-    $allmessage .= $message . ($usehtml ? "<br>\n" : "\n");
-    $allmessage .= $langs->trans("Total") . " = " . price($total, 0, $userlang, 0, 0, -1, $conf->currency) . ($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $message.($usehtml ? "<br>\n" : "\n");
+    $allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
     if (Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER')) {
         $allmessage .= Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER');
         if (dol_textishtml(Functions::getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER'))) {
@@ -259,8 +259,8 @@ 
     if ($mode == 'confirm') {
         $result = $mail->sendfile();
         if (!$result) {
-            print "Error sending email " . $mail->error . "\n";
-            dol_syslog("Error sending email " . $mail->error . "\n");
+            print "Error sending email ".$mail->error."\n";
+            dol_syslog("Error sending email ".$mail->error."\n");
         }
     } else {
         print "No email sent (test mode)\n";