alxarafe / alixar

dolibarr/htdocs/install/fileconf.php

Indentation +86 added lines, -86 removed lines

@@ -150,11 +150,11 @@ 
                        name="main_dir"

                        value="<?php print $dolibarr_main_document_root ?>"

                        <?php

-                       if (!empty($force_install_noedit)) {

-                           print ' disabled';

-                       }

+                        if (!empty($force_install_noedit)) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php

@@ -187,11 +187,11 @@ 
                        name="main_data_dir"

                        value="<?php print $dolibarr_main_data_root ?>"

                        <?php

-                       if (!empty($force_install_noedit)) {

-                           print ' disabled';

-                       }

+                        if (!empty($force_install_noedit)) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php

@@ -225,11 +225,11 @@ 
                        name="main_url"

                        value="<?php print $dolibarr_main_url_root; ?> "

                        <?php

-                       if (!empty($force_install_noedit)) {

-                           print ' disabled';

-                       }

+                        if (!empty($force_install_noedit)) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php print $langs->trans("Examples") . ":<br>"; ?>

@@ -252,17 +252,17 @@ 
                            id="main_force_https"

                            name="main_force_https"

                            <?php

-                           if (!empty($force_install_mainforcehttps)) {

-                               print ' checked';

-                           }

+                            if (!empty($force_install_mainforcehttps)) {

+                                print ' checked';

+                            }

 

-                           ?>

+                            ?>

                                <?php

-                               if ($force_install_noedit == 2 && $force_install_mainforcehttps !== null) {

-                                   print ' disabled';

-                               }

+                                if ($force_install_noedit == 2 && $force_install_mainforcehttps !== null) {

+                                    print ' disabled';

+                                }

 

-                               ?>

+                                ?>

                                >

                     </td>

                     <td class="comment"><?php echo $langs->trans("CheckToForceHttps"); ?>

@@ -290,11 +290,11 @@ 
                        name="db_name"

                        value="<?php echo (!empty($dolibarr_main_db_name)) ? $dolibarr_main_db_name : ($force_install_database ? $force_install_database : 'dolibarr'); ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_database !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_database !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>

@@ -428,11 +428,11 @@ 
                        name="db_host"

                        value="<?php print (!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_dbserver !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_dbserver !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("ServerAddressDescription"); ?>

@@ -448,11 +448,11 @@ 
                        id="db_port"

                        value="<?php print (!empty($force_install_port)) ? $force_install_port : $dolibarr_main_db_port; ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_port !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_port !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("ServerPortDescription"); ?>

@@ -468,11 +468,11 @@ 
                        name="db_prefix"

                        value="<?php echo(!empty($force_install_prefix) ? $force_install_prefix : (!empty($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : 'llx_')); ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_prefix !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_prefix !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("DatabasePrefixDescription"); ?></td>

@@ -485,17 +485,17 @@ 
                        id="db_create_database"

                        name="db_create_database"

                        <?php

-                       if ($force_install_createdatabase) {

-                           print ' checked';

-                       }

+                        if ($force_install_createdatabase) {

+                            print ' checked';

+                        }

 

-                       ?>

+                        ?>

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_createdatabase !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_createdatabase !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("CheckToCreateDatabase"); ?>

@@ -510,11 +510,11 @@ 
                        name="db_user"

                        value="<?php print (!empty($force_install_databaselogin)) ? $force_install_databaselogin : $dolibarr_main_db_user; ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_databaselogin !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_databaselogin !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("AdminLogin"); ?></td>

@@ -527,20 +527,20 @@ 
                        id="db_pass" autocomplete="off"

                        name="db_pass"

                        value="<?php

-                       // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.

-                       $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));

-                       if (!empty($dolibarr_main_prod)) {

-                           $autofill = '';

-                       }

-                       print dol_escape_htmltag($autofill);

-

-                       ?>"

+                        // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.

+                        $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));

+                        if (!empty($dolibarr_main_prod)) {

+                            $autofill = '';

+                        }

+                        print dol_escape_htmltag($autofill);

+

+                        ?>"

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_databasepass !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_databasepass !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("AdminPassword"); ?></td>

@@ -553,17 +553,17 @@ 
                        id="db_create_user"

                        name="db_create_user"

                        <?php

-                       if (!empty($force_install_createuser)) {

-                           print ' checked';

-                       }

+                        if (!empty($force_install_createuser)) {

+                            print ' checked';

+                        }

 

-                       ?>

+                        ?>

                        <?php

-                       if ($force_install_noedit == 2 && $force_install_createuser !== null) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit == 2 && $force_install_createuser !== null) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>

@@ -592,11 +592,11 @@ 
                        class="needroot"

                        value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"

                        <?php

-                       if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {

-                           print ' disabled';

-                       }

+                        if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {

+                            print ' disabled';

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>

@@ -620,24 +620,24 @@ 
                        class="needroot"

                        value="<?php

 // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.

-                       $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);

-                       if (!empty($dolibarr_main_prod)) {

-                           $autofill = '';

-                       }

+                        $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);

+                        if (!empty($dolibarr_main_prod)) {

+                            $autofill = '';

+                        }

 // Do not autofill password if instance is a production instance

-                       if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"], array('127.0.0.1', 'localhost', 'localhostgit'))

-                       ) {

-                           $autofill = '';

-                       }    // Do not autofill password for remote access

-                       print dol_escape_htmltag($autofill);

+                        if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"], array('127.0.0.1', 'localhost', 'localhostgit'))

+                        ) {

+                            $autofill = '';

+                        }    // Do not autofill password for remote access

+                        print dol_escape_htmltag($autofill);

 

-                       ?>"

+                        ?>"

                        <?php

-                       if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {

-                           print ' disabled';     // May be removed by javascript

-                       }

+                        if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {

+                            print ' disabled';     // May be removed by javascript

+                        }

 

-                       ?>

+                        ?>

                        >

             </td>

             <td class="comment"><?php echo $langs->trans("KeepEmptyIfNoPassword"); ?>

Spacing +26 added lines, -26 removed lines

@@ -93,7 +93,7 @@ 
 

 session_start(); // To be able to keep info into session (used for not losing pass during navigation. pass must not transit through parmaeters)

 

-pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY) ? '' : $force_dolibarr_js_JQUERY . '/'), 'main-inside-bis');

+pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY) ? '' : $force_dolibarr_js_JQUERY.'/'), 'main-inside-bis');

 

 // Test if we can run a first install process

 if (!is_writable($conffile)) {

@@ -105,7 +105,7 @@ 
 }

 

 if (!empty($force_install_message)) {

-    print '<div><br>' . $langs->trans($force_install_message) . '</div>';

+    print '<div><br>'.$langs->trans($force_install_message).'</div>';

 

     /* print '<script type="text/javascript">';

       print '	jQuery(document).ready(function() {

@@ -158,8 +158,8 @@ 
                        >

             </td>

             <td class="comment"><?php

-                print $langs->trans("WithNoSlashAtTheEnd") . "<br>";

-                print $langs->trans("Examples") . ":<br>";

+                print $langs->trans("WithNoSlashAtTheEnd")."<br>";

+                print $langs->trans("Examples").":<br>";

 

                 ?>

                 <ul>

@@ -176,7 +176,7 @@ 
             $dolibarr_main_data_root = @$force_install_main_data_root;

             if (empty($dolibarr_main_data_root)) {

                 //$dolibarr_main_data_root = detect_dolibarr_main_data_root($dolibarr_main_document_root);

-                $dolibarr_main_data_root = BASE_PATH . 'dolibarr/documents';

+                $dolibarr_main_data_root = BASE_PATH.'dolibarr/documents';

             }

 

             ?>

@@ -195,9 +195,9 @@ 
                        >

             </td>

             <td class="comment"><?php

-                print $langs->trans("WithNoSlashAtTheEnd") . "<br>";

-                print $langs->trans("DirectoryRecommendation") . "<br>";

-                print $langs->trans("Examples") . ":<br>";

+                print $langs->trans("WithNoSlashAtTheEnd")."<br>";

+                print $langs->trans("DirectoryRecommendation")."<br>";

+                print $langs->trans("Examples").":<br>";

 

                 ?>

                 <ul>

@@ -232,7 +232,7 @@ 
                        ?>

                        >

             </td>

-            <td class="comment"><?php print $langs->trans("Examples") . ":<br>"; ?>

+            <td class="comment"><?php print $langs->trans("Examples").":<br>"; ?>

                 <ul>

                     <li>http://localhost/</li>

                     <li>http://www.myserver.com:8180/dolibarr</li>

@@ -321,21 +321,21 @@ 
 

                 // Scan les drivers

                 //$dir=DOL_DOCUMENT_ROOT.'/core/db';

-                $dir = DOL_BASE_PATH . '/core/db';

+                $dir = DOL_BASE_PATH.'/core/db';

                 $handle = opendir($dir);

                 if (is_resource($handle)) {

                     while (($file = readdir($handle)) !== false) {

-                        if (is_readable($dir . "/" . $file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg)) {

+                        if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg)) {

                             $type = $reg[1];

                             if ($type === 'DoliDB')

                                 continue; // Skip abstract class

-                            $class = 'DoliDB' . ucfirst($type);

-                            include_once $dir . "/" . $file;

+                            $class = 'DoliDB'.ucfirst($type);

+                            include_once $dir."/".$file;

 

                             if ($type == 'sqlite')

-                                continue;    // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

+                                continue; // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

                             if ($type == 'sqlite3')

-                                continue;   // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

+                                continue; // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

 

 

 

@@ -345,7 +345,7 @@ 
                 

 // Version min of database

             $versionbasemin = explode('.', $class::VERSIONMIN);

-                            $note = '(' . $class::LABEL . ' >= ' . $class::VERSIONMIN . ')';

+                            $note = '('.$class::LABEL.' >= '.$class::VERSIONMIN.')';

 

                             // Switch to mysql if mysqli is not present

                             if ($defaultype == 'mysqli' && !function_exists('mysqli_connect'))

@@ -376,27 +376,27 @@ 
                                 $testfunction = '';

                                 $testclass = 'SQLite3';

                             }

-                            $option .= '<option value="' . $type . '"' . ($defaultype == $type ? ' selected' : '');

+                            $option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');

                             if ($testfunction && !function_exists($testfunction))

                                 $option .= ' disabled';

                             if ($testclass && !class_exists($testclass))

                                 $option .= ' disabled';

                             $option .= '>';

-                            $option .= $type . '&nbsp; &nbsp;';

+                            $option .= $type.'&nbsp; &nbsp;';

                             if ($note)

-                                $option .= ' ' . $note;

+                                $option .= ' '.$note;

                             // Deprecated and experimental

                             if ($type == 'mysql')

-                                $option .= ' ' . $langs->trans("Deprecated");

+                                $option .= ' '.$langs->trans("Deprecated");

                             elseif ($type == 'mssql')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

+                                $option .= ' '.$langs->trans("VersionExperimental");

                             elseif ($type == 'sqlite')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

+                                $option .= ' '.$langs->trans("VersionExperimental");

                             elseif ($type == 'sqlite3')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

+                                $option .= ' '.$langs->trans("VersionExperimental");

                             // No available

                             elseif (!function_exists($testfunction))

-                                $option .= ' - ' . $langs->trans("FunctionNotAvailableInThisPHP");

+                                $option .= ' - '.$langs->trans("FunctionNotAvailableInThisPHP");

                             $option .= '</option>';

                         }

                     }

@@ -601,7 +601,7 @@ 
             </td>

             <td class="comment"><?php echo $langs->trans("DatabaseRootLoginDescription"); ?>

                 <!--

-                <?php echo '<br>' . $langs->trans("Examples") . ':<br>' ?>

+                <?php echo '<br>'.$langs->trans("Examples").':<br>' ?>

                 <ul>

                     <li>root (Mysql)</li>

                     <li>postgres (PostgreSql)</li>

@@ -634,7 +634,7 @@ 
                        ?>"

                        <?php

                        if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {

-                           print ' disabled';     // May be removed by javascript

+                           print ' disabled'; // May be removed by javascript

                        }

 

                        ?>

Braces +40 added lines, -25 removed lines

@@ -125,7 +125,10 @@ 
 <div>

 

 

-    <table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">

+    <table class="nobordernopadding<?php if ($force_install_noedit) {
+    print ' hidewhennoedit';
+}
+?>">

 

         <tr>

             <td colspan="3" class="label">

@@ -327,15 +330,21 @@ 
                     while (($file = readdir($handle)) !== false) {

                         if (is_readable($dir . "/" . $file) && preg_match('/^(.*)\.class\.php$/i', $file, $reg)) {

                             $type = $reg[1];

-                            if ($type === 'DoliDB')

-                                continue; // Skip abstract class

+                            if ($type === 'DoliDB') {
+                                                            continue;
+                            }
+                            // Skip abstract class

                             $class = 'DoliDB' . ucfirst($type);

                             include_once $dir . "/" . $file;

 

-                            if ($type == 'sqlite')

-                                continue;    // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

-                            if ($type == 'sqlite3')

-                                continue;   // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

+                            if ($type == 'sqlite') {
+                                                            continue;
+                            }
+                            // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

+                            if ($type == 'sqlite3') {
+                                                            continue;
+                            }
+                            // We hide sqlite3 because support can't be complete until sqlite does not manage foreign key creation after table creation (ALTER TABLE child ADD CONSTRAINT not supported)

 

 

 

@@ -348,8 +357,9 @@ 
                             $note = '(' . $class::LABEL . ' >= ' . $class::VERSIONMIN . ')';

 

                             // Switch to mysql if mysqli is not present

-                            if ($defaultype == 'mysqli' && !function_exists('mysqli_connect'))

-                                $defaultype = 'mysql';

+                            if ($defaultype == 'mysqli' && !function_exists('mysqli_connect')) {
+                                                            $defaultype = 'mysql';
+                            }
 

                             // Show line into list

                             if ($type == 'mysql') {

@@ -377,26 +387,31 @@ 
                                 $testclass = 'SQLite3';

                             }

                             $option .= '<option value="' . $type . '"' . ($defaultype == $type ? ' selected' : '');

-                            if ($testfunction && !function_exists($testfunction))

-                                $option .= ' disabled';

-                            if ($testclass && !class_exists($testclass))

-                                $option .= ' disabled';

+                            if ($testfunction && !function_exists($testfunction)) {
+                                                            $option .= ' disabled';
+                            }
+                            if ($testclass && !class_exists($testclass)) {
+                                                            $option .= ' disabled';
+                            }
                             $option .= '>';

                             $option .= $type . '&nbsp; &nbsp;';

-                            if ($note)

-                                $option .= ' ' . $note;

+                            if ($note) {
+                                                            $option .= ' ' . $note;
+                            }
                             // Deprecated and experimental

-                            if ($type == 'mysql')

-                                $option .= ' ' . $langs->trans("Deprecated");

-                            elseif ($type == 'mssql')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

-                            elseif ($type == 'sqlite')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

-                            elseif ($type == 'sqlite3')

-                                $option .= ' ' . $langs->trans("VersionExperimental");

+                            if ($type == 'mysql') {
+                                                            $option .= ' ' . $langs->trans("Deprecated");
+                            } elseif ($type == 'mssql') {
+                                                            $option .= ' ' . $langs->trans("VersionExperimental");
+                            } elseif ($type == 'sqlite') {
+                                                            $option .= ' ' . $langs->trans("VersionExperimental");
+                            } elseif ($type == 'sqlite3') {
+                                                            $option .= ' ' . $langs->trans("VersionExperimental");
+                            }
                             // No available

-                            elseif (!function_exists($testfunction))

-                                $option .= ' - ' . $langs->trans("FunctionNotAvailableInThisPHP");

+                            elseif (!function_exists($testfunction)) {
+                                                            $option .= ' - ' . $langs->trans("FunctionNotAvailableInThisPHP");
+                            }
                             $option .= '</option>';

                         }

                     }

dolibarr/htdocs/install/step1.php

Spacing +159 added lines, -159 removed lines

@@ -40,7 +40,7 @@ 
 // Dolibarr pages directory

 $main_dir = GETPOST('main_dir') ? GETPOST('main_dir') : (empty($argv[3]) ? '' : $argv[3]);

 // Directory for generated documents (invoices, orders, ecm, etc...)

-$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4]) ? ($main_dir . '/documents') : $argv[4]);

+$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4]) ? ($main_dir.'/documents') : $argv[4]);

 // Dolibarr root URL

 $main_url = GETPOST('main_url') ? GETPOST('main_url') : (empty($argv[5]) ? '' : $argv[5]);

 // Database login information

@@ -63,7 +63,7 @@ 
 // Alternative root directory name

 $main_alt_dir_name = ((GETPOST("main_alt_dir_name", 'alpha') && GETPOST("main_alt_dir_name", 'alpha') != '') ? GETPOST("main_alt_dir_name", 'alpha') : 'custom');

 

-session_start();    // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)

+session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters)

 // Save a flag to tell to restore input value if we go back

 $_SESSION['dol_save_pass'] = $db_pass;

 //$_SESSION['dol_save_passroot']=$passroot;

@@ -75,7 +75,7 @@ 
 }

 

 if (@file_exists($forcedfile)) {

-    die($forcedfile . ' exists!');

+    die($forcedfile.' exists!');

     $useforcedwizard = true;

     include_once $forcedfile;

     // If forced install is enabled, replace the post values. These are empty because form fields are disabled.

@@ -149,29 +149,29 @@ 
 // Check parameters

 $is_sqlite = false;

 if (empty($db_type)) {

-    print '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseType")).'</div>';

     $error++;

 } else {

-    $is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3' );

+    $is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3');

 }

 if (empty($db_host) && !$is_sqlite) {

-    print '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Server")).'</div>';

     $error++;

 }

 if (empty($db_name)) {

-    print '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("DatabaseName")).'</div>';

     $error++;

 }

 if (empty($db_user) && !$is_sqlite) {

-    print '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentities("Login")).'</div>';

     $error++;

 }

 if (!empty($db_port) && !is_numeric($db_port)) {

-    print '<div class="error">' . $langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_port, $langs->transnoentities("Port")).'</div>';

     $error++;

 }

 if (!empty($db_prefix) && !preg_match('/^[a-z0-9]+_$/i', $db_prefix)) {

-    print '<div class="error">' . $langs->trans("ErrorBadValueForParameter", $db_prefix, $langs->transnoentities("DatabasePrefix")) . '</div>';

+    print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $db_prefix, $langs->transnoentities("DatabasePrefix")).'</div>';

     $error++;

 }

 

@@ -187,20 +187,20 @@ 
 

 // Test database connection

 if (!$error) {

-    $result = @include_once $main_dir . "/core/db/" . $db_type . '.class.php';

+    $result = @include_once $main_dir."/core/db/".$db_type.'.class.php';

     if ($result) {

         // If we require database or user creation we need to connect as root, so we need root login credentials

         if (!empty($db_create_database) && !$userroot) {

-            print '<div class="error">' . $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name) . '</div>';

+            print '<div class="error">'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $db_name).'</div>';

             print '<br>';

-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

             print $langs->trans("ErrorGoBackAndCorrectParameters");

             $error++;

         }

         if (!empty($db_create_user) && !$userroot) {

-            print '<div class="error">' . $langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user) . '</div>';

+            print '<div class="error">'.$langs->trans("YouAskLoginCreationSoDolibarrNeedToConnect", $db_user).'</div>';

             print '<br>';

-            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+            print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

             print $langs->trans("ErrorGoBackAndCorrectParameters");

             $error++;

         }

@@ -221,24 +221,24 @@ 
 

             $db = getDoliDBInstance($db_type, $db_host, $userroot, $passroot, $databasefortest, $db_port);

 

-            dol_syslog("databasefortest=" . $databasefortest . " connected=" . $db->connected . " database_selected=" . $db->database_selected, LOG_DEBUG);

+            dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);

             //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected;

 

             if (empty($db_create_database) && $db->connected && !$db->database_selected) {

-                print '<div class="error">' . $langs->trans("ErrorConnectedButDatabaseNotFound", $db_name) . '</div>';

+                print '<div class="error">'.$langs->trans("ErrorConnectedButDatabaseNotFound", $db_name).'</div>';

                 print '<br>';

                 if (!$db->connected)

-                    print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate") . '<br><br>';

+                    print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate").'<br><br>';

                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 $error++;

             } elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {

                 // Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.

                 if ($db->error == "No such file or directory")

-                    print '<div class="error">' . $langs->trans("ErrorToConnectToMysqlCheckInstance") . '</div>';

+                    print '<div class="error">'.$langs->trans("ErrorToConnectToMysqlCheckInstance").'</div>';

                 else

-                    print '<div class="error">' . $db->error . '</div>';

+                    print '<div class="error">'.$db->error.'</div>';

                 if (!$db->connected)

-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

                 //print '<a href="#" onClick="javascript: history.back();">';

                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 //print '</a>';

@@ -250,9 +250,9 @@ 
             $db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);

 

             if ($db->error) {

-                print '<div class="error">' . $db->error . '</div>';

+                print '<div class="error">'.$db->error.'</div>';

                 if (!$db->connected)

-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

                 //print '<a href="#" onClick="javascript: history.back();">';

                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 //print '</a>';

@@ -261,8 +261,8 @@ 
         }

     }

     else {

-        print "<br>\nFailed to include_once(\"" . $main_dir . "/core/db/" . $db_type . ".class.php\")<br>\n";

-        print '<div class="error">' . $langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")) . '</div>';

+        print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";

+        print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';

         //print '<a href="#" onClick="javascript: history.back();">';

         print $langs->trans("ErrorGoBackAndCorrectParameters");

         //print '</a>';

@@ -272,7 +272,7 @@ 
     if (isset($db))

         print $db->lasterror();

     if (isset($db) && !$db->connected)

-        print '<br>' . $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+        print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

     print $langs->trans("ErrorGoBackAndCorrectParameters");

     $error++;

 }

@@ -281,8 +281,8 @@ 
     if (!empty($db_create_database)) {

         $result = $db->select_db($db_name);

         if ($result) {

-            print '<div class="error">' . $langs->trans("ErrorDatabaseAlreadyExists", $db_name) . '</div>';

-            print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate") . '<br><br>';

+            print '<div class="error">'.$langs->trans("ErrorDatabaseAlreadyExists", $db_name).'</div>';

+            print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate").'<br><br>';

             print $langs->trans("ErrorGoBackAndCorrectParameters");

             $error++;

         }

@@ -307,11 +307,11 @@ 
         $defaultDBSortingCollation = 'utf8_unicode_ci';

     }

 

-    print '<input type="hidden" name="dolibarr_main_db_character_set" value="' . $defaultCharacterSet . '">';

-    print '<input type="hidden" name="dolibarr_main_db_collation" value="' . $defaultDBSortingCollation . '">';

+    print '<input type="hidden" name="dolibarr_main_db_character_set" value="'.$defaultCharacterSet.'">';

+    print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';

     $db_character_set = $defaultCharacterSet;

     $db_collation = $defaultDBSortingCollation;

-    dolibarr_install_syslog("step1: db_character_set=" . $db_character_set . " db_collation=" . $db_collation);

+    dolibarr_install_syslog("step1: db_character_set=".$db_character_set." db_collation=".$db_collation);

 }

 

 

@@ -321,24 +321,24 @@ 
     if (is_array($_POST)) {

         foreach ($_POST as $key => $value) {

             if (!preg_match('/^db_pass/i', $key)) {

-                dolibarr_install_syslog("step1: choice for " . $key . " = " . $value);

+                dolibarr_install_syslog("step1: choice for ".$key." = ".$value);

             }

         }

     }

 

     // Show title of step

-    print '<h3><img class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> ' . $langs->trans("ConfigurationFile") . '</h3>';

+    print '<h3><img class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/octicons/build/svg/gear.svg" width="20" alt="Configuration"> '.$langs->trans("ConfigurationFile").'</h3>';

     print '<table cellspacing="0" width="100%" cellpadding="1" border="0">';

 

     // Check parameter main_dir

     if (!$error) {

         if (!is_dir($main_dir)) {

-            dolibarr_install_syslog("step1: directory '" . $main_dir . "' is unavailable or can't be accessed");

+            dolibarr_install_syslog("step1: directory '".$main_dir."' is unavailable or can't be accessed");

 

             print "<tr><td>";

-            print $langs->trans("ErrorDirDoesNotExists", $main_dir) . '<br>';

-            print $langs->trans("ErrorWrongValueForParameter", $langs->trans("WebPagesDirectory")) . '<br>';

-            print $langs->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';

+            print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';

+            print $langs->trans("ErrorWrongValueForParameter", $langs->trans("WebPagesDirectory")).'<br>';

+            print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';

             print '</td><td>';

             print $langs->trans("Error");

             print "</td></tr>";

@@ -347,7 +347,7 @@ 
     }

 

     if (!$error) {

-        dolibarr_install_syslog("step1: directory '" . $main_dir . "' exists");

+        dolibarr_install_syslog("step1: directory '".$main_dir."' exists");

     }

 

 

@@ -359,22 +359,22 @@ 
         }

 

         if (!is_dir($main_data_dir)) {

-            print "<tr><td>" . $langs->trans("ErrorDirDoesNotExists", $main_data_dir);

-            print ' ' . $langs->trans("YouMustCreateItAndAllowServerToWrite");

+            print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);

+            print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");

             print '</td><td>';

-            print '<span class="error">' . $langs->trans("Error") . '</span>';

+            print '<span class="error">'.$langs->trans("Error").'</span>';

             print "</td></tr>";

-            print '<tr><td colspan="2"><br>' . $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'] . '?testget=ok') . '</td></tr>';

+            print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';

             $error++;

         } else {

             // Create .htaccess file in document directory

-            $pathhtaccess = $main_data_dir . '/.htaccess';

+            $pathhtaccess = $main_data_dir.'/.htaccess';

             if (!file_exists($pathhtaccess)) {

-                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '" . $main_data_dir . "'");

+                dolibarr_install_syslog("step1: .htaccess file did not exist, we created it in '".$main_data_dir."'");

                 $handlehtaccess = @fopen($pathhtaccess, 'w');

                 if ($handlehtaccess) {

-                    fwrite($handlehtaccess, 'Order allow,deny' . "\n");

-                    fwrite($handlehtaccess, 'Deny from all' . "\n");

+                    fwrite($handlehtaccess, 'Order allow,deny'."\n");

+                    fwrite($handlehtaccess, 'Deny from all'."\n");

 

                     fclose($handlehtaccess);

                     dolibarr_install_syslog("step1: .htaccess file created");

@@ -383,52 +383,52 @@ 
 

             // Documents are stored above the web pages root to prevent being downloaded without authentification

             $dir = array();

-            $dir[] = $main_data_dir . "/mycompany";

-            $dir[] = $main_data_dir . "/medias";

-            $dir[] = $main_data_dir . "/users";

-            $dir[] = $main_data_dir . "/facture";

-            $dir[] = $main_data_dir . "/propale";

-            $dir[] = $main_data_dir . "/ficheinter";

-            $dir[] = $main_data_dir . "/produit";

-            $dir[] = $main_data_dir . "/doctemplates";

+            $dir[] = $main_data_dir."/mycompany";

+            $dir[] = $main_data_dir."/medias";

+            $dir[] = $main_data_dir."/users";

+            $dir[] = $main_data_dir."/facture";

+            $dir[] = $main_data_dir."/propale";

+            $dir[] = $main_data_dir."/ficheinter";

+            $dir[] = $main_data_dir."/produit";

+            $dir[] = $main_data_dir."/doctemplates";

 

             // Loop on each directory of dir [] to create them if they do not exist

             $num = count($dir);

             for ($i = 0; $i < $num; $i++) {

                 if (is_dir($dir[$i])) {

-                    dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' exists");

+                    dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");

                 } else {

                     if (dol_mkdir($dir[$i]) < 0) {

                         print "<tr><td>";

-                        print "Failed to create directory: " . $dir[$i];

+                        print "Failed to create directory: ".$dir[$i];

                         print '</td><td>';

                         print $langs->trans("Error");

                         print "</td></tr>";

                         $error++;

                     } else {

-                        dolibarr_install_syslog("step1: directory '" . $dir[$i] . "' created");

+                        dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");

                     }

                 }

             }

 

-            require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+            require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

             // Copy directory medias

-            $srcroot = $main_dir . '/install/medias';

-            $destroot = $main_data_dir . '/medias';

+            $srcroot = $main_dir.'/install/medias';

+            $destroot = $main_data_dir.'/medias';

             dolCopyDir($srcroot, $destroot, 0, 0);

 

             if ($error) {

-                print "<tr><td>" . $langs->trans("ErrorDirDoesNotExists", $main_data_dir);

-                print ' ' . $langs->trans("YouMustCreateItAndAllowServerToWrite");

+                print "<tr><td>".$langs->trans("ErrorDirDoesNotExists", $main_data_dir);

+                print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite");

                 print '</td><td>';

-                print '<span class="error">' . $langs->trans("Error") . '</span>';

+                print '<span class="error">'.$langs->trans("Error").'</span>';

                 print "</td></tr>";

-                print '<tr><td colspan="2"><br>' . $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'] . '?testget=ok') . '</td></tr>';

+                print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';

             } else {

                 //ODT templates

-                $srcroot = $main_dir . '/install/doctemplates';

-                $destroot = $main_data_dir . '/doctemplates';

+                $srcroot = $main_dir.'/install/doctemplates';

+                $destroot = $main_data_dir.'/doctemplates';

                 $docs = array(

                     'contracts' => 'contract',

                     'invoices' => 'invoice',

@@ -444,14 +444,14 @@ 
                     'users' => 'user',

                 );

                 foreach ($docs as $cursordir => $cursorfile) {

-                    $src = $srcroot . '/' . $cursordir . '/template_' . $cursorfile . '.odt';

-                    $dirodt = $destroot . '/' . $cursordir;

-                    $dest = $dirodt . '/template_' . $cursorfile . '.odt';

+                    $src = $srcroot.'/'.$cursordir.'/template_'.$cursorfile.'.odt';

+                    $dirodt = $destroot.'/'.$cursordir;

+                    $dest = $dirodt.'/template_'.$cursorfile.'.odt';

 

                     dol_mkdir($dirodt);

                     $result = dol_copy($src, $dest, 0, 0);

                     if ($result < 0) {

-                        print '<tr><td colspan="2"><br>' . $langs->trans('ErrorFailToCopyFile', $src, $dest) . '</td></tr>';

+                        print '<tr><td colspan="2"><br>'.$langs->trans('ErrorFailToCopyFile', $src, $dest).'</td></tr>';

                     }

                 }

             }

@@ -468,7 +468,7 @@ 
             // We must ignore errors as an existing old file may already exist and not be replaceable or

             // the installer (like for ubuntu) may not have permission to create another file than conf.php.

             // Also no other process must be able to read file or we expose the new file, so content with password.

-            @dol_copy($conffile, $conffile . '.old', '0400');

+            @dol_copy($conffile, $conffile.'.old', '0400');

         }

 

         $error += write_conf_file($conffile);

@@ -482,12 +482,12 @@ 
         print '<tr><td>';

         print $langs->trans("ConfFileReload");

         print '</td>';

-        print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+        print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

 

         // Create database user if requested

         // Notice: Undefined variable: dbtheme_create_user in \alixar\dolibarr\htdocs\install\step1.php on line 490

         if (isset($db_create_user) && (isset($dbtheme_create_user)) && ($dbtheme_create_user == "1" || $db_create_user == "on")) {

-            dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user);

+            dolibarr_install_syslog("step1: create database user: ".$dolibarr_main_db_user);

 

             //print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->port;

             $databasefortest = $conf->db->name;

@@ -504,7 +504,7 @@ 
             $db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, $conf->db->port);

 

             if ($db->error) {

-                print '<div class="error">' . $db->error . '</div>';

+                print '<div class="error">'.$db->error.'</div>';

                 $error++;

             }

 

@@ -524,43 +524,43 @@ 
                     if ($result > 0 && $resultbis > 0) {

 

                         print '<tr><td>';

-                        print $langs->trans("UserCreation") . ' : ';

+                        print $langs->trans("UserCreation").' : ';

                         print $dolibarr_main_db_user;

                         print '</td>';

-                        print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+                        print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

                     } else {

                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS' || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {

                             dolibarr_install_syslog("step1: user already exists");

                             print '<tr><td>';

-                            print $langs->trans("UserCreation") . ' : ';

+                            print $langs->trans("UserCreation").' : ';

                             print $dolibarr_main_db_user;

                             print '</td>';

-                            print '<td>' . $langs->trans("LoginAlreadyExists") . '</td></tr>';

+                            print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';

                         } else {

                             dolibarr_install_syslog("step1: failed to create user", LOG_ERR);

                             print '<tr><td>';

-                            print $langs->trans("UserCreation") . ' : ';

+                            print $langs->trans("UserCreation").' : ';

                             print $dolibarr_main_db_user;

                             print '</td>';

-                            print '<td>' . $langs->trans("Error") . ': ' . $db->errno() . ' ' . $db->error() . "</td></tr>";

+                            print '<td>'.$langs->trans("Error").': '.$db->errno().' '.$db->error()."</td></tr>";

                         }

                     }

 

                     $db->close();

                 } else {

                     print '<tr><td>';

-                    print $langs->trans("UserCreation") . ' : ';

+                    print $langs->trans("UserCreation").' : ';

                     print $dolibarr_main_db_user;

                     print '</td>';

-                    print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td>';

+                    print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td>';

                     print '</tr>';

 

                     // warning message due to connection failure

                     print '<tr><td colspan="2"><br>';

                     print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);

                     print '<br>';

-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

-                    print $langs->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';

+                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

+                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';

                     print '</td></tr>';

 

                     $error++;

@@ -569,7 +569,7 @@ 
         }   // end of user account creation

         // If database creation was asked, we create it

         if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) {

-            dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user);

+            dolibarr_install_syslog("step1: create database: ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user);

             $newdb = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, '', $conf->db->port);

             //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;

 

@@ -578,15 +578,15 @@ 
 

                 if ($result) {

                     print '<tr><td>';

-                    print $langs->trans("DatabaseCreation") . " (" . $langs->trans("User") . " " . $userroot . ") : ";

+                    print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";

                     print $dolibarr_main_db_name;

                     print '</td>';

-                    print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+                    print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

 

                     $newdb->select_db($dolibarr_main_db_name);

                     $check1 = $newdb->getDefaultCharacterSetDatabase();

                     $check2 = $newdb->getDefaultCollationDatabase();

-                    dolibarr_install_syslog('step1: new database is using charset=' . $check1 . ' collation=' . $check2);

+                    dolibarr_install_syslog('step1: new database is using charset='.$check1.' collation='.$check2);

 

                     // If values differs, we save conf file again

                     //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);

@@ -594,30 +594,30 @@ 
                 } else {

                     // warning message

                     print '<tr><td colspan="2"><br>';

-                    print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name) . '<br>';

-                    print $newdb->lasterror() . '<br>';

+                    print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';

+                    print $newdb->lasterror().'<br>';

                     print $langs->trans("IfDatabaseExistsGoBackAndCheckCreate");

                     print '<br>';

                     print '</td></tr>';

 

-                    dolibarr_install_syslog('step1: failed to create database ' . $dolibarr_main_db_name . ' ' . $newdb->lasterrno() . ' ' . $newdb->lasterror(), LOG_ERR);

+                    dolibarr_install_syslog('step1: failed to create database '.$dolibarr_main_db_name.' '.$newdb->lasterrno().' '.$newdb->lasterror(), LOG_ERR);

                     $error++;

                 }

                 $newdb->close();

             } else {

                 print '<tr><td>';

-                print $langs->trans("DatabaseCreation") . " (" . $langs->trans("User") . " " . $userroot . ") : ";

+                print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";

                 print $dolibarr_main_db_name;

                 print '</td>';

-                print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td>';

+                print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td>';

                 print '</tr>';

 

                 // warning message

                 print '<tr><td colspan="2"><br>';

                 print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect", $dolibarr_main_db_user, $dolibarr_main_db_host, $userroot);

                 print '<br>';

-                print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

-                print $langs->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';

+                print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';

+                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';

                 print '</td></tr>';

 

                 $error++;

@@ -625,63 +625,63 @@ 
         }   // end of create database

         // We test access with dolibarr database user (not admin)

         if (!$error) {

-            dolibarr_install_syslog("step1: connection type=" . $conf->db->type . " on host=" . $conf->db->host . " port=" . $conf->db->port . " user=" . $conf->db->user . " name=" . $conf->db->name);

+            dolibarr_install_syslog("step1: connection type=".$conf->db->type." on host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);

             //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;

 

             $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);

 

             if ($db->connected) {

-                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " ok");

+                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." ok");

                 print "<tr><td>";

-                print $langs->trans("ServerConnection") . " (" . $langs->trans("User") . " " . $conf->db->user . ") : ";

+                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";

                 print $dolibarr_main_db_host;

                 print "</td><td>";

-                print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok">';

+                print '<img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok">';

                 print "</td></tr>";

 

                 // server access ok, basic access ok

                 if ($db->database_selected) {

-                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok");

+                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." ok");

                     print "<tr><td>";

-                    print $langs->trans("DatabaseConnection") . " (" . $langs->trans("User") . " " . $conf->db->user . ") : ";

+                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";

                     print $dolibarr_main_db_name;

                     print "</td><td>";

-                    print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok">';

+                    print '<img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok">';

                     print "</td></tr>";

 

                     $error = 0;

                 } else {

-                    dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " failed", LOG_ERR);

+                    dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);

                     print "<tr><td>";

-                    print $langs->trans("DatabaseConnection") . " (" . $langs->trans("User") . " " . $conf->db->user . ") : ";

+                    print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";

                     print $dolibarr_main_db_name;

                     print '</td><td>';

-                    print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error">';

+                    print '<img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error">';

                     print "</td></tr>";

 

                     // warning message

                     print '<tr><td colspan="2"><br>';

-                    print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name) . '<br>';

-                    print $langs->trans('IfAlreadyExistsCheckOption') . '<br>';

-                    print $langs->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';

+                    print $langs->trans('CheckThatDatabasenameIsCorrect', $dolibarr_main_db_name).'<br>';

+                    print $langs->trans('IfAlreadyExistsCheckOption').'<br>';

+                    print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';

                     print '</td></tr>';

 

                     $error++;

                 }

             } else {

-                dolibarr_install_syslog("step1: connection to server by user " . $conf->db->user . " failed", LOG_ERR);

+                dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);

                 print "<tr><td>";

-                print $langs->trans("ServerConnection") . " (" . $langs->trans("User") . " " . $conf->db->user . ") : ";

+                print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";

                 print $dolibarr_main_db_host;

                 print '</td><td>';

-                print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error">';

+                print '<img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error">';

                 print "</td></tr>";

 

                 // warning message

                 print '<tr><td colspan="2"><br>';

                 print $langs->trans("ErrorConnection", $conf->db->host, $conf->db->name, $conf->db->user);

-                print $langs->trans('IfLoginDoesNotExistsCheckCreateUser') . '<br>';

-                print $langs->trans("ErrorGoBackAndCorrectParameters") . '<br><br>';

+                print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'<br>';

+                print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';

                 print '</td></tr>';

 

                 $error++;

@@ -712,7 +712,7 @@ 
 $ret = 0;

 if ($error && isset($argv[1]))

     $ret = 1;

-dolibarr_install_syslog("Exit " . $ret);

+dolibarr_install_syslog("Exit ".$ret);

 

 dolibarr_install_syslog("--- step1: end");

 

@@ -734,9 +734,9 @@ 
     $fp = @fopen("$mainfile", "w");

     if ($fp) {

         clearstatcache();

-        fputs($fp, '<?php' . "\n");

+        fputs($fp, '<?php'."\n");

         fputs($fp, "// Wrapper to include main into htdocs\n");

-        fputs($fp, "include_once '" . $main_dir . "/main.inc.php';\n");

+        fputs($fp, "include_once '".$main_dir."/main.inc.php';\n");

         fclose($fp);

     }

 }

@@ -753,9 +753,9 @@ 
     $fp = @fopen("$masterfile", "w");

     if ($fp) {

         clearstatcache();

-        fputs($fp, '<?php' . "\n");

+        fputs($fp, '<?php'."\n");

         fputs($fp, "// Wrapper to include master into htdocs\n");

-        fputs($fp, "include_once '" . $main_dir . "/master.inc.php';\n");

+        fputs($fp, "include_once '".$main_dir."/master.inc.php';\n");

         fclose($fp);

     }

 }

@@ -790,53 +790,53 @@ 
     if ($fp) {

         clearstatcache();

 

-        fputs($fp, '<?php' . "\n");

-        fputs($fp, '//' . "\n");

-        fputs($fp, '// File generated by Dolibarr installer ' . DOL_VERSION . ' on ' . dol_print_date(dol_now(), '') . "\n");

-        fputs($fp, '//' . "\n");

-        fputs($fp, '// Take a look at conf.php.example file for an example of ' . $conffiletoshowshort . ' file' . "\n");

-        fputs($fp, '// and explanations for all possibles parameters.' . "\n");

-        fputs($fp, '//' . "\n");

+        fputs($fp, '<?php'."\n");

+        fputs($fp, '//'."\n");

+        fputs($fp, '// File generated by Dolibarr installer '.DOL_VERSION.' on '.dol_print_date(dol_now(), '')."\n");

+        fputs($fp, '//'."\n");

+        fputs($fp, '// Take a look at conf.php.example file for an example of '.$conffiletoshowshort.' file'."\n");

+        fputs($fp, '// and explanations for all possibles parameters.'."\n");

+        fputs($fp, '//'."\n");

 

-        fputs($fp, '$dolibarr_main_url_root=\'' . str_replace("'", "\'", trim($main_url)) . '\';');

+        fputs($fp, '$dolibarr_main_url_root=\''.str_replace("'", "\'", trim($main_url)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_document_root=\'' . str_replace("'", "\'", trim($main_dir)) . '\';');

+        fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'", "\'", trim($main_dir)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, $main_use_alt_dir . '$dolibarr_main_url_root_alt=\'' . str_replace("'", "\'", trim("/" . $main_alt_dir_name)) . '\';');

+        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'", "\'", trim("/".$main_alt_dir_name)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, $main_use_alt_dir . '$dolibarr_main_document_root_alt=\'' . str_replace("'", "\'", trim($main_dir . "/" . $main_alt_dir_name)) . '\';');

+        fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'", "\'", trim($main_dir."/".$main_alt_dir_name)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_data_root=\'' . str_replace("'", "\'", trim($main_data_dir)) . '\';');

+        fputs($fp, '$dolibarr_main_data_root=\''.str_replace("'", "\'", trim($main_data_dir)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_host=\'' . str_replace("'", "\'", trim($db_host)) . '\';');

+        fputs($fp, '$dolibarr_main_db_host=\''.str_replace("'", "\'", trim($db_host)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_port=\'' . str_replace("'", "\'", trim($db_port)) . '\';');

+        fputs($fp, '$dolibarr_main_db_port=\''.str_replace("'", "\'", trim($db_port)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_name=\'' . str_replace("'", "\'", trim($db_name)) . '\';');

+        fputs($fp, '$dolibarr_main_db_name=\''.str_replace("'", "\'", trim($db_name)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_prefix=\'' . str_replace("'", "\'", trim($main_db_prefix)) . '\';');

+        fputs($fp, '$dolibarr_main_db_prefix=\''.str_replace("'", "\'", trim($main_db_prefix)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_user=\'' . str_replace("'", "\'", trim($db_user)) . '\';');

+        fputs($fp, '$dolibarr_main_db_user=\''.str_replace("'", "\'", trim($db_user)).'\';');

         fputs($fp, "\n");

-        fputs($fp, '$dolibarr_main_db_pass=\'' . str_replace("'", "\'", trim($db_pass)) . '\';');

+        fputs($fp, '$dolibarr_main_db_pass=\''.str_replace("'", "\'", trim($db_pass)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_type=\'' . str_replace("'", "\'", trim($db_type)) . '\';');

+        fputs($fp, '$dolibarr_main_db_type=\''.str_replace("'", "\'", trim($db_type)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_character_set=\'' . str_replace("'", "\'", trim($db_character_set)) . '\';');

+        fputs($fp, '$dolibarr_main_db_character_set=\''.str_replace("'", "\'", trim($db_character_set)).'\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_db_collation=\'' . str_replace("'", "\'", trim($db_collation)) . '\';');

+        fputs($fp, '$dolibarr_main_db_collation=\''.str_replace("'", "\'", trim($db_collation)).'\';');

         fputs($fp, "\n");

 

         /* Authentication */

@@ -855,7 +855,7 @@ 
         fputs($fp, '$dolibarr_main_prod=\'0\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_force_https=\'' . $main_force_https . '\';');

+        fputs($fp, '$dolibarr_main_force_https=\''.$main_force_https.'\';');

         fputs($fp, "\n");

 

         fputs($fp, '$dolibarr_main_restrict_os_commands=\'mysqldump, mysql, pg_dump, pgrestore\';');

@@ -864,7 +864,7 @@ 
         fputs($fp, '$dolibarr_nocsrfcheck=\'0\';');

         fputs($fp, "\n");

 

-        fputs($fp, '$dolibarr_main_cookie_cryptkey=\'' . $key . '\';');

+        fputs($fp, '$dolibarr_main_cookie_cryptkey=\''.$key.'\';');

         fputs($fp, "\n");

 

         fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');

@@ -876,85 +876,85 @@ 
             fputs($fp, '//');

             $force_dolibarr_lib_FPDF_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_FPDF_PATH=\'' . $force_dolibarr_lib_FPDF_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_TCPDF_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_TCPDF_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\'' . $force_dolibarr_lib_TCPDF_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_FPDI_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_FPDI_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_FPDI_PATH=\'' . $force_dolibarr_lib_FPDI_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_TCPDI_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_TCPDI_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_TCPDI_PATH=\'' . $force_dolibarr_lib_TCPDI_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_ADODB_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_ADODB_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_ADODB_PATH=\'' . $force_dolibarr_lib_ADODB_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_GEOIP_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_GEOIP_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_GEOIP_PATH=\'' . $force_dolibarr_lib_GEOIP_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_NUSOAP_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_NUSOAP_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\'' . $force_dolibarr_lib_NUSOAP_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_PHPEXCEL_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\'' . $force_dolibarr_lib_PHPEXCEL_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_ODTPHP_PATH)) {

             fputs($fp, '//');

             $force_dolibarr_lib_ODTPHP_PATH = '';

         }

