alxarafe / alixar

scripts/emailings/mailing-send.php

Spacing +48 added lines, -48 removed lines

@@ -36,16 +36,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[1]) || !$argv[1]) {
-    print "Usage: " . $script_file . " (ID_MAILING|all) [userloginforsignature] [maxnbofemails]\n";
+    print "Usage: ".$script_file." (ID_MAILING|all) [userloginforsignature] [maxnbofemails]\n";
     exit(-1);
 }
 
@@ -64,9 +64,9 @@ 
 }
 
 
-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;
@@ -91,10 +91,10 @@ 
  */
 
 @set_time_limit(0);
-print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
 if (getDolGlobalInt('MAILING_DELAY')) {
-    print 'A delay of ' . ((float) getDolGlobalInt('MAILING_DELAY')) . ' seconds has been set between each email' . "\n";
+    print 'A delay of '.((float) getDolGlobalInt('MAILING_DELAY')).' seconds has been set between each email'."\n";
 }
 
 if (Functions::getDolGlobalString('MAILING_LIMIT_SENDBYCLI') == '-1') {
@@ -113,10 +113,10 @@ 
 
 // We get list of emailing id to process
 $sql = "SELECT m.rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "mailing as m";
+$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 $sql .= " WHERE m.statut IN (1,2)";
 if ($id != 'all') {
-    $sql .= " AND m.rowid= " . ((int) $id);
+    $sql .= " AND m.rowid= ".((int) $id);
     $sql .= " LIMIT 1";
 }
 
@@ -129,13 +129,13 @@ 
         for ($j = 0; $j < $num; $j++) {
             $obj = $db->fetch_object($resql);
 
-            dol_syslog("Process mailing with id " . $obj->rowid);
-            print "Process mailing with id " . $obj->rowid . "\n";
+            dol_syslog("Process mailing with id ".$obj->rowid);
+            print "Process mailing with id ".$obj->rowid."\n";
 
             $emailing = new Mailing($db);
             $emailing->fetch($obj->rowid);
 
-            $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($emailing->id, 2, 0, 1, $emailing, 'mailing');
+            $upload_dir = $conf->mailing->dir_output."/".get_exdir($emailing->id, 2, 0, 1, $emailing, 'mailing');
 
             $id = $emailing->id;
             $subject = $emailing->sujet;
@@ -155,27 +155,27 @@ 
             // On choisit les mails non deja envoyes pour ce mailing (statut=0)
             // ou envoyes en erreur (statut=-1)
             $sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
-            $sql2 .= " FROM " . MAIN_DB_PREFIX . "mailing_cibles as mc";
-            $sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = " . ((int) $id);
+            $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+            $sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id);
             if (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && empty($max)) {
-                $sql2 .= " LIMIT " . Functions::getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
+                $sql2 .= " LIMIT ".Functions::getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
             } elseif (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && $max > 0) {
-                $sql2 .= " LIMIT " . min(getDolGlobalInt('MAILING_LIMIT_SENDBYCLI'), $max);
+                $sql2 .= " LIMIT ".min(getDolGlobalInt('MAILING_LIMIT_SENDBYCLI'), $max);
             } elseif ($max > 0) {
-                $sql2 .= " LIMIT " . ((int) $max);
+                $sql2 .= " LIMIT ".((int) $max);
             }
 
             $resql2 = $db->query($sql2);
             if ($resql2) {
                 $num2 = $db->num_rows($resql2);
-                dol_syslog("Nb of targets = " . $num2, LOG_DEBUG);
-                print "Nb of targets = " . $num2 . "\n";
+                dol_syslog("Nb of targets = ".$num2, LOG_DEBUG);
+                print "Nb of targets = ".$num2."\n";
 
                 if ($num2) {
                     $now = dol_now();
 
                     // Positionne date debut envoi
-                    $sqlstartdate = "UPDATE " . MAIN_DB_PREFIX . "mailing SET date_envoi='" . $db->idate($now) . "' WHERE rowid=" . ((int) $id);
+                    $sqlstartdate = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".((int) $id);
                     $resqlstartdate = $db->query($sqlstartdate);
                     if (!$resqlstartdate) {
                         dol_print_error($db);
@@ -194,7 +194,7 @@ 
                         $obj = $db->fetch_object($resql2);
 
                         // sendto en RFC2822
-                        $sendto = str_replace(',', ' ', dolGetFirstLastname($obj->firstname, $obj->lastname) . " <" . $obj->email . ">");
+                        $sendto = str_replace(',', ' ', dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">");
 
                         // Make subtsitutions on topic and body
                         $other = explode(';', $obj->other);
@@ -228,7 +228,7 @@ 
                         $substitutionarray['__EMAIL__'] = $obj->email;
                         $substitutionarray['__LASTNAME__'] = $obj->lastname;
                         $substitutionarray['__FIRSTNAME__'] = $obj->firstname;
-                        $substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:' . $obj->email . '">' . $obj->email . '</a>';
+                        $substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
                         $substitutionarray['__OTHER1__'] = $other1;
                         $substitutionarray['__OTHER2__'] = $other2;
                         $substitutionarray['__OTHER3__'] = $other3;
@@ -236,9 +236,9 @@ 
                         $substitutionarray['__OTHER5__'] = $other5;
                         $substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
                         $substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
-                        $substitutionarray['__CHECK_READ__'] = '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . urlencode($obj->tag) . '&securitykey=' . dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-" . $obj->tag . "-" . $obj->email . "-" . $obj->rowid, "md5") . '&email=' . urlencode($obj->email) . '&mtid=' . ((int) $obj->rowid) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-                        $substitutionarray['__UNSUBSCRIBE__'] = '<a href="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-unsubscribe.php?tag=' . urlencode($obj->tag) . '&unsuscrib=1&securitykey=' . dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-" . $obj->tag . "-" . $obj->email . "-" . $obj->rowid, "md5") . '&email=' . urlencode($obj->email) . '&mtid=' . ((int) $obj->rowid) . '" target="_blank">' . $langs->trans("MailUnsubcribe") . '</a>';
-                        $substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT . '/public/emailing/mailing-unsubscribe.php?tag=' . urlencode($obj->tag) . '&unsuscrib=1&securitykey=' . dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') . "-" . $obj->tag . "-" . $obj->email . "-" . $obj->rowid, "md5") . '&email=' . urlencode($obj->email) . '&mtid=' . ((int) $obj->rowid);
+                        $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+                        $substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+                        $substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash(Functions::getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid);
 
                         $onlinepaymentenabled = 0;
                         if (isModEnabled('paypal')) {
@@ -258,10 +258,10 @@ 
                                 $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
                                 $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
                             } else {
-                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'membersubscription' . $obj->source_id, 2);
-                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'order' . $obj->source_id, 2);
-                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'invoice' . $obj->source_id, 2);
-                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'contractline' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN').'order'.$obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN').'invoice'.$obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYMENT_SECURITY_TOKEN').'contractline'.$obj->source_id, 2);
                             }
                         }
                         /* For backward compatibility */
