alxarafe / alixar

htdocs/Install/DocTemplates/websites/website_template-onepageblackpurple/containers/javascript.js.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/javascript');

htdocs/Install/DocTemplates/websites/website_template-restaurant/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-restaurant/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 '/home/ldestailleur/git/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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/Install/DocTemplates/websites/website_template-restaurant/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);
 }

htdocs/Install/DocTemplates/websites/website_template-restaurant/containers/styles.css.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?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();
-if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ 
+if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ 
 header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: text/css');
 }

htdocs/Install/DocTemplates/websites/website_template-restaurant/containers/javascript.js.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/javascript');

htdocs/Install/DocTemplates/websites/website_template-stellar/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-stellar/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 '/home/ldestailleur/git/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 '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/Install/DocTemplates/websites/website_template-stellar/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 = '';
 
@@ -26,7 +26,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) {
@@ -40,14 +40,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";
@@ -77,7 +77,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) {
@@ -87,8 +87,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);
 
@@ -102,26 +102,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;
 
@@ -129,9 +129,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;
         }
     }
@@ -145,19 +145,19 @@ 
         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);
@@ -174,29 +174,29 @@ 
         //$contenttype='text/plain';
         $outputencoding = 'UTF-8';
 
-        if ($contenttype)       header('Content-Type: ' . $contenttype . ($outputencoding ? '; charset=' . $outputencoding : ''));
-        if ($attachment)        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+        if ($attachment)        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');
+        if ($cachedelay) 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.';
+        if (!$result) print 'File '.$outputfile.' was empty.';
 
         // header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
         exit;
     }
 } 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'];
@@ -223,19 +223,19 @@ 
 
     // 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);
+    if ($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 . '"');
-    else header('Content-Disposition: inline; filename="' . $filename . '"');
-    header('Content-Length: ' . dol_filesize($fullpath_original_file));
+    if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+    else header('Content-Disposition: inline; filename="'.$filename.'"');
+    header('Content-Length: '.dol_filesize($fullpath_original_file));
 
     readfile($fullpath_original_file_osencoded);
 }

Braces +54 added lines, -20 removed lines

@@ -22,7 +22,9 @@ 
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
-if ($rss) $original_file = 'blog.rss';
+if ($rss) {
+    $original_file = 'blog.rss';
+}
 
 // If we have a hash public (hashp), we guess the original_file.
 if (!empty($hashp)) {
@@ -57,14 +59,23 @@ 
 
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
+    $attachment = false;
+}
+if (isset($_GET["attachment"])) {
+    $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
+}
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+    $attachment = false;
+}
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOSTISSET('type')) {
+    $type = GETPOST('type', 'alpha');
+} else {
+    $type = dol_mimetype($original_file);
+}
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../", "/", $original_file);
@@ -95,7 +106,9 @@ 
     $website->fetch('', $websitekey);
 
     $filters = array('type_container' => 'blogpost');
-    if ($l) $filters['lang'] = $l;
+    if ($l) {
+        $filters['lang'] = $l;
+    }
 
     $MAXNEWS = ($limit ? $limit : 20);
     $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -148,8 +161,9 @@ 
         $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 {
+            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);
                 dol_delete_file($outputfiletmp, 0, 1);
@@ -167,26 +181,39 @@ 
 
     if ($result >= 0) {
         $attachment = false;
-        if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+        if (isset($_GET["attachment"])) {
+            $attachment = $_GET["attachment"];
+        }
         //$attachment = false;
         $contenttype = 'application/rss+xml';
-        if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+        if (isset($_GET["contenttype"])) {
+            $contenttype = $_GET["contenttype"];
+        }
         //$contenttype='text/plain';
         $outputencoding = 'UTF-8';
 
-        if ($contenttype)       header('Content-Type: ' . $contenttype . ($outputencoding ? '; charset=' . $outputencoding : ''));
-        if ($attachment)        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        if ($contenttype) {
+            header('Content-Type: ' . $contenttype . ($outputencoding ? '; charset=' . $outputencoding : ''));
+        }
+        if ($attachment) {
+            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');
-        else header('Cache-Control: private, must-revalidate');
+        if ($cachedelay) {
+            header('Cache-Control: max-age=' . $cachedelay . ', private, must-revalidate');
+        } else {
+            header('Cache-Control: private, must-revalidate');
+        }
 
         // Clean parameters
         $outputfile = $dir_temp . '/' . $filename;
         $result = readfile($outputfile);
-        if (!$result) print 'File ' . $outputfile . ' was empty.';
+        if (!$result) {
+            print 'File ' . $outputfile . ' was empty.';
+        }
 
         // header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
         exit;
@@ -231,13 +258,20 @@ 
     //top_httphead($type);
     header('Content-Type: ' . $type);
     header('Content-Description: File Transfer');
-    if ($encoding)   header('Content-Encoding: ' . $encoding);
+    if ($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 . '"');
-    else header('Content-Disposition: inline; filename="' . $filename . '"');
+    if ($attachment) {
+        header('Content-Disposition: attachment; filename="' . $filename . '"');
+    } else {
+        header('Content-Disposition: inline; filename="' . $filename . '"');
+    }
     header('Content-Length: ' . dol_filesize($fullpath_original_file));
 
     readfile($fullpath_original_file_osencoded);
 }
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+    $db->close();
+}
 // END PHP