-        fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\'' . $force_dolibarr_lib_ODTPHP_PATH . '\';');

+        fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {

             fputs($fp, '//');

             $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';

         }

-        fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\'' . $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP . '\';');

+        fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_js_CKEDITOR)) {

             fputs($fp, '//');

             $force_dolibarr_js_CKEDITOR = '';

         }

-        fputs($fp, '$dolibarr_js_CKEDITOR=\'' . $force_dolibarr_js_CKEDITOR . '\';');

+        fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_js_JQUERY)) {

             fputs($fp, '//');

             $force_dolibarr_js_JQUERY = '';

         }

-        fputs($fp, '$dolibarr_js_JQUERY=\'' . $force_dolibarr_js_JQUERY . '\';');

+        fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_js_JQUERY_UI)) {

             fputs($fp, '//');

             $force_dolibarr_js_JQUERY_UI = '';

         }

-        fputs($fp, '$dolibarr_js_JQUERY_UI=\'' . $force_dolibarr_js_JQUERY_UI . '\';');

+        fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_js_JQUERY_FLOT)) {

             fputs($fp, '//');

             $force_dolibarr_js_JQUERY_FLOT = '';

         }

-        fputs($fp, '$dolibarr_js_JQUERY_FLOT=\'' . $force_dolibarr_js_JQUERY_FLOT . '\';');

+        fputs($fp, '$dolibarr_js_JQUERY_FLOT=\''.$force_dolibarr_js_JQUERY_FLOT.'\';');

         fputs($fp, "\n");

 

         // Write params to overwrites default font path

@@ -963,13 +963,13 @@ 
             fputs($fp, '//');

             $force_dolibarr_font_DOL_DEFAULT_TTF = '';

         }

-        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\'' . $force_dolibarr_font_DOL_DEFAULT_TTF . '\';');

+        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');

         fputs($fp, "\n");

         if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {

             fputs($fp, '//');

             $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';

         }

-        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\'' . $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD . '\';');

+        fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');

         fputs($fp, "\n");

 

         fclose($fp);

@@ -980,9 +980,9 @@ 
 

             print "<tr><td>";

             print $langs->trans("SaveConfigurationFile");

-            print ' <strong>' . $conffile . '</strong>';

+            print ' <strong>'.$conffile.'</strong>';

             print "</td><td>";

-            print '<img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok">';

+            print '<img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok">';

             print "</td></tr>";

         } else {

             $error++;

Braces +27 added lines, -20 removed lines

@@ -227,18 +227,21 @@ 
             if (empty($db_create_database) && $db->connected && !$db->database_selected) {

                 print '<div class="error">' . $langs->trans("ErrorConnectedButDatabaseNotFound", $db_name) . '</div>';

                 print '<br>';

-                if (!$db->connected)

-                    print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate") . '<br><br>';

+                if (!$db->connected) {
+                                    print $langs->trans("IfDatabaseNotExistsGoBackAndUncheckCreate") . '<br><br>';
+                }
                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 $error++;

             } elseif ($db->error && !(!empty($db_create_database) && $db->connected)) {

                 // Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.

-                if ($db->error == "No such file or directory")

-                    print '<div class="error">' . $langs->trans("ErrorToConnectToMysqlCheckInstance") . '</div>';

-                else

-                    print '<div class="error">' . $db->error . '</div>';

-                if (!$db->connected)

-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+                if ($db->error == "No such file or directory") {
+                                    print '<div class="error">' . $langs->trans("ErrorToConnectToMysqlCheckInstance") . '</div>';
+                } else {
+                                    print '<div class="error">' . $db->error . '</div>';
+                }
+                if (!$db->connected) {
+                                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                }
                 //print '<a href="#" onClick="javascript: history.back();">';

                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 //print '</a>';

@@ -251,16 +254,16 @@ 
 

             if ($db->error) {

                 print '<div class="error">' . $db->error . '</div>';

-                if (!$db->connected)

-                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+                if (!$db->connected) {
+                                    print $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+                }
                 //print '<a href="#" onClick="javascript: history.back();">';

                 print $langs->trans("ErrorGoBackAndCorrectParameters");

                 //print '</a>';

                 $error++;

             }

         }

-    }

-    else {

+    } else {

         print "<br>\nFailed to include_once(\"" . $main_dir . "/core/db/" . $db_type . ".class.php\")<br>\n";

         print '<div class="error">' . $langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")) . '</div>';

         //print '<a href="#" onClick="javascript: history.back();">';

@@ -269,10 +272,12 @@ 
         $error++;

     }

 } else {

-    if (isset($db))

-        print $db->lasterror();

-    if (isset($db) && !$db->connected)

-        print '<br>' . $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';

+    if (isset($db)) {
+            print $db->lasterror();
+    }
+    if (isset($db) && !$db->connected) {
+            print '<br>' . $langs->trans("BecauseConnectionFailedParametersMayBeWrong") . '<br><br>';
+    }
     print $langs->trans("ErrorGoBackAndCorrectParameters");

     $error++;

 }

@@ -710,8 +715,9 @@ 
 

 <?php

 $ret = 0;

-if ($error && isset($argv[1]))

-    $ret = 1;

+if ($error && isset($argv[1])) {
+    $ret = 1;
+}
 dolibarr_install_syslog("Exit " . $ret);

 

 dolibarr_install_syslog("--- step1: end");

@@ -719,8 +725,9 @@ 
 pFooter($error ? 1 : 0, $setuplang, 'jsinfo', 1);

 

 // Return code if ran from command line

-if ($ret)

-    exit($ret);

+if ($ret) {
+    exit($ret);
+}
 

 /**

  *  Create main file. No particular permissions are set by installer.

dolibarr/htdocs/install/step5.php

Spacing +67 added lines, -67 removed lines

@@ -30,8 +30,8 @@ 
 if (file_exists($conffile)) {

     include_once $conffile;

 }

-require_once $dolibarr_main_document_root . '/core/lib/admin.lib.php';

-require_once $dolibarr_main_document_root . '/core/lib/security.lib.php'; // for dol_hash

+require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';

+require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; // for dol_hash

 

 global $langs;

 

@@ -43,14 +43,14 @@ 
 

 // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install

 // or MAIN_VERSION_LAST_UPGRADE for upgrade.

-$targetversion = DOL_VERSION;  // If it's latest upgrade

+$targetversion = DOL_VERSION; // If it's latest upgrade

 if (!empty($action) && preg_match('/upgrade/i', $action)) { // If it's an old upgrade

     $tmp = explode('_', $action, 2);

     if ($tmp[0] == 'upgrade') {

         if (!empty($tmp[1])) {

-            $targetversion = $tmp[1];   // if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'

+            $targetversion = $tmp[1]; // if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'

         } else {

-            $targetversion = DOL_VERSION;                // if $action = 'upgrade', we use DOL_VERSION

+            $targetversion = DOL_VERSION; // if $action = 'upgrade', we use DOL_VERSION

         }

     }

 }

@@ -91,17 +91,17 @@ 
 // If install, check password and password_verification used to create admin account

 if ($action == "set") {

     if ($pass <> $pass_verif) {

-        header("Location: ?controller=install&method=step4&error=1&selectlang=$setuplang" . (isset($login) ? '&login=' . $login : ''));

+        header("Location: ?controller=install&method=step4&error=1&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));

         exit;

     }

 

     if (dol_strlen(trim($pass)) == 0) {

-        header("Location: ?controller=install&method=step4&error=2&selectlang=$setuplang" . (isset($login) ? '&login=' . $login : ''));

+        header("Location: ?controller=install&method=step4&error=2&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));

         exit;

     }

 

     if (dol_strlen(trim($login)) == 0) {

-        header("Location: ?controller=install&method=step4&error=3&selectlang=$setuplang" . (isset($login) ? '&login=' . $login : ''));

+        header("Location: ?controller=install&method=step4&error=3&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));

         exit;

     }

 }

@@ -126,7 +126,7 @@ 
 

     // If password is encoded, we decode it

     if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {

-        require_once $dolibarr_main_document_root . '/core/lib/security.lib.php';

+        require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';

         if (preg_match('/crypted:/i', $dolibarr_main_db_pass)) {

             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);

@@ -148,7 +148,7 @@ 
 

     // Create the global $hookmanager object

     //include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-    include_once DOL_BASE_PATH . '/core/class/hookmanager.class.php';

+    include_once DOL_BASE_PATH.'/core/class/hookmanager.class.php';

     $hookmanager = new HookManager($db);

 

     $ok = 0;

@@ -157,15 +157,15 @@ 
     if ($action == "set") {

         // Active module user

         $modName = 'modUser';

-        $file = $modName . ".class.php";

-        dolibarr_install_syslog('step5: load module user ' . DOL_BASE_PATH . "/core/modules/" . $file, LOG_INFO);

+        $file = $modName.".class.php";

+        dolibarr_install_syslog('step5: load module user '.DOL_BASE_PATH."/core/modules/".$file, LOG_INFO);

         //include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;

-        die(DOL_BASE_PATH . "/core/modules/" . $file);

-        include_once DOL_BASE_PATH . "/core/modules/" . $file;

+        die(DOL_BASE_PATH."/core/modules/".$file);

+        include_once DOL_BASE_PATH."/core/modules/".$file;

         $objMod = new $modName($db);

         $result = $objMod->init();

         if (!$result) {

-            print 'ERROR in activating module file=' . $file;

+            print 'ERROR in activating module file='.$file;

         }

 

         if ($db->connected) {

@@ -178,25 +178,25 @@ 
 

             // Create admin user

             //include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';

-            include_once DOL_BASE_PATH . '/user/class/user.class.php';

+            include_once DOL_BASE_PATH.'/user/class/user.class.php';

 

             // Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)

             $sql = "SELECT u.rowid, u.pass, u.pass_crypted";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+            $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

             $resql = $db->query($sql);

             if ($resql) {

                 $numrows = $db->num_rows($resql);

                 if ($numrows == 0) {

                     // Define default setup for password encryption

                     dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);

-                    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities

+                    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0); // All entities

                     if (function_exists('password_hash')) {

-                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                     // All entities

+                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0); // All entities

                     } else {

-                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                           // All entities

+                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities

                     }

                 }

-                dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = ' . $conf->global->DATABASE_PWD_ENCRYPTED . ' MAIN_SECURITY_HASH_ALGO = ' . $conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);

+                dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);

             }

 

             // Create user used to create the admin user

@@ -213,27 +213,27 @@ 
             $newuser->admin = 1;

             $newuser->entity = 0;

 

-            $conf->global->USER_MAIL_REQUIRED = 0;     // Force global option to be sure to create a new user with no email

+            $conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email

             $result = $newuser->create($createuser, 1);

             if ($result > 0) {

-                print $langs->trans("AdminLoginCreatedSuccessfuly", $login) . "<br>";

+                print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";

                 $success = 1;

             } else {

                 if ($newuser->error == 'ErrorLoginAlreadyExists') {

                     dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);

-                    print '<br><div class="warning">' . $langs->trans("AdminLoginAlreadyExists", $login) . "</div><br>";

+                    print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists", $login)."</div><br>";

                     $success = 1;

                 } else {

-                    dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);

-                    print '<br><div class="error">' . $langs->trans("FailedToCreateAdminLogin") . ' ' . $newuser->error . '</div><br><br>';

+                    dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);

+                    print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';

                 }

             }

 

             if ($success) {

                 // Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.

                 $db->begin();

-                dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);

-                $resql = $db->query("INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity) values(" . $db->encrypt('MAIN_VERSION_FIRST_INSTALL', 1) . "," . $db->encrypt($targetversion, 1) . ",'chaine',0,'Dolibarr version when first install',0)");

+                dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to '.$targetversion, LOG_DEBUG);

+                $resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when first install',0)");

                 if ($resql) {

                     $conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;

                     $db->commit();

@@ -244,12 +244,12 @@ 
 

                 $db->begin();

 

-                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);

-                $resql = $db->query("DELETE FROM " . MAIN_DB_PREFIX . "const WHERE " . $db->decrypt('name') . "='MAIN_VERSION_LAST_INSTALL'");

+                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);

+                $resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");

                 if (!$resql) {

                     dol_print_error($db, 'Error in setup program');

                 }

-                $resql = $db->query("INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity) values(" . $db->encrypt('MAIN_VERSION_LAST_INSTALL', 1) . "," . $db->encrypt($targetversion, 1) . ",'chaine',0,'Dolibarr version when last install',0)");

+                $resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when last install',0)");

                 if (!$resql) {

                     dol_print_error($db, 'Error in setup program');

                 }

@@ -257,11 +257,11 @@ 
 

                 if ($useforcedwizard) {

                     dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);

-                    $resql = $db->query("DELETE FROM " . MAIN_DB_PREFIX . "const WHERE " . $db->decrypt('name') . "='MAIN_REMOVE_INSTALL_WARNING'");

+                    $resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");

                     if (!$resql) {

                         dol_print_error($db, 'Error in setup program');

                     }

-                    $resql = $db->query("INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity) values(" . $db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1) . "," . $db->encrypt(1, 1) . ",'chaine',1,'Disable install warnings',0)");

+                    $resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1).",".$db->encrypt(1, 1).",'chaine',1,'Disable install warnings',0)");

                     if (!$resql) {

                         dol_print_error($db, 'Error in setup program');

                     }

@@ -278,20 +278,20 @@ 
                     $tmparray = explode(',', $force_install_module);

                     foreach ($tmparray as $modtoactivate) {

                         $modtoactivatenew = preg_replace('/\.class\.php$/i', '', $modtoactivate);

-                        print $langs->trans("ActivateModule", $modtoactivatenew) . '<br>';

+                        print $langs->trans("ActivateModule", $modtoactivatenew).'<br>';

 

-                        $file = $modtoactivatenew . '.class.php';

-                        dolibarr_install_syslog('step5: activate module file=' . $file);

-                        $res = dol_include_once("/core/modules/" . $file);

+                        $file = $modtoactivatenew.'.class.php';

+                        dolibarr_install_syslog('step5: activate module file='.$file);

+                        $res = dol_include_once("/core/modules/".$file);

 

                         $res = activateModule($modtoactivatenew, 1);

                         if (!empty($res['errors']))

-                            print 'ERROR in activating module file=' . $file;

+                            print 'ERROR in activating module file='.$file;

                     }

                 }

 

                 dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');

-                $resql = $db->query("DELETE FROM " . MAIN_DB_PREFIX . "const WHERE " . $db->decrypt('name') . "='MAIN_NOT_INSTALLED'");

+                $resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");

                 if (!$resql) {

                     dol_print_error($db, 'Error in setup program');

                 }

@@ -299,7 +299,7 @@ 
                 $db->commit();

             }

         } else {

-            print $langs->trans("ErrorFailedToConnect") . "<br>";

+            print $langs->trans("ErrorFailedToConnect")."<br>";

         }

     }

     // If upgrade

@@ -325,28 +325,28 @@ 
             }

 

             if ($tagdatabase) {

-                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);

-                $resql = $db->query("DELETE FROM " . MAIN_DB_PREFIX . "const WHERE " . $db->decrypt('name') . "='MAIN_VERSION_LAST_UPGRADE'");

+                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion);

+                $resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");

                 if (!$resql) {

                     dol_print_error($db, 'Error in setup program');

                 }

-                $resql = $db->query("INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity) VALUES (" . $db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1) . "," . $db->encrypt($targetversion, 1) . ",'chaine',0,'Dolibarr version for last upgrade',0)");

+                $resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");

                 if (!$resql) {

                     dol_print_error($db, 'Error in setup program');

                 }

                 $conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;

             } else {

-                dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');

+                dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');

             }

         } else {

-            print $langs->trans("ErrorFailedToConnect") . "<br>";

+            print $langs->trans("ErrorFailedToConnect")."<br>";

         }

     } else {

         dol_print_error('', 'step5.php: unknown choice of action');

     }

 

     // May fail if parameter already defined

-    $resql = $db->query("INSERT INTO " . MAIN_DB_PREFIX . "const(name,value,type,visible,note,entity) VALUES (" . $db->encrypt('MAIN_LANG_DEFAULT', 1) . "," . $db->encrypt($setuplang, 1) . ",'chaine',0,'Default language',1)");

+    $resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT', 1).",".$db->encrypt($setuplang, 1).",'chaine',0,'Default language',1)");

     //if (! $resql) dol_print_error($db,'Error in setup program');

 

     $db->close();

@@ -359,44 +359,44 @@ 
 if ($action == "set" && $success) {

     if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {

         // Install is finished

-        print $langs->trans("SystemIsInstalled") . "<br>";

+        print $langs->trans("SystemIsInstalled")."<br>";

 

         $createlock = 0;

 

         if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {

             // Install is finished, we create the lock file

-            $lockfile = DOL_DATA_ROOT . '/install.lock';

+            $lockfile = DOL_DATA_ROOT.'/install.lock';

             $fp = @fopen($lockfile, "w");

             if ($fp) {

                 if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {

-                    $force_install_lockinstall = 444;    // For backward compatibility

+                    $force_install_lockinstall = 444; // For backward compatibility

                 }

-                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission " . $force_install_lockinstall . ")");

+                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");

                 fclose($fp);

                 @chmod($lockfile, octdec($force_install_lockinstall));

                 $createlock = 1;

             }

         }

         if (empty($createlock)) {

-            print '<div class="warning">' . $langs->trans("WarningRemoveInstallDir") . "</div>";

+            print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";

         }

 

         print "<br>";

 

-        print $langs->trans("YouNeedToPersonalizeSetup") . "<br><br>";

+        print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";

 

         //print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';

-        print '<div class="center"><a href="' . BASE_URI . '?mainmenu=home&leftmenu=setup' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';

+        print '<div class="center"><a href="'.BASE_URI.'?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';

         print $langs->trans("GoToSetupArea");

         print '</a></div>';

     } else {

         // If here MAIN_VERSION_LAST_UPGRADE is not empty

-        print $langs->trans("VersionLastUpgrade") . ': <b><span class="ok">' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '</span></b><br>';

-        print $langs->trans("VersionProgram") . ': <b><span class="ok">' . DOL_VERSION . '</span></b><br>';

-        print $langs->trans("MigrationNotFinished") . '<br>';

+        print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';

+        print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';

+        print $langs->trans("MigrationNotFinished").'<br>';

         print "<br>";

 

-        print '<div class="center"><a href="' . $dolibarr_main_url_root . '/install/index.php">';

+        print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';

         print $langs->trans("GoToUpgradePage");

         print '</a></div>';

     }

@@ -405,37 +405,37 @@ 
 elseif (empty($action) || preg_match('/upgrade/i', $action)) {

     if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {

         // Upgrade is finished

-        print $langs->trans("SystemIsUpgraded") . "<br>";

+        print $langs->trans("SystemIsUpgraded")."<br>";

 

         $createlock = 0;

 

         if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {

             // Upgrade is finished, we create the lock file

-            $lockfile = DOL_DATA_ROOT . '/install.lock';

+            $lockfile = DOL_DATA_ROOT.'/install.lock';

             $fp = @fopen($lockfile, "w");

             if ($fp) {

                 if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {

-                    $force_install_lockinstall = 444;    // For backward compatibility

+                    $force_install_lockinstall = 444; // For backward compatibility

                 }

-                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission " . $force_install_lockinstall . ")");

+                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");

                 fclose($fp);

                 @chmod($lockfile, octdec($force_install_lockinstall));

                 $createlock = 1;

             }

         }

         if (empty($createlock)) {

-            print '<br><div class="warning">' . $langs->trans("WarningRemoveInstallDir") . "</div>";

+            print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";

         }

 

         print "<br><br>";

 

-        print '<div class="center"><a href="' . BASE_URI . '/index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';

-        print $langs->trans("GoToDolibarr") . '...';

+        print '<div class="center"><a href="'.BASE_URI.'/index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';

+        print $langs->trans("GoToDolibarr").'...';

         print '</a></div><br>';

     } else {

         // If here MAIN_VERSION_LAST_UPGRADE is not empty

-        print $langs->trans("VersionLastUpgrade") . ': <b><span class="ok">' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '</span></b><br>';

-        print $langs->trans("VersionProgram") . ': <b><span class="ok">' . DOL_VERSION . '</span></b>';

+        print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';

+        print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';

 

         print "<br>";

 

@@ -454,7 +454,7 @@ 
 if ($error && isset($argv[1])) {

     $ret = 1;

 }

-dolibarr_install_syslog("Exit " . $ret);

+dolibarr_install_syslog("Exit ".$ret);

 

 dolibarr_install_syslog("- step5: Dolibarr setup finished");

 

Braces +6 added lines, -4 removed lines

@@ -131,8 +131,9 @@ 
             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);

             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);

             $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted

-        } else

-            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);

+        } else {
+                    $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+        }
     }

 

     $conf->db->type = $dolibarr_main_db_type;

@@ -285,8 +286,9 @@ 
                         $res = dol_include_once("/core/modules/" . $file);

 

                         $res = activateModule($modtoactivatenew, 1);

-                        if (!empty($res['errors']))

-                            print 'ERROR in activating module file=' . $file;

+                        if (!empty($res['errors'])) {
+                                                    print 'ERROR in activating module file=' . $file;
+                        }
                     }

                 }

 

dolibarr/htdocs/install/inc.php

Spacing +73 added lines, -73 removed lines

@@ -33,12 +33,12 @@ 
 // Just to define version DOL_VERSION
 if (!defined('DOL_INC_FOR_VERSION_ERROR'))
     define('DOL_INC_FOR_VERSION_ERROR', '1');
-require_once DOL_BASE_PATH . '/filefunc.inc.php';
+require_once DOL_BASE_PATH.'/filefunc.inc.php';
 
-require_once DOL_BASE_PATH . '/core/class/translate.class.php';
-require_once DOL_BASE_PATH . '/core/lib/functions.lib.php';
-require_once DOL_BASE_PATH . '/core/lib/admin.lib.php';
-require_once DOL_BASE_PATH . '/core/lib/files.lib.php';
+require_once DOL_BASE_PATH.'/core/class/translate.class.php';
+require_once DOL_BASE_PATH.'/core/lib/functions.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/admin.lib.php';
+require_once DOL_BASE_PATH.'/core/lib/files.lib.php';
 
 /*
  * adobdbtime package
@@ -78,7 +78,7 @@ 
 // Define vars
 $conffiletoshowshort = "conf.php";
 // Define localization of conf file
-$conffile = DOL_BASE_PATH . "/conf/conf.php";
+$conffile = DOL_BASE_PATH."/conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
 //$conffile = "/etc/dolibarr/conf.php";
@@ -100,7 +100,7 @@ 
             $dolibarr_main_db_port = '3306'; // For backward compatibility
         }
         // Clean parameters
-        $dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : DOL_BASE_PATH . '../documents';
+        $dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : DOL_BASE_PATH.'../documents';
         $dolibarr_main_url_root = isset($dolibarr_main_url_root) ? trim($dolibarr_main_url_root) : '';
         $dolibarr_main_url_root_alt = isset($dolibarr_main_url_root_alt) ? trim($dolibarr_main_url_root_alt) : '';
         $dolibarr_main_document_root = isset($dolibarr_main_document_root) ? trim($dolibarr_main_document_root) : '';
@@ -126,7 +126,7 @@ 
         // Load database driver
         if ($result) {
             if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type)) {
-                $result = include_once $dolibarr_main_document_root . "/core/db/" . $dolibarr_main_db_type . '.class.php';
+                $result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
                 if (!$result) {
                     $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
                 }
@@ -146,14 +146,14 @@ 
 }
 define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
 
-define('DOL_CLASS_PATH', 'class/');                             // Filsystem path to class dir
-define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : DOL_BASE_PATH . '../documents'));
-define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : ''));           // URL relative root
-$uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT'));  // $uri contains url without http*
-$suburi = strstr($uri, '/');       // $suburi contains url without domain
+define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
+define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_root : DOL_BASE_PATH.'../documents'));
+define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
+$uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
+$suburi = strstr($uri, '/'); // $suburi contains url without domain
 if ($suburi == '/')
-    $suburi = '';   // If $suburi is /, it is now ''
-define('DOL_URL_ROOT', $suburi);    // URL relative root ('', '/dolibarr', ...)
+    $suburi = ''; // If $suburi is /, it is now ''
+define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 
 
 if (empty($conf->file->character_set_client))
@@ -189,14 +189,14 @@ 
     $langs->load("install");
     print $langs->trans("YouTryInstallDisabledByDirLock");
     if (!empty($dolibarr_main_url_root)) {
-        print 'Click on following link, <a href="' . $dolibarr_main_url_root . '/admin/index.php?mainmenu=home&leftmenu=setup' . (isset($_POST["login"]) ? '&username=' . urlencode($_POST["login"]) : '') . '">';
+        print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
     }
     exit;
 }
 
-$lockfile = DOL_DATA_ROOT . '/install.lock';
+$lockfile = DOL_DATA_ROOT.'/install.lock';
 if (constant('DOL_DATA_ROOT') === null) {
     // We don't have a configuration file yet
     // Try to detect any lockfile in the default documents path
@@ -210,8 +210,8 @@ 
     $langs->load("install");
     print $langs->trans("YouTryInstallDisabledByFileLock");
     if (!empty($dolibarr_main_url_root)) {
-        print $langs->trans("ClickOnLinkOrRemoveManualy") . '<br>';
-        print '<a href="' . $dolibarr_main_url_root . '/admin/index.php?mainmenu=home&leftmenu=setup' . (isset($_POST["login"]) ? '&username=' . urlencode($_POST["login"]) : '') . '">';
+        print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
+        print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
     } else {
@@ -230,13 +230,13 @@ 
     if (@is_writable('/tmp'))
         define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
     else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-        define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+        define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
     else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-        define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+        define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
     else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
         define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
     else if (@is_writable('../../'))
-        define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+        define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
 
 
 
@@ -261,9 +261,9 @@ 
 // We init log handler for install
 $handlers = array('mod_syslog_file');
 foreach ($handlers as $handler) {
-    $file = DOL_BASE_PATH . '/core/modules/syslog/' . $handler . '.php';
+    $file = DOL_BASE_PATH.'/core/modules/syslog/'.$handler.'.php';
     if (!file_exists($file)) {
-        throw new Exception('Missing log handler file ' . $handler . '.php');
+        throw new Exception('Missing log handler file '.$handler.'.php');
     }
 
     require_once $file;
@@ -323,7 +323,7 @@ 
     global $dolibarr_main_db_pass;
     global $character_set_client;
 
-    $return = include_once $dolibarr_main_document_root . '/core/class/conf.class.php';
+    $return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
     if (!$return)
         return -1;
 
@@ -363,13 +363,13 @@ 
         if (@is_writable('/tmp'))
             define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
         else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+            define('SYSLOG_FILE', $_ENV["TMP"].'/dolibarr_install.log');
         else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+            define('SYSLOG_FILE', $_ENV["TEMP"].'/dolibarr_install.log');
         else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
             define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
         else if (@is_writable('../../'))
-            define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+            define('SYSLOG_FILE', '../../dolibarr_install.log'); // For others
 
 
 
@@ -394,9 +394,9 @@ 
     // We init log handler for install
     $handlers = array('mod_syslog_file');
     foreach ($handlers as $handler) {
-        $file = DOL_BASE_PATH . '/core/modules/syslog/' . $handler . '.php';
+        $file = DOL_BASE_PATH.'/core/modules/syslog/'.$handler.'.php';
         if (!file_exists($file)) {
-            throw new Exception('Missing log handler file ' . $handler . '.php');
+            throw new Exception('Missing log handler file '.$handler.'.php');
         }
 
         require_once $file;
@@ -442,64 +442,64 @@ 
     }
 
     // We force the content charset
-    header("Content-type: text/html; charset=" . $conf->file->character_set_client);
+    header("Content-type: text/html; charset=".$conf->file->character_set_client);
     header("X-Content-Type-Options: nosniff");
 
-    print '<!DOCTYPE HTML>' . "\n";
-    print '<html>' . "\n";
-    print '<head>' . "\n";
-    print '<meta charset="' . $conf->file->character_set_client . '">' . "\n";
-    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">' . "\n";
-    print '<meta name="generator" content="Dolibarr installer">' . "\n";
-    print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/install/default.css">' . "\n";
+    print '<!DOCTYPE HTML>'."\n";
+    print '<html>'."\n";
+    print '<head>'."\n";
+    print '<meta charset="'.$conf->file->character_set_client.'">'."\n";
+    print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+    print '<meta name="generator" content="Dolibarr installer">'."\n";
+    print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/install/default.css">'."\n";
 
-    print '<!-- Includes CSS for JQuery -->' . "\n";
+    print '<!-- Includes CSS for JQuery -->'."\n";
     if ($jQueryUiCustomPath) {
-        print '<link rel="stylesheet" type="text/css" href="' . $jQueryUiCustomPath . 'css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";  // JQuery
+        print '<link rel="stylesheet" type="text/css" href="'.$jQueryUiCustomPath.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
     } else {
         //print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";    // JQuery
-        print '<link rel="stylesheet" type="text/css" href="' . DOL_BASE_URI . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.min.css" />' . "\n";    // JQuery
+        print '<link rel="stylesheet" type="text/css" href="'.DOL_BASE_URI.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n"; // JQuery
     }
-    print '<!-- Includes JS for JQuery -->' . "\n";
+    print '<!-- Includes JS for JQuery -->'."\n";
     if ($jQueryCustomPath) {
-        print '<script type="text/javascript" src="' . $jQueryCustomPath . 'jquery.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.$jQueryCustomPath.'jquery.min.js"></script>'."\n";
     } else {
         // print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery.min.js"></script>' . "\n";
-        print '<script type="text/javascript" src="' . BASE_URI . '/vendor/components/jquery/jquery.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.BASE_URI.'/vendor/components/jquery/jquery.min.js"></script>'."\n";
     }
     if ($jQueryUiCustomPath) {
-        print '<script type="text/javascript" src="' . $jQueryUiCustomPath . 'jquery-ui.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.$jQueryUiCustomPath.'jquery-ui.min.js"></script>'."\n";
     } else {
         // print '<script type="text/javascript" src="' . DOL_BASE_URI . '/includes/jquery/js/jquery-ui.min.js"></script>' . "\n";
-        print '<script type="text/javascript" src="' . BASE_URI . '/vendor/components/jqueryui/jquery-ui.min.js"></script>' . "\n";
+        print '<script type="text/javascript" src="'.BASE_URI.'/vendor/components/jqueryui/jquery-ui.min.js"></script>'."\n";
     }
-    print '<title>' . $langs->trans("DolibarrSetup") . '</title>' . "\n";
+    print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
     print "<!-- Alixar debugBar header -->";
     print Debug::getRenderHeader(); // Includes Alixar debugBar header
-    print '</head>' . "\n";
+    print '</head>'."\n";
 
-    print '<body>' . "\n";
+    print '<body>'."\n";
 
     print '<div class="divlogoinstall" style="text-align:center">';
-    print '<img class="imglogoinstall" src="' . DOL_BASE_URI . '/theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
+    print '<img class="imglogoinstall" src="'.DOL_BASE_URI.'/theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
     print DOL_VERSION;
     print '</div><br>';
 
-    print '<span class="titre">' . $langs->trans("DolibarrSetup");
+    print '<span class="titre">'.$langs->trans("DolibarrSetup");
     if ($subtitle) {
-        print ' - ' . $subtitle;
+        print ' - '.$subtitle;
     }
-    print '</span>' . "\n";
+    print '</span>'."\n";
 
     //print '<form name="forminstall" style="width: 100%" action="' . $next . '.php' . ($param ? '?' . $param : '') . '" method="POST">' . "\n";
-    print '<form name="forminstall" style="width: 100%" href="' . BASE_URI . '?controller=install&method=' . $next . ($param ? '&' . $param : '') . '" method="POST">' . "\n";
-    print '<input type="hidden" name="next" value="' . $next . '">' . "\n";
-    print '<input type="hidden" name="testpost" value="ok">' . "\n";
-    print '<input type="hidden" name="action" value="' . $action . '">' . "\n";
+    print '<form name="forminstall" style="width: 100%" href="'.BASE_URI.'?controller=install&method='.$next.($param ? '&'.$param : '').'" method="POST">'."\n";
+    print '<input type="hidden" name="next" value="'.$next.'">'."\n";
+    print '<input type="hidden" name="testpost" value="ok">'."\n";
+    print '<input type="hidden" name="action" value="'.$action.'">'."\n";
 
-    print '<table class="main" width="100%"><tr><td>' . "\n";
+    print '<table class="main" width="100%"><tr><td>'."\n";
 
-    print '<table class="' . $csstable . '" width="100%"><tr><td>' . "\n";
+    print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
 }
 
 /**
@@ -519,29 +519,29 @@ 
     $langs->load("other");
     $langs->load("admin");
 
-    print '</td></tr></table>' . "\n";
-    print '</td></tr></table>' . "\n";
+    print '</td></tr></table>'."\n";
+    print '</td></tr></table>'."\n";
 
     if (!$nonext || ($nonext == '2')) {
         print '<div class="nextbutton" id="nextbutton">';
         if ($nonext == '2') {
-            print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"] . '&ignoreerrors=1' : '') . '<br><br>';
+            print $langs->trans("ErrorFoundDuringMigration", isset($_SERVER["REQUEST_URI"]) ? $_SERVER["REQUEST_URI"].'&ignoreerrors=1' : '').'<br><br>';
         }
 
-        print '<input type="submit" ' . ($nonext == '2' ? 'disabled="disabled" ' : '') . 'value="' . $langs->trans("NextStep") . ' ->"';
+        print '<input type="submit" '.($nonext == '2' ? 'disabled="disabled" ' : '').'value="'.$langs->trans("NextStep").' ->"';
         if ($jscheckfunction) {
-            print ' onClick="return ' . $jscheckfunction . '();"';
+            print ' onClick="return '.$jscheckfunction.'();"';
         }
         print '></div>';
         if ($withpleasewait) {
-            print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>' . $langs->trans("NextStepMightLastALongTime") . '<br><br><div class="blinkwait">' . $langs->trans("PleaseBePatient") . '</div></div>';
+            print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
         }
     }
     if ($setuplang) {
-        print '<input type="hidden" name="selectlang" value="' . $setuplang . '">';
+        print '<input type="hidden" name="selectlang" value="'.$setuplang.'">';
     }
 
-    print '</form>' . "\n";
+    print '</form>'."\n";
 
     // If there is some logs in buffer to show
     if (isset($conf->logbuffer) && count($conf->logbuffer)) {
@@ -549,7 +549,7 @@ 
         print "<!-- Start of log output\n";
         //print '<div class="hidden">'."\n";
         foreach ($conf->logbuffer as $logline) {
-            print $logline . "<br>\n";
+            print $logline."<br>\n";
         }
         //print '</div>'."\n";
         print "End of log output -->\n";
@@ -558,8 +558,8 @@ 
 
     print "<!-- Alixar debugBar footer -->";
     print Debug::getRenderFooter(); // Includes Alixar debugBar footer
-    print '</body>' . "\n";
-    print '</html>' . "\n";
+    print '</body>'."\n";
+    print '</html>'."\n";
 }
 
 /**
@@ -624,16 +624,16 @@ 
         $dolibarr_main_url_root = $_SERVER["SCRIPT_URI"];
     } // If defined (Ie: Apache with Caudium)
     elseif (isset($_SERVER["SERVER_URL"]) && isset($_SERVER["DOCUMENT_URI"])) {
-        $dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
+        $dolibarr_main_url_root = $_SERVER["SERVER_URL"].$_SERVER["DOCUMENT_URI"];
     } // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
     else {
-        $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
+        $proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
         if (!empty($_SERVER["HTTP_HOST"])) {
             $serverport = $_SERVER["HTTP_HOST"];
         } else {
             $serverport = $_SERVER["SERVER_NAME"];
         }
-        $dolibarr_main_url_root = $proto . "://" . $serverport . $_SERVER["SCRIPT_NAME"];
+        $dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
     }
     // Clean proposed URL
     // We assume /install to be under /htdocs, so we get the parent path of the current URL

Braces +95 added lines, -61 removed lines

@@ -31,8 +31,9 @@ 
  * 	\brief      File that define environment for support pages
  */
 // Just to define version DOL_VERSION