@@ -271,25 +271,25 @@ 
                             if (!Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
                                 $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
                             } else {
-                                $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'membersubscription' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN').'membersubscription'.$obj->source_id, 2);
                             }
 
                             if (!Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
                                 $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
                             } else {
-                                $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'order' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN').'order'.$obj->source_id, 2);
                             }
 
                             if (!Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
                                 $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
                             } else {
-                                $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'invoice' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN').'invoice'.$obj->source_id, 2);
                             }
 
                             if (!Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
                                 $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
                             } else {
-                                $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'contractline' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(Functions::getDolGlobalString('PAYPAL_SECURITY_TOKEN').'contractline'.$obj->source_id, 2);
                             }
                         }
 
@@ -320,7 +320,7 @@ 
                             }
                         }
                         // Fabrication du mail
-                        $trackid = 'emailing-' . $obj->fk_mailing . '-' . $obj->rowid;
+                        $trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
                         $upload_dir_tmp = $upload_dir;
                         $mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, $moreinheader, 'emailing', '', $upload_dir_tmp);
 
@@ -341,7 +341,7 @@ 
                             // Mail successful
                             $nbok++;
 
-                            dol_syslog("ok for emailing id " . $id . " #" . $i . ($mail->error ? ' - ' . $mail->error : ''), LOG_DEBUG);
+                            dol_syslog("ok for emailing id ".$id." #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
                             // Note: If emailing is 100 000 targets, 100 000 entries are added, so we don't enter events for each target here
                             // We must union table llx_mailing_taget for event tab OR enter 1 event with a special table link (id of email in event)
@@ -361,8 +361,8 @@ 
                              * // End call triggers
                              */
 
-                            $sqlok = "UPDATE " . MAIN_DB_PREFIX . "mailing_cibles";
-                            $sqlok .= " SET statut = 1, date_envoi = '" . $db->idate($now) . "' WHERE rowid = " . ((int) $obj->rowid);
+                            $sqlok = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sqlok .= " SET statut = 1, date_envoi = '".$db->idate($now)."' WHERE rowid = ".((int) $obj->rowid);
                             $resqlok = $db->query($sqlok);
                             if (!$resqlok) {
                                 dol_print_error($db);
@@ -371,7 +371,7 @@ 
                                 // if cheack read is use then update prospect contact status
                                 if (strpos($message, '__CHECK_READ__') !== false) {
                                     // Update status communication of thirdparty prospect
-                                    $sqlx = "UPDATE " . MAIN_DB_PREFIX . "societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM " . MAIN_DB_PREFIX . "mailing_cibles WHERE rowid=" . ((int) $obj->rowid) . ")";
+                                    $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".((int) $obj->rowid).")";
                                     dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
                                     $resqlx = $db->query($sqlx);
                                     if (!$resqlx) {
@@ -380,7 +380,7 @@ 
                                     }
 
                                     // Update status communication of contact prospect
-                                    $sqlx = "UPDATE " . MAIN_DB_PREFIX . "societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "socpeople AS sc INNER JOIN " . MAIN_DB_PREFIX . "mailing_cibles AS mc ON mc.rowid=" . ((int) $obj->rowid) . " AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+                                    $sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".((int) $obj->rowid)." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
                                     dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
                                     $resqlx = $db->query($sqlx);
@@ -398,10 +398,10 @@ 
                             // Mail failed
                             $nbko++;
 
-                            dol_syslog("error for emailing id " . $id . " #" . $i . ($mail->error ? ' - ' . $mail->error : ''), LOG_DEBUG);
+                            dol_syslog("error for emailing id ".$id." #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
-                            $sqlerror = "UPDATE " . MAIN_DB_PREFIX . "mailing_cibles";
-                            $sqlerror .= " SET statut=-1, date_envoi='" . $db->idate($now) . "' WHERE rowid=" . $obj->rowid;
+                            $sqlerror = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sqlerror .= " SET statut=-1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
                             $resqlerror = $db->query($sqlerror);
                             if (!$resqlerror) {
                                 dol_print_error($db);
@@ -412,8 +412,8 @@ 
                         $i++;
                     }
                 } else {
-                    $mesg = "Emailing id " . $id . " has no recipient to target";
-                    print $mesg . "\n";
+                    $mesg = "Emailing id ".$id." has no recipient to target";
+                    print $mesg."\n";
                     dol_syslog($mesg, LOG_ERR);
                 }
 
@@ -423,10 +423,10 @@ 
                     $statut = 3;
                 }
 
-                $sqlenddate = "UPDATE " . MAIN_DB_PREFIX . "mailing SET statut=" . ((int) $statut) . " WHERE rowid=" . ((int) $id);
+                $sqlenddate = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".((int) $statut)." WHERE rowid=".((int) $id);
 
                 dol_syslog("update global status", LOG_DEBUG);
-                print "Update status of emailing id " . $id . " to " . $statut . "\n";
+                print "Update status of emailing id ".$id." to ".$statut."\n";
                 $resqlenddate = $db->query($sqlenddate);
                 if (!$resqlenddate) {
                     dol_print_error($db);
@@ -439,7 +439,7 @@ 
         }
     } else {
         $mesg = "No validated emailing id to send found.";
-        print $mesg . "\n";
+        print $mesg."\n";
         dol_syslog($mesg, LOG_ERR);
         $error++;
     }

