alxarafe / alixar

Dolibarr/Modules/Install/Controller/InstallController.php

Spacing +20 added lines, -20 removed lines

@@ -428,7 +428,7 @@ 
                             print '<span class="error">A ' . $conffiletoshow . ' file exists with a dolibarr_main_document_root to ' . $dolibarr_main_document_root . ' that seems wrong. Try to fix or remove the ' . $conffiletoshow . ' file.</span><br>' . "\n";
                             dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING);
                         } else {
-                            require_once $dolibarr_main_document_root . '/../Dolibarr/Lib/Admin.php';;
+                            require_once $dolibarr_main_document_root . '/../Dolibarr/Lib/Admin.php'; ;
 
                             // If password is encoded, we decode it
                             if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
@@ -545,7 +545,7 @@ 
                     $allowupgrade = true;
                 }
 
-                $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/";   // We use mysql migration scripts whatever is database driver
+                $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver
                 dolibarr_install_syslog("Scan sql files for migration files in " . $dir);
 
                 // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
@@ -2040,67 +2040,67 @@ 
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_FPDF_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_FPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_FPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_FPDF_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_TCPDF_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_TCPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_TCPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_TCPDF_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_FPDI_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_FPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_FPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_FPDI_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_TCPDI_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_TCPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_TCPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_TCPDI_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_GEOIP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_GEOIP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_GEOIP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_GEOIP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_NUSOAP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_NUSOAP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_NUSOAP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_ODTPHP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_ODTPHP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_ODTPHP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_CKEDITOR)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_CKEDITOR = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_CKEDITOR = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_CKEDITOR=\'' . dol_escape_php($force_dolibarr_js_CKEDITOR, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_JQUERY)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_JQUERY = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_JQUERY = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_JQUERY=\'' . dol_escape_php($force_dolibarr_js_JQUERY, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_JQUERY_UI)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_JQUERY_UI = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_JQUERY_UI = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_JQUERY_UI=\'' . dol_escape_php($force_dolibarr_js_JQUERY_UI, 1) . '\';');
                     fwrite($fp, "\n");
@@ -2109,13 +2109,13 @@ 
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_font_DOL_DEFAULT_TTF = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_font_DOL_DEFAULT_TTF = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\'' . dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\'' . dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1) . '\';');
                     fwrite($fp, "\n");
@@ -2435,9 +2435,9 @@ 
 // Only works if you are not in safe_mode. / 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(1800);   // Need 1800 on some very slow OS like Windows 7/64
+        @set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
         error_reporting($err);
 
         $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
@@ -2991,7 +2991,7 @@ 
 
         $conf->file->instance_unique_id = (empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id); // Unique id of instance
 
-        $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+        $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
         $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"' . ((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"') . '> ';
         $out .= '<label for="dolibarrpingno">' . $langs->trans("MakeAnonymousPing") . '</label>';
@@ -3325,8 +3325,8 @@ 
                     $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_PASSWORD_GENERATED = '';    // To not use any rule for password validation