-if (!defined('DOL_INC_FOR_VERSION_ERROR'))
+if (!defined('DOL_INC_FOR_VERSION_ERROR')) {
     define('DOL_INC_FOR_VERSION_ERROR', '1');
+}
 require_once DOL_BASE_PATH . '/filefunc.inc.php';
 
 require_once DOL_BASE_PATH . '/core/class/translate.class.php';
@@ -151,23 +152,31 @@ 
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : ''));           // URL relative root
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT'));  // $uri contains url without http*
 $suburi = strstr($uri, '/');       // $suburi contains url without domain
-if ($suburi == '/')
-    $suburi = '';   // If $suburi is /, it is now ''
+if ($suburi == '/') {
+    $suburi = '';
+}
+// If $suburi is /, it is now ''
 define('DOL_URL_ROOT', $suburi);    // URL relative root ('', '/dolibarr', ...)
 
 
-if (empty($conf->file->character_set_client))
+if (empty($conf->file->character_set_client)) {
     $conf->file->character_set_client = "utf-8";
-if (empty($conf->db->character_set))
+}
+if (empty($conf->db->character_set)) {
     $conf->db->character_set = 'utf8';
-if (empty($conf->db->dolibarr_main_db_collation))
+}
+if (empty($conf->db->dolibarr_main_db_collation)) {
     $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci';
-if (empty($conf->db->dolibarr_main_db_encryption))
+}
+if (empty($conf->db->dolibarr_main_db_encryption)) {
     $conf->db->dolibarr_main_db_encryption = 0;
-if (empty($conf->db->dolibarr_main_db_cryptkey))
+}
+if (empty($conf->db->dolibarr_main_db_cryptkey)) {
     $conf->db->dolibarr_main_db_cryptkey = '';
-if (empty($conf->db->user))
+}
+if (empty($conf->db->user)) {
     $conf->db->user = '';
+}
 
 // Define array of document root directories
 $conf->file->dol_document_root = array(DOL_DOCUMENT_ROOT);
@@ -224,19 +233,24 @@ 
 // Force usage of log file for install and upgrades
 $conf->syslog->enabled = 1;
 $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-if (!defined('SYSLOG_HANDLERS'))
+if (!defined('SYSLOG_HANDLERS')) {
     define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+}
 if (!defined('SYSLOG_FILE')) { // To avoid warning on systems with constant already defined
-    if (@is_writable('/tmp'))
-        define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-    else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-        define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
-    else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-        define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
-    else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
-        define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-    else if (@is_writable('../../'))
-        define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+    if (@is_writable('/tmp')) {
+            define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+    } else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) {
+            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+    } else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) {
+            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+    } else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) {
+            define('SYSLOG_FILE', '../../../../dolibarr_install.log');
+    }
+    // For DoliWamp
+    else if (@is_writable('../../')) {
+            define('SYSLOG_FILE', '../../dolibarr_install.log');
+    }
+    // For others
 
 
 
@@ -254,10 +268,12 @@ 
         
 //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
 }
-if (defined('SYSLOG_FILE'))
+if (defined('SYSLOG_FILE')) {
     $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-if (!defined('SYSLOG_FILE_NO_ERROR'))
+}
+if (!defined('SYSLOG_FILE_NO_ERROR')) {
     define('SYSLOG_FILE_NO_ERROR', 1);
+}
 // We init log handler for install
 $handlers = array('mod_syslog_file');
 foreach ($handlers as $handler) {
@@ -272,9 +288,10 @@ 
         throw new Exception('Log handler does not extend LogHandlerInterface');
     }
 
-    if (empty($conf->loghandlers[$handler]))
-        $conf->loghandlers[$handler] = $loghandlerinstance;
-}
+    if (empty($conf->loghandlers[$handler])) {
+            $conf->loghandlers[$handler] = $loghandlerinstance;
+    }
+    }
 
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc')) { // magic_quotes_* removed in PHP 5.4
@@ -298,10 +315,11 @@ 
 
 // Defini objet langs
 $langs = new Translate('..', $conf);
-if (GETPOST('lang', 'aZ09'))
+if (GETPOST('lang', 'aZ09')) {
     $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
-else
+} else {
     $langs->setDefaultLang('auto');
+}
 
 $bc[false] = ' class="bg1"';
 $bc[true] = ' class="bg2"';
@@ -324,8 +342,9 @@ 
     global $character_set_client;
 
     $return = include_once $dolibarr_main_document_root . '/core/class/conf.class.php';
-    if (!$return)
-        return -1;
+    if (!$return) {
+            return -1;
+    }
 
     $conf = new Conf();
     $conf->db->type = trim($dolibarr_main_db_type);
@@ -336,40 +355,51 @@ 
     $conf->db->pass = trim($dolibarr_main_db_pass);
 
     // Mysql driver support has been removed in favor of mysqli
-    if ($conf->db->type == 'mysql')
-        $conf->db->type = 'mysqli';
-    if (empty($character_set_client))
-        $character_set_client = "UTF-8";
+    if ($conf->db->type == 'mysql') {
+            $conf->db->type = 'mysqli';
+    }
+    if (empty($character_set_client)) {
+            $character_set_client = "UTF-8";
+    }
     $conf->file->character_set_client = strtoupper($character_set_client);
-    if (empty($dolibarr_main_db_character_set))
-        $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+    if (empty($dolibarr_main_db_character_set)) {
+            $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : '');
+    }
     $conf->db->character_set = $dolibarr_main_db_character_set;
-    if (empty($dolibarr_main_db_collation))
-        $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+    if (empty($dolibarr_main_db_collation)) {
+            $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : '');
+    }
     $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
-    if (empty($dolibarr_main_db_encryption))
-        $dolibarr_main_db_encryption = 0;
+    if (empty($dolibarr_main_db_encryption)) {
+            $dolibarr_main_db_encryption = 0;
+    }
     $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-    if (empty($dolibarr_main_db_cryptkey))
-        $dolibarr_main_db_cryptkey = '';
+    if (empty($dolibarr_main_db_cryptkey)) {
+            $dolibarr_main_db_cryptkey = '';
+    }
     $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
     // Force usage of log file for install and upgrades
     $conf->syslog->enabled = 1;
     $conf->global->SYSLOG_LEVEL = constant('LOG_DEBUG');
-    if (!defined('SYSLOG_HANDLERS'))
-        define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+    if (!defined('SYSLOG_HANDLERS')) {
+            define('SYSLOG_HANDLERS', '["mod_syslog_file"]');
+    }
     if (!defined('SYSLOG_FILE')) { // To avoid warning on systems with constant already defined
-        if (@is_writable('/tmp'))
-            define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
-        else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"]))
-            define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
-        else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"]))
-            define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
-        else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat'))
-            define('SYSLOG_FILE', '../../../../dolibarr_install.log'); // For DoliWamp
-        else if (@is_writable('../../'))
-            define('SYSLOG_FILE', '../../dolibarr_install.log');    // For others
+        if (@is_writable('/tmp')) {
+                    define('SYSLOG_FILE', '/tmp/dolibarr_install.log');
+        } else if (!empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) {
+                    define('SYSLOG_FILE', $_ENV["TMP"] . '/dolibarr_install.log');
+        } else if (!empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) {
+                    define('SYSLOG_FILE', $_ENV["TEMP"] . '/dolibarr_install.log');
+        } else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) {
+                    define('SYSLOG_FILE', '../../../../dolibarr_install.log');
+        }
+        // For DoliWamp
+        else if (@is_writable('../../')) {
+                    define('SYSLOG_FILE', '../../dolibarr_install.log');
+        }
+        // For others
 
 
 
@@ -387,10 +417,12 @@ 
             
 //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
     }
-    if (defined('SYSLOG_FILE'))
-        $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-    if (!defined('SYSLOG_FILE_NO_ERROR'))
-        define('SYSLOG_FILE_NO_ERROR', 1);
+    if (defined('SYSLOG_FILE')) {
+            $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+    }
+    if (!defined('SYSLOG_FILE_NO_ERROR')) {
+            define('SYSLOG_FILE_NO_ERROR', 1);
+    }
     // We init log handler for install
     $handlers = array('mod_syslog_file');
     foreach ($handlers as $handler) {
@@ -405,8 +437,9 @@ 
             throw new Exception('Log handler does not extend LogHandlerInterface');
         }
 
-        if (empty($conf->loghandlers[$handler]))
-            $conf->loghandlers[$handler] = $loghandlerinstance;
+        if (empty($conf->loghandlers[$handler])) {
+                    $conf->loghandlers[$handler] = $loghandlerinstance;
+        }
     }
 
     return 1;
@@ -571,8 +604,9 @@ 
  */
 function dolibarr_install_syslog($message, $level = LOG_DEBUG)
 {
-    if (!defined('LOG_DEBUG'))
-        define('LOG_DEBUG', 6);
+    if (!defined('LOG_DEBUG')) {
+            define('LOG_DEBUG', 6);
+    }
     dol_syslog($message, $level);
 }
 

dolibarr/htdocs/install/step2.php

Spacing +66 added lines, -66 removed lines

@@ -25,8 +25,8 @@ 
  *      \brief      Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data

  */

 include 'inc.php';

-require_once $dolibarr_main_document_root . '/core/class/conf.class.php';

-require_once $dolibarr_main_document_root . '/core/lib/admin.lib.php';

+require_once $dolibarr_main_document_root.'/core/class/conf.class.php';

+require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';

 

 global $langs;

 

@@ -37,7 +37,7 @@ 
 // Cette page peut etre longue. On augmente le delai autorise.

 // Ne fonctionne que si on est pas en safe_mode.

 $err = error_reporting();

-error_reporting(0);  // Disable all errors

+error_reporting(0); // Disable all errors

 //error_reporting(E_ALL);

 @set_time_limit(900); // Need 900 on some OS like Windows 7/64

 error_reporting($err);

@@ -88,7 +88,7 @@ 
 }

 

 if ($action == "set") {

-    print '<h3><img class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> ' . $langs->trans("Database") . '</h3>';

+    print '<h3><img class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/octicons/build/svg/database.svg" width="20" alt="Database"> '.$langs->trans("Database").'</h3>';

 

     print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';

     $error = 0;

@@ -97,18 +97,18 @@ 
 

     if ($db->connected) {

         print "<tr><td>";

-        print $langs->trans("ServerConnection") . " : " . $conf->db->host . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+        print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

         $ok = 1;

     } else {

-        print "<tr><td>Failed to connect to server : " . $conf->db->host . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td></tr>';

+        print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td></tr>';

     }

 

     if ($ok) {

         if ($db->database_selected) {

-            dolibarr_install_syslog("step2: successful connection to database: " . $conf->db->name);

+            dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);

         } else {

-            dolibarr_install_syslog("step2: failed connection to database :" . $conf->db->name, LOG_ERR);

-            print "<tr><td>Failed to select database " . $conf->db->name . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td></tr>';

+            dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);

+            print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td></tr>';

             $ok = 0;

         }

     }

@@ -118,12 +118,12 @@ 
     if ($ok) {

         $version = $db->getVersion();

         $versionarray = $db->getVersionArray();

-        print '<tr><td>' . $langs->trans("DatabaseVersion") . '</td>';

-        print '<td>' . $version . '</td></tr>';

+        print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';

+        print '<td>'.$version.'</td></tr>';

         //print '<td align="right">'.join('.',$versionarray).'</td></tr>';

 

-        print '<tr><td>' . $langs->trans("DatabaseName") . '</td>';

-        print '<td>' . $db->database_name . '</td></tr>';

+        print '<tr><td>'.$langs->trans("DatabaseName").'</td>';

+        print '<td>'.$db->database_name.'</td></tr>';

         //print '<td align="right">'.join('.',$versionarray).'</td></tr>';

     }

 

@@ -150,12 +150,12 @@ 
     if ($ok && $createtables) {

         // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)

         //$dir = "mysql/tables/";

-        $dir = DOL_BASE_PATH . "/install/mysql/tables/";

+        $dir = DOL_BASE_PATH."/install/mysql/tables/";

 

 

         $ok = 0;

         $handle = opendir($dir);

-        dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);

+        dolibarr_install_syslog("step2: open tables directory ".$dir." handle=".$handle);

         $tablefound = 0;

         $tabledata = array();

         if (is_resource($handle)) {

@@ -173,7 +173,7 @@ 
         foreach ($tabledata as $file) {

             $name = substr($file, 0, dol_strlen($file) - 4);

             $buffer = '';

-            $fp = fopen($dir . $file, "r");

+            $fp = fopen($dir.$file, "r");

             if ($fp) {

                 while (!feof($fp)) {

                     $buf = fgets($fp, 4096);

@@ -202,7 +202,7 @@ 
                 //print "<tr><td>Creation de la table $name/td>";

                 $requestnb++;

 

-                dolibarr_install_syslog("step2: request: " . $buffer);

+                dolibarr_install_syslog("step2: request: ".$buffer);

                 $resql = $db->query($buffer, 0, 'dml');

                 if ($resql) {

                     // print "<td>OK requete ==== $buffer</td></tr>";

@@ -212,31 +212,31 @@ 
                         $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS') {

                         //print "<td>Deja existante</td></tr>";

                     } else {

-                        print "<tr><td>" . $langs->trans("CreateTableAndPrimaryKey", $name);

-                        print "<br>\n" . $langs->trans("Request") . ' ' . $requestnb . ' : ' . $buffer . ' <br>Executed query : ' . $db->lastquery;

+                        print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);

+                        print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;

                         print "\n</td>";

-                        print '<td><span class="error">' . $langs->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span></td></tr>';

+                        print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';

                         $error++;

                     }

                 }

             } else {

-                print "<tr><td>" . $langs->trans("CreateTableAndPrimaryKey", $name);

+                print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);

                 print "</td>";

-                print '<td><span class="error">' . $langs->trans("Error") . ' Failed to open file ' . $dir . $file . '</span></td></tr>';

+                print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';

                 $error++;

-                dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);

+                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);

             }

         }

 

         if ($tablefound) {

             if ($error == 0) {

                 print '<tr><td>';

-                print $langs->trans("TablesAndPrimaryKeysCreation") . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+                print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

                 $ok = 1;

             }

         } else {

-            print '<tr><td>' . $langs->trans("ErrorFailedToFindSomeFiles", $dir) . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td></tr>';

-            dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);

+            print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td></tr>';

+            dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);

         }

     }

 

@@ -250,11 +250,11 @@ 
     if ($ok && $createkeys) {

         // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)

         //$dir = "mysql/tables/";

-        $dir = DOL_BASE_PATH . "/install/mysql/tables/";

+        $dir = DOL_BASE_PATH."/install/mysql/tables/";

 

         $okkeys = 0;

         $handle = opendir($dir);

-        dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);

+        dolibarr_install_syslog("step2: open keys directory ".$dir." handle=".$handle);

         $tablefound = 0;

         $tabledata = array();

         if (is_resource($handle)) {

@@ -273,7 +273,7 @@ 
             $name = substr($file, 0, dol_strlen($file) - 4);

             //print "<tr><td>Creation de la table $name</td>";

             $buffer = '';

-            $fp = fopen($dir . $file, "r");

+            $fp = fopen($dir.$file, "r");

             if ($fp) {

                 while (!feof($fp)) {

                     $buf = fgets($fp, 4096);

@@ -319,7 +319,7 @@ 
                         //print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";

                         $requestnb++;

 

-                        dolibarr_install_syslog("step2: request: " . $buffer);

+                        dolibarr_install_syslog("step2: request: ".$buffer);

                         $resql = $db->query($buffer, 0, 'dml');

                         if ($resql) {

                             //print "<td>OK requete ==== $buffer</td></tr>";

@@ -333,27 +333,27 @@ 
                                 //print "<td>Deja existante</td></tr>";

                                 $key_exists = 1;

                             } else {

-                                print "<tr><td>" . $langs->trans("CreateOtherKeysForTable", $name);

-                                print "<br>\n" . $langs->trans("Request") . ' ' . $requestnb . ' : ' . $db->lastqueryerror();

+                                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);

+                                print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();

                                 print "\n</td>";

-                                print '<td><span class="error">' . $langs->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span></td></tr>';

+                                print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';

                                 $error++;

                             }

                         }

                     }

                 }

             } else {

-                print "<tr><td>" . $langs->trans("CreateOtherKeysForTable", $name);

+                print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);

                 print "</td>";

-                print '<td><span class="error">' . $langs->trans("Error") . " Failed to open file " . $dir . $file . "</span></td></tr>";

+                print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";

                 $error++;

-                dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);

+                dolibarr_install_syslog("step2: failed to open file ".$dir.$file, LOG_ERR);

             }

         }

 

         if ($tablefound && $error == 0) {

             print '<tr><td>';

-            print $langs->trans("OtherKeysCreation") . '</td><td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+            print $langs->trans("OtherKeysCreation").'</td><td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

             $okkeys = 1;

         }

     }

@@ -368,29 +368,29 @@ 
         // For this file, we use a directory according to database type

         if ($choix == 1)

             //$dir = "mysql/functions/";

-            $dir = DOL_BASE_PATH . "/install/mysql/functions/";

+            $dir = DOL_BASE_PATH."/install/mysql/functions/";

         elseif ($choix == 2)

         //$dir = "pgsql/functions/";

-            $dir = DOL_BASE_PATH . "/install/pgsql/functions/";

+            $dir = DOL_BASE_PATH."/install/pgsql/functions/";

         elseif ($choix == 3)

             //$dir = "mssql/functions/";

-            $dir = DOL_BASE_PATH . "/install/mssql/functions/";

+            $dir = DOL_BASE_PATH."/install/mssql/functions/";

         elseif ($choix == 4) {

             //$dir = "sqlite3/functions/";

-            $dir = DOL_BASE_PATH . "/install/sqlite3/functions/";

+            $dir = DOL_BASE_PATH."/install/sqlite3/functions/";

         }

 

         // Creation donnees

         $file = "functions.sql";

-        if (file_exists($dir . $file)) {

-            $fp = fopen($dir . $file, "r");

-            dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);

+        if (file_exists($dir.$file)) {

+            $fp = fopen($dir.$file, "r");

+            dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".$fp);

             if ($fp) {

                 $buffer = '';

                 while (!feof($fp)) {

                     $buf = fgets($fp, 4096);

                     if (substr($buf, 0, 2) <> '--') {

-                        $buffer .= $buf . "§";

+                        $buffer .= $buf."§";

                     }

                 }

                 fclose($fp);

@@ -401,8 +401,8 @@ 
             foreach ($listesql as $buffer) {

                 $buffer = trim($buffer);

                 if ($buffer) {

-                    dolibarr_install_syslog("step2: request: " . $buffer);

-                    print "<!-- Insert line : " . $buffer . "<br>-->\n";

+                    dolibarr_install_syslog("step2: request: ".$buffer);

+                    print "<!-- Insert line : ".$buffer."<br>-->\n";

                     $resql = $db->query($buffer, 0, 'dml');

                     if ($resql) {

                         $ok = 1;

@@ -413,21 +413,21 @@ 
                         } else {

                             $ok = 0;

 

-                            print "<tr><td>" . $langs->trans("FunctionsCreation");

-                            print "<br>\n" . $langs->trans("Request") . ' ' . $requestnb . ' : ' . $buffer;

+                            print "<tr><td>".$langs->trans("FunctionsCreation");

+                            print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;

                             print "\n</td>";

-                            print '<td><span class="error">' . $langs->trans("ErrorSQL") . " " . $db->errno() . " " . $db->error() . '</span></td></tr>';

+                            print '<td><span class="error">'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'</span></td></tr>';

                             $error++;

                         }

                     }

                 }

             }

 

-            print "<tr><td>" . $langs->trans("FunctionsCreation") . "</td>";

+            print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";

             if ($ok) {

-                print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+                print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

             } else {

-                print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td></tr>';

+                print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td></tr>';

                 $ok = 1;

             }

         }

@@ -442,11 +442,11 @@ 
     if ($ok && $createdata) {

         // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)

         //$dir = "mysql/data/";

-        $dir = DOL_BASE_PATH . "/install/mysql/data/";

+        $dir = DOL_BASE_PATH."/install/mysql/data/";

 

         // Insert data

         $handle = opendir($dir);

-        dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);

+        dolibarr_install_syslog("step2: open directory data ".$dir." handle=".$handle);

         $tablefound = 0;

         $tabledata = array();

         if (is_resource($handle)) {

@@ -458,7 +458,7 @@ 
 

                         

 //print 'x'.$file.'-'.$createdata.'<br>';

-                    if (is_numeric($createdata) || preg_match('/' . preg_quote($createdata) . '/i', $file)) {

+                    if (is_numeric($createdata) || preg_match('/'.preg_quote($createdata).'/i', $file)) {

                         $tablefound++;

                         $tabledata[] = $file;

                     }

@@ -471,8 +471,8 @@ 
         sort($tabledata);

         foreach ($tabledata as $file) {

             $name = substr($file, 0, dol_strlen($file) - 4);

-            $fp = fopen($dir . $file, "r");

-            dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);

+            $fp = fopen($dir.$file, "r");

+            dolibarr_install_syslog("step2: open data file ".$dir.$file." handle=".$fp);

             if ($fp) {

                 $arrayofrequests = array();

                 $linefound = 0;

@@ -492,14 +492,14 @@ 
                         if (empty($arrayofrequests[$linegroup]))

                             $arrayofrequests[$linegroup] = $buffer;

                         else

-                            $arrayofrequests[$linegroup] .= " " . $buffer;

+                            $arrayofrequests[$linegroup] .= " ".$buffer;

 

                         $linefound++;

                     }

                 }

                 fclose($fp);

 

-                dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");

+                dolibarr_install_syslog("step2: found ".$linefound." records, defined ".count($arrayofrequests)." group(s).");

 

                 $okallfile = 1;

                 $db->begin();

@@ -521,7 +521,7 @@ 
                         } else {

                             $ok = 0;

                             $okallfile = 0;

-                            print '<span class="error">' . $langs->trans("ErrorSQL") . " : " . $db->lasterrno() . " - " . $db->lastqueryerror() . " - " . $db->lasterror() . "</span><br>";

+                            print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";

                         }

                     }

                 }

@@ -533,12 +533,12 @@ 
             }

         }

 

-        print "<tr><td>" . $langs->trans("ReferenceDataLoading") . "</td>";

+        print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";

         if ($ok) {

-            print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

+            print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/tick.png" alt="Ok"></td></tr>';

         } else {

-            print '<td><img src="' . DOL_BASE_URI . '/theme/eldy/img/error.png" alt="Error"></td></tr>';

-            $ok = 1;    // Data loading are not blocking errors

+            print '<td><img src="'.DOL_BASE_URI.'/theme/eldy/img/error.png" alt="Error"></td></tr>';

+            $ok = 1; // Data loading are not blocking errors

         }

     }

     print '</table>';

@@ -550,7 +550,7 @@ 
 $ret = 0;

 if (!$ok && isset($argv[1]))

     $ret = 1;

-dolibarr_install_syslog("Exit " . $ret);

+dolibarr_install_syslog("Exit ".$ret);

 

 dolibarr_install_syslog("- step2: end");

 

Braces +57 added lines, -42 removed lines

@@ -49,23 +49,29 @@ 
 $langs->loadLangs(array("admin", "install"));

 

 $choix = 0;

-if ($dolibarr_main_db_type == "mysqli")

-    $choix = 1;

-if ($dolibarr_main_db_type == "pgsql")

-    $choix = 2;

-if ($dolibarr_main_db_type == "mssql")

-    $choix = 3;

-if ($dolibarr_main_db_type == "sqlite")

-    $choix = 4;

-if ($dolibarr_main_db_type == "sqlite3")

-    $choix = 5;

+if ($dolibarr_main_db_type == "mysqli") {
+    $choix = 1;
+}
+if ($dolibarr_main_db_type == "pgsql") {
+    $choix = 2;
+}
+if ($dolibarr_main_db_type == "mssql") {
+    $choix = 3;
+}
+if ($dolibarr_main_db_type == "sqlite") {
+    $choix = 4;
+}
+if ($dolibarr_main_db_type == "sqlite3") {
+    $choix = 5;
+}
 

 //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');

 // Now we load forced values from install.forced.php file.

 $useforcedwizard = false;

 $forcedfile = "./install.forced.php";

-if ($conffile == "/etc/dolibarr/conf.php")

-    $forcedfile = "/etc/dolibarr/install.forced.php";