scripts/user/sync_groups_ldap2dolibarr.php

Spacing +36 added lines, -36 removed lines

@@ -35,19 +35,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 . "/user/class/user.class.php";
-require_once DOL_DOCUMENT_ROOT . "/user/class/usergroup.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."/user/class/user.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.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_GROUPS'), Functions::getDolGlobalString('LDAP_GROUP_FIELD_FULLNAME'), Functions::getDolGlobalString('LDAP_GROUP_FIELD_DESCRIPTION'), Functions::getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS'));
@@ -99,25 +99,25 @@ 
 $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_GROUP_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_GROUP_DN')."\n";
 if (Functions::getDolGlobalString('LDAP_GROUP_FILTER')) {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_GROUP_FILTER') . ')' . "\n"; // Note: filter is defined into function getRecords
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_GROUP_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_KEY_GROUPS') . '=*)' . "\n";
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_KEY_GROUPS').'=*)'."\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) {
@@ -126,7 +126,7 @@ 
 }
 
 if (!Functions::getDolGlobalString('LDAP_GROUP_DN')) {
-    print $langs->trans("Error") . ': ' . $langs->trans("LDAP setup for groups not defined inside Dolibarr");
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
     exit(-1);
 }
 
@@ -154,25 +154,25 @@ 
             // print_r($ldapgroup);
 
             if ($group->id > 0) { // Group update
-                print $langs->transnoentities("GroupUpdate") . ' # ' . $key . ': name=' . $group->name;
+                print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
                 $res = $group->update();
 
                 if ($res > 0) {
-                    print ' --> Updated group id=' . $group->id . ' name=' . $group->name;
+                    print ' --> Updated group id='.$group->id.' name='.$group->name;
                 } else {
                     $error++;
-                    print ' --> ' . $res . ' ' . $group->error;
+                    print ' --> '.$res.' '.$group->error;
                 }
                 print "\n";
             } else { // Group creation
-                print $langs->transnoentities("GroupCreate") . ' # ' . $key . ': name=' . $group->name;
+                print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
                 $res = $group->create();
 
                 if ($res > 0) {
-                    print ' --> Created group id=' . $group->id . ' name=' . $group->name;
+                    print ' --> Created group id='.$group->id.' name='.$group->name;
                 } else {
                     $error++;
-                    print ' --> ' . $res . ' ' . $group->error;
+                    print ' --> '.$res.' '.$group->error;
                 }
                 print "\n";
             }
