alxarafe / alixar

public/htdocs/install/doctemplates/websites/website_template-noimg/containers/manifest.json.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php 
 // BEGIN PHP
 $websitekey = basename(__DIR__);
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__ . '/master.inc.php'; 
 } // Load env if not already loaded
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/website.lib.php';
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/website.inc.php';

public/htdocs/install/upgrade2.php

Spacing +2 added lines, -2 removed lines

@@ -4211,7 +4211,7 @@ 
 
     if (!is_object($user)) {
         include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-        $user = new User($db);  // To avoid error during migration
+        $user = new User($db); // To avoid error during migration
     }
 
     dolibarr_install_syslog("upgrade2::migrate_reload_modules force=" . $force . ", listofmodule=" . implode(',', array_keys($listofmodule)));
@@ -5042,7 +5042,7 @@ 
                 $error++;
             }
 
-            $current_contract =  $obj->cid;
+            $current_contract = $obj->cid;
         }
     } else {
         $error++;

public/htdocs/install/check.php

Spacing +2 added lines, -2 removed lines

@@ -360,7 +360,7 @@ 
                     $conf->db->name = $dolibarr_main_db_name;
                     $conf->db->user = $dolibarr_main_db_user;
                     $conf->db->pass = $dolibarr_main_db_pass;
-                    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port);
+                    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
                     if ($db->connected && $db->database_selected) {
                         $ok = true;
                     }
@@ -457,7 +457,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

public/htdocs/install/inc.php

Spacing +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
     echo "      Display this help message.\n";
 }
 
-if (php_sapi_name() === "cli" && (float)PHP_VERSION > 7.0) {
+if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
     $rest_index = 0;
     $opts = getopt($short_options, $long_options, $rest_index);
 
@@ -149,7 +149,7 @@ 
          * @param string $arg
          * @return bool
          */
-        static function ($arg) {
+        static function($arg) {
             return strlen($arg) >= 2 && $arg[0] == '-';
         }
     );
@@ -159,7 +159,7 @@ 
      * @param string $arg
      * @return string
      */
-        static function ($arg) {
+        static function($arg) {
             if (strlen($arg) > 1) {
                 return "--" . $arg;
             }
@@ -294,10 +294,10 @@ 
 
 // Check install.lock (for both install and upgrade)
 
-$lockfile = DOL_DATA_ROOT . '/install.lock';    // To lock all /install pages
-$lockfile2 = DOL_DOCUMENT_ROOT . '/install.lock';    // To lock all /install pages (recommended)
-$upgradeunlockfile = DOL_DATA_ROOT . '/upgrade.unlock';    // To unlock upgrade process
-$upgradeunlockfile2 = DOL_DOCUMENT_ROOT . '/upgrade.unlock';    // To unlock upgrade process
+$lockfile = DOL_DATA_ROOT . '/install.lock'; // To lock all /install pages
+$lockfile2 = DOL_DOCUMENT_ROOT . '/install.lock'; // To lock all /install pages (recommended)
+$upgradeunlockfile = DOL_DATA_ROOT . '/upgrade.unlock'; // To unlock upgrade process
+$upgradeunlockfile2 = DOL_DOCUMENT_ROOT . '/upgrade.unlock'; // To unlock upgrade process
 if (constant('DOL_DATA_ROOT') === null) {
     // We don't have a configuration file yet
     // Try to detect any lockfile in the default documents path

public/htdocs/install/step2.php

Spacing +5 added lines, -5 removed lines

@@ -42,9 +42,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]);
@@ -93,7 +93,7 @@ 
 
 dolibarr_install_syslog("--- step2: entering step2.php page");
 
-'@phan-var-force string $dolibarr_main_db_prefix';  // From configuraiotn file or install/inc.php
+'@phan-var-force string $dolibarr_main_db_prefix'; // From configuraiotn file or install/inc.php
 
 /*
  *	View
@@ -114,7 +114,7 @@ 
     print '<table cellspacing="0" style="padding: 4px 4px 4px 0" border="0" width="100%">';
     $error = 0;
 
-    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port);
+    $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
 
     if ($db->connected) {
         print "<tr><td>";
@@ -599,7 +599,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>';

public/htdocs/install/step1.php

Braces +3 added lines, -2 removed lines

@@ -99,8 +99,9 @@
             $main_data_dir = $argv[4]; // override when executing the script in command line
         }
         // In mode 3 the main_url is custom
-        if ($force_install_noedit != 3)
-        $main_url = detect_dolibarr_main_url_root();
+        if ($force_install_noedit != 3) {
+                $main_url = detect_dolibarr_main_url_root();
+        }
         if (!empty($argv[5])) {
             $main_url = $argv[5]; // override when executing the script in command line
         }

public/htdocs/comm/remise.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 
 $form = new Form($db);
 
-if (! ($socid > 0)) {
+if (!($socid > 0)) {
     accessforbidden('Record not found');
 }
 

public/htdocs/comm/propal/card.php

Spacing +5 added lines, -5 removed lines

@@ -1159,8 +1159,8 @@ 
                         if (count($prodcustprice->lines) > 0) {
                             $pu_ht = price($prodcustprice->lines[0]->price);
                             $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-                            $price_min =  price($prodcustprice->lines[0]->price_min);
-                            $price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+                            $price_min = price($prodcustprice->lines[0]->price_min);
+                            $price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
                             $price_base_type = $prodcustprice->lines[0]->price_base_type;
                             /*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
                             if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -1904,7 +1904,7 @@ 
     print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
     print '<input type="hidden" name="token" value="' . newToken() . '">';
     print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="changecompany" value="0">';   // will be set to 1 by javascript so we know post is done after a company change
+    print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
     print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
     if ($origin != 'project' && $originid) {
         print '<input type="hidden" name="origin" value="' . $origin . '">';
@@ -2295,7 +2295,7 @@ 
         if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
             $formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">' . $langs->trans("CloseAs") . '</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
         }
-        $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');               // Field to complete private note (not replace)
+        $formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => ''); // Field to complete private note (not replace)
 
         if (getDolGlobalInt('PROPOSAL_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
             // This is a hidden option:
@@ -2479,7 +2479,7 @@ 
         $nbMandated = 0;
         foreach ($object->lines as $line) {
             $res = $line->fetch_product();
-            if ($res  > 0) {
+            if ($res > 0) {
                 if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
                     $nbMandated++;
                     break;

public/htdocs/comm/propal/list.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_user    = GETPOSTINT('search_user');
+$search_user = GETPOSTINT('search_user');
 if ($search_user == -1) {
     $search_user = 0;
 }
@@ -111,7 +111,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);   // Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_date_end_startday = GETPOSTINT('search_date_end_startday');
 $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth');
@@ -119,7 +119,7 @@ 
 $search_date_end_endday = GETPOSTINT('search_date_end_endday');
 $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth');
 $search_date_end_endyear = GETPOSTINT('search_date_end_endyear');
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);   // Use tzserver
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);
 $search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
 $search_date_delivery_startmonth = GETPOSTINT('search_date_delivery_startmonth');