+if ($conffile == "/etc/dolibarr/conf.php") {
+    $forcedfile = "/etc/dolibarr/install.forced.php";
+}
 if (@file_exists($forcedfile)) {

     $useforcedwizard = true;

     include_once $forcedfile;

@@ -301,8 +307,9 @@ 
                     }

 

                     // Ajout ligne si non commentaire

-                    if (!preg_match('/^--/i', $buf))

-                        $buffer .= $buf;

+                    if (!preg_match('/^--/i', $buf)) {
+                                            $buffer .= $buf;
+                    }
                 }

                 fclose($fp);

 

@@ -366,16 +373,16 @@ 
      * ************************************************************************************* */

     if ($ok && $createfunctions) {

         // For this file, we use a directory according to database type

-        if ($choix == 1)

-            //$dir = "mysql/functions/";

-            $dir = DOL_BASE_PATH . "/install/mysql/functions/";

-        elseif ($choix == 2)

-        //$dir = "pgsql/functions/";

-            $dir = DOL_BASE_PATH . "/install/pgsql/functions/";

-        elseif ($choix == 3)

-            //$dir = "mssql/functions/";

-            $dir = DOL_BASE_PATH . "/install/mssql/functions/";

-        elseif ($choix == 4) {

+        if ($choix == 1) {
+                    //$dir = "mysql/functions/";

+            $dir = DOL_BASE_PATH . "/install/mysql/functions/";
+        } elseif ($choix == 2) {
+                //$dir = "pgsql/functions/";

+            $dir = DOL_BASE_PATH . "/install/pgsql/functions/";
+        } elseif ($choix == 3) {
+                    //$dir = "mssql/functions/";

+            $dir = DOL_BASE_PATH . "/install/mssql/functions/";
+        } elseif ($choix == 4) {

             //$dir = "sqlite3/functions/";

             $dir = DOL_BASE_PATH . "/install/sqlite3/functions/";

         }

@@ -452,8 +459,10 @@ 
         if (is_resource($handle)) {

             while (($file = readdir($handle)) !== false) {

                 if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file)) {

-                    if (preg_match('/^llx_accounting_account_/', $file))

-                        continue; // We discard data file of chart of account. Will be loaded when a chart is selected.

+                    if (preg_match('/^llx_accounting_account_/', $file)) {
+                                            continue;
+                    }
+                    // We discard data file of chart of account. Will be loaded when a chart is selected.

 

 

                         

@@ -483,16 +492,18 @@ 
                     $buffer = fgets($fp, 4096);

                     $buffer = trim($buffer);

                     if ($buffer) {

-                        if (substr($buffer, 0, 2) == '--')

-                            continue;

+                        if (substr($buffer, 0, 2) == '--') {
+                                                    continue;
+                        }
 

                         if ($linefound && ($linefound % $sizeofgroup) == 0) {

                             $linegroup++;

                         }

-                        if (empty($arrayofrequests[$linegroup]))

-                            $arrayofrequests[$linegroup] = $buffer;

-                        else

-                            $arrayofrequests[$linegroup] .= " " . $buffer;

+                        if (empty($arrayofrequests[$linegroup])) {
+                                                    $arrayofrequests[$linegroup] = $buffer;
+                        } else {
+                                                    $arrayofrequests[$linegroup] .= " " . $buffer;
+                        }
 

                         $linefound++;

                     }

@@ -526,10 +537,11 @@ 
                     }

                 }

 

-                if ($okallfile)

-                    $db->commit();

-                else

-                    $db->rollback();

+                if ($okallfile) {
+                                    $db->commit();
+                } else {
+                                    $db->rollback();
+                }
             }

         }

 

@@ -548,17 +560,20 @@ 
 

 

 $ret = 0;

-if (!$ok && isset($argv[1]))

-    $ret = 1;

+if (!$ok && isset($argv[1])) {
+    $ret = 1;
+}
 dolibarr_install_syslog("Exit " . $ret);

 

 dolibarr_install_syslog("- step2: end");

 

 pFooter($ok ? 0 : 1, $setuplang);

 

-if (isset($db) && is_object($db))

-    $db->close();

+if (isset($db) && is_object($db)) {
+    $db->close();
+}
 

 // Return code if ran from command line

-if ($ret)

-    exit($ret);

+if ($ret) {
+    exit($ret);
+}

dolibarr/htdocs/install/step4.php

Spacing +11 added lines, -11 removed lines

@@ -26,8 +26,8 @@ 
  * 	\brief      Ask login and password of Dolibarr admin user

  */

 include_once 'inc.php';

-require_once $dolibarr_main_document_root . '/core/class/conf.class.php';

-require_once $dolibarr_main_document_root . '/core/lib/admin.lib.php';

+require_once $dolibarr_main_document_root.'/core/class/conf.class.php';

+require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';

 

 global $langs;

 

@@ -66,26 +66,26 @@ 
     exit;

 }

 

-print '<h3><img class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> ' . $langs->trans("DolibarrAdminLogin") . '</h3>';

+print '<h3><img class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/octicons/build/svg/key.svg" width="20" alt="Database"> '.$langs->trans("DolibarrAdminLogin").'</h3>';

 

-print $langs->trans("LastStepDesc") . '<br><br>';

+print $langs->trans("LastStepDesc").'<br><br>';

 

 print '<table cellspacing="0" cellpadding="2">';

 

 $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);

 

 if ($db->ok) {

-    print '<tr><td><label for="login">' . $langs->trans("Login") . ' :</label></td><td>';

-    print '<input id="login" name="login" type="text" value="' . (!empty($_GET["login"]) ? GETPOST("login") : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '') . '></td></tr>';

-    print '<tr><td><label for="pass">' . $langs->trans("Password") . ' :</label></td><td>';

+    print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';

+    print '<input id="login" name="login" type="text" value="'.(!empty($_GET["login"]) ? GETPOST("login") : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').'></td></tr>';

+    print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';

     print '<input type="password" id="pass" name="pass"></td></tr>';

-    print '<tr><td><label for="pass_verif">' . $langs->trans("PasswordAgain") . ' :</label></td><td>';

+    print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';

     print '<input type="password" id="pass_verif" name="pass_verif"></td></tr>';

     print '</table>';

 

     if (isset($_GET["error"]) && $_GET["error"] == 1) {

         print '<br>';

-        print '<div class="error">' . $langs->trans("PasswordsMismatch") . '</div>';

+        print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';

         $error = 0; // We show button

     }

 

@@ -99,7 +99,7 @@ 
 

     if (isset($_GET["error"]) && $_GET["error"] == 3) {

         print '<br>';

-        print '<div class="error">' . $langs->trans("PleaseTypeALogin") . '</div>';

+        print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';

         $error = 0; // We show button

     }

 }

@@ -109,7 +109,7 @@ 
     $ret = 1;

 }

 

-dolibarr_install_syslog("Exit " . $ret);

+dolibarr_install_syslog("Exit ".$ret);

 dolibarr_install_syslog("- step4: end");

 pFooter($error, $setuplang);

 

Braces +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
 // Now we load forced value from install.forced.php file.

 $useforcedwizard = false;

 $forcedfile = "./install.forced.php";

-if ($conffile == "/etc/dolibarr/conf.php")

-    $forcedfile = "/etc/dolibarr/install.forced.php";