@@ -193,7 +193,7 @@ 
                         $userKey = array($userdn);
                     } else { // Pour les autres schémas, les membres sont listés sous forme de DN completes
                         $userFilter = explode(',', $userdn);
-                        $userKey = $ldap->getAttributeValues('(' . $userFilter[0] . ')', Functions::getDolGlobalString('LDAP_KEY_USERS'));
+                        $userKey = $ldap->getAttributeValues('('.$userFilter[0].')', Functions::getDolGlobalString('LDAP_KEY_USERS'));
                     }
                     if (!is_array($userKey)) {
                         continue;
@@ -217,7 +217,7 @@ 
                 // Add the user in the group
                 if (!in_array($fuser->id, array_keys($group->members))) {
                     $fuser->SetInGroup($group->id, $group->entity);
-                    echo $fuser->login . ' added' . "\n";
+                    echo $fuser->login.' added'."\n";
                 }
             }
 
@@ -225,20 +225,20 @@ 
             foreach ($group->members as $guser) {
                 if (!in_array($guser->id, $userIdList)) {
                     $guser->RemoveFromGroup($group->id, $group->entity);
-                    echo $guser->login . ' removed' . "\n";
+                    echo $guser->login.' removed'."\n";
                 }
             }
         }
 
         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/user/sync_groups_dolibarr2ldap.php

Spacing +12 added lines, -12 removed lines

@@ -34,23 +34,23 @@ 
 
 $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 . "/user/class/usergroup.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 // Global variables
 $version = DOL_VERSION;
@@ -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));
 
 /*
  * if (Functions::getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
@@ -75,7 +75,7 @@ 
  */
 
 $sql = "SELECT rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "usergroup";
+$sql .= " FROM ".MAIN_DB_PREFIX."usergroup";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -94,7 +94,7 @@ 
         $fgroup->id = $obj->rowid;
         $fgroup->fetch($fgroup->id);
 
-        print $langs->trans("UpdateGroup") . " rowid=" . $fgroup->id . " " . $fgroup->name;
+        print $langs->trans("UpdateGroup")." rowid=".$fgroup->id." ".$fgroup->name;
 
         $oldobject = $fgroup;
 