+                    $conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+                    $conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
                     $result = $newuser->create($createuser, 1);
                     if ($result > 0) {

Dolibarr/Modules/Ai/Controller/AiAdminController.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
 // Load Dolibarr environment
 require BASE_PATH . '/main.inc.php';
 require_once BASE_PATH . '/ai/lib/ai.lib.php';
-require_once BASE_PATH . '/../Dolibarr/Lib/Admin.php';;
+require_once BASE_PATH . '/../Dolibarr/Lib/Admin.php'; ;
 
 use DoliCore\Base\DolibarrController;
 use DoliCore\Form\Form;
@@ -75,7 +75,7 @@ 
 // Parameters
         $action = GETPOST('action', 'aZ09');
         $backtopage = GETPOST('backtopage', 'alpha');
-        $modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+        $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
         if (empty($action)) {
             $action = 'edit';
@@ -113,7 +113,7 @@ 
             $item->defaultFieldValue = '';
             $item->cssClass = 'minwidth500';*/
 
-            $item = $formSetup->newItem('AI_API_' . strtoupper($ia) . '_KEY');  // Name of constant must end with _KEY so it is encrypted when saved into database.
+            $item = $formSetup->newItem('AI_API_' . strtoupper($ia) . '_KEY'); // Name of constant must end with _KEY so it is encrypted when saved into database.
             $item->defaultFieldValue = '';
             $item->cssClass = 'minwidth500';
         }
@@ -161,7 +161,7 @@ 
 // Parameters
         $action = GETPOST('action', 'aZ09');
         $backtopage = GETPOST('backtopage', 'alpha');
-        $modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+        $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
         if (empty($action)) {
             $action = 'edit';

Dolibarr/Modules/BookCal/Views/availabilities_list.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');   // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -380,7 +380,7 @@ 
     } elseif (in_array($val['type'], ['double(24,8)', 'double(6,3)', 'integer', 'real', 'price']) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
         $cssforfield .= ($cssforfield ? ' ' : '') . 'right';
     }
-    $cssforfield = preg_replace('/small\s*/', '', $cssforfield);    // the 'small' css must not be used for the title label
+    $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
     if (!empty($arrayfields['t.' . $key]['checked'])) {
         print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n";
         $totalarray['nbfield']++;

Dolibarr/Modules/BookCal/Views/calendar_list.php

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');   // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : [];
 
@@ -365,7 +365,7 @@ 
     } elseif (in_array($val['type'], ['double(24,8)', 'double(6,3)', 'integer', 'real', 'price']) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
         $cssforfield .= ($cssforfield ? ' ' : '') . 'right';
     }
-    $cssforfield = preg_replace('/small\s*/', '', $cssforfield);    // the 'small' css must not be used for the title label
+    $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
     if (!empty($arrayfields['t.' . $key]['checked'])) {
         print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n";
         $totalarray['nbfield']++;

Dolibarr/Modules/BookCal/Controller/BookCalCalendarListController.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
         $object = new Calendar($db);
         $extrafields = new ExtraFields($db);
         $diroutputmassaction = $conf->bookcal->dir_output . '/temp/massgeneration/' . $user->id;
-        $hookmanager->initHooks([$contextpage]);   // Note that conf->hooks_modules contains array of activated contexes
+        $hookmanager->initHooks([$contextpage]); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
         $extrafields->fetch_name_optionals_label($object->table_element);
@@ -103,7 +103,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
         if (!$sortfield) {
-            reset($object->fields);                 // Reset is required to avoid key() to return null.
+            reset($object->fields); // Reset is required to avoid key() to return null.
             $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition.
         }
         if (!$sortorder) {

Dolibarr/Modules/BookCal/Controller/BookCalAdminSetupController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 // Parameters
         $action = GETPOST('action', 'aZ09');
         $backtopage = GETPOST('backtopage', 'alpha');
-        $modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+        $modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
         $value = GETPOST('value', 'alpha');
         $label = GETPOST('label', 'alpha');

Dolibarr/Modules/BookCal/Controller/BookCalAvailabilitiesListController.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 
 // Default sort order (if not yet defined by previous GETPOST)
         if (!$sortfield) {
-            reset($object->fields);                 // Reset is required to avoid key() to return null.
+            reset($object->fields); // Reset is required to avoid key() to return null.
             $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition.
         }
         if (!$sortorder) {

Dolibarr/Modules/BookCal/Controller/BookCalCalendarCardController.php

Spacing +1 added lines, -1 removed lines

@@ -1838,7 +1838,7 @@
         $confirm = GETPOST('confirm', 'alpha');
         $cancel = GETPOST('cancel', 'aZ09');
         $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search
-        $backtopage = GETPOST('backtopage', 'alpha');                   // if not set, a default page will be used
+        $backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used
         $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
         $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
         $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');

htdocs/install/repair.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 if (file_exists($conffile)) {
     include_once $conffile;
 }
-require_once $dolibarr_main_document_root . '/../Dolibarr/Lib/Admin.php';;
+require_once $dolibarr_main_document_root . '/../Dolibarr/Lib/Admin.php'; ;
 include_once $dolibarr_main_document_root . '/../Dolibarr/Lib/Images.php';
 require_once $dolibarr_main_document_root . '/core/class/extrafields.class.php';
 require_once 'lib/repair.lib.php';
@@ -1147,13 +1147,13 @@ 
                             }
                             if ($key == 'js') {
                                 $value = $obj->value;
-                                $valuearray = (array) json_decode($value);  // Force cast into array because sometimes it is a stdClass
+                                $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
                                 $reloffile = $valuearray[0];
                                 $reloffile = preg_replace('/^\//', '', $valuearray[0]);
                             }
                             if ($key == 'css') {
                                 $value = $obj->value;
-                                $valuearray = (array) json_decode($value);  // Force cast into array because sometimes it is a stdClass
+                                $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
                                 if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
                                     $valuearray = array();
                                     $valuearray[0] = $value; // If value was not a json array but a string
@@ -1169,7 +1169,7 @@ 
                                     $result = 'found'; // If error, we force like if we found to avoid any deletion
                                 }
                             } else {
-                                $result = 'found';  //
+                                $result = 'found'; //
                             }
 
                             if (!$result) {