+if ($conffile == "/etc/dolibarr/conf.php") {
+    $forcedfile = "/etc/dolibarr/install.forced.php";
+}
 if (@file_exists($forcedfile)) {

     $useforcedwizard = true;

     include_once $forcedfile;

Helpers/AlSecurity2.php

Spacing +36 added lines, -36 removed lines

@@ -40,7 +40,7 @@ 
     {
         $t = '?';
         if ($mode == 'user')
-            $t = getenv('APACHE_RUN_USER');   // $_ENV['APACHE_RUN_USER'] is empty
+            $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
         if ($mode == 'group')
             $t = getenv('APACHE_RUN_GROUP');
         return $t;
@@ -64,7 +64,7 @@ 
             $entitytotest = 1;
         }
 
-        AlDolUtils::dol_syslog("checkLoginPassEntity usertotest=" . $usertotest . " entitytotest=" . $entitytotest . " authmode=" . join(',', $authmode));
+        AlDolUtils::dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
         $login = '';
 
         // Validation of login/pass/entity with standard modules
@@ -74,7 +74,7 @@ 
                 if ($test && $mode && !$login) {
                     // Validation of login/pass/entity for mode $mode
                     $mode = trim($mode);
-                    $authfile = 'functions_' . $mode . '.php';
+                    $authfile = 'functions_'.$mode.'.php';
                     $fullauthfile = '';
 
                     /*
@@ -93,7 +93,7 @@ 
                     $dirlogin = array_merge(array("/Helpers/login"), (array) Globals::$conf->modules_parts['login']);
                     foreach ($dirlogin as $reldir) {
                         // Check if file found (do not use dol_is_file to avoid loading files.lib.php)
-                        $tmpnewauthfile = BASE_PATH . $reldir . '/' . $authfile;
+                        $tmpnewauthfile = BASE_PATH.$reldir.'/'.$authfile;
                         if (is_file($tmpnewauthfile)) {
                             $fullauthfile = $tmpnewauthfile;
                         }
@@ -105,10 +105,10 @@ 
                     }
                     if ($fullauthfile && $result) {
                         // Call function to check user/password
-                        $function = 'check_user_password_' . $mode;
+                        $function = 'check_user_password_'.$mode;
                         $login = \call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
                         if ($login) { // Login is successfull
-                            $test = false;            // To stop once at first login success
+                            $test = false; // To stop once at first login success
                             Globals::$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
                             $dol_tz = AlDolUtils::GETPOST('tz');
                             $dol_dst = AlDolUtils::GETPOST('dst');
@@ -116,7 +116,7 @@ 
                             $dol_screenheight = AlDolUtils::GETPOST('screenheight');
                         }
                     } else {
-                        AlDolUtils::dol_syslog("Authentification ko - failed to load file '" . $authfile . "'", LOG_ERR);
+                        AlDolUtils::dol_syslog("Authentification ko - failed to load file '".$authfile."'", LOG_ERR);
                         sleep(1);
                         // Load translation files required by the page
                         Globals::$langs->loadLangs(array('other', 'main', 'errors'));
@@ -155,7 +155,7 @@ 
 
         // Title
         $appli = constant('DOL_APPLICATION_TITLE');
-        $title = $appli . ' ' . constant('DOL_VERSION');
+        $title = $appli.' '.constant('DOL_VERSION');
         if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
             $title = Globals::$conf->global->MAIN_APPLICATION_TITLE;
         }
@@ -182,19 +182,19 @@ 
         if (!empty(Globals::$conf->modules_parts['tpl'])) { // Using this feature slow down application
             $dirtpls = array_merge(Globals::$conf->modules_parts['tpl'], array('/core/tpl/'));
             foreach ($dirtpls as $reldir) {
-                $tmp = AlDolUtils::dol_buildpath($reldir . 'login.tpl.php');
+                $tmp = AlDolUtils::dol_buildpath($reldir.'login.tpl.php');
                 if (file_exists($tmp)) {
                     $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp);
                     break;
                 }
             }
         } else {
-            $template_dir = DOL_DOCUMENT_ROOT . "/core/tpl/";
+            $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
         }
 
 // Set cookie for timeout management
         $prefix = AlDolUtils::dol_getprefix('');
-        $sessiontimeout = 'DOLSESSTIMEOUT_' . $prefix;
+        $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
         if (!empty(Globals::$conf->global->MAIN_SESSION_TIMEOUT)) {
             setcookie($sessiontimeout, Globals::$conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
         }
@@ -221,7 +221,7 @@ 
 
 // Execute hook getLoginPageOptions (for table)
         $parameters = array('entity' => AlDolUtils::GETPOST('entity', 'int'));
-        $reshook = Globals::$hookManager->executeHooks('getLoginPageOptions', $parameters);    // Note that $action and $object may have been modified by some hooks.
+        $reshook = Globals::$hookManager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
         if (is_array(Globals::$hookManager->resArray) && !empty(Globals::$hookManager->resArray)) {
             $morelogincontent = Globals::$hookManager->resArray; // (deprecated) For compatibility
         } else {
@@ -230,7 +230,7 @@ 
 
 // Execute hook getLoginPageExtraOptions (eg for js)
         $parameters = array('entity' => AlDolUtils::GETPOST('entity', 'int'));
-        $reshook = Globals::$hookManager->executeHooks('getLoginPageExtraOptions', $parameters);    // Note that $action and $object may have been modified by some hooks.
+        $reshook = Globals::$hookManager->executeHooks('getLoginPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
         $moreloginextracontent = Globals::$hookManager->resPrint;
 
 // Login
@@ -239,23 +239,23 @@ 
 
 // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
         $width = 0;
-        $urllogo = DOL_BASE_URI . '/theme/login_logo.png';
+        $urllogo = DOL_BASE_URI.'/theme/login_logo.png';
 
-        if (!empty($mysoc->logo_small) && is_readable(Globals::$conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_small)) {
-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/thumbs/' . $mysoc->logo_small);
-        } elseif (!empty($mysoc->logo) && is_readable(Globals::$conf->mycompany->dir_output . '/logos/' . $mysoc->logo)) {
-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/' . $mysoc->logo);
+        if (!empty($mysoc->logo_small) && is_readable(Globals::$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+        } elseif (!empty($mysoc->logo) && is_readable(Globals::$conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo);
             $width = 128;
-        } elseif (is_readable(DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/dolibarr_logo.png';
-        } elseif (is_readable(DOL_BASE_URI . '/theme/dolibarr_logo.png')) {
-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';
+        } elseif (is_readable(DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/dolibarr_logo.png';
+        } elseif (is_readable(DOL_BASE_URI.'/theme/dolibarr_logo.png')) {
+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';
         }
 
 // Security graphical code
         $captcha = 0;
         $captcha_refresh = '';
-        if (function_exists("imagecreatefrompng") &&!empty(Globals::$conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+        if (function_exists("imagecreatefrompng") && !empty(Globals::$conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
             $captcha = 1;
             $captcha_refresh = img_picto(Globals::$langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"');
         }
@@ -284,11 +284,11 @@ 
         }
 
 // Google AD
-        $main_google_ad_client = ((!empty(Globals::$conf->global->MAIN_GOOGLE_AD_CLIENT) &&!empty(Globals::$conf->global->MAIN_GOOGLE_AD_SLOT)) ? 1 : 0);
+        $main_google_ad_client = ((!empty(Globals::$conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty(Globals::$conf->global->MAIN_GOOGLE_AD_SLOT)) ? 1 : 0);
 
 // Set jquery theme
         $dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
-        $favicon = AlDolUtils::dol_buildpath('/theme/' . Globals::$conf->theme . '/img/favicon.ico', 1);
+        $favicon = AlDolUtils::dol_buildpath('/theme/'.Globals::$conf->theme.'/img/favicon.ico', 1);
         if (!empty(Globals::$conf->global->MAIN_FAVICON_URL)) {
             $favicon = Globals::$conf->global->MAIN_FAVICON_URL;
         }
@@ -321,7 +321,7 @@ 
      */
     function makesalt($type = CRYPT_SALT_LENGTH)
     {
-        AlDolUtils::dol_syslog("makesalt type=" . $type);
+        AlDolUtils::dol_syslog("makesalt type=".$type);
         switch ($type) {
             case 12: // 8 + 4
                 $saltlen = 8;
@@ -344,8 +344,8 @@ 
         while (dol_strlen($salt) < $saltlen)
             $salt .= chr(mt_rand(64, 126));
 
-        $result = $saltprefix . $salt . $saltsuffix;
-        AlDolUtils::dol_syslog("makesalt return=" . $result);
+        $result = $saltprefix.$salt.$saltsuffix;
+        AlDolUtils::dol_syslog("makesalt return=".$result);
         return $result;
     }
 
@@ -357,12 +357,12 @@ 
      */
     function encodedecode_dbpassconf($level = 0)
     {
-        AlDolUtils::dol_syslog("encodedecode_dbpassconf level=" . $level, LOG_DEBUG);
+        AlDolUtils::dol_syslog("encodedecode_dbpassconf level=".$level, LOG_DEBUG);
         Globals::$config = '';
         $passwd = '';
         $passwd_crypted = '';
 
-        if ($fp = fopen(DOL_DOCUMENT_ROOT . '/conf/conf.php', 'r')) {
+        if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r')) {
             while (!feof($fp)) {
                 $buffer = fgets($fp, 4096);
 
@@ -399,10 +399,10 @@ 
                 if ($lineofpass) {
 // Add value at end of file
                     if ($level == 0) {
-                        Globals::$config .= '$dolibarr_main_db_pass=\'' . $passwd . '\';' . "\n";
+                        Globals::$config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
                     }
                     if ($level == 1) {
-                        Globals::$config .= '$dolibarr_main_db_pass=\'crypted:' . $passwd_crypted . '\';' . "\n";
+                        Globals::$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
                     }
 
 //print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
@@ -414,7 +414,7 @@ 
             fclose($fp);
 
 // Write new conf file
-            $file = DOL_DOCUMENT_ROOT . '/conf/conf.php';
+            $file = DOL_DOCUMENT_ROOT.'/conf/conf.php';
             if ($fp = @fopen($file, 'w')) {
                 fputs($fp, Globals::$config);
                 fflush($fp);
@@ -491,10 +491,10 @@ 
             }
         } else
             if (!empty (Globals::$conf->global->USER_PASSWORD_GENERATED)) {
-            $nomclass = "modGeneratePass" . ucfirst(Globals::$conf->global->USER_PASSWORD_GENERATED);
-            $nomfichier = $nomclass . ".class.php";
+            $nomclass = "modGeneratePass".ucfirst(Globals::$conf->global->USER_PASSWORD_GENERATED);
+            $nomfichier = $nomclass.".class.php";
 //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
-            require_once DOL_DOCUMENT_ROOT . "/core/modules/security/generate/" . $nomfichier;
+            require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier;
             $genhandler = new $nomclass($db, Globals::$conf, Globals::$langs, $user);
             $generated_password = $genhandler->getNewGeneratedPassword();
             unset($genhandler);

Braces +10 added lines, -6 removed lines

@@ -39,10 +39,13 @@ 
     function dol_getwebuser($mode)
     {
         $t = '?';
-        if ($mode == 'user')
-            $t = getenv('APACHE_RUN_USER');   // $_ENV['APACHE_RUN_USER'] is empty
-        if ($mode == 'group')
-            $t = getenv('APACHE_RUN_GROUP');
+        if ($mode == 'user') {
+                    $t = getenv('APACHE_RUN_USER');
+        }
+        // $_ENV['APACHE_RUN_USER'] is empty
+        if ($mode == 'group') {
+                    $t = getenv('APACHE_RUN_GROUP');
+        }
         return $t;
     }
 
@@ -341,8 +344,9 @@ 
                 break;
         }
         $salt = '';
-        while (dol_strlen($salt) < $saltlen)
-            $salt .= chr(mt_rand(64, 126));
+        while (dol_strlen($salt) < $saltlen) {
+                    $salt .= chr(mt_rand(64, 126));
+        }
 
         $result = $saltprefix . $salt . $saltsuffix;
         AlDolUtils::dol_syslog("makesalt return=" . $result);

Helpers/AlDolUtils.php

Spacing +532 added lines, -532 removed lines

@@ -52,7 +52,7 @@ 
      */

     static function getStaticMember($class, $member)

     {

-        AlDolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        AlDolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

         /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -77,7 +77,7 @@ 
 

         if (isset($class::$member))

             return $class::$member;

-        dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

+        dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');

         return null;

     }

 

@@ -94,9 +94,9 @@ 
      */

     static function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

     {

-        require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+        require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-        $class = 'DoliDB' . ucfirst($type);

+        $class = 'DoliDB'.ucfirst($type);

         $dolidb = new $class($type, $host, $user, $pass, $name, $port);

         return $dolidb;

     }

@@ -265,7 +265,7 @@ 
             $depth = $db->transaction_opened;

             $disconnectdone = $db->close();

         }

-        AlDolUtils::dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+        AlDolUtils::dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

     }

 

     /**

@@ -311,7 +311,7 @@ 
             return 'BadFirstParameterForDolUtils::GETPOST';

         }

         if (empty($check)) {

-            AlDolUtils::dol_syslog("Deprecated use of AlDolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

+            AlDolUtils::dol_syslog("Deprecated use of AlDolUtils::GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

             // Enable this line to know who call the AlDolUtils::GETPOST with '' $check parameter.

             //var_dump(debug_backtrace()[0]);

         }

@@ -340,7 +340,7 @@ 
             $relativepathstring = $_SERVER["PHP_SELF"];

             // Clean $relativepathstring

             if (constant('DOL_BASE_URI')) {

-                $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);

             }

             $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

             $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

@@ -349,8 +349,8 @@ 
             // Code for search criteria persistence.

             // Retrieve values if restore_lastsearch_values

             if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not AlDolUtils::GETPOST

-                if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                    $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+                if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                    $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                     if (is_array($tmp)) {

                         foreach ($tmp as $key => $val) {

                             if ($key == $paramname) { // We are on the requested parameter

@@ -361,12 +361,12 @@ 
                     }

                 }

                 // If there is saved contextpage, page or limit

-                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                    $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+                if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+                } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+                } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                    $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

                 }

             }

             // Else, retreive default values if we are not doing a sort

@@ -435,7 +435,7 @@ 
                                                 $qualified = 1;

 

                                             if ($qualified) {

-                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                                 foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

                                                     if ($out)

                                                         $out .= ', ';

@@ -471,11 +471,11 @@ 
                                             if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                                 // We made a search from quick search menu, do we still use default filter ?

                                                 if (empty(Globals::$conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {

-                                                    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                                    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                                     $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                                 }

                                             } else {

-                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                                $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                                 $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                             }

                                             break;

@@ -494,7 +494,7 @@ 
         // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

         if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

             $maxloop = 20;

-            $loopnb = 0;    // Protection against infinite loop

+            $loopnb = 0; // Protection against infinite loop

             while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

                 $loopnb++;

                 $newout = '';

@@ -539,10 +539,10 @@ 
                 } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                     $newout = Globals::$conf->entity;

                 } else {

-                    $newout = '';     // Key not found, we replace with empty string

+                    $newout = ''; // Key not found, we replace with empty string

                 }

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-                $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+                $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

             }

         }

 

@@ -652,7 +652,7 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (empty(Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {

-                return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+                return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

             }

             // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

             if (Globals::$conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {

@@ -662,16 +662,16 @@ 
                 return $_SERVER["SERVER_NAME"];

             }

 

-            return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return AlSecurity::dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+            return AlSecurity::dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

 

             // Use this for a "readable" cookie name

             //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_BASE_URI);

         }

-        return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT . DOL_BASE_URI);

+        return AlSecurity::dol_hash(DOL_DOCUMENT_ROOT.DOL_BASE_URI);

     }

 

     /**

@@ -691,7 +691,7 @@ 
         $fullpath = dol_buildpath($relpath);

 

         if (!file_exists($fullpath)) {

-            AlDolUtils::dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+            AlDolUtils::dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

             return false;

         }

 

@@ -720,14 +720,14 @@ 
 

         if ($type == 0 /* empty($type) */) { // For a filesystem path

 //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-            $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+            $res = DOL_BASE_PATH.'/'.$path; // Standard default path

             if (isset(Globals::$conf->file->dol_document_root)) {

                 foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

                     if ($key == 'main') {

                         continue;

                     }

-                    if (file_exists($dirroot . '/' . $path)) {

-                        $res = $dirroot . '/' . $path;

+                    if (file_exists($dirroot.'/'.$path)) {

+                        $res = $dirroot.'/'.$path;

                         return $res;

                     }

                 }

@@ -744,13 +744,13 @@ 
 // using proxy, rewriting, virtual path, etc...

             $res = '';

             if ($type == 1) {

-                $res = /* DOL_BASE_URI */ DOL_BASE_URI . '/' . $path;   // Standard value

+                $res = /* DOL_BASE_URI */ DOL_BASE_URI.'/'.$path; // Standard value

             }

             if ($type == 2) {

-                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

+                $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH.'/'.$path; // Standard value

             }

             if ($type == 3) {

-                $res = DOL_BASE_URI . '/' . $path;

+                $res = DOL_BASE_URI.'/'.$path;

             }

 

             foreach (Globals::$conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

@@ -759,33 +759,33 @@ 
                         // global $dolibarr_main_url_root;

                         // Define $urlwithroot

                         // $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim(DOL_BASE_URI));

+                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim(DOL_BASE_URI));

 

-                        $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                        $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // This is to use external domain name found into config file

                         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                     }

                     continue;

                 }

-                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+                preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

                 if (!empty($regs[1])) {

                     //print $key.'-'.$dirroot.'/'.$path.'-'.Globals::$conf->file->dol_url_root[$type].'<br>'."\n";

-                    if (file_exists($dirroot . '/' . $regs[1])) {

+                    if (file_exists($dirroot.'/'.$regs[1])) {

                         if ($type == 1) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_BASE_URI).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 2) {

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).Globals::$conf->file->dol_url_root[$key].'/'.$path;

                         }

                         if ($type == 3) {

                             // global $dolibarr_main_url_root;

                             // Define $urlwithroot

-                            $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_BASE_URI, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                            $urlwithroot = $urlwithouturlroot . DOL_BASE_URI;  // This is to use external domain name found into config file

+                            $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_BASE_URI, '/').'$/i', '', trim($dolibarr_main_url_root));

+                            $urlwithroot = $urlwithouturlroot.DOL_BASE_URI; // This is to use external domain name found into config file

                             //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . Globals::$conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                            $res = (preg_match('/^http/i', Globals::$conf->file->dol_url_root[$key]) ? '' : $urlwithroot).Globals::$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                         }

                         break;

                     }

@@ -813,7 +813,7 @@ 
         if (empty($native)) {

             $myclone = unserialize(serialize($object));

         } else {

-            $myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

+            $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

         }

 

         return $myclone;

@@ -934,7 +934,7 @@ 
      */

     static function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

     {

-        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

+        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

         if (is_array($badcharstoreplace))

             $forbidden_chars_to_replace = $badcharstoreplace;

@@ -997,12 +997,12 @@ 
     static function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

     {

 // escape quotes and backslashes, newlines, etc.

-        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

+        $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

         if (!$keepb)

             $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

         if (!$keepn)

             $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

-        return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+        return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

     /**

@@ -1072,14 +1072,14 @@ 
             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

             if (!empty($_REQUEST['logtohtml']) && (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty(Globals::$conf->global->MAIN_LOGTOHTML))) {   // MAIN_LOGTOHTML kept for backward compatibility

-                Globals::$conf->logbuffer[] = AlDolUtils::dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+                Globals::$conf->logbuffer[] = AlDolUtils::dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;

             }

 

 //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output

 // If html log tag enabled and url parameter log defined, we show output log on HTML comments

             if (!empty(Globals::$conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

                 print "\n\n<!-- Log start\n";

-                print $message . "\n";

+                print $message."\n";

                 print "Log end -->\n";

             }

 

@@ -1093,7 +1093,7 @@ 
 

 // This is when server run behind a reverse proxy

             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"]) ? '' : '->'.$_SERVER['REMOTE_ADDR']);

 // This is when server run normally on a server

             else if (!empty($_SERVER["REMOTE_ADDR"]))

                 $data['ip'] = $_SERVER['REMOTE_ADDR'];

@@ -1102,10 +1102,10 @@ 
                 $data['ip'] = $_SERVER['SERVER_ADDR'];

 // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

             else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+                $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

 // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

             else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+                $data['ip'] = '???@'.$_SERVER['LOGNAME'];

 // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

                 if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

@@ -1157,10 +1157,10 @@ 
     {

         // global Globals::$conf, Globals::$langs, Globals::$hookManager;

 

-        $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+        $out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";

 

         if ($morehtmlright) {

-            $out .= '<div class="inline-block floatright tabsElem">' . $morehtmlright . '</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

+            $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

         }

 

 // Show title

@@ -1171,8 +1171,8 @@ 
             $limittitle = 30;

             $out .= '<a class="tabTitle">';

             if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

-            $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

+                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';

+            $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

             $out .= '</a>';

         }

 

@@ -1212,23 +1212,23 @@ 
             }

 

             if ($i < $limittoshow || $isactive) {

-                $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+                $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty(Globals::$conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0])) {

-                        $out .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     } else {

-                        $out .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                     }

                 } else if (!empty($links[$i][1])) {

                     //print "x $i $active ".$links[$i][2]." z";

                     if ($isactive) {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     } else {

-                        $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabunactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                        $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                         $out .= $links[$i][1];

-                        $out .= '</a>' . "\n";

+                        $out .= '</a>'."\n";

                     }

                 }

                 $out .= '</div>';

@@ -1241,14 +1241,14 @@ 
                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                     if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                        $outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                     else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                        $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                 }

                 else if (!empty($links[$i][1])) {

-                    $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

-                    $outmore .= '</a>' . "\n";

+                    $outmore .= '</a>'."\n";

                 }

                 $outmore .= '</div>';

 

@@ -1264,24 +1264,24 @@ 
             $right = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

             $tabsname = str_replace("@", "", $picto);

-            $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . Globals::$langs->trans("More") . '... (' . $nbintab . ')</a>';

-            $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+            $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+            $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.Globals::$langs->trans("More").'... ('.$nbintab.')</a>';

+            $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

             $out .= $outmore;

             $out .= '</div>';

             $out .= '<div></div>';

             $out .= "</div>\n";

 

             $out .= "<script>";

-            $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-            $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+            $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+            $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

             $out .= "</script>";

         }

 

         $out .= "</div>\n";

 

         if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+            $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";

 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = Globals::$hookManager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1405,7 +1405,7 @@ 
                 $maxvisiblephotos = 1;

             }

             if ($showimage) {

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', Globals::$conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             } else {

                 if (!empty(Globals::$conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1414,19 +1414,19 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 // $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } elseif ($object->element == 'ticket') {

             $width = 80;

             $cssclass = 'photoref';

-            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

+            $showimage = $object->is_photo_available(Globals::$conf->ticket->multidir_output[$entity].'/'.$object->track_id);

             $maxvisiblephotos = (isset(Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? Globals::$conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

             if (Globals::$conf->browser->layout == 'phone') {

                 $maxvisiblephotos = 1;

             }

             if ($showimage) {

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', Globals::$conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

             } else {

                 if (!empty(Globals::$conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                     $nophoto = '';

@@ -1435,7 +1435,7 @@ 
 //elseif (Globals::$conf->browser->layout != 'phone') {    // Show no photo link

                 $nophoto = '/public/theme/common/nophoto.png';

 //$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

 //}

             }

         } else {

@@ -1445,25 +1445,25 @@ 
                     // Check if a preview file is available

                     if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                         $objectref = dol_sanitizeFileName($object->ref);

-                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity]) . "/";

+                        $dir_output = (empty(Globals::$conf->$modulepart->multidir_output[$entity]) ? Globals::$conf->$modulepart->dir_output : Globals::$conf->$modulepart->multidir_output[$entity])."/";

                         if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

                             $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);

-                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                            $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

                         if (empty($subdir))

                             $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

 

-                        $filepath = $dir_output . $subdir . "/";

+                        $filepath = $dir_output.$subdir."/";

 

-                        $file = $filepath . $objectref . ".pdf";

-                        $relativepath = $subdir . '/' . $objectref . '.pdf';

+                        $file = $filepath.$objectref.".pdf";

+                        $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                         // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                        $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                        $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                        $relativepathimage = $relativepath . '_preview.png';

+                        $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                        $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                        $relativepathimage = $relativepath.'_preview.png';

 

                         // Si fichier PDF existe

                         if (file_exists($file)) {

@@ -1472,7 +1472,7 @@ 
                             if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))

                             ) {

                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

-                                    include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+                                    include_once DOL_BASE_PATH.'/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

                                     if ($ret < 0)

                                         $error++;

@@ -1485,14 +1485,14 @@ 
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                                 $phototoshow .= '</div></div>';

                             }

                             // Si fichier png PDF de plus d'1 page trouve

                             elseif (file_exists($fileimagebis)) {

-                                $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                                $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                                $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_BASE_URI . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                                $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_BASE_URI.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                                 $phototoshow .= '</div></div>';

                             }

                         }

@@ -1519,10 +1519,10 @@ 
                         $picto = $object->picto;

                         if ($object->element == 'project' && !$object->public)

                             $picto = 'project'; // instead of projectpub

-                        $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

+                        $nophoto = img_picto('', 'object_'.$picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

-                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                     $morehtmlleft .= '</div>';

                 }

@@ -1530,7 +1530,7 @@ 
         }

 

         if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';

 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1543,14 +1543,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

             } else {

-                $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

             }

             $morehtmlstatus .= ' &nbsp; ';

 //$morehtmlstatus.=Globals::$langs->trans("Status").' ('.Globals::$langs->trans("Buy").') ';

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->produit->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                 $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

             } else {

-                $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+                $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

@@ -1577,7 +1577,7 @@ 
             if ($object->progress >= 100)

                 $object->fk_statut = 3;

             $tmptxt = $object->getLibStatut(5);

-            $morehtmlstatus .= $tmptxt;  // No status on task

+            $morehtmlstatus .= $tmptxt; // No status on task

         }

         else { // Generic case

             $tmptxt = $object->getLibStatut(6);

@@ -1591,18 +1591,18 @@ 
             if (method_exists($object, 'getVentilExportCompta')) {

                 $accounted = $object->getVentilExportCompta();

                 Globals::$langs->load("accountancy");

-                $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

+                $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? Globals::$langs->trans("Accounted") : Globals::$langs->trans("NotYetAccounted"));

             }

         }

 

 // Add alias for thirdparty

         if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+            $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';

 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

             if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+                $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';

         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1612,11 +1612,11 @@ 
         }

         if (!empty(Globals::$conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

             $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-            $morehtmlref .= Globals::$langs->trans("TechnicalID") . ': ' . $object->id;

+            $morehtmlref .= Globals::$langs->trans("TechnicalID").': '.$object->id;

             $morehtmlref .= '</div>';

         }

 

-        print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+        print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

         print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

         print '</div>';

         print '<div class="underrefbanner clearboth"></div>';

@@ -1638,7 +1638,7 @@ 
         if ($fieldrequired)

             $ret .= '<span class="fieldrequired">';

         if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+            $ret .= '<label for="'.$fieldkey.'">';

         $ret .= Globals::$langs->trans($langkey);

         if ((Globals::$conf->dol_use_jmobile != 4))

             $ret .= '</label>';

@@ -1657,9 +1657,9 @@ 
     static function dol_bc($var, $moreclass = '')

     {

         // global $bc;

-        $ret = ' ' . $bc[$var];

+        $ret = ' '.$bc[$var];

         if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+            $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

         return $ret;

     }

 

@@ -1679,50 +1679,50 @@ 
         // global Globals::$conf, Globals::$langs;

 

         $ret = '';

-        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

+        $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

 // Address

         if (empty($mode)) {

             $ret .= $object->address;

         }

 // Zip/Town/State

         if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty(Globals::$conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {    // US: title firstname name \n address lines \n town, state, zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

+                $ret .= ($ret ? ", " : '').$object->zip;

         }

         else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

-            $ret .= ($ret ? $sep : '' ) . $object->town;

+            $ret .= ($ret ? $sep : '').$object->town;

             if ($object->state) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

             if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

+                $ret .= ($ret ? $sep : '').$object->zip;

         }

         else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

             if ($object->state) {

-                $ret .= "\n" . $object->state;

+                $ret .= "\n".$object->state;

             }

         } else if (in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-            $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

-            $ret .= ($object->departement_id ? (' (' . ($object->departement_id) . ')') : '');

+            $ret .= ($ret ? $sep : '').$object->zip;

+            $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

+            $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');

         } else {                                          // Other: title firstname name \n address lines \n zip town \n country

-            $ret .= $object->zip ? (($ret ? $sep : '' ) . $object->zip) : '';

-            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '' )) . $object->town) : '');

+            $ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

+            $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');

             if ($object->state && in_array($object->country_code, $countriesusingstate)) {

-                $ret .= ($ret ? ", " : '') . $object->state;

+                $ret .= ($ret ? ", " : '').$object->state;

             }

         }

         if (!is_object($outputlangs))

             $outputlangs = Globals::$langs;

         if ($withcountry) {

             Globals::$langs->load("dict");

-            $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

+            $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

         }

 

         return $ret;

@@ -1776,13 +1776,13 @@ 
             if (is_string($tzoutput)) {

                 if ($tzoutput == 'tzserver') {

                     $to_gmt = false;

-                    $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                    $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                     $offsettz = 0;

                     $offsetdst = 0;

                 } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

                     $to_gmt = true;

                     $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'

-                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                    $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                     $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

                 }

             }

@@ -1828,9 +1828,9 @@ 
         else if ($format == 'dayxcard')

             $format = '%Y%m%d';

         else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

+            $format = '%Y-%m-%d'; // DATE_RFC3339

         else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

+            $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

         else if ($format == 'standard')

             $format = '%Y-%m-%d %H:%M:%S';

 

@@ -1841,7 +1841,7 @@ 
 

 // If date undefined or "", we return ""

         if (AlDolUtils::dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+            return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1911,7 +1911,7 @@ 
         if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg) || preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) { // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

 // TODO Remove this.

 // This part of code should not be used.

-            AlDolUtils::dol_syslog("Functions.lib::DolUtils::dol_print_date static function call with deprecated value of time in page " . $_SERVER["PHP_SELF"], LOG_ERR);

+            AlDolUtils::dol_syslog("Functions.lib::DolUtils::dol_print_date static function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);

 // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'

             $syear = (!empty($reg[1]) ? $reg[1] : '');

             $smonth = (!empty($reg[2]) ? $reg[2] : '');

@@ -1929,7 +1929,7 @@ 
 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

             } else

-                $ret = 'Bad value ' . $time . ' for date';

+                $ret = 'Bad value '.$time.' for date';

         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -1938,11 +1938,11 @@ 
             $month = adodb_strftime('%m', $timetouse);

             $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

             if ($encodetooutput) {

-                $monthtext = $outputlangs->transnoentities('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentities('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

             } else {

-                $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+                $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+                $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

             }

 //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

             $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1953,8 +1953,8 @@ 
         if (preg_match('/__a__/i', $format)) {

             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

-            $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-            $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+            $w = adodb_strftime('%w', $timetouse); // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+            $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

             $ret = str_replace('__A__', $dayweek, $ret);

             $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

         }

@@ -2001,9 +2001,9 @@ 
 

         $usealternatemethod = false;

         if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

+            $usealternatemethod = true; // <= 1970

         if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+            $usealternatemethod = true; // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2063,23 +2063,23 @@ 
 

         if (method_exists('DateTime', 'getTimestamp')) {

             if (empty($gm) || $gm === 'server') {

-                $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+                $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

                 $localtz = new \DateTimeZone($default_timezone);

             } else if ($gm === 'user') {

 // We use dol_tz_string first because it is more reliable.

-                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]);  // Example 'Europe/Berlin'

+                $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'

                 try {

                     $localtz = new \DateTimeZone($default_timezone);

                 } catch (Exception $e) {

-                    AlDolUtils::dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                    AlDolUtils::dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);

                     $default_timezone = @date_default_timezone_get();

                 }

             } else if (strrpos($gm, "tz,") !== false) {

-                $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+                $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

                 try {

                     $localtz = new \DateTimeZone($timezone);

                 } catch (Exception $e) {

-                    AlDolUtils::dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                    AlDolUtils::dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

                 }

             }

 

@@ -2118,8 +2118,8 @@ 
         if ($mode == 'gmt')

             $ret = time(); // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

-            require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

-            $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

+            require_once DOL_BASE_PATH.'/core/lib/date.lib.php';

+            $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time

             $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

         }

         /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2165,9 +2165,9 @@ 
         }

 // Use long or short text unit

         if (empty($shortunit)) {

-            $ret .= ' ' . $textunitlong;

+            $ret .= ' '.$textunitlong;

         } else {

-            $ret .= ' ' . $textunitshort;

+            $ret .= ' '.$textunitshort;

         }

 

         return $ret;

@@ -2195,13 +2195,13 @@ 
         $link .= $url;

         $link .= '"';

         if ($target)

-            $link .= ' target="' . $target . '"';

+            $link .= ' target="'.$target.'"';

         $link .= '>';

         if (!preg_match('/^http/i', $url))

             $link .= 'http://';

         $link .= dol_trunc($url, $max);

         $link .= '</a>';

-        return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

+        return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';

     }

 

     /**

@@ -2242,9 +2242,9 @@ 
                 $type = 'AC_EMAIL';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                    $newemail = '<div>'.$newemail.' '.$link.'</div>';

             }

         }

         else {

@@ -2254,7 +2254,7 @@ 
             }

         }

 

-        $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+        $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto(Globals::$langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

         if (Globals::$hookManager) {

             $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

             $reshook = Globals::$hookManager->executeHooks('printEmail', $parameters, $email);

@@ -2284,26 +2284,26 @@ 
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

-            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+            $newskype .= img_picto(Globals::$langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

             $newskype .= $value;

             if ($type == 'skype') {

                 $newskype .= '&nbsp;';

                 $newskype .= '<a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?call" alt="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Call") . '&nbsp;' . $value . '">';

-                $newskype .= '<img src="' . DOL_BASE_URI . '/theme/common/skype_callbutton.png" border="0">';

+                $newskype .= '?call" alt="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Call").'&nbsp;'.$value.'">';

+                $newskype .= '<img src="'.DOL_BASE_URI.'/theme/common/skype_callbutton.png" border="0">';

                 $newskype .= '</a><a href="skype:';

                 $newskype .= $value;

-                $newskype .= '?chat" alt="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '" title="' . Globals::$langs->trans("Chat") . '&nbsp;' . $value . '">';

-                $newskype .= '<img class="paddingleft" src="' . DOL_BASE_URI . '/theme/common/skype_chatbutton.png" border="0">';

+                $newskype .= '?chat" alt="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'" title="'.Globals::$langs->trans("Chat").'&nbsp;'.$value.'">';

+                $newskype .= '<img class="paddingleft" src="'.DOL_BASE_URI.'/theme/common/skype_chatbutton.png" border="0">';

                 $newskype .= '</a>';

             }

             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                $newskype .= ($link ? ' ' . $link : '');

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

+                $newskype .= ($link ? ' '.$link : '');

             }

             $newskype .= '</div>';

         }

@@ -2347,165 +2347,165 @@ 
         if (strtoupper($countrycode) == "FR") {

 // France

             if (AlDolUtils::dol_strlen($phone) == 10) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 2) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 7) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 9) {

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 11) {

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 12) {

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CA") {

             if (AlDolUtils::dol_strlen($phone) == 10) {

-                $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+                $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

             }

         } elseif (strtoupper($countrycode) == "PT") {//Portugal

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "SR") {//Suriname

             if (AlDolUtils::dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

             }

         } elseif (strtoupper($countrycode) == "DE") {//Allemagne

             if (AlDolUtils::dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 4) . $separ . substr($newphone, 11, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 4) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "ES") {//Espagne

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "RO") {// Roumanie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TR") {//Turquie

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "US") {//Etat-Unis

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

             }

         } elseif (strtoupper($countrycode) == "MX") {//Mexique

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

             }

         } elseif (strtoupper($countrycode) == "ML") {//Mali

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "TH") {//Thaïlande

             if (AlDolUtils::dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "MU") {//Maurice

             if (AlDolUtils::dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "SY") {//Syrie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 4);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

             }

         } elseif (strtoupper($countrycode) == "DZ") {//Algérie

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "BE") {//Belgique

             if (AlDolUtils::dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "PF") {//Polynésie française

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             }

         } elseif (strtoupper($countrycode) == "CO") {//Colombie

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "JO") {//Jordanie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 1) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

             }

         } elseif (strtoupper($countrycode) == "MG") {//Madagascar

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "GB") {//Royaume uni

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

             }

         } elseif (strtoupper($countrycode) == "CH") {//Suisse

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

             } elseif (AlDolUtils::dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

-                $newphone = $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 3) . $separ . substr($newphone, 11, 4);

+                $newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);

             }

         } elseif (strtoupper($countrycode) == "TN") {//Tunisie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             }

         } elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "MQ") {//Martinique

             if (AlDolUtils::dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

-                $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "IT") {//Italie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

             } elseif (AlDolUtils::dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

             }

         } elseif (strtoupper($countrycode) == "AU") {//Australie

             if (AlDolUtils::dol_strlen($phone) == 12) {//ex: +61_A_BCDE_FGHI

-                $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 4);

+                $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);

             }

         }

         if (!empty($addlink)) { // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

             if (Globals::$conf->browser->layout == 'phone' || (!empty(Globals::$conf->clicktodial->enabled) && !empty(Globals::$conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) { // If phone or option for, we use link of phone

-                $newphone = '<a href="tel:' . $phone . '"';

-                $newphone .= '>' . $phone . '</a>';

+                $newphone = '<a href="tel:'.$phone.'"';

+                $newphone .= '>'.$phone.'</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

                 if (empty($user->clicktodial_loaded))

                     $user->fetch_clicktodial();

@@ -2529,10 +2529,10 @@ 
                     '__PASS__' => $clicktodial_password);

                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

-                $newphone = '<a href="' . $url . '"';

+                $newphone = '<a href="'.$url.'"';

                 if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

                     $newphone .= ' target="_blank"';

-                $newphone .= '>' . $newphonesav . '</a>';

+                $newphone .= '>'.$newphonesav.'</a>';

             }

 

 //if (($cid || $socid) && ! empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2542,9 +2542,9 @@ 
                 if ($addlink == 'AC_FAX')

                     $type = 'AC_FAX';

                 if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                    $link = '<a href="'.DOL_BASE_URI.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object(Globals::$langs->trans("AddAction"), "calendar").'</a>';

                 if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                    $newphone = '<div>'.$newphone.' '.$link.'</div>';

             }

         }

 

@@ -2575,7 +2575,7 @@ 
                 $rep .= '<div class="nospan float" style="margin-right: 10px">';

             else

                 $rep .= '<span style="margin-right: 10px;">';

-            $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

+            $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

             if ($adddivfloat)

                 $rep .= '</div>';

             else

@@ -2602,15 +2602,15 @@ 
             $ret .= $ip;

         }

 

-        echo ('<p>DOL_BASE_PATH: ' . DOL_BASE_PATH . '/DOL_BASE_URI: ' . DOL_BASE_URI . '</p>');

+        echo ('<p>DOL_BASE_PATH: '.DOL_BASE_PATH.'/DOL_BASE_URI: '.DOL_BASE_URI.'</p>');

 

         if ($mode != 2) {

             $countrycode = dolGetCountryCodeFromIp($ip);

             if ($countrycode) { // If success, countrycode is us, fr, ...

-                if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

-                    $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

+                if (file_exists(DOL_BASE_PATH.'/theme/common/flags/'.$countrycode.'.png')) {

+                    $ret .= ' '.img_picto($countrycode.' '.Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

                 } else

-                    $ret .= ' (' . $countrycode . ')';

+                    $ret .= ' ('.$countrycode.')';

             }

         }

 

@@ -2648,7 +2648,7 @@ 
 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

 //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

 //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2674,7 +2674,7 @@ 
             $datafile = Globals::$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

 //$ip='24.24.24.24';

 //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-            include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+            include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

             $geoip = new DolGeoIP('country', $datafile);

             $countrycode = $geoip->getCountryCodeFromIP($ip);

             $ret = $countrycode;

@@ -2729,12 +2729,12 @@ 
                     $showomap = 1;

 

                 if ($showgmap) {

-                    $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

                 if ($showomap) {

-                    $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                    $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_BASE_URI . '/theme/common/gmap.png"></a>';

+                    $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                    $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_BASE_URI.'/theme/common/gmap.png"></a>';

                 }

             }

         }

@@ -2880,7 +2880,7 @@ 
         if ($trunc == 'right') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

+                return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

             else

             //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string;

                 return $string;

@@ -2890,21 +2890,21 @@ 
             if (AlDolUtils::dol_strlen($newstring, $stringencoding) > 2 && AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

-                return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

+                return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

             } else

                 return $string;

         }

         elseif ($trunc == 'left') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+                return '...'.dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

             else

                 return $string;

         }

         elseif ($trunc == 'wrap') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

+                return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

             else

                 return $string;

         } else

@@ -2937,7 +2937,7 @@ 
         $url = DOL_BASE_URI;

 

         $theme = Globals::$conf->theme;

-        $path = 'theme/' . $theme;

+        $path = 'theme/'.$theme;

 

 // Define fullpathpicto to use into src

         if ($pictoisfullpath) {

@@ -2986,7 +2986,7 @@ 
                     $fakey = 'fa-pencil';

                     $facolor = '#444';

                 } elseif ($pictowithoutext == 'filter') {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                 } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                     $fakey = 'fa-arrows';

                 } elseif ($pictowithoutext == 'listlight') {

@@ -3025,15 +3025,15 @@ 
                 } elseif ($pictowithoutext == 'jabber') {

                     $fakey = 'fa-comment-o';

                 } else {

-                    $fakey = 'fa-' . $pictowithoutext;

+                    $fakey = 'fa-'.$pictowithoutext;

                     $facolor = '#444';

                     $marginleftonlyshort = 0;

                 }

 

                 if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                    $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                    $morecss .= ($morecss ? ' ' : '').$reg[1];

                 }

-                $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . AlDolUtils::dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+                $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.AlDolUtils::dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.AlDolUtils::dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

                 if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                     $enabledisablehtml .= $titlealt;

                 }

@@ -3043,11 +3043,11 @@ 
             }

 

             if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH . '/theme/' . $theme; // If the theme does not have the same name as the module

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

             } else if (!empty(Globals::$conf->global->MAIN_OVERWRITE_THEME_RES)) {

-                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES . '/theme/' . Globals::$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme

+                $path = Globals::$conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.Globals::$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

             } else if (!empty(Globals::$conf->modules_parts['theme']) && array_key_exists($theme, Globals::$conf->modules_parts['theme'])) {

-                $path = $theme . '/theme/' . $theme; // If the theme have the same name as the module

+                $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module

             }

 

 // If we ask an image into $url/$mymodule/img (instead of default path)

@@ -3067,15 +3067,15 @@ 
                     continue;

                 }

 // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded

-                if (file_exists($dirroot . '/' . $path . '/img/' . $picto)) {

+                if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                     //$url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

-                    $url = DOL_BASE_URI . Globals::$conf->file->dol_url_root[$type];

+                    $url = DOL_BASE_URI.Globals::$conf->file->dol_url_root[$type];

                     break;

                 }

             }

 

 // $url is '' or '/custom', $path is current theme or

-            $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+            $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

         }

 

         if ($srconly) {

@@ -3083,7 +3083,7 @@ 
         }

 

 // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-        return '<img src="' . $fullpathpicto . '" alt="' . AlDolUtils::dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+        return '<img src="'.$fullpathpicto.'" alt="'.AlDolUtils::dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.AlDolUtils::dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

     }

 

     /**

@@ -3101,7 +3101,7 @@ 
      */

     static function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

     {

-        return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+        return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

     }

 

     /**

@@ -3122,7 +3122,7 @@ 
             $picto .= '.png';

 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

-        $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

+        $path = DOL_BASE_URI.'/theme/'.Globals::$conf->theme.'/img/weather/'.$picto;

 

         return img_picto($titlealt, $path, $moreatt, 1);

     }

@@ -3149,10 +3149,10 @@ 
             $path = $picto;

         } else {

             //$path = DOL_BASE_URI . '/theme/common/' . $picto;

-            $path = DOL_BASE_URI . '/theme/common/' . $picto;

+            $path = DOL_BASE_URI.'/theme/common/'.$picto;

 

             if (!empty(Globals::$conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

-                $themepath = DOL_BASE_PATH . 'theme/' . Globals::$conf->theme . '/img/' . $picto;

+                $themepath = DOL_BASE_PATH.'theme/'.Globals::$conf->theme.'/img/'.$picto;

 

                 if (file_exists($themepath)) {

                     $path = $themepath;

@@ -3191,14 +3191,14 @@ 
                 $numaction = 3;

                 $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeContactDone');

             } else {

-                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+                $titlealt = Globals::$langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

                 $numaction = 0;

             }

         }

         if (!is_numeric($numaction))

             $numaction = 0;

 

-        return img_picto($titlealt, 'stcomm' . $numaction . '.png');

+        return img_picto($titlealt, 'stcomm'.$numaction.'.png');

     }

 

     /**

@@ -3215,7 +3215,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Show');

 

-        return img_picto($titlealt, 'pdf' . $size . '.png');

+        return img_picto($titlealt, 'pdf'.$size.'.png');

     }

 

     /**

@@ -3267,7 +3267,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Modify');

 

-        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

+        return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.(Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));

     }

 

     /**

@@ -3285,7 +3285,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('View');

 

-        $moreatt = ($float ? 'style="float: right" ' : '') . $other;

+        $moreatt = ($float ? 'style="float: right" ' : '').$other;

 

         return img_picto($titlealt, 'view.png', $moreatt);

     }

@@ -3358,7 +3358,7 @@ 
                 $usealttitle = Globals::$langs->trans('Info');

         }

 

-        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

+        return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');

     }

 

     /**

@@ -3392,7 +3392,7 @@ 
             $titlealt = Globals::$langs->trans('Warning');

 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

-        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

+        return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));

     }

 

     /**

@@ -3426,7 +3426,7 @@ 
             $titlealt = Globals::$langs->trans('Next');

 

 //return img_picto($titlealt, 'next.png', $moreatt);

-        return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.AlDolUtils::dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3444,7 +3444,7 @@ 
             $titlealt = Globals::$langs->trans('Previous');

 

 //return img_picto($titlealt, 'previous.png', $moreatt);

-        return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"></span>';

+        return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.AlDolUtils::dol_escape_htmltag($titlealt).'"></span>';

     }

 

     /**

@@ -3462,7 +3462,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Down');

 

-        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3480,7 +3480,7 @@ 
         if ($titlealt == 'default')

             $titlealt = Globals::$langs->trans('Up');

 

-        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

+        return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');

     }

 

     /**

@@ -3563,7 +3563,7 @@ 
             $brand = 'credit-card';

         }

 

-        return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+        return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

     }

 

     /**

@@ -3576,17 +3576,17 @@ 
      */

     static function img_mime($file, $titlealt = '', $morecss = '')

     {

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

         $mimetype = dol_mimetype($file, '', 1);

         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

         if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+            $titlealt = 'Mime type: '.$mimetype;

 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

-        return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

+        return '<i class="fa fa-'.$mimefa.' paddingright"></i>';

     }

 

     /**

@@ -3601,7 +3601,7 @@ 
      */

     static function img_phone($titlealt = 'default', $option = 0)

     {

-        AlDolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        AlDolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         // global Globals::$conf, Globals::$langs;

 

@@ -3632,8 +3632,8 @@ 
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-        $input .= 'value="' . AlDolUtils::dol_escape_htmltag($titlealt) . '" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+        $input .= 'value="'.AlDolUtils::dol_escape_htmltag($titlealt).'" title="'.AlDolUtils::dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3654,8 +3654,8 @@ 
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

-        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-        $input .= 'value="' . AlDolUtils::dol_escape_htmltag($titlealt) . '" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '" >';

+        $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+        $input .= 'value="'.AlDolUtils::dol_escape_htmltag($titlealt).'" title="'.AlDolUtils::dol_escape_htmltag($titlealt).'" >';

 

         return $input;

     }

@@ -3675,10 +3675,10 @@ 
         // global Globals::$conf, Globals::$langs;

 

         if ($infoonimgalt) {

-            return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+            return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

         }

 

-        return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . AlDolUtils::dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+        return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.AlDolUtils::dol_escape_htmltag($admin ? Globals::$langs->trans('InfoAdmin') : Globals::$langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

     }

 

     /**

@@ -3712,39 +3712,39 @@ 
         Globals::$langs->loadLangs(array('main', 'errors'));

 

         if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

-            $out .= Globals::$langs->trans("DolibarrHasDetectedError") . ".<br>\n";

+            $out .= Globals::$langs->trans("DolibarrHasDetectedError").".<br>\n";

             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {

                 $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

             }

-            $out .= Globals::$langs->trans("InformationToHelpDiagnose") . ":<br>\n";

+            $out .= Globals::$langs->trans("InformationToHelpDiagnose").":<br>\n";

 

-            $out .= "<b>" . Globals::$langs->trans("Date") . ":</b> " . AlDolUtils::dol_print_date(time(), 'dayhourlog') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Date").":</b> ".AlDolUtils::dol_print_date(time(), 'dayhourlog')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";

             if (isset(Globals::$conf->global->MAIN_FEATURES_LEVEL)) {

-                $out .= "<b>" . Globals::$langs->trans("LevelOfFeature") . ":</b> " . Globals::$conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("LevelOfFeature").":</b> ".Globals::$conf->global->MAIN_FEATURES_LEVEL."<br>\n";

             }

             if (function_exists("phpversion")) {

-                $out .= "<b>" . Globals::$langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("PHP").":</b> ".phpversion()."<br>\n";

             }

-            $out .= "<b>" . Globals::$langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

             if (function_exists("php_uname")) {

-                $out .= "<b>" . Globals::$langs->trans("OS") . ":</b> " . php_uname() . "<br>\n";

+                $out .= "<b>".Globals::$langs->trans("OS").":</b> ".php_uname()."<br>\n";

             }

-            $out .= "<b>" . Globals::$langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

             $out .= "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("RequestedUrl") . ":</b> " . AlDolUtils::dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? AlDolUtils::dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-            $out .= "<b>" . Globals::$langs->trans("MenuManager") . ":</b> " . (isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '') . "<br>\n";

+            $out .= "<b>".Globals::$langs->trans("RequestedUrl").":</b> ".AlDolUtils::dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? AlDolUtils::dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+            $out .= "<b>".Globals::$langs->trans("MenuManager").":</b> ".(isset(Globals::$conf->standard_menu) ? Globals::$conf->standard_menu : '')."<br>\n";

             $out .= "<br>\n";

-            $syslog .= "url=" . AlDolUtils::dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-            $syslog .= ", query_string=" . AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+            $syslog .= "url=".AlDolUtils::dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+            $syslog .= ", query_string=".AlDolUtils::dol_escape_htmltag($_SERVER["QUERY_STRING"]);

         } else {                              // Mode CLI

-            $out .= '> ' . Globals::$langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-            $syslog .= "pid=" . dol_getmypid();

+            $out .= '> '.Globals::$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+            $syslog .= "pid=".dol_getmypid();

         }

 

         if (is_object($dbError)) {

-            $out .= '<pre>' . print_r($dbError, true) . '</pre>';

+            $out .= '<pre>'.print_r($dbError, true).'</pre>';

             /*

               if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

               $out .= "<b>" . Globals::$langs->trans("DatabaseTypeManager") . ":</b> " . $dbError->type . "<br>\n";

@@ -3783,31 +3783,31 @@ 
                     continue;

                 }

                 if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                    $out .= "<b>" . Globals::$langs->trans("Message") . ":</b> " . AlDolUtils::dol_escape_htmltag($msg) . "<br>\n";

+                    $out .= "<b>".Globals::$langs->trans("Message").":</b> ".AlDolUtils::dol_escape_htmltag($msg)."<br>\n";

                 } else {                        // Mode CLI

-                    $out .= '> ' . Globals::$langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                    $out .= '> '.Globals::$langs->transnoentities("Message").":\n".$msg."\n";

                 }

-                $syslog .= ", msg=" . $msg;

+                $syslog .= ", msg=".$msg;

             }

         }

         if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

             xdebug_print_function_stack();

-            $out .= '<b>XDebug informations:</b>' . "<br>\n";

-            $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-            $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-            $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+            $out .= '<b>XDebug informations:</b>'."<br>\n";

+            $out .= 'File: '.xdebug_call_file()."<br>\n";

+            $out .= 'Line: '.xdebug_call_line()."<br>\n";

+            $out .= 'Function: '.xdebug_call_function()."<br>\n";

             $out .= "<br>\n";

         }

 

         if (empty($dolibarr_main_prod)) {

             print $out;

         } else {

-            print Globals::$langs->trans("DolibarrHasDetectedError") . '. ';

+            print Globals::$langs->trans("DolibarrHasDetectedError").'. ';

             print Globals::$langs->trans("YouCanSetOptionDolibarrMainProdToZero");

             define("MAIN_CORE_ERROR", 1);

         }

 //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-        AlDolUtils::dol_syslog("Error " . $syslog, LOG_ERR);

+        AlDolUtils::dol_syslog("Error ".$syslog, LOG_ERR);

     }

 

     /**

@@ -3831,14 +3831,14 @@ 
         Globals::$langs->load("errors");

         $now = dol_now();

 

-        print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

-        print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode . AlDolUtils::dol_print_date($now, '%Y%m%d'));

+        print '<br><div class="center login_main_message"><div class="'.$morecss.'">';

+        print Globals::$langs->trans("ErrorContactEMail", $email, $prefixcode.AlDolUtils::dol_print_date($now, '%Y%m%d'));

         if ($errormessage) {

-            print '<br><br>' . $errormessage;

+            print '<br><br>'.$errormessage;

         }

         if (is_array($errormessages) && count($errormessages)) {

             foreach ($errormessages as $mesgtoshow) {

-                print '<br><br>' . $mesgtoshow;

+                print '<br><br>'.$mesgtoshow;

             }

         }

         print '</div></div>';

@@ -3896,16 +3896,16 @@ 
         }

 

         $tmpsortfield = explode(',', $sortfield);

-        $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+        $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

         $tmpfield = explode(',', $field);

-        $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+        $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

 //var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);

 // If field is used as sort criteria we use a specific css class liste_titre_sel

 // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")

         if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre_sel" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

         } else {

-            $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+            $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

         }

 

         if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3913,7 +3913,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             $sortordertouseinlink = '';

@@ -3931,7 +3931,7 @@ 
                 }

             }

             $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-            $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+            $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

         }

 

         if ($tooltip) {

@@ -3949,7 +3949,7 @@ 
             $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

             $options = preg_replace('/&+/i', '&', $options);

             if (!preg_match('/^&/', $options)) {

-                $options = '&' . $options;

+                $options = '&'.$options;

             }

 

             if (!$sortorder || $field1 != $sortfield1) {

@@ -3959,19 +3959,19 @@ 
                 if (preg_match('/^DESC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

                 }

                 if (preg_match('/^ASC/', $sortorder)) {

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                     //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                    $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                    $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

                 }

             }

         }

 

         $out .= $sortimg;

 

-        $out .= '</' . $tag . '>';

+        $out .= '</'.$tag.'>';

 

         return $out;

     }

@@ -3986,9 +3986,9 @@ 
      */

     static function print_titre($title)

     {

-        AlDolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        AlDolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-        print '<div class="titre">' . $title . '</div>';

+        print '<div class="titre">'.$title.'</div>';

     }

 

     /**

@@ -4031,20 +4031,20 @@ 
         }

 

         $return .= "\n";

-        $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+        $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

         if ($picto) {

-            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . AlDolUtils::img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+            $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.AlDolUtils::img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

         }

         $return .= '<td class="nobordernopadding valignmiddle">';

-        $return .= '<div class="titre inline-block">' . $titre . '</div>';

+        $return .= '<div class="titre inline-block">'.$titre.'</div>';

         $return .= '</td>';

         if (AlDolUtils::dol_strlen($morehtmlcenter)) {

-            $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+            $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

         }

         if (AlDolUtils::dol_strlen($morehtmlright)) {

-            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+            $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

         }

-        $return .= '</tr></table>' . "\n";

+        $return .= '</tr></table>'."\n";

 

         return $return;

     }

@@ -4092,29 +4092,29 @@ 
 //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

         print "\n";

-        print "<!-- Begin title '" . $titre . "' -->\n";

-        print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+        print "<!-- Begin title '".$titre."' -->\n";

+        print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

         if ($picto && $titre)

             print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

-        print '<div class="titre inline-block">' . $titre;

+        print '<div class="titre inline-block">'.$titre;

         if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+            print ' ('.$totalnboflines.')';

         print '</div></td>';

 

 // Center

         if ($morehtmlcenter) {

-            print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+            print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

         }

 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

         if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

+            $options .= "&sortfield=".urlencode($sortfield);

         if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

+            $options .= "&sortorder=".urlencode($sortorder);

 // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4132,40 +4132,40 @@ 
                 }

 

                 if ($cpt >= 1) {

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';

                     if ($cpt > 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';

                 }

 

                 do {

                     if ($cpt == $page) {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . '</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';

                     } else {

-                        $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . $cpt . $options . '">' . ($cpt + 1) . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

                     }

                     $cpt++;

                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

                     if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                     else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

-                    $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

+                        $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

+                    $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

                 }

             }

             else {

-                $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

+                $pagelist .= '<li'.((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";

             }

         }

 

-        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+        print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

         print '</td>';

 

-        print '</tr></table>' . "\n";

+        print '</tr></table>'."\n";

         print "<!-- End title -->\n\n";

     }

 

@@ -4196,12 +4196,12 @@ 
                 $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

 

             print '<li class="pagination">';

-            print '<select class="flat selectlimit" name="limit" title="' . AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';

+            print '<select class="flat selectlimit" name="limit" title="'.AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")).'">';

             $tmpchoice = explode(',', $pagesizechoices);

-            $tmpkey = $limit . ':' . $limit;

+            $tmpkey = $limit.':'.$limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

-            $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

+            $tmpkey = Globals::$conf->liste_limit.':'.Globals::$conf->liste_limit;

             if (!in_array($tmpkey, $tmpchoice))

                 $tmpchoice[] = $tmpkey;

             asort($tmpchoice, SORT_NUMERIC);

@@ -4216,7 +4216,7 @@ 
                         $selected = ' selected="selected"';

                         $found = true;

                     }

-                    print '<option name="' . $key . '"' . $selected . '>' . AlDolUtils::dol_escape_htmltag($val) . '</option>' . "\n";

+                    print '<option name="'.$key.'"'.$selected.'>'.AlDolUtils::dol_escape_htmltag($val).'</option>'."\n";

                 }

             }

             print '</select>';

@@ -4235,20 +4235,20 @@ 
             print '</li>';

         }

         if ($page > 0) {

-            print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("Previous")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("Previous")).'"></i></a></li>';

         }

         if ($betweenarrows) {

             print $betweenarrows;

         }

         if ($nextpage > 0) {

-            print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("Next")) . '"></i></a></li>';

+            print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("Next")).'"></i></a></li>';

         }

         if ($afterarrows) {

             print '<li class="paginationafterarrows">';

             print $afterarrows;

             print '</li>';

         }

-        print '</ul></div>' . "\n";

+        print '</ul></div>'."\n";

     }

 

     /**

@@ -4270,8 +4270,8 @@ 
             $addpercent = true;

         }

         if (preg_match('/\((.*)\)/', $rate, $reg)) {

-            $morelabel = ' (' . $reg[1] . ')';

-            $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+            $morelabel = ' ('.$reg[1].')';

+            $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

         }

         if (preg_match('/\*/', $rate)) {

             $rate = str_replace('*', '', $rate);

@@ -4280,10 +4280,10 @@ 
 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

         if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

+            $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

         else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

-            $ret = $rate . ($addpercent ? '%' : '');

+            $ret = $rate.($addpercent ? '%' : '');

         }

         if (($info_bits & 1) && $usestarfornpr >= 0)

             $ret .= ' *';

@@ -4376,10 +4376,10 @@ 
                 $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

             else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

-                $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

+                $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);

             }

         }

-        $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+        $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

         return $output;

     }

@@ -4432,7 +4432,7 @@ 
 // Now make replace (the main goal of function)

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4461,14 +4461,14 @@ 
                 $temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000

                 $temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1

                 $nbofdec = max(0, AlDolUtils::dol_strlen($temps) - 2); // -2 to remove "0."

-                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+                $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

             }

 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

             if ($thousand != ',' && $thousand != '.')

                 $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-            $amount = str_replace(' ', '', $amount);  // To avoid spaces

+            $amount = str_replace(' ', '', $amount); // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

         }

@@ -4489,7 +4489,7 @@ 
      */

     static function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

     {

-        require_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

         if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

             $dimension = $dimension * 1000000;

@@ -4505,7 +4505,7 @@ 
             $unit = $unit + 3;

         }

 

-        $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+        $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

         return $ret;

     }

@@ -4529,7 +4529,7 @@ 
         if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

             $thirdparty_seller = $mysoc;

 

-        AlDolUtils::dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

+        AlDolUtils::dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);

 

         $vatratecleaned = $vatrate;

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4560,7 +4560,7 @@ 
             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

                 if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                    return 0; // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

                     if (!$thirdparty_buyer->localtax2_assuj)

                         return 0;

@@ -4614,13 +4614,13 @@ 
 

 // By default, search value of local tax on line of common tax

         $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

+            $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

         else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+            $sql .= " AND t.recuperableonly ='".$vatnpr."'";

         AlDolUtils::dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