@@ -107,10 +107,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/user/sync_users_dolibarr2ldap.php

Spacing +11 added lines, -11 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);
 }
 
@@ -48,9 +48,9 @@ 
 }
 $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 . "/user/class/user.class.php";
+require_once $path."../../htdocs/master.inc.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php";
 
 // Global variables
 $version = DOL_VERSION;
@@ -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));
 
 /*
  * if (! Functions::getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
@@ -75,7 +75,7 @@ 
  */
 
 $sql = "SELECT rowid";
-$sql .= " FROM " . MAIN_DB_PREFIX . "user";
+$sql .= " FROM ".MAIN_DB_PREFIX."user";
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -93,7 +93,7 @@ 
         $fuser = new User($db);
         $fuser->fetch($obj->rowid);
 
-        print $langs->trans("UpdateUser") . " rowid=" . $fuser->id . " " . $fuser->getFullName($langs);
+        print $langs->trans("UpdateUser")." rowid=".$fuser->id." ".$fuser->getFullName($langs);
 
         $oldobject = $fuser;
 
@@ -106,10 +106,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/user/sync_users_ldap2dolibarr.php

Spacing +35 added lines, -35 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 . "/core/lib/date.lib.php";
-require_once DOL_DOCUMENT_ROOT . "/core/class/ldap.class.php";
-require_once DOL_DOCUMENT_ROOT . "/user/class/user.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."/user/class/user.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(
@@ -117,26 +117,26 @@ 
 $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_USER_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_USER_DN')."\n";
 if (Functions::getDolGlobalString('LDAP_FILTER_CONNECTION')) {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_FILTER_CONNECTION') . ')' . "\n"; // Note: filter is defined into function getRecords
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_FILTER_CONNECTION').')'."\n"; // Note: filter is defined into function getRecords
 } else {
-    print 'Filter=(' . Functions::getDolGlobalString('LDAP_KEY_USERS') . '=*)' . "\n";
+    print 'Filter=('.Functions::getDolGlobalString('LDAP_KEY_USERS').'=*)'."\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 "excludeuser=" . join(',', $excludeuser) . "\n";
-print "Mapped LDAP fields=" . join(',', $required_fields) . "\n";
+print "commitiferror=".$forcecommit."\n";
+print "excludeuser=".join(',', $excludeuser)."\n";
+print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
 if (!$confirmed) {
@@ -145,7 +145,7 @@ 
 }
 
 if (!Functions::getDolGlobalString('LDAP_USER_DN')) {
-    print $langs->trans("Error") . ': ' . $langs->trans("LDAP setup for users not defined inside Dolibarr");
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
     exit(-1);
 }
 
@@ -153,7 +153,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);
@@ -192,7 +192,7 @@ 
         foreach ($ldaprecords as $key => $ldapuser) {
             // If login into exclude list, we discard record
             if (in_array($ldapuser[Functions::getDolGlobalString('LDAP_FIELD_LOGIN')], $excludeuser)) {
-                print $langs->transnoentities("UserDiscarded") . ' # ' . $key . ': login=' . $ldapuser[Functions::getDolGlobalString('LDAP_FIELD_LOGIN')] . ' --> Discarded' . "\n";
+                print $langs->transnoentities("UserDiscarded").' # '.$key.': login='.$ldapuser[Functions::getDolGlobalString('LDAP_FIELD_LOGIN')].' --> Discarded'."\n";
                 continue;
             }
 
@@ -248,24 +248,24 @@ 
             // print_r($ldapuser);
 
             if ($fuser->id > 0) { // User update
-                print $langs->transnoentities("UserUpdate") . ' # ' . $key . ': login=' . $fuser->login . ', fullname=' . $fuser->getFullName($langs);
+                print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
                 $res = $fuser->update($user);
 
                 if ($res < 0) {
                     $error++;
-                    print ' --> ' . $res . ' ' . $fuser->error;
+                    print ' --> '.$res.' '.$fuser->error;
                 } else {
-                    print ' --> Updated user id=' . $fuser->id . ' login=' . $fuser->login;
+                    print ' --> Updated user id='.$fuser->id.' login='.$fuser->login;
                 }
             } else { // User creation
-                print $langs->transnoentities("UserCreate") . ' # ' . $key . ': login=' . $fuser->login . ', fullname=' . $fuser->getFullName($langs);
+                print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
                 $res = $fuser->create($user);
 
                 if ($res > 0) {
-                    print ' --> Created user id=' . $fuser->id . ' login=' . $fuser->login;
+                    print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
                 } else {
                     $error++;
-                    print ' --> ' . $res . ' ' . $fuser->error;
+                    print ' --> '.$res.' '.$fuser->error;
                 }
             }
             print "\n";
@@ -284,13 +284,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";

htdocs/index.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 }
 
 $pageName = str_replace('/', '\\', $page);
-$namespace = 'Alixar\\' . $pageName . '\\' . $ctrl;
+$namespace = 'Alixar\\'.$pageName.'\\'.$ctrl;
 
 $controller = new $namespace();
 $controller->view();
\ No newline at end of file

htdocs/Install/DocTemplates/websites/website_template-onepageblackpurple/containers/manifest.json.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php // BEGIN PHP
 $websitekey = basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; 
 } // Load env if not already loaded
-require_once DOL_DOCUMENT_ROOT . '/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/website.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
 ob_start();
 header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: application/manifest+json');

htdocs/Install/DocTemplates/websites/website_template-onepageblackpurple/containers/master.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+    if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
     require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

Braces +3 added lines, -1 removed lines

@@ -2,6 +2,8 @@
 
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+    if (! defined('USEEXTERNALSERVER')) {
+        define('USEEXTERNALSERVER', 1);
+    }
     require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/Install/DocTemplates/websites/website_template-onepageblackpurple/containers/wrapper.php

Spacing +33 added lines, -33 removed lines

@@ -8,7 +8,7 @@ 
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
     require_once './master.inc.php';
 } // Load master if not already loaded
-include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 $encoding = '';
 
@@ -28,7 +28,7 @@ 
 
 // If we have a hash public (hashp), we guess the original_file.
 if (!empty($hashp)) {
-    include_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
     $ecmfile = new EcmFiles($db);
     $result = $ecmfile->fetch(0, '', '', '', $hashp);
     if ($result > 0) {
@@ -42,14 +42,14 @@ 
         if ($modulepart) {  // Not required, so often not defined, for link using public hashp parameter.
             if ($moduleparttocheck == $modulepart) {
                 // We remove first level of directory
-                $original_file = (($tmp[1] ? $tmp[1] . '/' : '') . $ecmfile->filename); // this is relative to module dir
+                $original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
                 //var_dump($original_file); exit;
             } else {
                 print 'Bad link. File is from another module part.';
             }
         } else {
             $modulepart = $moduleparttocheck;
-            $original_file = (($tmp[1] ? $tmp[1] . '/' : '') . $ecmfile->filename); // this is relative to module dir
+            $original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
         }
     } else {
         print "ErrorFileNotFoundWithSharedLink";
@@ -88,7 +88,7 @@ 
     header('Pragma: cache'); // This is to avoid having Pragma: no-cache
 }
 
-$refname = basename(dirname($original_file) . "/");
+$refname = basename(dirname($original_file)."/");
 
 // Get RSS news
 if ($rss) {
@@ -98,8 +98,8 @@ 
     $filename = $original_file;
     $dir_temp = $conf->website->dir_temp;
 
-    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.'/website/class/website.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
     $website = new Website($db);
     $websitepage = new WebsitePage($db);
 
@@ -115,26 +115,26 @@ 
     $eventarray = array();
     if (is_array($arrayofblogs)) {
         foreach ($arrayofblogs as $blog) {
-            $blog->fullpageurl = $website->virtualhost . '/' . $blog->pageurl . '.php';
+            $blog->fullpageurl = $website->virtualhost.'/'.$blog->pageurl.'.php';
             $eventarray[] = $blog;
         }
     }
 
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/xcal.lib.php";
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php";
-    require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+    require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-    dol_syslog("build_exportfile Build export file format=" . $format . ", type=" . $type . ", cachedelay=" . $cachedelay . ", filename=" . $filename . ", filters size=" . count($filters), LOG_DEBUG);
+    dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
     // Clean parameters
     if (!$filename) {
         $extension = 'rss';
-        $filename = $format . '.' . $extension;
+        $filename = $format.'.'.$extension;
     }
 
     // Create dir and define output file (definitive and temporary)
     $result = dol_mkdir($dir_temp);
-    $outputfile = $dir_temp . '/' . $filename;
+    $outputfile = $dir_temp.'/'.$filename;
 
     $result = 0;
 
@@ -142,9 +142,9 @@ 
 
     if ($cachedelay) {
         $nowgmt = dol_now();
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
-            dol_syslog("build_exportfile file " . $outputfile . " is not older than now - cachedelay (" . $nowgmt . " - " . $cachedelay . "). Build is canceled");
+            dol_syslog("build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
             $buildfile = false;
         }
     }
@@ -160,20 +160,20 @@ 
         dolChmod($outputfiletmp);
 
         // Write file
-        $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost . '/wrapper.php?rss=1' . ($l ? '&l=' . $l : ''), $l);
+        $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
         if ($result >= 0) {
             if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
                 $result = 1;
             } else {
-                $error = 'Failed to rename ' . $outputfiletmp . ' into ' . $outputfile;
-                dol_syslog("build_exportfile " . $error, LOG_ERR);
+                $error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
+                dol_syslog("build_exportfile ".$error, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 print $error;
                 exit(-1);
             }
         } else {
-            dol_syslog("build_exportfile build_xxxfile function fails to for format=" . $format . " outputfiletmp=" . $outputfile, LOG_ERR);
+            dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
             dol_delete_file($outputfiletmp, 0, 1);
             $langs->load("errors");
             print $langs->trans("ErrorFailToCreateFile", $outputfile);
@@ -195,26 +195,26 @@ 
         $outputencoding = 'UTF-8';
 
         if ($contenttype) {
-            header('Content-Type: ' . $contenttype . ($outputencoding ? '; charset=' . $outputencoding : ''));
+            header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
         }
         if ($attachment) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
         }
 
         // Ajout directives pour resoudre bug IE
         //header('Cache-Control: Public, must-revalidate');
         //header('Pragma: public');
         if ($cachedelay) {
-            header('Cache-Control: max-age=' . $cachedelay . ', private, must-revalidate');
+            header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
         } else {
             header('Cache-Control: private, must-revalidate');
         }
 
         // Clean parameters
-        $outputfile = $dir_temp . '/' . $filename;
+        $outputfile = $dir_temp.'/'.$filename;
         $result = readfile($outputfile);
         if (!$result) {
-            print 'File ' . $outputfile . ' was empty.';
+            print 'File '.$outputfile.' was empty.';
         }
 
         // header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
@@ -222,10 +222,10 @@ 
     }
 } elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
     // Get logos