@@ -4666,10 +4666,10 @@ 
     {

         // global $db, $mysoc;

         $sql = "SELECT t.localtax1, t.localtax2 ";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-        $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-        $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-        $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+        $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+        $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+        $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

         $sql .= "  )";

 

         $resql = $db->query($sql);

@@ -4699,13 +4699,13 @@ 
     {

         // global $db, $mysoc;

 

-        AlDolUtils::dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+        AlDolUtils::dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4714,13 +4714,13 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             /* if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4756,13 +4756,13 @@ 
     {

         // global $db, $mysoc;

 

-        AlDolUtils::dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+        AlDolUtils::dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

         if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

+            $sql .= " WHERE t.rowid = ".(int) $vatrate;

         else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

@@ -4771,14 +4771,14 @@ 
                 $vatratecode = $reg[2];

             }

 

-            $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+            $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

             if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

             else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-            $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+            $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

             if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+                $sql .= " AND t.code = '".$vatratecode."'";

         }

 

         $resql = $db->query($sql);

@@ -4810,7 +4810,7 @@ 
     {

         // global $db, Globals::$conf, $mysoc;

 

-        require_once DOL_BASE_PATH . '/product/class/product.class.php';

+        require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

         $ret = 0;

         $found = 0;

@@ -4825,12 +4825,12 @@ 
                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 else {

-                    $ret = $product->tva_tx;    // Default vat of product we defined

+                    $ret = $product->tva_tx; // Default vat of product we defined

                     if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                        $ret .= ' ('.$product->default_vat_code.')';

                 }

                 $found = 1;

             }

@@ -4844,8 +4844,8 @@ 
             if (empty(Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

 // If vat of product for the country not found or not defined, we return the first higher vat of country.

                 $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+                $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

                 $sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

                 $sql .= $db->plimit(1);

 

@@ -4855,16 +4855,16 @@ 
                     if ($obj) {

                         $ret = $obj->vat_rate;

                         if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                            $ret .= ' ('.$obj->default_vat_code.')';

                     }

                     $db->free($sql);

                 } else

                     dol_print_error($db);

             } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

         }

 

-        AlDolUtils::dol_syslog("get_product_vat_for_country: ret=" . $ret);

+        AlDolUtils::dol_syslog("get_product_vat_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4882,7 +4882,7 @@ 
         // global $db, $mysoc;

 

         if (!class_exists('Product')) {

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         }

 

         $ret = 0;

@@ -4907,8 +4907,8 @@ 
         if (!$found) {

 // If vat of product for the country not found or not defined, we return higher vat of country.

             $sql = "SELECT taux as vat_rate, localtax1, localtax2";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

             $sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4925,7 +4925,7 @@ 
                 dol_print_error($db);

         }

 

-        AlDolUtils::dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+        AlDolUtils::dol_syslog("get_product_localtax_for_country: ret=".$ret);

         return $ret;

     }

 

@@ -4949,7 +4949,7 @@ 
     {

         // global Globals::$conf;

 

-        require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/company.lib.php';

 

 // Note: possible values for tva_assuj are 0/1 or franchise/reel

         $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4960,7 +4960,7 @@ 
         $buyer_country_code = $thirdparty_buyer->country_code;

         $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-        AlDolUtils::dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+        AlDolUtils::dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty(Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? Globals::$conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

 // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

 // we use the buyer VAT.

@@ -5026,14 +5026,14 @@ 
 

         if ($idprodfournprice > 0) {

             if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+                require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

         }

         elseif ($idprod > 0) {

             if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+                require_once DOL_BASE_PATH.'product/class/product.class.php';

             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5112,7 +5112,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="1" checked disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+                $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

             $classname = 'ok';

         }

@@ -5123,7 +5123,7 @@ 
             if ($case == 2)

                 $result = '<input type="checkbox" value="0" disabled>';

             if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

+                $result = '<input type="checkbox" value="0" disabled> '.$result;

 

             if ($color == 2)

                 $classname = 'ok';

@@ -5131,7 +5131,7 @@ 
                 $classname = 'error';

         }

         if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            return '<font class="'.$classname.'">'.$result.'</font>';

         return $result;

     }

 

@@ -5165,13 +5165,13 @@ 
                 $num = preg_replace('/([^0-9])/i', '', $num);

             else

                 $num = preg_replace('/^.*\-/i', '', $num);

-            $num = substr("000" . $num, -$level);

+            $num = substr("000".$num, -$level);

             if ($level == 1)

                 $path = substr($num, 0, 1);

             if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

             if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

+                $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

         }

         else {

 // TODO

@@ -5202,7 +5202,7 @@ 
     {

         // global Globals::$conf;

 

-        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

         if (@is_dir($dir_osencoded))

@@ -5214,15 +5214,15 @@ 
         $ccdir = '';

         if (!empty($dataroot)) {

 // Remove data root from loop

-            $dir = str_replace($dataroot . '/', '', $dir);

-            $ccdir = $dataroot . '/';

+            $dir = str_replace($dataroot.'/', '', $dir);

+            $ccdir = $dataroot.'/';

         }

 

         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

             if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

+                $ccdir .= '/'.$cdir[$i];

             else

                 $ccdir .= $cdir[$i];

             if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5285,20 +5285,20 @@ 
             if ($ccdir) {

                 $ccdir_osencoded = dol_osencode($ccdir);

                 if (!@is_dir($ccdir_osencoded)) {

-                    AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                    AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                     umask(0);

                     $dirmaskdec = octdec($newmask);

                     if (empty($newmask)) {

                         $dirmaskdec = empty(Globals::$conf->global->MAIN_UMASK) ? octdec('0755') : octdec(Globals::$conf->global->MAIN_UMASK);

                     }

-                    $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                    $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                     if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                         // Si le is_dir a renvoye une fausse info, alors on passe ici.

-                        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Fails to create directory '" . $ccdir . "' or directory already exists.", LOG_WARNING);

+                        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                         $nberr++;

                     } else {

-                        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                        AlDolUtils::dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);

                         $nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore

                         $nbcreated++;

                     }

@@ -5346,9 +5346,9 @@ 
         } else {

             $pattern = "/<[^<>]+>/";

 // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-            $temp = preg_replace($pattern, "", $temp);    // pass 1

+            $temp = preg_replace($pattern, "", $temp); // pass 1

 // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-            $temp = preg_replace($pattern, "", $temp);    // pass 2

+            $temp = preg_replace($pattern, "", $temp); // pass 2

 // $temp after pass 2: 0000-021

         }

 

@@ -5404,8 +5404,8 @@ 
     {

         $temp = $stringtoclean;

         foreach ($disallowed_tags as $tagtoremove) {

-            $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-            $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+            $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

         }

         return $temp;

     }

@@ -5422,12 +5422,12 @@ 
     {

         if ($nboflines == 1) {

             if (AlDolUtils::dol_textishtml($text)) {

-                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+                $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters

                 $firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters

             } else {

                 $firstline = preg_replace('/[\n\r].*/', '', $text);

             }

-            return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+            return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

         } else {

             $ishtml = 0;

             if (AlDolUtils::dol_textishtml($text)) {

@@ -5443,7 +5443,7 @@ 
                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

             else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+                $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

@@ -5457,7 +5457,7 @@ 
                 $i++;

             }

             unset($a);

-            return $firstline . (($i < $nba) ? '...' : '');

+            return $firstline.(($i < $nba) ? '...' : '');

         }

     }

 

@@ -5528,9 +5528,9 @@ 
     static function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

     {

         $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-        $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+        $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+        $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

         $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

         return $ret;

     }

@@ -5543,7 +5543,7 @@ 
      */

     static function dol_htmlcleanlastbr($stringtodecode)

     {

-        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+        $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

         return $ret;

     }

 

@@ -5640,7 +5640,7 @@ 
             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

         else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5671,7 +5671,7 @@ 
      */

     static function dol_microtime_float()

     {

-        AlDolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+        AlDolUtils::dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

         return microtime(true);

     }

@@ -5717,9 +5717,9 @@ 
             elseif (preg_match('/<h[0-9]>/i', $msg))

                 return true;

             elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

             elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+                return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5944,7 +5944,7 @@ 
                     if ($object->fetch_optionals() > 0) {

                         if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                                $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                             }

                         }

                     }

@@ -5956,7 +5956,7 @@ 
                     $paymenturl = '';

                 } else {

                     // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

-                    require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

+                    require_once DOL_BASE_PATH.'/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

                     if (is_object($object) && $object->element == 'commande')

@@ -6017,7 +6017,7 @@ 
 

 //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

         if (empty($exclude) || !in_array('date', $exclude)) {

-            include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+            include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

             $tmp = dol_getdate(dol_now(), true);

             $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -6027,13 +6027,13 @@ 
 

             $substitutionarray = array_merge($substitutionarray, array(

                 '__DAY__' => (string) $tmp['mday'],

-                '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+                '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+                '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+                '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

                 '__MONTH__' => (string) $tmp['mon'],

-                '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+                '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

                 '__YEAR__' => (string) $tmp['year'],

                 '__PREVIOUS_DAY__' => (string) $tmp2['day'],

                 '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -6092,7 +6092,7 @@ 
                 if (!empty($tmp[1]))

                     $outputlangs->load($tmp[1]);

 

-                $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

+                $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

         }

 

@@ -6108,13 +6108,13 @@ 
                 $newval = '*****forbidden*****';

             else

                 $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

-            $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($newval) : $newval, $text);

+            $text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

             if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

+                $value = ''; // Protection

             if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

                 $value = ''; // Protection

 

@@ -6140,7 +6140,7 @@ 
     {

         // global Globals::$conf, $user;

 

-        require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+        require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

 // Add a substitution key for each extrafields, using key __EXTRA_XXX__

 // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6170,11 +6170,11 @@ 
                 if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                     $module = $reg[1];

 

-                    AlDolUtils::dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                    AlDolUtils::dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                     // Include the user's functions file

-                    require_once $dir . $substitfile['name'];

+                    require_once $dir.$substitfile['name'];

                     // Call the user's function, and only if it is defined

-                    $function_name = $module . "_" . $callfunc;

+                    $function_name = $module."_".$callfunc;

                     if (function_exists($function_name))

                         $function_name($substitutionarray, $outputlangs, $object, $parameters);

                 }

@@ -6216,13 +6216,13 @@ 
             $outputlangs = Globals::$langs;

 

         if ($date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', AlDolUtils::dol_print_date($date_start, $format, false, $outputlangs), AlDolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', AlDolUtils::dol_print_date($date_start, $format, false, $outputlangs), AlDolUtils::dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if ($date_start && !$date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', AlDolUtils::dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', AlDolUtils::dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

         if (!$date_start && $date_end) {

-            $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', AlDolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+            $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', AlDolUtils::dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

         }

 

         return $out;

@@ -6302,7 +6302,7 @@ 
             AlDolUtils::dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

             if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+                dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

             if (empty($mesgs))

                 setEventMessage($mesg, $style);

             else {

@@ -6371,7 +6371,7 @@ 
 

 // If inline message with no format, we add it.

         if ((empty(Globals::$conf->use_javascript_ajax) || !empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-            $divstart = '<div class="' . $style . ' clearboth">';

+            $divstart = '<div class="'.$style.' clearboth">';

             $divend = '</div>';

         }

 

@@ -6398,14 +6398,14 @@ 
             if (!empty(Globals::$conf->use_javascript_ajax) && empty(Globals::$conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

                 $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty(Globals::$conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: static function (){} } );

 						}

 					});

@@ -6600,11 +6600,11 @@ 
     {

         // global Globals::$conf;

 

-        $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+        $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0

         if (empty($tmp) && !empty($_SERVER["WINDIR"]))

             $tmp = 'iso-8859-1'; // By default for windows

         if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

+            $tmp = 'utf-8'; // By default for other

         if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

             $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6635,16 +6635,16 @@ 
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-            return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+            return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

         }

 

         AlDolUtils::dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-        $sql = "SELECT " . $fieldid . " as valuetoget";

-        $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

-        $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

+        $sql = "SELECT ".$fieldid." as valuetoget";

+        $sql .= " FROM ".MAIN_DB_PREFIX.$tablename;

+        $sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";

         if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+            $sql .= " AND entity IN (".getEntity($tablename).")";

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -6675,8 +6675,8 @@ 
 //print $strRights."<br>\n";

         $rights = true;

         if ($strRights != '') {

-            $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-            self::dol_eval($str);  // The dol_eval must contains all the// global $xxx used into a condition

+            $str = 'if(!('.$strRights.')) { $rights = false; }';

+            self::dol_eval($str); // The dol_eval must contains all the// global $xxx used into a condition

         }

         return $rights;

     }

@@ -6703,9 +6703,9 @@ 
 //print $s."<br>\n";

         if ($returnvalue) {

             if ($hideerrors)

-                return @eval('return ' . $s . ';');

+                return @eval('return '.$s.';');

             else

-                return eval('return ' . $s . ';');

+                return eval('return '.$s.';');

         }

         else {

             if ($hideerrors)

@@ -6759,7 +6759,7 @@ 
             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

 

-        return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+        return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

     }

 

     /**

@@ -6957,16 +6957,16 @@ 
             'zu-ZA',

         );

 

-        $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+        $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

         if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+            return strtolower($countrycode).'_'.strtoupper($countrycode);

 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

             $locale_region = locale_get_region($locale);

             if (strtoupper($countrycode) == $locale_region) {

 //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-                return strtolower($locale_language) . '_' . strtoupper($locale_region);

+                return strtolower($locale_language).'_'.strtoupper($locale_region);

             }

         }

 

@@ -7027,7 +7027,7 @@ 
                                 $label = Globals::$langs->trans($values[2]);

 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-                            $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                            $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                             $head[$h][1] = $label;

                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

@@ -7098,43 +7098,43 @@ 
         // global $micro_start_time;

 

         if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

+            print "\n".'<!-- Common footer for private page -->'."\n";

         else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+            print "\n".'<!-- Common footer for public page -->'."\n";

 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

-        print '<div id="page_y" style="display: none;">' . filter_input(INPUT_POST, 'page_y') . '</div>' . "\n";

+        print '<div id="page_y" style="display: none;">'.filter_input(INPUT_POST, 'page_y').'</div>'."\n";

 

         $parameters = array();

-        $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+        $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

             if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+                print Globals::$conf->global->MAIN_HTML_FOOTER."\n";

 

             print "\n";

             if (!empty(Globals::$conf->use_javascript_ajax)) {

-                print '<script type="text/javascript" language="javascript">' . "\n";

-                print 'jQuery(document).ready(function() {' . "\n";

+                print '<script type="text/javascript" language="javascript">'."\n";

+                print 'jQuery(document).ready(function() {'."\n";

 

                 if ($zone == 'private' && empty(Globals::$conf->dol_use_jmobile)) {

                     print "\n";

-                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                     print 'jQuery(".menuhider").click(function() {';

-                    print '  console.log("We click on .menuhider");' . "\n";

+                    print '  console.log("We click on .menuhider");'."\n";

                     //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                     print "  $('.side-nav').toggle()\n";

                     print "  $('.login_block').toggle()\n";

-                    print '});' . "\n";

+                    print '});'."\n";

                 }

 

 // Management of focus and mandatory for fields

                 if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                    print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

                     if (constant('DOL_BASE_URI'))

-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                        $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7157,9 +7157,9 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Set focus on field

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                                 }

                             }

                         }

@@ -7183,16 +7183,16 @@ 
                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

                                     // Add property 'required' on input

-                                    print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                    print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                    print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                    print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                                 }

                             }

                         }

                     }

                 }

 

-                print '});' . "\n";

+                print '});'."\n";

 

 // Google Analytics

 // TODO Add a hook here

@@ -7200,15 +7200,15 @@ 
                     if ((Globals::$conf->dol_use_jmobile != 4)) {

                         print "\n";

                         print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                        print '  var _gaq = _gaq || [];' . "\n";

-                        print '  _gaq.push([\'_setAccount\', \'' . Globals::$conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                        print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                        print '' . "\n";

-                        print '  (function() {' . "\n";

-                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                        print '  })();' . "\n";

+                        print '  var _gaq = _gaq || [];'."\n";

+                        print '  _gaq.push([\'_setAccount\', \''.Globals::$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                        print '  _gaq.push([\'_trackPageview\']);'."\n";

+                        print ''."\n";

+                        print '  (function() {'."\n";

+                        print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                        print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                        print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                        print '  })();'."\n";

                     }

                 }

 

@@ -7218,27 +7218,27 @@ 
                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

                     if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

-                    print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                        print 'MEMCACHED_SERVER='.Globals::$conf->global->MEMCACHED_SERVER.' - ';

+                    print 'MAIN_OPTIMIZE_SPEED='.(isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

-                        print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                        print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                     }

                     if (function_exists("memory_get_usage")) {

-                        print ' - Mem: ' . memory_get_usage();

+                        print ' - Mem: '.memory_get_usage();

                     }

                     if (function_exists("xdebug_memory_usage")) {

-                        print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                        print ' - XDebug mem: ' . xdebug_memory_usage();

-                        print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                        print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                        print ' - XDebug mem: '.xdebug_memory_usage();

+                        print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                     }

                     if (function_exists("zend_loader_file_encoded")) {

-                        print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                        print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                     }

-                    print '");' . "\n";

+                    print '");'."\n";

                 }

 

-                print "\n" . '</script>' . "\n";

+                print "\n".'</script>'."\n";

             }

 

 // Add Xdebug coverage of code

@@ -7252,7 +7252,7 @@ 
                 print "<!-- Start of log output\n";

 //print '<div class="hidden">'."\n";

                 foreach (Globals::$conf->logbuffer as $logline) {

-                    print $logline . "<br>\n";

+                    print $logline."<br>\n";

                 }

 //print '</div>'."\n";

                 print "End of log output -->\n";

@@ -7295,8 +7295,8 @@ 
      */

     static function dol_set_focus($selector)

     {

-        print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+        print "\n".'<!-- Set focus onto a specific field -->'."\n";

+        print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

     }

 

     /**

@@ -7341,7 +7341,7 @@ 
             $value = preg_replace('/\*/', '%', $value); // Replace * with %

         }

         if ($mode == 1) {

-            $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote(Globals::$langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+            $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote(Globals::$langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

         }

 

         $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7370,14 +7370,14 @@ 
                     if ($newcrit != '') {

                         $numnewcrit = price2num($newcrit);

                         if (is_numeric($numnewcrit)) {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                            $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                         } else {

-                            $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                            $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                         }

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 2) {

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                     $i2++; // a criteria was added to string

                 } else if ($mode == 3) {

                     $tmparray = explode(',', trim($crit));

@@ -7386,10 +7386,10 @@ 
                         foreach ($tmparray as $val) {

                             if ($val) {

                                 $listofcodes .= ($listofcodes ? ',' : '');

-                                $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                                $listofcodes .= "'".$db->escape(trim($val))."'";

                             }

                         }

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                         $i2++; // a criteria was added to string

                     }

                 } else if ($mode == 4) {

@@ -7398,10 +7398,10 @@ 
                         $listofcodes = '';

                         foreach ($tmparray as $val) {

                             if ($val) {

-                                $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                                $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                                $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                                 $newres .= ')';

                                 $i2++;

                             }

@@ -7418,9 +7418,9 @@ 
                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

                         if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field

-                            $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                            $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                         } else {

-                            $newres .= $field . " LIKE '";

+                            $newres .= $field." LIKE '";

 

                             $tmpcrit = trim($tmpcrit);

                             $tmpcrit2 = $tmpcrit;

@@ -7439,7 +7439,7 @@ 
                             $newres .= $tmpafter;

                             $newres .= "'";

                             if ($tmpcrit2 == '') {

-                                $newres .= ' OR ' . $field . " IS NULL";

+                                $newres .= ' OR '.$field." IS NULL";

                             }

                         }

 

@@ -7450,10 +7450,10 @@ 
                 $i++;

             }

             if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+                $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

             $j++;

         }

-        $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+        $res = ($nofirstand ? "" : " AND ")."(".$res.")";

 //print 'xx'.$res.'yy';

         return $res;

     }

@@ -7472,8 +7472,8 @@ 
         $url = $object->getLastMainDocLink($object->element);

 

         if ($url) {

-            $out .= img_picto('', 'object_globe.png') . ' ' . Globals::$langs->trans("DirectDownloadLink") . '<br>';

-            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+            $out .= img_picto('', 'object_globe.png').' '.Globals::$langs->trans("DirectDownloadLink").'<br>';

+            $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

             $out .= ajax_autoselect("directdownloadlink", 0);

         }

         return $out;

@@ -7514,7 +7514,7 @@ 
         if ($extName)

             $subdir = 'thumbs/';

 

-        return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+        return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

     }

 

     /**

@@ -7540,14 +7540,14 @@ 
 

         if ($alldata == 1) {

             if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime' => dol_mimetype($relativepath),);

             else

                 return array();

         }

 

 // old behavior

         if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

+            return 'javascript:document_preview(\''.dol_escape_js(DOL_BASE_URI.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js(Globals::$langs->trans('Preview')).'\')';

         else

             return '';

     }

@@ -7564,11 +7564,11 @@ 
         // global Globals::$langs;

         $out = '<script type="text/javascript">

                jQuery(document).ready(static function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

         if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';

+            $out .= ' <a href="'.$addlink.'" target="_blank">'.Globals::$langs->trans("Link").'</a>';

         return $out;

     }

 

@@ -7949,9 +7949,9 @@ 
 

         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

-            $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+            $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

             if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+                $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7989,14 +7989,14 @@ 
                 $g = $tmp[1];

                 $b = $tmp[2];

             } else {

-                $hexr = $stringcolor[0] . $stringcolor[1];

-                $hexg = $stringcolor[2] . $stringcolor[3];

-                $hexb = $stringcolor[4] . $stringcolor[5];

+                $hexr = $stringcolor[0].$stringcolor[1];

+                $hexg = $stringcolor[2].$stringcolor[3];

+                $hexb = $stringcolor[4].$stringcolor[5];

                 $r = hexdec($hexr);

                 $g = hexdec($hexg);

                 $b = hexdec($hexb);

             }

-            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+            $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

             if ($bright > 0.6)

                 $res = 1;

         }

@@ -8031,11 +8031,11 @@ 
                 return 0; // Entry is for menus all excluded to external users

         }

         if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

+            return 0; // No permissions and user is external

         if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

             return 0; // No permissions and option to hide when not allowed, even for internal user, is on

         if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            return 2; // No permissions and user is external

         return 1;

     }

 

Braces +1340 added lines, -963 removed lines

@@ -75,8 +75,9 @@ 
           if ($found) return $result;

           } */

 

-        if (isset($class::$member))

-            return $class::$member;

+        if (isset($class::$member)) {
+                    return $class::$member;
+        }
         dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

         return null;

     }

@@ -127,8 +128,9 @@ 
         } else {

             $out = '';

             $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-            if (in_array($element, $addzero))

-                $out .= '0,';

+            if (in_array($element, $addzero)) {
+                            $out .= '0,';
+            }
             $out .= Globals::$conf->entity;

             return $out;

         }

@@ -391,14 +393,17 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                             $foundintru = 0;

                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                    $foundintru = 1;

+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }

-                                            if (!$foundintru)

-                                                $qualified = 1;

+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);

-                                        } else

-                                            $qualified = 1;

+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 

                                         if ($qualified) {

                                             //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -425,20 +430,24 @@ 
                                                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                                 $foundintru = 0;

                                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                        $foundintru = 1;

+                                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                            $foundintru = 1;
+                                                    }
                                                 }

-                                                if (!$foundintru)

-                                                    $qualified = 1;

+                                                if (!$foundintru) {
+                                                                                                    $qualified = 1;
+                                                }
                                                 //var_dump($defkey.'-'.$qualified);

-                                            } else

-                                                $qualified = 1;

+                                            } else {
+                                                                                            $qualified = 1;
+                                            }
 

                                             if ($qualified) {

                                                 $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                                 foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                                    if ($out)

-                                                        $out .= ', ';

+                                                    if ($out) {
+                                                                                                            $out .= ', ';
+                                                    }
                                                     if ($paramname == 'sortfield') {

                                                         $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                                     }

@@ -458,14 +467,17 @@ 
                                             $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                             $foundintru = 0;

                                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                    $foundintru = 1;

+                                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                                    $foundintru = 1;
+                                                }
                                             }

-                                            if (!$foundintru)

-                                                $qualified = 1;

+                                            if (!$foundintru) {
+                                                                                            $qualified = 1;
+                                            }
                                             //var_dump($defkey.'-'.$qualified);

-                                        } else

-                                            $qualified = 1;

+                                        } else {
+                                                                                    $qualified = 1;
+                                        }
 

                                         if ($qualified) {

                                             if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -556,18 +568,20 @@ 
                 }

                 break;

             case 'intcomma':

-                if (preg_match('/[^0-9,-]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^0-9,-]+/i', $out)) {
+                                    $out = '';
+                }
                 break;

             case 'alpha':

                 if (!is_array($out)) {

                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'san_alpha':

@@ -576,27 +590,31 @@ 
             case 'aZ':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09':

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

                 if (!is_array($out)) {

                     $out = trim($out);

-                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                        $out = '';

+                    if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                            $out = '';
+                    }
                 }

                 break;

             case 'array':

-                if (!is_array($out) || empty($out))

-                    $out = array();

+                if (!is_array($out) || empty($out)) {
+                                    $out = array();
+                }
                 break;

             case 'nohtml':  // Recommended for most scalar parameters

                 $out = dol_string_nohtmltag($out, 0);

@@ -606,16 +624,18 @@ 
                     $out = trim($out);

                     // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                     // '../' is dangerous because it allows dir transversals

-                    if (preg_match('/"/', $out))

-                        $out = '';

-                    else if (preg_match('/\.\.\//', $out))

-                        $out = '';

+                    if (preg_match('/"/', $out)) {
+                                            $out = '';
+                    } else if (preg_match('/\.\.\//', $out)) {
+                                            $out = '';
+                    }
                     $out = dol_string_nohtmltag($out);

                 }

                 break;

             case 'custom':

-                if (empty($filter))

-                    return 'BadFourthParameterForDolUtils::GETPOST';

+                if (empty($filter)) {
+                                    return 'BadFourthParameterForDolUtils::GETPOST';
+                }
                 $out = filter_var($out, $filter, $options);

                 break;

         }

@@ -733,11 +753,11 @@ 
                 }

             }

             if ($returnemptyifnotfound) {        // Not found into alternate dir

-                if ($returnemptyifnotfound == 1 || !file_exists($res))

-                    return '';

+                if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                                    return '';
+                }
             }

-        }

-        else {    // For an url path

+        } else {    // For an url path

 // We try to get local path of file on filesystem from url

 // Note that trying to know if a file on disk exist by forging path on disk from url

 // works only for some web server and some setup. This is bugged when

@@ -831,12 +851,14 @@ 
     static function dol_size($size, $type = '')

     {

         //global Globals::$conf;

-        if (empty(Globals::$conf->dol_optimize_smallscreen))

-            return $size;

-        if ($type == 'width' && $size > 250)

-            return 250;

-        else

-            return 10;

+        if (empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    return $size;
+        }
+        if ($type == 'width' && $size > 250) {
+                    return 250;
+        } else {
+                    return 10;
+        }
     }

 

     /**

@@ -936,9 +958,10 @@ 
     {

         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

         $forbidden_chars_to_remove = array();

-        if (is_array($badcharstoreplace))

-            $forbidden_chars_to_replace = $badcharstoreplace;

-//$forbidden_chars_to_remove=array("(",")");

+        if (is_array($badcharstoreplace)) {
+                    $forbidden_chars_to_replace = $badcharstoreplace;
+        }
+        //$forbidden_chars_to_remove=array("(",")");

 

         return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

     }

@@ -974,9 +997,9 @@ 
         if (empty($mode)) {

             $substitjs["'"] = "\\'";

             $substitjs['"'] = "\\'";

-        } else if ($mode == 1)

-            $substitjs["'"] = "\\'";

-        else if ($mode == 2) {

+        } else if ($mode == 1) {
+                    $substitjs["'"] = "\\'";
+        } else if ($mode == 2) {

             $substitjs['"'] = '\\"';

         } else if ($mode == 3) {

             $substitjs["'"] = "\\'";

@@ -998,10 +1021,12 @@ 
     {

 // escape quotes and backslashes, newlines, etc.

         $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-        if (!$keepb)

-            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-        if (!$keepn)

-            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+        if (!$keepb) {
+                    $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+        }
+        if (!$keepn) {
+                    $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+        }
         return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

     }

 

@@ -1051,8 +1076,9 @@ 
     {

         // global Globals::$conf, $user;

 // If syslog module enabled

-        if (empty(Globals::$conf->syslog->enabled))

-            return;

+        if (empty(Globals::$conf->syslog->enabled)) {
+                    return;
+        }
 

         if ($ident < 0) {

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

@@ -1066,8 +1092,9 @@ 
             if (!in_array($level, $logLevels, true)) {

                 throw new Exception('Incorrect log level');

             }

-            if ($level > Globals::$conf->global->SYSLOG_LEVEL)

-                return;

+            if ($level > Globals::$conf->global->SYSLOG_LEVEL) {
+                            return;
+            }
 

             $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

 // If adding log inside HTML page is required

@@ -1092,24 +1119,30 @@ 
             );

 

 // This is when server run behind a reverse proxy

-            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-                $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

-// This is when server run normally on a server

-            else if (!empty($_SERVER["REMOTE_ADDR"]))

-                $data['ip'] = $_SERVER['REMOTE_ADDR'];

-// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-            else if (!empty($_SERVER['SERVER_ADDR']))

-                $data['ip'] = $_SERVER['SERVER_ADDR'];

-// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-            else if (!empty($_SERVER['COMPUTERNAME']))

-                $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

-// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-            else if (!empty($_SERVER['LOGNAME']))

-                $data['ip'] = '???@' . $_SERVER['LOGNAME'];

-// Loop on each log handler and send output

+            if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+            }
+            // This is when server run normally on a server

+            else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                            $data['ip'] = $_SERVER['REMOTE_ADDR'];
+            }
+            // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

+            else if (!empty($_SERVER['SERVER_ADDR'])) {
+                            $data['ip'] = $_SERVER['SERVER_ADDR'];
+            }
+            // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

+            else if (!empty($_SERVER['COMPUTERNAME'])) {
+                            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+            }
+            // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

+            else if (!empty($_SERVER['LOGNAME'])) {
+                            $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+            }
+            // Loop on each log handler and send output

             foreach (Globals::$conf->loghandlers as $loghandlerinstance) {

-                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                    continue;

+                if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                                    continue;
+                }
                 $loghandlerinstance->export($data, $suffixinfilename);

             }

             unset($data);

@@ -1165,13 +1198,15 @@ 
 

 // Show title

         $showtitle = 1;

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $showtitle = 0;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $showtitle = 0;
+        }
         if (!empty($title) && $showtitle) {

             $limittitle = 30;

             $out .= '<a class="tabTitle">';

-            if ($picto)

-                $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+            if ($picto) {
+                            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+            }
             $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

             $out .= '</a>';

         }

@@ -1180,12 +1215,14 @@ 
         $maxkey = -1;

         if (is_array($links) && !empty($links)) {

             $keys = array_keys($links);

-            if (count($keys))

-                $maxkey = max($keys);

+            if (count($keys)) {
+                            $maxkey = max($keys);
+            }
         }

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2;
+        }
 

 // Show tabs

         $bactive = false;

@@ -1198,8 +1235,9 @@ 
         for ($i = 0; $i <= $maxkey; $i++) {

             if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

 // If active tab is already present

-                if ($i >= $limittoshow)

-                    $limittoshow--;

+                if ($i >= $limittoshow) {
+                                    $limittoshow--;
+                }
             }

         }

 

@@ -1240,12 +1278,12 @@ 
                 }

                 $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

                 if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                    if (!empty($links[$i][0]))

-                        $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                    else

-                        $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-                }

-                else if (!empty($links[$i][1])) {

+                    if (!empty($links[$i][0])) {
+                                            $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                    } else {
+                                            $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                    }
+                } else if (!empty($links[$i][1])) {

                     $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                     $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                     $outmore .= '</a>' . "\n";

@@ -1256,8 +1294,9 @@ 
             }

             $displaytab = $i;

         }

-        if ($popuptab)

-            $outmore .= '</div>';

+        if ($popuptab) {
+                    $outmore .= '</div>';
+        }
 

         if ($displaytab > $limittoshow) {

             $left = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1280,8 +1319,9 @@ 
 

         $out .= "</div>\n";

 

-        if (!$notab || $notab == -1)

-            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        if (!$notab || $notab == -1) {
+                    $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+        }
 

         $parameters = array('tabname' => $active, 'out' => $out);

         $reshook = Globals::$hookManager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1311,10 +1351,11 @@ 
      */

     static function dol_get_fiche_end($notab = 0)

     {

-        if (!$notab || $notab == -1)

-            return "\n</div>\n";

-        else

-            return '';

+        if (!$notab || $notab == -1) {
+                    return "\n</div>\n";
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -1346,8 +1387,9 @@ 
         $showimage = 1;

         $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity);

         $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
         $modulepart = 'unknown';

 

         if ($object->element == 'societe') {

@@ -1452,8 +1494,10 @@ 
                         } else {

                             $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                         }

-                        if (empty($subdir))

-                            $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                        if (empty($subdir)) {
+                                                    $subdir = 'errorgettingsubdirofobject';
+                        }
+                        // Protection to avoid to return empty path

 

                         $filepath = $dir_output . $subdir . "/";

 

@@ -1474,14 +1518,16 @@ 
                                 if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                     include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                     $ret = dol_convert_file($file, 'png', $fileimage);

-                                    if ($ret < 0)

-                                        $error++;

+                                    if ($ret < 0) {
+                                                                            $error++;
+                                    }
                                 }

                             }

 

                             $heightforphotref = 70;

-                            if (!empty(Globals::$conf->dol_optimize_smallscreen))

-                                $heightforphotref = 60;

+                            if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                                                            $heightforphotref = 60;
+                            }
                             // Si fichier png PDF d'1 page trouve

                             if (file_exists($fileimage)) {

                                 $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1517,8 +1563,10 @@ 
                         $width = 14;

                         $cssclass = 'photorefcenter';

                         $picto = $object->picto;

-                        if ($object->element == 'project' && !$object->public)

-                            $picto = 'project'; // instead of projectpub

+                        if ($object->element == 'project' && !$object->public) {
+                                                    $picto = 'project';
+                        }
+                        // instead of projectpub

                         $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                     }

                     $morehtmlleft .= '<!-- No photo to show -->';

@@ -1529,8 +1577,9 @@ 
             }

         }

 

-        if ($showbarcode)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        if ($showbarcode) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+        }
 

         if ($object->element == 'societe') {

             if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1554,35 +1603,37 @@ 
             }

         } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

             $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+            }
             $morehtmlstatus .= $tmptxt;

-        }

-        elseif ($object->element == 'contrat' || $object->element == 'contract') {

-            if ($object->statut == 0)

-                $morehtmlstatus .= $object->getLibStatut(5);

-            else

-                $morehtmlstatus .= $object->getLibStatut(4);

-        }

-        elseif ($object->element == 'facturerec') {

-            if ($object->frequency == 0)

-                $morehtmlstatus .= $object->getLibStatut(2);

-            else

-                $morehtmlstatus .= $object->getLibStatut(5);

-        }

-        elseif ($object->element == 'project_task') {

+        } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+            if ($object->statut == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(4);
+            }
+        } elseif ($object->element == 'facturerec') {

+            if ($object->frequency == 0) {
+                            $morehtmlstatus .= $object->getLibStatut(2);
+            } else {
+                            $morehtmlstatus .= $object->getLibStatut(5);
+            }
+        } elseif ($object->element == 'project_task') {

             $object->fk_statut = 1;

-            if ($object->progress > 0)

-                $object->fk_statut = 2;

-            if ($object->progress >= 100)

-                $object->fk_statut = 3;

+            if ($object->progress > 0) {
+                            $object->fk_statut = 2;
+            }
+            if ($object->progress >= 100) {
+                            $object->fk_statut = 3;
+            }
             $tmptxt = $object->getLibStatut(5);

             $morehtmlstatus .= $tmptxt;  // No status on task

-        }

-        else { // Generic case

+        } else { // Generic case

             $tmptxt = $object->getLibStatut(6);

-            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone')

-                $tmptxt = $object->getLibStatut(5);

+            if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') {
+                            $tmptxt = $object->getLibStatut(5);
+            }
             $morehtmlstatus .= $tmptxt;

         }

 

@@ -1596,13 +1647,15 @@ 
         }

 

 // Add alias for thirdparty

-        if (!empty($object->name_alias))

-            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        if (!empty($object->name_alias)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+        }
 

 // Add label

         if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-            if (!empty($object->label))

-                $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+            if (!empty($object->label)) {
+                            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+            }
         }

 

         if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1635,15 +1688,19 @@ 
     {

         // global Globals::$conf, Globals::$langs;

         $ret = '';

-        if ($fieldrequired)

-            $ret .= '<span class="fieldrequired">';

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '<label for="' . $fieldkey . '">';

+        if ($fieldrequired) {
+                    $ret .= '<span class="fieldrequired">';
+        }
+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '<label for="' . $fieldkey . '">';
+        }
         $ret .= Globals::$langs->trans($langkey);

-        if ((Globals::$conf->dol_use_jmobile != 4))

-            $ret .= '</label>';

-        if ($fieldrequired)

-            $ret .= '</span>';

+        if ((Globals::$conf->dol_use_jmobile != 4)) {
+                    $ret .= '</label>';
+        }
+        if ($fieldrequired) {
+                    $ret .= '</span>';
+        }
         return $ret;

     }

 

@@ -1658,8 +1715,9 @@ 
     {

         // global $bc;

         $ret = ' ' . $bc[$var];

-        if ($moreclass)

-            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        if ($moreclass) {
+                    $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+        }
         return $ret;

     }

 

@@ -1690,18 +1748,18 @@ 
             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? ", " : '') . $object->zip;

-        }

-        else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? ", " : '') . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

             $ret .= ($ret ? $sep : '' ) . $object->town;

             if ($object->state) {

                 $ret .= ($ret ? ", " : '') . $object->state;

             }

-            if ($object->zip)

-                $ret .= ($ret ? $sep : '' ) . $object->zip;

-        }

-        else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+            if ($object->zip) {
+                            $ret .= ($ret ? $sep : '' ) . $object->zip;
+            }
+        } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

             $ret .= ($ret ? $sep : '' ) . $object->zip;

             $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

             if ($object->state) {

@@ -1718,8 +1776,9 @@ 
                 $ret .= ($ret ? ", " : '') . $object->state;

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
         if ($withcountry) {

             Globals::$langs->load("dict");

             $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1740,8 +1799,9 @@ 
     {

         if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

             return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-        } else

-            return 'Error date into a not supported range';

+        } else {
+                    return 'Error date into a not supported range';
+        }
     }

 

     /**

@@ -1787,10 +1847,12 @@ 
                 }

             }

         }

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

-        if (!$format)

-            $format = 'daytextshort';

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
+        if (!$format) {
+                    $format = 'daytextshort';
+        }
         $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

         $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

         if ($formatwithoutreduce != $format) {

@@ -1799,40 +1861,46 @@ 
         }  // so format 'dayreduceformat' is processed like day

 // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

 // TODO Add format daysmallyear and dayhoursmallyear

-        if ($format == 'day')

-            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);

-        else if ($format == 'hour')

-            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);

-        else if ($format == 'hourduration')

-            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);

-        else if ($format == 'daytext')

-            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);

-        else if ($format == 'daytextshort')

-// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);

-        else if ($format == 'dayhour')

-            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M");

-        else if ($format == 'dayhoursec')

-            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);

-        else if ($format == 'dayhourtext')

-            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);

-        else if ($format == 'dayhourtextshort')

-            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);

-// Format not sensitive to language

-        else if ($format == 'dayhourlog')

-            $format = '%Y%m%d%H%M%S';

-        else if ($format == 'dayhourldap')

-            $format = '%Y%m%d%H%M%SZ';

-        else if ($format == 'dayhourxcard')

-            $format = '%Y%m%dT%H%M%SZ';

-        else if ($format == 'dayxcard')

-            $format = '%Y%m%d';

-        else if ($format == 'dayrfc')

-            $format = '%Y-%m-%d';             // DATE_RFC3339

-        else if ($format == 'dayhourrfc')

-            $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-        else if ($format == 'standard')

-            $format = '%Y-%m-%d %H:%M:%S';

+        if ($format == 'day') {
+                    $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short);
+        } else if ($format == 'hour') {
+                    $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short);
+        } else if ($format == 'hourduration') {
+                    $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration);
+        } else if ($format == 'daytext') {
+                    $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text);
+        } else if ($format == 'daytextshort') {
+            // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+            $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short);
+        } else if ($format == 'dayhour') {
+                    $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M");
+        } else if ($format == 'dayhoursec') {
+                    $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short);
+        } else if ($format == 'dayhourtext') {
+                    $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text);
+        } else if ($format == 'dayhourtextshort') {
+                    $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short);
+        }
+        // Format not sensitive to language

+        else if ($format == 'dayhourlog') {
+                    $format = '%Y%m%d%H%M%S';
+        } else if ($format == 'dayhourldap') {
+                    $format = '%Y%m%d%H%M%SZ';
+        } else if ($format == 'dayhourxcard') {
+                    $format = '%Y%m%dT%H%M%SZ';
+        } else if ($format == 'dayxcard') {
+                    $format = '%Y%m%d';
+        } else if ($format == 'dayrfc') {
+                    $format = '%Y-%m-%d';
+        }
+        // DATE_RFC3339

+        else if ($format == 'dayhourrfc') {
+                    $format = '%Y-%m-%dT%H:%M:%SZ';
+        }
+        // DATETIME RFC3339

+        else if ($format == 'standard') {
+                    $format = '%Y-%m-%d %H:%M:%S';
+        }
 

         if ($reduceformat) {

             $format = str_replace('%Y', '%y', $format);

@@ -1840,8 +1908,10 @@ 
         }

 

 // If date undefined or "", we return ""

-        if (AlDolUtils::dol_strlen($time) == 0)

-            return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        if (AlDolUtils::dol_strlen($time) == 0) {
+                    return '';
+        }
+        // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1928,8 +1998,9 @@ 
                 $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

                 $ret = adodb_strftime($format, $timetouse, $to_gmt);

-            } else

-                $ret = 'Bad value ' . $time . ' for date';

+            } else {
+                            $ret = 'Bad value ' . $time . ' for date';
+            }
         }

 

         if (preg_match('/__b__/i', $format)) {

@@ -2000,10 +2071,14 @@ 
         // global Globals::$conf;

 

         $usealternatemethod = false;

-        if ($timestamp <= 0)

-            $usealternatemethod = true;    // <= 1970

-        if ($timestamp >= 2145913200)

-            $usealternatemethod = true;  // >= 2038

+        if ($timestamp <= 0) {
+                    $usealternatemethod = true;
+        }
+        // <= 1970

+        if ($timestamp >= 2145913200) {
+                    $usealternatemethod = true;
+        }
+        // >= 2038

 

         if ($usealternatemethod) {

             $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2038,27 +2113,36 @@ 
         // global Globals::$conf;

 //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

 // Clean parameters

-        if ($hour == -1 || empty($hour))

-            $hour = 0;

-        if ($minute == -1 || empty($minute))

-            $minute = 0;

-        if ($second == -1 || empty($second))

-            $second = 0;

+        if ($hour == -1 || empty($hour)) {
+                    $hour = 0;
+        }
+        if ($minute == -1 || empty($minute)) {
+                    $minute = 0;
+        }
+        if ($second == -1 || empty($second)) {
+                    $second = 0;
+        }
 

 // Check parameters

         if ($check) {

-            if (!$month || !$day)

-                return '';

-            if ($day > 31)

-                return '';

-            if ($month > 12)

-                return '';

-            if ($hour < 0 || $hour > 24)

-                return '';

-            if ($minute < 0 || $minute > 60)

-                return '';

-            if ($second < 0 || $second > 60)

-                return '';

+            if (!$month || !$day) {
+                            return '';
+            }
+            if ($day > 31) {
+                            return '';
+            }
+            if ($month > 12) {
+                            return '';
+            }
+            if ($hour < 0 || $hour > 24) {
+                            return '';
+            }
+            if ($minute < 0 || $minute > 60) {
+                            return '';
+            }
+            if ($second < 0 || $second > 60) {
+                            return '';
+            }
         }

 

         if (method_exists('DateTime', 'getTimestamp')) {

@@ -2115,8 +2199,10 @@ 
 

 // Note that gmmktime and mktime return same value (GMT) when used without parameters

 //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead

-        if ($mode == 'gmt')

-            $ret = time(); // Time for now at greenwich.

+        if ($mode == 'gmt') {
+                    $ret = time();
+        }
+        // Time for now at greenwich.

         else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

             require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

             $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2150,8 +2236,9 @@ 
         // global Globals::$conf, Globals::$langs;

         $level = 1024;

 

-        if (!empty(Globals::$conf->dol_optimize_smallscreen))

-            $shortunit = 1;

+        if (!empty(Globals::$conf->dol_optimize_smallscreen)) {
+                    $shortunit = 1;
+        }
 

 // Set value text

         if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2186,19 +2273,23 @@ 
     {

         // global Globals::$langs;

 

-        if (empty($url))

-            return '';

+        if (empty($url)) {
+                    return '';
+        }
 

         $link = '<a href="';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= $url;

         $link .= '"';

-        if ($target)

-            $link .= ' target="' . $target . '"';

+        if ($target) {
+                    $link .= ' target="' . $target . '"';
+        }
         $link .= '>';

-        if (!preg_match('/^http/i', $url))

-            $link .= 'http://';

+        if (!preg_match('/^http/i', $url)) {
+                    $link .= 'http://';
+        }
         $link .= dol_trunc($url, $max);

         $link .= '</a>';

         return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2222,13 +2313,15 @@ 
 

         $newemail = $email;

 

-        if (empty($email))

-            return '&nbsp;';

+        if (empty($email)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($addlink)) {

             $newemail = '<a style="text-overflow: ellipsis;" href="';

-            if (!preg_match('/^mailto:/i', $email))

-                $newemail .= 'mailto:';

+            if (!preg_match('/^mailto:/i', $email)) {
+                            $newemail .= 'mailto:';
+            }
             $newemail .= $email;

             $newemail .= '">';

             $newemail .= dol_trunc($email, $max);

@@ -2241,13 +2334,14 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_EMAIL';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+                }
             }

-        }

-        else {

+        } else {

             if ($showinvalid && !isValidEmail($email)) {

                 Globals::$langs->load("errors");

                 $newemail .= img_warning(Globals::$langs->trans("ErrorBadEMail", $email));

@@ -2279,8 +2373,9 @@ 
 

         $newskype = $value;

 

-        if (empty($value))

-            return '&nbsp;';

+        if (empty($value)) {
+                    return '&nbsp;';
+        }
 

         if (!empty($type)) {

             $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2301,13 +2396,13 @@ 
             if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

                 $addlink = 'AC_SKYPE';

                 $link = '';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
                 $newskype .= ($link ? ' ' . $link : '');

             }

             $newskype .= '</div>';

-        }

-        else {

+        } else {

             Globals::$langs->load("errors");

             $newskype .= img_warning(Globals::$langs->trans("ErrorBadSocialNetworkValue", $value));

         }

@@ -2336,12 +2431,14 @@ 
         if (empty($phone)) {

             return '';

         }

-        if (empty($countrycode))

-            $countrycode = $mysoc->country_code;

+        if (empty($countrycode)) {
+                    $countrycode = $mysoc->country_code;
+        }
 

 // Short format for small screens

-        if (Globals::$conf->dol_optimize_smallscreen)

-            $separ = '';

+        if (Globals::$conf->dol_optimize_smallscreen) {
+                    $separ = '';
+        }
 

         $newphone = $phone;

         if (strtoupper($countrycode) == "FR") {

@@ -2507,15 +2604,18 @@ 
                 $newphone = '<a href="tel:' . $phone . '"';

                 $newphone .= '>' . $phone . '</a>';

             } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-                if (empty($user->clicktodial_loaded))

-                    $user->fetch_clicktodial();

+                if (empty($user->clicktodial_loaded)) {
+                                    $user->fetch_clicktodial();
+                }
 

 // Define urlmask

                 $urlmask = 'ErrorClickToDialModuleNotConfigured';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_URL))

-                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;

-                if (!empty($user->clicktodial_url))

-                    $urlmask = $user->clicktodial_url;

+                if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) {
+                                    $urlmask = Globals::$conf->global->CLICKTODIAL_URL;
+                }
+                if (!empty($user->clicktodial_url)) {
+                                    $urlmask = $user->clicktodial_url;
+                }
 

                 $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

                 $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2530,8 +2630,9 @@ 
                 $url = make_substitutions($url, $substitarray);

                 $newphonesav = $newphone;

                 $newphone = '<a href="' . $url . '"';

-                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET))

-                    $newphone .= ' target="_blank"';

+                if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                                    $newphone .= ' target="_blank"';
+                }
                 $newphone .= '>' . $newphonesav . '</a>';

             }

 

@@ -2539,12 +2640,15 @@ 
             if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

                 $type = 'AC_TEL';

                 $link = '';

-                if ($addlink == 'AC_FAX')

-                    $type = 'AC_FAX';

-                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE))

-                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';

-                if ($link)

-                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                if ($addlink == 'AC_FAX') {
+                                    $type = 'AC_FAX';
+                }
+                if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                                    $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>';
+                }
+                if ($link) {
+                                    $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+                }
             }

         }

 

@@ -2571,15 +2675,17 @@ 
                     $picto = '';

                 }

             }

-            if ($adddivfloat)

-                $rep .= '<div class="nospan float" style="margin-right: 10px">';

-            else

-                $rep .= '<span style="margin-right: 10px;">';

+            if ($adddivfloat) {
+                            $rep .= '<div class="nospan float" style="margin-right: 10px">';
+            } else {
+                            $rep .= '<span style="margin-right: 10px;">';
+            }
             $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-            if ($adddivfloat)

-                $rep .= '</div>';

-            else

-                $rep .= '</span>';

+            if ($adddivfloat) {
+                            $rep .= '</div>';
+            } else {
+                            $rep .= '</span>';
+            }
         }

 

         return $rep;

@@ -2609,8 +2715,9 @@ 
             if ($countrycode) { // If success, countrycode is us, fr, ...

                 if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) {

                     $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-                } else

-                    $ret .= ' (' . $countrycode . ')';

+                } else {
+                                    $ret .= ' (' . $countrycode . ')';
+                }
             }

         }

 

@@ -2707,26 +2814,33 @@ 
                 $out .= Globals::$hookManager->resPrint;

             }

             if (empty($reshook)) {

-                if (empty($charfornl))

-                    $out .= nl2br($address);

-                else

-                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+                if (empty($charfornl)) {
+                                    $out .= nl2br($address);
+                } else {
+                                    $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+                }
 

                 $showgmap = $showomap = 0;

 

 // TODO Add a hook here

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS))

-                    $showgmap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                    $showgmap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                    $showgmap = 1;

-                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                    $showomap = 1;

-                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                    $showomap = 1;

-                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                    $showomap = 1;

+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                                    $showgmap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                                    $showgmap = 1;
+                }
+                if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                                    $showomap = 1;
+                }
+                if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                                    $showomap = 1;
+                }
 

                 if ($showgmap) {

                     $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2738,10 +2852,11 @@ 
                 }

             }

         }

-        if ($noprint)

-            return $out;

-        else

-            print $out;

+        if ($noprint) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     /**

@@ -2753,10 +2868,12 @@ 
      */

     static function isValidEmail($address, $acceptsupervisorkey = 0)

     {

-        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-            return true;

-        if (filter_var($address, FILTER_VALIDATE_EMAIL))

-            return true;

+        if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+                    return true;
+        }
+        if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+                    return true;
+        }
 

         return false;

     }

@@ -2778,10 +2895,12 @@ 
                 $mxhosts = array();

                 $weight = array();

                 getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-                if (count($mxhosts) > 1)

-                    return 1;

-                if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                    return 1;

+                if (count($mxhosts) > 1) {
+                                    return 1;
+                }
+                if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                                    return 1;
+                }
 

                 return 0;

             }

@@ -2810,10 +2929,11 @@ 
      */

     static function dol_strlen($string, $stringencoding = 'UTF-8')

     {

-        if (function_exists('mb_strlen'))

-            return mb_strlen($string, $stringencoding);

-        else

-            return strlen($string);

+        if (function_exists('mb_strlen')) {
+                    return mb_strlen($string, $stringencoding);
+        } else {
+                    return strlen($string);
+        }
     }

 

     /**

@@ -2830,8 +2950,9 @@ 
     {

         // global Globals::$langs;

 

-        if (empty($stringencoding))

-            $stringencoding = Globals::$langs->charset_output;

+        if (empty($stringencoding)) {
+                    $stringencoding = Globals::$langs->charset_output;
+        }
 

         $ret = '';

         if (empty($trunconbytes)) {

@@ -2867,48 +2988,55 @@ 
     {

         // global Globals::$conf;

 

-        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC))

-            return $string;

+        if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) {
+                    return $string;
+        }
 

-        if (empty($stringencoding))

-            $stringencoding = 'UTF-8';

-// reduce for small screen

-        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1)

-            $size = round($size / 3);

+        if (empty($stringencoding)) {
+                    $stringencoding = 'UTF-8';
+        }
+        // reduce for small screen

+        if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) {
+                    $size = round($size / 3);
+        }
 

 // We go always here

         if ($trunc == 'right') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-            else

-            //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string;

-                return $string;

-        }

-        elseif ($trunc == 'middle') {

+            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+            } else {
+                        //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string;

+                return $string;
+            }
+        } elseif ($trunc == 'middle') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

             if (AlDolUtils::dol_strlen($newstring, $stringencoding) > 2 && AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {

                 $size1 = round($size / 2);

                 $size2 = round($size / 2);

                 return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-            } else

-                return $string;

-        }

-        elseif ($trunc == 'left') {

+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'left') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-                return '...' . dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-            else

-                return $string;

-        }

-        elseif ($trunc == 'wrap') {

+            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+                // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+                return '...' . dol_substr($newstring, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+            } else {
+                            return $string;
+            }
+        } elseif ($trunc == 'wrap') {

             $newstring = AlDolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1))

-                return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-            else

-                return $string;

-        } else

-            return 'BadParam3CallingDolTrunc';

+            if (AlDolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, AlDolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+            } else {
+                            return $string;
+            }
+        } else {
+                    return 'BadParam3CallingDolTrunc';
+        }
     }

 

     /**

@@ -3118,8 +3246,9 @@ 
     {

         // global Globals::$conf;

 

-        if (!preg_match('/(\.png|\.gif)$/i', $picto))

-            $picto .= '.png';

+        if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+                    $picto .= '.png';
+        }
 

 //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

         $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto;

@@ -3195,8 +3324,9 @@ 
                 $numaction = 0;

             }

         }

-        if (!is_numeric($numaction))

-            $numaction = 0;

+        if (!is_numeric($numaction)) {
+                    $numaction = 0;
+        }
 

         return img_picto($titlealt, 'stcomm' . $numaction . '.png');

     }

@@ -3212,8 +3342,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Show');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Show');
+        }
 

         return img_picto($titlealt, 'pdf' . $size . '.png');

     }

@@ -3229,8 +3360,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Add');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Add');
+        }
 

         return img_picto($titlealt, 'edit_add.png', $other);

     }

@@ -3246,8 +3378,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Remove');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Remove');
+        }
 

         return img_picto($titlealt, 'edit_remove.png', $other);

     }

@@ -3264,8 +3397,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Modify');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Modify');
+        }
 

         return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

     }

@@ -3282,8 +3416,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('View');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('View');
+        }
 

         $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3301,8 +3436,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Delete');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Delete');
+        }
 

         return img_picto($titlealt, 'delete.png', $other);

 //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3318,8 +3454,9 @@ 
     static function img_printer($titlealt = "default", $other = '')

     {

         // global Globals::$conf, Globals::$langs;

-        if ($titlealt == "default")

-            $titlealt = Globals::$langs->trans("Print");

+        if ($titlealt == "default") {
+                    $titlealt = Globals::$langs->trans("Print");
+        }
         return img_picto($titlealt, 'printer.png', $other);

     }

 

@@ -3334,8 +3471,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Split');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Split');
+        }
 

         return img_picto($titlealt, 'split.png', $other);

     }

@@ -3352,10 +3490,11 @@ 
         // global Globals::$conf, Globals::$langs;

 

         if ($usealttitle) {

-            if (is_string($usealttitle))

-                $usealttitle = AlDolUtils::dol_escape_htmltag($usealttitle);

-            else

-                $usealttitle = Globals::$langs->trans('Info');

+            if (is_string($usealttitle)) {
+                            $usealttitle = AlDolUtils::dol_escape_htmltag($usealttitle);
+            } else {
+                            $usealttitle = Globals::$langs->trans('Info');
+            }
         }

 

         return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3371,8 +3510,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Informations');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Informations');
+        }
 

         return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

     }

@@ -3388,8 +3528,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Warning');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Warning');
+        }
 

 //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

         return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3405,8 +3546,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Error');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Error');
+        }
 

         return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

     }

@@ -3422,8 +3564,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Next');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Next');
+        }
 

 //return img_picto($titlealt, 'next.png', $moreatt);

         return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"></span>';

@@ -3440,8 +3583,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Previous');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Previous');
+        }
 

 //return img_picto($titlealt, 'previous.png', $moreatt);

         return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . AlDolUtils::dol_escape_htmltag($titlealt) . '"></span>';

@@ -3459,8 +3603,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Down');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Down');
+        }
 

         return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3477,8 +3622,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Up');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Up');
+        }
 

         return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

     }

@@ -3495,8 +3641,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Left');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Left');
+        }
 

         return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

     }

@@ -3513,8 +3660,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Right');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Right');
+        }
 

         return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

     }

@@ -3530,11 +3678,13 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Active');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Active');
+        }
 

-        if ($allow == 1)

-            return img_picto($titlealt, 'tick.png');

+        if ($allow == 1) {
+                    return img_picto($titlealt, 'tick.png');
+        }
 

         return '-';

     }

@@ -3582,8 +3732,9 @@ 
         $mimeimg = dol_mimetype($file, '', 2);

         $mimefa = dol_mimetype($file, '', 4);

 

-        if (empty($titlealt))

-            $titlealt = 'Mime type: ' . $mimetype;

+        if (empty($titlealt)) {
+                    $titlealt = 'Mime type: ' . $mimetype;
+        }
 

 //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

         return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3605,13 +3756,15 @@ 
 

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Call');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Call');
+        }
 

-        if ($option == 1)

-            $img = 'call';

-        else

-            $img = 'call_out';

+        if ($option == 1) {
+                    $img = 'call';
+        } else {
+                    $img = 'call_out';
+        }
 

         return img_picto($titlealt, $img);

     }

@@ -3627,8 +3780,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3649,8 +3803,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if ($titlealt == 'default')

-            $titlealt = Globals::$langs->trans('Search');

+        if ($titlealt == 'default') {
+                    $titlealt = Globals::$langs->trans('Search');
+        }
 

         $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -4078,12 +4233,15 @@ 
         $savtotalnboflines = $totalnboflines;

         $totalnboflines = abs($totalnboflines);

 

-        if ($picto == 'setup')

-            $picto = 'title_setup.png';

-        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png')

-            $picto = 'title.gif';

-        if ($limit < 0)

-            $limit = Globals::$conf->liste_limit;

+        if ($picto == 'setup') {
+                    $picto = 'title_setup.png';
+        }
+        if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+                    $picto = 'title.gif';
+        }
+        if ($limit < 0) {
+                    $limit = Globals::$conf->liste_limit;
+        }
         if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

             $nextpage = 1;

         } else {

@@ -4097,11 +4255,13 @@ 
 // Left

 //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

         print '<td class="nobordernopadding valignmiddle">';

-        if ($picto && $titre)

-            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+        if ($picto && $titre) {
+                    print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+        }
         print '<div class="titre inline-block">' . $titre;

-        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-            print ' (' . $totalnboflines . ')';

+        if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+                    print ' (' . $totalnboflines . ')';
+        }
         print '</div></td>';

 

 // Center

@@ -4111,21 +4271,24 @@ 
 

 // Right

         print '<td class="nobordernopadding valignmiddle" align="right">';

-        if ($sortfield)

-            $options .= "&sortfield=" . urlencode($sortfield);

-        if ($sortorder)

-            $options .= "&sortorder=" . urlencode($sortorder);

-// Show navigation bar

+        if ($sortfield) {
+                    $options .= "&sortfield=" . urlencode($sortfield);
+        }
+        if ($sortorder) {
+                    $options .= "&sortorder=" . urlencode($sortorder);
+        }
+        // Show navigation bar

         $pagelist = '';

         if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

             if ($totalnboflines) { // If we know total nb of lines

 // Define nb of extra page links before and after selected page + ... + first or last

                 $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1);

 

-                if ($limit > 0)

-                    $nbpages = ceil($totalnboflines / $limit);

-                else

-                    $nbpages = 1;

+                if ($limit > 0) {
+                                    $nbpages = ceil($totalnboflines / $limit);
+                } else {
+                                    $nbpages = 1;
+                }
                 $cpt = ($page - $maxnbofpage);

                 if ($cpt < 0) {

                     $cpt = 0;

@@ -4133,10 +4296,11 @@ 
 

                 if ($cpt >= 1) {

                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                    if ($cpt > 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                    if ($cpt > 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                    }
                 }

 

                 do {

@@ -4149,14 +4313,14 @@ 
                 } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

                 if ($cpt < $nbpages) {

-                    if ($cpt < $nbpages - 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                    else if ($cpt == $nbpages - 2)

-                        $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                    if ($cpt < $nbpages - 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                    } else if ($cpt == $nbpages - 2) {
+                                            $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                    }
                     $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

                 }

-            }

-            else {

+            } else {

                 $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

             }

         }

@@ -4192,18 +4356,21 @@ 
             $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

 //$pagesizechoices.=',0:'.Globals::$langs->trans("All");     // Not yet supported

 //$pagesizechoices.=',2:2';

-            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES))

-                $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;

+            if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) {
+                            $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES;
+            }
 

             print '<li class="pagination">';

             print '<select class="flat selectlimit" name="limit" title="' . AlDolUtils::dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">';

             $tmpchoice = explode(',', $pagesizechoices);

             $tmpkey = $limit . ':' . $limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit;

-            if (!in_array($tmpkey, $tmpchoice))

-                $tmpchoice[] = $tmpkey;

+            if (!in_array($tmpkey, $tmpchoice)) {
+                            $tmpchoice[] = $tmpkey;
+            }
             asort($tmpchoice, SORT_NUMERIC);

             $found = false;

             foreach ($tmpchoice as $val) {

@@ -4279,14 +4446,15 @@ 
         }

 

 // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-        if (!preg_match('/\//', $rate))

-            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-        else {

+        if (!preg_match('/\//', $rate)) {
+                    $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+        } else {

 // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

             $ret = $rate . ($addpercent ? '%' : '');

         }

-        if (($info_bits & 1) && $usestarfornpr >= 0)

-            $ret .= ' *';

+        if (($info_bits & 1) && $usestarfornpr >= 0) {
+                    $ret .= ' *';
+        }
         $ret .= $morelabel;

         return $ret;

     }

@@ -4310,11 +4478,14 @@ 
     {

         // global Globals::$langs, Globals::$conf;

 // Clean parameters

-        if (empty($amount))

-            $amount = 0; // To have a numeric value if amount not defined or = ''

+        if (empty($amount)) {
+                    $amount = 0;
+        }
+        // To have a numeric value if amount not defined or = ''

         $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-        if ($rounding < 0)

-            $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);

+        if ($rounding < 0) {
+                    $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT);
+        }
         $nbdecimal = $rounding;

 

 // Output separators by default (french)

@@ -4322,18 +4493,22 @@ 
         $thousand = ' ';

 

 // If $outlangs not forced, we use use language

-        if (!is_object($outlangs))

-            $outlangs = Globals::$langs;

-

-        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        else if ($thousand == 'Space')

-            $thousand = ' ';

-//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (!is_object($outlangs)) {
+                    $outlangs = Globals::$langs;
+        }
+

+        if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } else if ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 //print "amount=".$amount."-";

         $amount = str_replace(',', '.', $amount); // should be useless

 //print $amount."-";

@@ -4344,9 +4519,10 @@ 
         $end = '';

 

 // We increase nbdecimal if there is more decimal than asked (to not loose information)

-        if (AlDolUtils::dol_strlen($decpart) > $nbdecimal)

-            $nbdecimal = AlDolUtils::dol_strlen($decpart);

-// Si on depasse max

+        if (AlDolUtils::dol_strlen($decpart) > $nbdecimal) {
+                    $nbdecimal = AlDolUtils::dol_strlen($decpart);
+        }
+        // Si on depasse max

         if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) {

             $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN;

             if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) {

@@ -4356,8 +4532,9 @@ 
         }

 

 // If force rounding

-        if ($forcerounding >= 0)

-            $nbdecimal = $forcerounding;

+        if ($forcerounding >= 0) {
+                    $nbdecimal = $forcerounding;
+        }
 

 // Format number

         $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4368,13 +4545,14 @@ 
 // Add symbol of currency if requested

         $cursymbolbefore = $cursymbolafter = '';

         if ($currency_code) {

-            if ($currency_code == 'auto')

-                $currency_code = Globals::$conf->currency;

+            if ($currency_code == 'auto') {
+                            $currency_code = Globals::$conf->currency;
+            }
 

             $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-            if (in_array($currency_code, $listofcurrenciesbefore))

-                $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-            else {

+            if (in_array($currency_code, $listofcurrenciesbefore)) {
+                            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+            } else {

                 $tmpcur = $outlangs->getCurrencySymbol($currency_code);

                 $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

             }

@@ -4407,15 +4585,18 @@ 
 // Decimal delimiter for PHP and database SQL requests must be '.'

         $dec = ',';

         $thousand = ' ';

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-            $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");

-        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-            $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");

-        if ($thousand == 'None')

-            $thousand = '';

-        elseif ($thousand == 'Space')

-            $thousand = ' ';

-//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

+        if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+                    $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal");
+        }
+        if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+                    $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand");
+        }
+        if ($thousand == 'None') {
+                    $thousand = '';
+        } elseif ($thousand == 'Space') {
+                    $thousand = ' ';
+        }
+        //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

 // Convert value to universal number format (no thousand separator, '.' as decimal separator)

         if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

 //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';

@@ -4430,8 +4611,10 @@ 
             }

 //print "QQ".$amount.'<br>';

 // Now make replace (the main goal of function)

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4440,20 +4623,24 @@ 
 // Now, make a rounding if required

         if ($rounding) {

             $nbofdectoround = '';

-            if ($rounding == 'MU')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;

-            elseif ($rounding == 'MT')

-                $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;

-            elseif ($rounding == 'MS')

-                $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;

-            elseif (is_numeric($rounding))

-                $nbofdectoround = $rounding;

-//print "RR".$amount.' - '.$nbofdectoround.'<br>';

-            if (AlDolUtils::dol_strlen($nbofdectoround))

-                $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-            else

-                return 'ErrorBadParameterProvidedToFunction';

-//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

+            if ($rounding == 'MU') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT;
+            } elseif ($rounding == 'MT') {
+                            $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT;
+            } elseif ($rounding == 'MS') {
+                            $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK;
+            } elseif (is_numeric($rounding)) {
+                            $nbofdectoround = $rounding;
+            }
+            //print "RR".$amount.' - '.$nbofdectoround.'<br>';

+            if (AlDolUtils::dol_strlen($nbofdectoround)) {
+                            $amount = round($amount, $nbofdectoround);
+            }
+            // $nbofdectoround can be 0.

+            else {
+                            return 'ErrorBadParameterProvidedToFunction';
+            }
+            //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

 // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

 // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

             if (is_numeric($amount)) {

@@ -4466,8 +4653,10 @@ 
 //print "TT".$amount.'<br>';

 // Always make replace because each math static function (like round) replace

 // with local values and we want a number that has a SQL string format x.y

-            if ($thousand != ',' && $thousand != '.')

-                $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+            if ($thousand != ',' && $thousand != '.') {
+                            $amount = str_replace(',', '.', $amount);
+            }
+            // To accept 2 notations for french users

             $amount = str_replace(' ', '', $amount);  // To avoid spaces

             $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

             $amount = str_replace($dec, '.', $amount);

@@ -4526,8 +4715,9 @@ 
     {

         // global $db, Globals::$conf, $mysoc;

 

-        if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-            $thirdparty_seller = $mysoc;

+        if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+                    $thirdparty_seller = $mysoc;
+        }
 

         AlDolUtils::dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4545,37 +4735,43 @@ 
 // Some test to guess with no need to make database access

         if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

             if ($local == 1) {

-                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                    return 0;

+                if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                                    return 0;
+                }
                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax1_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax1_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax1_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax1_assuj) {
+                                            return 0;
+                    }
                 }

             }

 

             if ($local == 2) {

 //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-                if (!$mysoc->localtax2_assuj)

-                    return 0;  // If main vat is 0, IRPF may be different than 0.

+                if (!$mysoc->localtax2_assuj) {
+                                    return 0;
+                }
+                // If main vat is 0, IRPF may be different than 0.

                 if ($thirdparty_seller->id == $mysoc->id) {

-                    if (!$thirdparty_buyer->localtax2_assuj)

-                        return 0;

-                }

-                else {

-                    if (!$thirdparty_seller->localtax2_assuj)

-                        return 0;

+                    if (!$thirdparty_buyer->localtax2_assuj) {
+                                            return 0;
+                    }
+                } else {

+                    if (!$thirdparty_seller->localtax2_assuj) {
+                                            return 0;
+                    }
                 }

             }

-        }

-        else {

-            if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-                return 0;

+        } else {

+            if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
         }

 

 // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4617,19 +4813,23 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-        else

-            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code ='" . $vatratecode . "'";
+        }
+        // If we have the code, we use it in priority

+        else {
+                    $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+        }
         AlDolUtils::dol_syslog("get_localtax", LOG_DEBUG);

         $resql = $db->query($sql);

 

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4675,10 +4875,11 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($local == 1)

-                return $obj->localtax1;

-            elseif ($local == 2)

-                return $obj->localtax2;

+            if ($local == 1) {
+                            return $obj->localtax1;
+            } elseif ($local == 2) {
+                            return $obj->localtax2;
+            }
         }

 

         return 0;

@@ -4704,9 +4905,9 @@ 
 // Search local taxes

         $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4719,19 +4920,22 @@ 
               else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-            else

-                return array();

-        } else

-            dol_print_error($db);

+            if ($obj) {
+                            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+            } else {
+                            return array();
+            }
+        } else {
+                    dol_print_error($db);
+        }
 

         return array();

     }

@@ -4761,9 +4965,9 @@ 
 // Search local taxes

         $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-        if ($firstparamisid)

-            $sql .= " WHERE t.rowid = " . (int) $vatrate;

-        else {

+        if ($firstparamisid) {
+                    $sql .= " WHERE t.rowid = " . (int) $vatrate;
+        } else {

             $vatratecleaned = $vatrate;

             $vatratecode = '';

             if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4772,13 +4976,17 @@ 
             }

 

             $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

-            if ($mysoc->country_code == 'ES')

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-            else

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+            if ($mysoc->country_code == 'ES') {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+            }
+            // local tax in spain use the buyer country ??

+            else {
+                            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+            }
             $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-            if ($vatratecode)

-                $sql .= " AND t.code = '" . $vatratecode . "'";

+            if ($vatratecode) {
+                            $sql .= " AND t.code = '" . $vatratecode . "'";
+            }
         }

 

         $resql = $db->query($sql);

@@ -4824,17 +5032,17 @@ 
                 if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                     $product->get_buyprice($idprodfournprice, 0, 0, 0);

                     $ret = $product->vatrate_supplier;

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

-                }

-                else {

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
+                } else {

                     $ret = $product->tva_tx;    // Default vat of product we defined

-                    if ($product->default_vat_code)

-                        $ret .= ' (' . $product->default_vat_code . ')';

+                    if ($product->default_vat_code) {
+                                            $ret .= ' (' . $product->default_vat_code . ')';
+                    }
                 }

                 $found = 1;

-            }

-            else {

+            } else {

 // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

 // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

             }

@@ -4854,14 +5062,18 @@ 
                     $obj = $db->fetch_object($resql);

                     if ($obj) {

                         $ret = $obj->vat_rate;

-                        if ($obj->default_vat_code)

-                            $ret .= ' (' . $obj->default_vat_code . ')';

+                        if ($obj->default_vat_code) {
+                                                    $ret .= ' (' . $obj->default_vat_code . ')';
+                        }
                     }

                     $db->free($sql);

-                } else

-                    dol_print_error($db);

-            } else

-                $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+                } else {
+                                    dol_print_error($db);
+                }
+            } else {
+                            $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+            }
+            // Forced value if autodetect fails

         }

 

         AlDolUtils::dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4916,13 +5128,15 @@ 
             if ($resql) {

                 $obj = $db->fetch_object($resql);

                 if ($obj) {

-                    if ($local == 1)

-                        $ret = $obj->localtax1;

-                    elseif ($local == 2)

-                        $ret = $obj->localtax2;

+                    if ($local == 1) {
+                                            $ret = $obj->localtax1;
+                    } elseif ($local == 2) {
+                                            $ret = $obj->localtax2;
+                    }
                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
         }

 

         AlDolUtils::dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -5025,15 +5239,16 @@ 
         // global $db;

 

         if ($idprodfournprice > 0) {

-            if (!class_exists('ProductFournisseur'))

-                require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            if (!class_exists('ProductFournisseur')) {
+                            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+            }
             $prodprice = new ProductFournisseur($db);

             $prodprice->fetch_product_fournisseur_price($idprodfournprice);

             return $prodprice->fourn_tva_npr;

-        }

-        elseif ($idprod > 0) {

-            if (!class_exists('Product'))

-                require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        } elseif ($idprod > 0) {

+            if (!class_exists('Product')) {
+                            require_once DOL_BASE_PATH . 'product/class/product.class.php';
+            }
             $prod = new Product($db);

             $prod->fetch($idprod);

             return $prod->tva_npr;

@@ -5059,30 +5274,35 @@ 
     {

         // global $mysoc;

 

-        if (!is_object($thirdparty_seller))

-            return -1;

-        if (!is_object($thirdparty_buyer))

-            return -1;

+        if (!is_object($thirdparty_seller)) {
+                    return -1;
+        }
+        if (!is_object($thirdparty_buyer)) {
+                    return -1;
+        }
 

         if ($local == 1) { // Localtax 1

             if ($mysoc->country_code == 'ES') {

-                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

+                if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

 // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                    return 0;

-                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                    return 0;

-            }

-        }

-        elseif ($local == 2) { //I Localtax 2

+                if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
+                if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                                    return 0;
+                }
+            }

+        } elseif ($local == 2) { //I Localtax 2

 // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-                return 0;

+            if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                            return 0;
+            }
         }

 

         if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5107,31 +5327,38 @@ 
         $classname = '';

         if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

             $result = Globals::$langs->trans('yes');

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("Yes");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="1" checked disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("Yes");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="1" checked disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+            }
 

             $classname = 'ok';

-        }

-        elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+        } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

             $result = Globals::$langs->trans("no");

-            if ($case == 1 || $case == 3)

-                $result = Globals::$langs->trans("No");

-            if ($case == 2)

-                $result = '<input type="checkbox" value="0" disabled>';

-            if ($case == 3)

-                $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-            if ($color == 2)

-                $classname = 'ok';

-            else

-                $classname = 'error';

-        }

-        if ($color)

-            return '<font class="' . $classname . '">' . $result . '</font>';

+            if ($case == 1 || $case == 3) {
+                            $result = Globals::$langs->trans("No");
+            }
+            if ($case == 2) {
+                            $result = '<input type="checkbox" value="0" disabled>';
+            }
+            if ($case == 3) {
+                            $result = '<input type="checkbox" value="0" disabled> ' . $result;
+            }
+

+            if ($color == 2) {
+                            $classname = 'ok';
+            } else {
+                            $classname = 'error';
+            }
+        }

+        if ($color) {
+                    return '<font class="' . $classname . '">' . $result . '</font>';
+        }
         return $result;

     }

 

@@ -5157,23 +5384,27 @@ 
         $path = '';

 

         $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

-            $arrayforoldpath[] = 'product';

+        if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+                    $arrayforoldpath[] = 'product';
+        }
         if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

 // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-            if (empty($alpha))

-                $num = preg_replace('/([^0-9])/i', '', $num);

-            else

-                $num = preg_replace('/^.*\-/i', '', $num);

+            if (empty($alpha)) {
+                            $num = preg_replace('/([^0-9])/i', '', $num);
+            } else {
+                            $num = preg_replace('/^.*\-/i', '', $num);
+            }
             $num = substr("000" . $num, -$level);

-            if ($level == 1)

-                $path = substr($num, 0, 1);

-            if ($level == 2)

-                $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-            if ($level == 3)

-                $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        }

-        else {

+            if ($level == 1) {
+                            $path = substr($num, 0, 1);
+            }
+            if ($level == 2) {
+                            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+            if ($level == 3) {
+                            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+            }
+        } else {

 // TODO

 // We will enhance here a common way of forging path for document storage

 // Here, object->id, object->ref and modulepart are required.

@@ -5184,8 +5415,9 @@ 
             }

         }

 

-        if (empty($withoutslash) && !empty($path))

-            $path .= '/';

+        if (empty($withoutslash) && !empty($path)) {
+                    $path .= '/';
+        }
 

         return $path;

     }

@@ -5205,8 +5437,9 @@ 
         AlDolUtils::dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

         $dir_osencoded = dol_osencode($dir);

-        if (@is_dir($dir_osencoded))

-            return 0;

+        if (@is_dir($dir_osencoded)) {
+                    return 0;
+        }
 

         $nberr = 0;

         $nbcreated = 0;

@@ -5221,12 +5454,15 @@ 
         $cdir = explode("/", $dir);

         $num = count($cdir);

         for ($i = 0; $i < $num; $i++) {

-            if ($i > 0)

-                $ccdir .= '/' . $cdir[$i];

-            else

-                $ccdir .= $cdir[$i];

-            if (preg_match("/^.:$/", $ccdir, $regs))

-                continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+            if ($i > 0) {
+                            $ccdir .= '/' . $cdir[$i];
+            } else {
+                            $ccdir .= $cdir[$i];
+            }
+            if (preg_match("/^.:$/", $ccdir, $regs)) {
+                            continue;
+            }
+            // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5337,8 +5573,9 @@ 
      */

     static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

     {

-        if ($removelinefeed == 2)

-            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+        if ($removelinefeed == 2) {
+                    $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+        }
         $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

         if ($strip_tags) {

@@ -5355,8 +5592,9 @@ 
         $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

 // Supprime aussi les retours

-        if ($removelinefeed == 1)

-            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+        if ($removelinefeed == 1) {
+                    $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+        }
 

 // et les espaces doubles

         while (strpos($temp, "  ")) {

@@ -5442,18 +5680,21 @@ 
             if ($charset == 'UTF-8') {

                 $pattern = '/(<br[^>]*>)/Uu';

             } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-            else

-                $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            else {
+                            $pattern = '/(<br[^>]*>)/U';
+            }
+            // /U is to have UNGREEDY regex to limit to one html tag.

             $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

             $firstline = '';

             $i = 0;

             $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

             while (($i < $nba) && ($i < ($nboflines * 2))) {

-                if ($i % 2 == 0)

-                    $firstline .= $a[$i];

-                elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                    $firstline .= ($ishtml ? "<br>\n" : "\n");

+                if ($i % 2 == 0) {
+                                    $firstline .= $a[$i];
+                } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                                    $firstline .= ($ishtml ? "<br>\n" : "\n");
+                }
                 $i++;

             }

             unset($a);

@@ -5502,15 +5743,18 @@ 
         $newstring = $stringtoencode;

         if (AlDolUtils::dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

             $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-            if ($removelasteolbr)

-                $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/<br>$/i', '', $newstring);
+            }
+            // Remove last <br> (remove only last one)

             $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

             $newstring = AlDolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

             $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-        }

-        else {

-            if ($removelasteolbr)

-                $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+        } else {

+            if ($removelasteolbr) {
+                            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+            }
+            // Remove last \n (may remove several)

             $newstring = dol_nl2br(AlDolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

         }

 // Other substitutions that htmlentities does not do

@@ -5612,8 +5856,9 @@ 
      */

     static function dol_nboflines($s, $maxchar = 0)

     {

-        if ($s == '')

-            return 0;

+        if ($s == '') {
+                    return 0;
+        }
         $arraystring = explode("\n", $s);

         $nb = count($arraystring);

 

@@ -5632,15 +5877,18 @@ 
     static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

     {

         $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-        if (AlDolUtils::dol_textishtml($text))

-            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+        if (AlDolUtils::dol_textishtml($text)) {
+                    $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+        }
 

         $text = strtr($text, $repTable);

         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $nblines = (int) floor((count($a) + 1) / 2);

@@ -5687,39 +5935,47 @@ 
     static function dol_textishtml($msg, $option = 0)

     {

         if ($option == 1) {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<br/i', $msg))

-                return true;

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br/i', $msg)) {
+                            return true;
+            }
             return false;

-        }

-        else {

-            if (preg_match('/<html/i', $msg))

-                return true;

-            elseif (preg_match('/<body/i', $msg))

-                return true;

-            elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-                return true;

-            elseif (preg_match('/<br\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-                return true;

-            elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-                return true;

-            elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-                return true; // must accept <img src="http://example.com/aaa.png" />

-            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-                return true; // must accept <a href="http://example.com/aaa.png" />

-            elseif (preg_match('/<h[0-9]>/i', $msg))

-                return true;

-            elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-                return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-            elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-                return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+        } else {

+            if (preg_match('/<html/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<body/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<br\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <img src="http://example.com/aaa.png" />

+            elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                            return true;
+            }
+            // must accept <a href="http://example.com/aaa.png" />

+            elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                            return true;
+            } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                            return true;
+            }
+            // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+            elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                            return true;
+            }
+            // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

             return false;

         }

@@ -5871,12 +6127,14 @@ 
                 $birthday = AlDolUtils::dol_print_date($object->birth, 'day');

 

                 $substitutionarray['__MEMBER_ID__'] = $object->id;

-                if (method_exists($object, 'getCivilityLabel'))

-                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+                if (method_exists($object, 'getCivilityLabel')) {
+                                    $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+                }
                 $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->firstname) : $object->firstname;

                 $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->lastname) : $object->lastname;

-                if (method_exists($object, 'getFullName'))

-                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+                if (method_exists($object, 'getFullName')) {
+                                    $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+                }
                 $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->societe) : $object->societe;

                 $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->address) : $object->address;

                 $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? AlDolUtils::dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5924,10 +6182,12 @@ 
                     $dateplannedstart = '';

                     $datenextexpiration = '';

                     foreach ($object->lines as $line) {

-                        if ($line->date_ouverture_prevue > $dateplannedstart)

-                            $dateplannedstart = $line->date_ouverture_prevue;

-                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                            $datenextexpiration = $line->date_fin_prevue;

+                        if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                                    $dateplannedstart = $line->date_ouverture_prevue;
+                        }
+                        if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                                    $datenextexpiration = $line->date_fin_prevue;
+                        }
                     }

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = AlDolUtils::dol_print_date($dateplannedstart, 'dayrfc');

                     $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = AlDolUtils::dol_print_date($dateplannedstart, 'standard');