-    readfile(dol_osencode($conf->mycompany->dir_output . "/" . $original_file));
+    readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 } else {
     // Find the subdirectory name as the reference
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, null, $refname);
     $accessallowed              = empty($check_access['accessallowed']) ? '' : $check_access['accessallowed'];
     $sqlprotectagainstexternals = empty($check_access['sqlprotectagainstexternals']) ? '' : $check_access['sqlprotectagainstexternals'];
@@ -252,24 +252,24 @@ 
 
     // This test if file exists should be useless. We keep it to find bug more easily
     if (!file_exists($fullpath_original_file_osencoded)) {
-        print "ErrorFileDoesNotExists: " . dol_escape_htmltag($original_file);
+        print "ErrorFileDoesNotExists: ".dol_escape_htmltag($original_file);
         exit;
     }
 
     // Permissions are ok and file found, so we return it
     //top_httphead($type);
-    header('Content-Type: ' . $type);
+    header('Content-Type: '.$type);
     header('Content-Description: File Transfer');
     if ($encoding) {
-        header('Content-Encoding: ' . $encoding);
+        header('Content-Encoding: '.$encoding);
     }
     // Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
     if ($attachment) {
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
     } else {
-        header('Content-Disposition: inline; filename="' . $filename . '"');
+        header('Content-Disposition: inline; filename="'.$filename.'"');
     }
-    header('Content-Length: ' . dol_filesize($fullpath_original_file));
+    header('Content-Length: '.dol_filesize($fullpath_original_file));
 
     readfile($fullpath_original_file_osencoded);
 }