@@ -5937,8 +6197,9 @@ 
 

 // Create dynamic tags for __EXTRAFIELD_FIELD__

                 if ($object->table_element && $object->id > 0) {

-                    if (!is_object($extrafields))

-                        $extrafields = new ExtraFields($db);

+                    if (!is_object($extrafields)) {
+                                            $extrafields = new ExtraFields($db);
+                    }
                     $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                     if ($object->fetch_optionals() > 0) {

@@ -5959,12 +6220,15 @@ 
                     require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                     $outputlangs->loadLangs(array('paypal', 'other'));

                     $typeforonlinepayment = 'free';

-                    if (is_object($object) && $object->element == 'commande')

-                        $typeforonlinepayment = 'order';

-                    if (is_object($object) && $object->element == 'facture')

-                        $typeforonlinepayment = 'invoice';

-                    if (is_object($object) && $object->element == 'member')

-                        $typeforonlinepayment = 'member';

+                    if (is_object($object) && $object->element == 'commande') {
+                                            $typeforonlinepayment = 'order';
+                    }
+                    if (is_object($object) && $object->element == 'facture') {
+                                            $typeforonlinepayment = 'invoice';
+                    }
+                    if (is_object($object) && $object->element == 'member') {
+                                            $typeforonlinepayment = 'member';
+                    }
                     $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                     $paymenturl = $url;

                 }

@@ -5974,16 +6238,19 @@ 
 

                 if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+                }
                 if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+                }
                 if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                     $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-                } else

-                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+                } else {
+                                    $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+                }
             }

         }

         if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5993,18 +6260,22 @@ 
             $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

             $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

             $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+            }
 

             $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

             $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(1))

-                $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

-            if ($onlykey != 2 || $mysoc->useLocalTax(2))

-                $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';

+            if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
+            if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : '';
+            }
 

 // TODO Add keys for foreign multicurrency

 // For backward compatibility

@@ -6074,23 +6345,27 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if (!is_array($substitutionarray))

-            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+        if (!is_array($substitutionarray)) {
+                    return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+        }
 

-        if (empty($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (empty($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

 // Make substitution for language keys

         if (is_object($outputlangs)) {

             while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

                 $msgishtml = 0;

-                if (AlDolUtils::dol_textishtml($text, 1))

-                    $msgishtml = 1;

+                if (AlDolUtils::dol_textishtml($text, 1)) {
+                                    $msgishtml = 1;
+                }
 

 // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

                 $tmp = explode('|', $reg[1]);

-                if (!empty($tmp[1]))

-                    $outputlangs->load($tmp[1]);

+                if (!empty($tmp[1])) {
+                                    $outputlangs->load($tmp[1]);
+                }
 

                 $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

             }

@@ -6100,23 +6375,29 @@ 
 // it is also converted.

         while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

             $msgishtml = 0;

-            if (AlDolUtils::dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (AlDolUtils::dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             $keyfound = $reg[1];

-            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-                $newval = '*****forbidden*****';

-            else

-                $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;

+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                            $newval = '*****forbidden*****';
+            } else {
+                            $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound;
+            }
             $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? AlDolUtils::dol_htmlentitiesbr($newval) : $newval, $text);

         }

 

 // Make substitition for array $substitutionarray

         foreach ($substitutionarray as $key => $value) {

-            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = '';  // Protection

-            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-                $value = ''; // Protection

+            if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

+            if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                            $value = '';
+            }
+            // Protection

 

             $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

         }

@@ -6162,8 +6443,9 @@ 
             $dir = dol_buildpath($reldir, 0);

 

 // Check if directory exists

-            if (!dol_is_dir($dir))

-                continue;

+            if (!dol_is_dir($dir)) {
+                            continue;
+            }
 

             $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

             foreach ($substitfiles as $substitfile) {

@@ -6175,8 +6457,9 @@ 
                     require_once $dir . $substitfile['name'];

                     // Call the user's function, and only if it is defined

                     $function_name = $module . "_" . $callfunc;

-                    if (function_exists($function_name))

-                        $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                    if (function_exists($function_name)) {
+                                            $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                    }
                 }

             }

         }

@@ -6212,8 +6495,9 @@ 
 

         $out = '';

 

-        if (!is_object($outputlangs))

-            $outputlangs = Globals::$langs;

+        if (!is_object($outputlangs)) {
+                    $outputlangs = Globals::$langs;
+        }
 

         if ($date_start && $date_end) {

             $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', AlDolUtils::dol_print_date($date_start, $format, false, $outputlangs), AlDolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6242,20 +6526,22 @@ 
 

         $ret = '';

 // If order not defined, we use the setup

-        if ($nameorder < 0)

-            $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+        if ($nameorder < 0) {
+                    $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+        }
         if ($nameorder && ((string) $nameorder != '2')) {

             $ret .= $firstname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $lastname;

-        }

-        else if ($nameorder == 2) {

+        } else if ($nameorder == 2) {

             $ret .= $firstname;

         } else {

             $ret .= $lastname;

-            if ($firstname && $lastname)

-                $ret .= ' ';

+            if ($firstname && $lastname) {
+                            $ret .= ' ';
+            }
             $ret .= $firstname;

         }

         return $ret;

@@ -6275,13 +6561,14 @@ 
     {

 //DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

         if (!is_array($mesgs)) {  // If mesgs is a string

-            if ($mesgs)

-                $_SESSION['dol_events'][$style][] = $mesgs;

-        }

-        else {      // If mesgs is an array

+            if ($mesgs) {
+                            $_SESSION['dol_events'][$style][] = $mesgs;
+            }
+        } else {      // If mesgs is an array

             foreach ($mesgs as $mesg) {

-                if ($mesg)

-                    $_SESSION['dol_events'][$style][] = $mesg;

+                if ($mesg) {
+                                    $_SESSION['dol_events'][$style][] = $mesg;
+                }
             }

         }

     }

@@ -6301,13 +6588,16 @@ 
         if (empty($mesg) && empty($mesgs)) {

             AlDolUtils::dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

         } else {

-            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-                dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-            if (empty($mesgs))

-                setEventMessage($mesg, $style);

-            else {

-                if (!empty($mesg) && !in_array($mesg, $mesgs))

-                    setEventMessage($mesg, $style); // Add message string if not already into array

+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+            }
+            if (empty($mesgs)) {
+                            setEventMessage($mesg, $style);
+            } else {

+                if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                                    setEventMessage($mesg, $style);
+                }
+                // Add message string if not already into array

                 setEventMessage($mesgs, $style);

             }

         }

@@ -6326,22 +6616,25 @@ 
     {

 // Show mesgs

         if (isset($_SESSION['dol_events']['mesgs'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+            }
             unset($_SESSION['dol_events']['mesgs']);

         }

 

 // Show errors

         if (isset($_SESSION['dol_events']['errors'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+            }
             unset($_SESSION['dol_events']['errors']);

         }

 

 // Show warnings

         if (isset($_SESSION['dol_events']['warnings'])) {

-            if (empty($disabledoutputofmessages))

-                dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+            if (empty($disabledoutputofmessages)) {
+                            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+            }
             unset($_SESSION['dol_events']['warnings']);

         }

     }

@@ -6382,8 +6675,9 @@ 
                 foreach ($mesgarray as $message) {

                     $ret++;

                     $out .= Globals::$langs->trans($message);

-                    if ($ret < count($mesgarray))

-                        $out .= "<br>\n";

+                    if ($ret < count($mesgarray)) {
+                                            $out .= "<br>\n";
+                    }
                 }

             }

             if ($mesgstring) {

@@ -6449,8 +6743,9 @@ 
      */

     static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

     {

-        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-            return;

+        if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+                    return;
+        }
 

         $iserror = 0;

         $iswarning = 0;

@@ -6465,14 +6760,17 @@ 
                     break;

                 }

             }

-        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-            $iserror++;

-        else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-            $iswarning++;

-        if ($style == 'error')

-            $iserror++;

-        if ($style == 'warning')

-            $iswarning++;

+        } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+                    $iserror++;
+        } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+                    $iswarning++;
+        }
+        if ($style == 'error') {
+                    $iserror++;
+        }
+        if ($style == 'warning') {
+                    $iswarning++;
+        }
 

         if ($iserror || $iswarning) {

 // Remove div from texts

@@ -6491,8 +6789,9 @@ 
                 $mesgarray = $newmesgarray;

             }

             print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-        } else

-            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

+        } else {
+                    print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+        }
     }

 

     /**

@@ -6533,15 +6832,17 @@ 
             $sizearray = count($array);

             if ($sizearray > 0) {

                 $temp = array();

-                foreach (array_keys($array) as $key)

-                    $temp[$key] = $array[$key][$index];

+                foreach (array_keys($array) as $key) {
+                                    $temp[$key] = $array[$key][$index];
+                }
 

-                if (!$natsort)

-                    ($order == 'asc') ? asort($temp) : arsort($temp);

-                else {

+                if (!$natsort) {
+                                    ($order == 'asc') ? asort($temp) : arsort($temp);
+                } else {

                     ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                    if ($order != 'asc')

-                        $temp = array_reverse($temp, true);

+                    if ($order != 'asc') {
+                                            $temp = array_reverse($temp, true);
+                    }
                 }

 

                 $sorted = array();

@@ -6567,23 +6868,38 @@ 
         // We must use here a binary strlen static function (so not AlDolUtils::dol_strlen)

         $strLength = AlDolUtils::dol_strlen($str);

         for ($i = 0; $i < $strLength; $i++) {

-            if (ord($str[$i]) < 0x80)

-                continue; // 0bbbbbbb

-            elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-                $n = 1; // 110bbbbb

-            elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-                $n = 2; // 1110bbbb

-            elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-                $n = 3; // 11110bbb

-            elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-                $n = 4; // 111110bb

-            elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-                $n = 5; // 1111110b

-            else

-                return false; // Does not match any model

+            if (ord($str[$i]) < 0x80) {
+                            continue;
+            }
+            // 0bbbbbbb

+            elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                            $n = 1;
+            }
+            // 110bbbbb

+            elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                            $n = 2;
+            }
+            // 1110bbbb

+            elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                            $n = 3;
+            }
+            // 11110bbb

+            elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                            $n = 4;
+            }
+            // 111110bb

+            elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                            $n = 5;
+            }
+            // 1111110b

+            else {
+                            return false;
+            }
+            // Does not match any model

             for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                    return false;

+                if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                                    return false;
+                }
             }

         }

         return true;

@@ -6601,15 +6917,21 @@ 
         // global Globals::$conf;

 

         $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-        if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-            $tmp = 'iso-8859-1'; // By default for windows

-        if (empty($tmp))

-            $tmp = 'utf-8';          // By default for other

-        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING))

-            $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;

-

-        if ($tmp == 'iso-8859-1')

-            return utf8_decode($str);

+        if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+                    $tmp = 'iso-8859-1';
+        }
+        // By default for windows

+        if (empty($tmp)) {
+                    $tmp = 'utf-8';
+        }
+        // By default for other

+        if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) {
+                    $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING;
+        }
+

+        if ($tmp == 'iso-8859-1') {
+                    return utf8_decode($str);
+        }
         return $str;

     }

 

@@ -6630,8 +6952,9 @@ 
     {

         // global $cache_codes;

 // If key empty

-        if ($key == '')

-            return '';

+        if ($key == '') {
+                    return '';
+        }
 

 // Check in cache

         if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6643,20 +6966,21 @@ 
         $sql = "SELECT " . $fieldid . " as valuetoget";

         $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

         $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-        if (!empty($entityfilter))

-            $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+        if (!empty($entityfilter)) {
+                    $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+        }
 

         $resql = $db->query($sql);

         if ($resql) {

             $obj = $db->fetch_object($resql);

-            if ($obj)

-                $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-            else

-                $cache_codes[$tablename][$key][$fieldid] = '';

+            if ($obj) {
+                            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+            } else {
+                            $cache_codes[$tablename][$key][$fieldid] = '';
+            }
             $db->free($resql);

             return $cache_codes[$tablename][$key][$fieldid];

-        }

-        else {

+        } else {

             return -1;

         }

     }

@@ -6702,16 +7026,17 @@ 
         // global $soc;       // For backward compatibility

 //print $s."<br>\n";

         if ($returnvalue) {

-            if ($hideerrors)

-                return @eval('return ' . $s . ';');

-            else

-                return eval('return ' . $s . ';');

-        }

-        else {

-            if ($hideerrors)

-                @eval($s);

-            else

-                eval($s);

+            if ($hideerrors) {
+                            return @eval('return ' . $s . ';');
+            } else {
+                            return eval('return ' . $s . ';');
+            }
+        } else {

+            if ($hideerrors) {
+                            @eval($s);
+            } else {
+                            eval($s);
+            }
         }

     }

 

@@ -6737,8 +7062,9 @@ 
     {

         // global Globals::$langs;

 

-        if (empty($codelang))

-            return '';

+        if (empty($codelang)) {
+                    return '';
+        }
 

         if ($codelang == 'auto') {

             return '<span class="fa fa-globe"></span>';

@@ -6752,9 +7078,9 @@ 
             'sv_SV' => 'se'

         );

 

-        if (isset($langtocountryflag[$codelang]))

-            $flagImage = $langtocountryflag[$codelang];

-        else {

+        if (isset($langtocountryflag[$codelang])) {
+                    $flagImage = $langtocountryflag[$codelang];
+        } else {

             $tmparray = explode('_', $codelang);

             $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

         }

@@ -6772,15 +7098,20 @@ 
     {

         // global $mysoc;

 

-        if (strtoupper($countrycode) == 'MQ')

-            return 'fr_CA';

-        if (strtoupper($countrycode) == 'SE')

-            return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+        if (strtoupper($countrycode) == 'MQ') {
+                    return 'fr_CA';
+        }
+        if (strtoupper($countrycode) == 'SE') {
+                    return 'sv_SE';
+        }
+        // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

         if (strtoupper($countrycode) == 'CH') {

-            if ($mysoc->country_code == 'FR')

-                return 'fr_CH';

-            if ($mysoc->country_code == 'DE')

-                return 'de_CH';

+            if ($mysoc->country_code == 'FR') {
+                            return 'fr_CH';
+            }
+            if ($mysoc->country_code == 'DE') {
+                            return 'de_CH';
+            }
         }

 

 // Locale list taken from:

@@ -6958,8 +7289,9 @@ 
         );

 

         $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-        if (in_array($buildprimarykeytotest, $locales))

-            return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        if (in_array($buildprimarykeytotest, $locales)) {
+                    return strtolower($countrycode) . '_' . strtoupper($countrycode);
+        }
 

         foreach ($locales as $locale) {

             $locale_language = locale_get_primary_language($locale);

@@ -7013,18 +7345,21 @@ 
 

                 if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                     if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                        if ($values[0] != $type)

-                            continue;

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
 

                         if (verifCond($values[4])) {

-                            if ($values[3])

-                                Globals::$langs->load($values[3]);

+                            if ($values[3]) {
+                                                            Globals::$langs->load($values[3]);
+                            }
                             if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                                 $substitutionarray = array();

                                 complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                                 $label = make_substitutions($reg[1], $substitutionarray);

-                            } else

-                                $label = Globals::$langs->trans($values[2]);

+                            } else {
+                                                            $label = Globals::$langs->trans($values[2]);
+                            }
 

                             //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                             $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -7032,30 +7367,32 @@ 
                             $head[$h][2] = str_replace('+', '', $values[1]);

                             $h++;

                         }

-                    }

-                    else if (count($values) == 5) {       // deprecated

+                    } else if (count($values) == 5) {       // deprecated

                         AlDolUtils::dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                        if ($values[0] != $type)

-                            continue;

-                        if ($values[3])

-                            Globals::$langs->load($values[3]);

+                        if ($values[0] != $type) {
+                                                    continue;
+                        }
+                        if ($values[3]) {
+                                                    Globals::$langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = Globals::$langs->trans($values[2]);

+                        } else {
+                                                    $label = Globals::$langs->trans($values[2]);
+                        }
 

                         $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                    if ($values[0] != $type)

-                        continue;

+                } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
                     $tabname = str_replace('-', '', $values[1]);

                     foreach ($head as $key => $val) {

                         $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -7097,10 +7434,11 @@ 
         // global $action;

         // global $micro_start_time;

 

-        if ($zone == 'private')

-            print "\n" . '<!-- Common footer for private page -->' . "\n";

-        else

-            print "\n" . '<!-- Common footer for public page -->' . "\n";

+        if ($zone == 'private') {
+                    print "\n" . '<!-- Common footer for private page -->' . "\n";
+        } else {
+                    print "\n" . '<!-- Common footer for public page -->' . "\n";
+        }
 

 // A div to store page_y POST parameter so we can read it using javascript

         print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7109,8 +7447,9 @@ 
         $parameters = array();

         $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

         if (empty($reshook)) {

-            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER))

-                print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";

+            if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) {
+                            print Globals::$conf->global->MAIN_HTML_FOOTER . "\n";
+            }
 

             print "\n";

             if (!empty(Globals::$conf->use_javascript_ajax)) {

@@ -7133,8 +7472,9 @@ 
                     print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                     $relativepathstring = $_SERVER["PHP_SELF"];

                     // Clean $relativepathstring

-                    if (constant('DOL_BASE_URI'))

-                        $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);

+                    if (constant('DOL_BASE_URI')) {
+                                            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+                    }
                     $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                     $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7145,14 +7485,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7171,14 +7514,17 @@ 
                                 $tmpqueryarraytohave = explode('&', $defkey);

                                 $foundintru = 0;

                                 foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                        $foundintru = 1;

+                                    if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                            $foundintru = 1;
+                                    }
                                 }

-                                if (!$foundintru)

-                                    $qualified = 1;

+                                if (!$foundintru) {
+                                                                    $qualified = 1;
+                                }
                                 //var_dump($defkey.'-'.$qualified);

-                            } else

-                                $qualified = 1;

+                            } else {
+                                                            $qualified = 1;
+                            }
 

                             if ($qualified) {

                                 foreach ($defval as $paramkey => $paramval) {

@@ -7217,8 +7563,9 @@ 
                     print "\n";

                     print "/* JS CODE TO ENABLE to add memory info */\n";

                     print 'window.console && console.log("';

-                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER))

-                        print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';

+                    if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) {
+                                            print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - ';
+                    }
                     print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                     if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable.

                         $micro_end_time = microtime(true);

@@ -7348,8 +7695,9 @@ 
 

         $crits = explode(' ', $value);

         $res = '';

-        if (!is_array($fields))

-            $fields = array($fields);

+        if (!is_array($fields)) {
+                    $fields = array($fields);
+        }
 

         $nboffields = count($fields);

         $end2 = count($crits);

@@ -7412,8 +7760,9 @@ 
                     $tmpcrits = explode('|', $crit);

                     $i3 = 0;

                     foreach ($tmpcrits as $tmpcrit) {

-                        if (empty($tmpcrit))

-                            continue;

+                        if (empty($tmpcrit)) {
+                                                    continue;
+                        }
 

                         $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7449,8 +7798,9 @@ 
                 }

                 $i++;

             }

-            if ($newres)

-                $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            if ($newres) {
+                            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+            }
             $j++;

         }

         $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7490,29 +7840,37 @@ 
     static function getImageFileNameForSize($file, $extName, $extImgTarget = '')

     {

         $dirName = dirname($file);

-        if ($dirName == '.')

-            $dirName = '';

+        if ($dirName == '.') {
+                    $dirName = '';
+        }
 

         $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

         $fileName = basename($fileName);

 

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-        if (empty($extImgTarget))

-            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-        if (!$extImgTarget)

-            return $file;

+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+        }
+        if (empty($extImgTarget)) {
+                    $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+        }
+

+        if (!$extImgTarget) {
+                    return $file;
+        }
 

         $subdir = '';

-        if ($extName)

-            $subdir = 'thumbs/';

+        if ($extName) {
+                    $subdir = 'thumbs/';
+        }
 

         return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

     }

@@ -7530,8 +7888,9 @@ 
     {

         // global Globals::$conf, Globals::$langs;

 

-        if (empty(Globals::$conf->use_javascript_ajax))

-            return '';

+        if (empty(Globals::$conf->use_javascript_ajax)) {
+                    return '';
+        }
 

         $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

 //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7539,17 +7898,19 @@ 
         $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

         if ($alldata == 1) {

-            if ($num_mime !== false)

-                return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-            else

-                return array();

+            if ($num_mime !== false) {
+                            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+            } else {
+                            return array();
+            }
         }

 

 // old behavior

-        if ($num_mime !== false)

-            return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';

-        else

-            return '';

+        if ($num_mime !== false) {
+                    return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')';
+        } else {
+                    return '';
+        }
     }

 

     /**

@@ -7567,8 +7928,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-        if ($addlink)

-            $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';

+        if ($addlink) {
+                    $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>';
+        }
         return $out;

     }

 

@@ -7950,8 +8312,9 @@ 
         if (!isset($dictvalues[$tablename])) {

             $dictvalues[$tablename] = array();

             $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-            if ($checkentity)

-                $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            if ($checkentity) {
+                            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+            }
 

             $resql = $db->query($sql);

             if ($resql) {

@@ -7963,11 +8326,14 @@ 
             }

         }

 

-        if (!empty($dictvalues[$tablename][$id]))

-            return $dictvalues[$tablename][$id]->{$field}; // Found

+        if (!empty($dictvalues[$tablename][$id])) {
+                    return $dictvalues[$tablename][$id]->{$field};
+        }
+        // Found

         else { // Not found

-            if ($id > 0)

-                return $id;

+            if ($id > 0) {
+                            return $id;
+            }
             return '';

         }

     }

@@ -7997,8 +8363,9 @@ 
                 $b = hexdec($hexb);

             }

             $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-            if ($bright > 0.6)

-                $res = 1;

+            if ($bright > 0.6) {
+                            $res = 1;
+            }
         }

         return $res;

     }

@@ -8016,8 +8383,10 @@ 
         // global Globals::$conf;

 //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

 //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-        if (empty($menuentry['enabled']))

-            return 0; // Entry disabled by condition

+        if (empty($menuentry['enabled'])) {
+                    return 0;
+        }
+        // Entry disabled by condition

         if ($type_user && $menuentry['module']) {

             $tmploops = explode('|', $menuentry['module']);

             $found = 0;

@@ -8027,15 +8396,23 @@ 
                     break;

                 }

             }

-            if (!$found)

-                return 0; // Entry is for menus all excluded to external users

-        }

-        if (!$menuentry['perms'] && $type_user)

-            return 0;            // No permissions and user is external

-        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-            return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-        if (!$menuentry['perms'])

-            return 2;               // No permissions and user is external

+            if (!$found) {
+                            return 0;
+            }
+            // Entry is for menus all excluded to external users

+        }

+        if (!$menuentry['perms'] && $type_user) {
+                    return 0;
+        }
+        // No permissions and user is external

+        if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+                    return 0;
+        }
+        // No permissions and option to hide when not allowed, even for internal user, is on

+        if (!$menuentry['perms']) {
+                    return 2;
+        }
+        // No permissions and user is external

         return 1;

     }

 

Helpers/login/functions_dolibarr.php

Spacing +10 added lines, -10 removed lines

@@ -25,23 +25,23 @@ 
     $login = '';

 

     if (!empty($usertotest)) {

-        AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=" . $usertotest . " passwordtotest=" . preg_replace('/./', '*', $passwordtotest) . " entitytotest=" . $entitytotest);

+        AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);

 

         // If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko

-        $table = MAIN_DB_PREFIX . "user";

+        $table = MAIN_DB_PREFIX."user";

         $usernamecol1 = 'login';

         $usernamecol2 = 'email';

         $entitycol = 'entity';

 

         $sql = 'SELECT rowid, login, entity, pass, pass_crypted';

-        $sql .= ' FROM ' . $table;

+        $sql .= ' FROM '.$table;

         //$sql .= ' WHERE (' . $usernamecol1 . " = '" . $db->escape($usertotest) . "'";

-        $sql .= ' WHERE (' . $usernamecol1 . " = '" . $usertotest . "'";

+        $sql .= ' WHERE ('.$usernamecol1." = '".$usertotest."'";

         if (preg_match('/@/', $usertotest)) {

             // $sql .= ' OR ' . $usernamecol2 . " = '" . $db->escape($usertotest) . "'";

-            $sql .= ' OR ' . $usernamecol2 . " = '" . $usertotest . "'";

+            $sql .= ' OR '.$usernamecol2." = '".$usertotest."'";

         }

-        $sql .= ') AND ' . $entitycol . " IN (0," . ($entity ? $entity : 1) . ")";

+        $sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";

         $sql .= ' AND statut = 1';

         // Required to first found the user into entity, then the superadmin.

         // For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.

@@ -71,7 +71,7 @@ 
             if ($cryptType == 'md5') {

                 if (AlSecurity::dol_verifyHash($passtyped, $passcrypted)) {

                     $passok = true;

-                    AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - " . $cryptType . " of pass is ok");

+                    AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");

                 }

             }

 

@@ -87,15 +87,15 @@ 
             if ($passok) {

                 $login = $user['login'];

             } else {

-                DolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '" . $usertotest . "'");

-                sleep(2);      // Anti brut force protection

+                DolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");

+                sleep(2); // Anti brut force protection

                 // Load translation files required by the page

                 Globals::$langs->loadLangs(array('main', 'errors'));

 

                 $_SESSION["dol_loginmesg"] = Globals::$langs->trans("ErrorBadLoginPassword");

             }

         } else {

-            AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '" . $usertotest . "'");

+            AlDolUtils::dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");

             sleep(1);

 

             // Load translation files required by the page