alxarafe / alixar

htdocs/website/class/websitepage.class.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
      */
     public $fk_website;
 
-    public $fk_page;        // If translation of another page
+    public $fk_page; // If translation of another page
 
     public $pageurl;
     public $aliasalt;
@@ -134,8 +134,8 @@ 
      */
     public $fk_object;
 
-    const STATUS_DRAFT = 0;         // offline
-    const STATUS_VALIDATED = 1;     // online
+    const STATUS_DRAFT = 0; // offline
+    const STATUS_VALIDATED = 1; // online
 
 
     /**

htdocs/website/class/website.class.php

Spacing +4 added lines, -4 removed lines

@@ -1145,7 +1145,7 @@ 
             $stringtoexport = str_replace('medias/image/' . $website->ref . '/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
             $stringtoexport = str_replace('medias/js/' . $website->ref . '/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
             $stringtoexport = str_replace('"image/' . $website->ref . '/', '"image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="image/websiteref/file.png" into html content
-            $stringtoexport = str_replace('"/image/' . $website->ref . '/', '"/image/__WEBSITE_KEY__/', $stringtoexport);   // When we have a link src="/image/websiteref/file.png" into html content
+            $stringtoexport = str_replace('"/image/' . $website->ref . '/', '"/image/__WEBSITE_KEY__/', $stringtoexport); // When we have a link src="/image/websiteref/file.png" into html content
             $stringtoexport = str_replace('"js/' . $website->ref . '/', '"js/__WEBSITE_KEY__/', $stringtoexport);
             $stringtoexport = str_replace('"/js/' . $website->ref . '/', '"/js/__WEBSITE_KEY__/', $stringtoexport);
 
@@ -1464,7 +1464,7 @@ 
                 $filetpl = $pathofwebsite . '/page' . $object->fk_default_home . '.tpl.php';
             }
             $filewrapper = $pathofwebsite . '/wrapper.php';
-            dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);  // This includes also a version of index.php into sublanguage directories
+            dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object); // This includes also a version of index.php into sublanguage directories
         }
 
         if ($error) {
@@ -1867,7 +1867,7 @@ 
                 $destContent = file_get_contents($fileNeeded['fullname']);
 
                 $numOfPageDest = $this->extractNumberFromFilename($fileNeeded['name']);
-                $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest,$numOfPageSource));
+                $differences = $this->showDifferences($destContent, $sourceContent, array($numOfPageDest, $numOfPageSource));
                 $differences['file_destination'] = $fileNeeded;
             }
             return $differences;
@@ -1908,7 +1908,7 @@ 
         $linefound = array();
         $countNumPage = count($exceptNumPge);
 
-        for ($i = 0;$i < $countNumPage; $i++) {
+        for ($i = 0; $i < $countNumPage; $i++) {
             $linefound[$i] = array();
             $linefound[$i]['meta'] = '/content="' . preg_quote($exceptNumPge[$i], '/') . '" \/>/';
             $linefound[$i]['output'] = '/dolWebsiteOutput\(\$tmp, "html", ' . preg_quote($exceptNumPge[$i], '/') . '\);/';

htdocs/fourn/facture/list.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOST('search_status', 'intcomma');  // Can be '' or a numeric
+$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric
 $search_paymentmode = GETPOSTINT('search_paymentmode');
 $search_paymentcond = GETPOSTINT('search_paymentcond');
 $search_town = GETPOST('search_town', 'alpha');

htdocs/fourn/facture/paiement.php

Spacing +4 added lines, -4 removed lines

@@ -312,14 +312,14 @@ 
 
             // Creation of payment line
             $paiement = new PaiementFourn($db);
-            $paiement->datepaye     = $datepaye;
+            $paiement->datepaye = $datepaye;
 
             $correctedAmounts = [];
             foreach ($amounts as $key => $value) {
                 $correctedAmounts[$key] = (float) $value;
             }
 
-            $paiement->amounts      = $correctedAmounts; // Array of amounts
+            $paiement->amounts = $correctedAmounts; // Array of amounts
             $paiement->multicurrency_amounts = $multicurrency_amounts;
             $paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
             $paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching
@@ -610,8 +610,8 @@ 
                         $total = 0;
                         $total_ttc = 0;
                         $totalrecu = 0;
-                        $totalrecucreditnote = 0;   // PHP Warning:  Undefined variable $totalrecucreditnote
-                        $totalrecudeposits = 0;     // PHP Warning:  Undefined variable $totalrecudeposits
+                        $totalrecucreditnote = 0; // PHP Warning:  Undefined variable $totalrecucreditnote
+                        $totalrecudeposits = 0; // PHP Warning:  Undefined variable $totalrecudeposits
                         while ($i < $num) {
                             $objp = $db->fetch_object($resql);
 

htdocs/fourn/facture/card-rec.php

Spacing +19 added lines, -19 removed lines

@@ -84,10 +84,10 @@ 
     $page = 0;
 }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) {
+if (!$sortorder) {
     $sortorder = 'DESC';
 }
-if (! $sortfield) {
+if (!$sortfield) {
     $sortfield = 'f.titre';
 }
 $pageprev = $page - 1;
@@ -96,7 +96,7 @@ 
 $object = new FactureFournisseurRec($db);
 if (($id > 0 || $title) && $action != 'create' && $action != 'add') {
     $ret = $object->fetch($id, $title);
-    if (! $ret) {
+    if (!$ret) {
         setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
     }
 }
@@ -140,7 +140,7 @@ 
     $action = 'list';
     $massaction = '';
 }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
     $massaction = '';
 }
 
@@ -167,7 +167,7 @@ 
 
     // Create predefined invoice
     if ($action == 'add') {
-        if (! GETPOST('title', 'alphanohtml')) {
+        if (!GETPOST('title', 'alphanohtml')) {
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
             $action = "create";
             $error++;
@@ -190,7 +190,7 @@ 
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $object->titre = GETPOST('title', 'alphanohtml'); // deprecated
             $object->title = GETPOST('title', 'alphanohtml');
             $object->libelle = GETPOST('libelle', 'alpha'); // deprecated
@@ -239,7 +239,7 @@ 
                 $action = "create";
             }
 
-            if (! $error) {
+            if (!$error) {
                 $db->commit();
 
                 header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
@@ -289,7 +289,7 @@ 
         $result = $object->setValueFrom('titre', $title, '', null, 'text', '', $user);
 
         if ($result > 0) {
-            $object->titre = $title;    // deprecated
+            $object->titre = $title; // deprecated
             $object->title = $title;
             $object->ref = $object->title;
         } else {
@@ -336,7 +336,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $db->commit();
         } else {
             $db->rollback();
@@ -353,7 +353,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $db->commit();
         } else {
             $db->rollback();
@@ -412,7 +412,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $result = $object->insertExtraFields('BILLREC_MODIFY');
             if ($result < 0) {
                 setEventMessages($object->error, $object->errors, 'errors');
@@ -463,7 +463,7 @@ 
             setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
             $error++;
         }
-        if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (! ($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
+        if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (!($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
             $error++;
         }
@@ -512,7 +512,7 @@ 
             }
         }
 
-        if (! $error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
+        if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
             $ret = $object->fetch($id);
             if ($ret < 0) {
                 dol_print_error($db, $object->error);
@@ -728,8 +728,8 @@ 
                 $action = '';
             }
         }
-    } elseif ($action == 'updateline' && $usercancreate && ! GETPOST('cancel', 'alpha')) {
-        if (! $object->fetch($id) > 0) {
+    } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
+        if (!$object->fetch($id) > 0) {
             dol_print_error($db);
         }
         $object->fetch_thirdparty();
@@ -780,7 +780,7 @@ 
 
         // Define special_code for special lines
         $special_code = GETPOSTINT('special_code');
-        if (! GETPOST('qty', 'alpha')) {
+        if (!GETPOST('qty', 'alpha')) {
             $special_code = 3;
         }
 
@@ -826,7 +826,7 @@ 
         $date_end_fill = !empty(GETPOSTINT('date_end_fill')) ? GETPOSTINT('date_end_fill') : 'NULL';
 
         // Update line
-        if (! $error) {
+        if (!$error) {
             $result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
             if ($result >= 0) {
                 $object->fetch($object->id); // Reload lines
@@ -1456,8 +1456,8 @@ 
             print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
         }
         //var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-        if (! $object->isMaxNbGenReached()) {
-            if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+        if (!$object->isMaxNbGenReached()) {
+            if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
                 print img_warning($langs->trans("Late"));
             }
         } else {

htdocs/fourn/facture/list-rec.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,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_when_startday = GETPOSTINT('search_date_when_startday');
 $search_date_when_startmonth = GETPOSTINT('search_date_when_startmonth');
@@ -89,7 +89,7 @@ 
 $search_date_when_endday = GETPOSTINT('search_date_when_endday');
 $search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth');
 $search_date_when_endyear = GETPOSTINT('search_date_when_endyear');
-$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);   // Use tzserver
+$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
 $search_recurring = GETPOSTINT('search_recurring');
 $search_frequency = GETPOST('search_frequency', 'alpha');

htdocs/fourn/facture/card.php

Spacing +6 added lines, -6 removed lines

@@ -776,7 +776,7 @@ 
             $error++;
         }
 
-        $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');   // If we enter the 02 january, we need to save the 02 january for server
+        $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
         $datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), 'tzserver');
         //var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
         //var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
@@ -1058,7 +1058,7 @@ 
                 $object->ref                = GETPOST('ref', 'alphanohtml');
                 $object->ref_supplier       = GETPOST('ref_supplier', 'alphanohtml');
                 $object->socid              = GETPOSTINT('socid');
-                $object->libelle            = GETPOST('label', 'alphanohtml');  // deprecated
+                $object->libelle            = GETPOST('label', 'alphanohtml'); // deprecated
                 $object->label              = GETPOST('label', 'alphanohtml');
                 $object->date               = $dateinvoice;
                 $object->date_echeance      = $datedue;
@@ -1414,7 +1414,7 @@ 
         // Edit line
         $db->begin();
 
-        if (! $object->fetch($id) > 0) {
+        if (!$object->fetch($id) > 0) {
             dol_print_error($db);
         }
         $object->fetch_thirdparty();
@@ -1558,7 +1558,7 @@ 
             $idprod = GETPOSTINT('idprod');
         }
 
-        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);      // Can be '1.2' or '1.2 (CODE)'
+        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
 
         $price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
         $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
@@ -2257,7 +2257,7 @@ 
     print '<form name="add" 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
 
     if (!empty($societe->id) && $societe->id > 0) {
         print '<input type="hidden" name="socid" value="' . $societe->id . '">' . "\n";
@@ -4147,7 +4147,7 @@ 
                 }
 
                 // Clone as predefined / Create template
-                if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
+                if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
                     if (!$objectidnext && count($object->lines) > 0) {
                         print '<a class="butAction" href="' . DOL_URL_ROOT . '/fourn/facture/card-rec.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a>';
                     }

htdocs/fourn/facture/contact.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     $socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-$hookmanager->initHooks(array('invoicesuppliercardcontact','invoicesuppliercontactcard', 'globalcard'));
+$hookmanager->initHooks(array('invoicesuppliercardcontact', 'invoicesuppliercontactcard', 'globalcard'));
 
 $object = new FactureFournisseur($db);
 

htdocs/fourn/paiement/list.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,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_company         = GETPOST('search_company', 'alpha');
 $search_payment_type    = GETPOST('search_payment_type');
@@ -204,7 +204,7 @@ 
 $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn AS f ON f.rowid = pf.fk_facturefourn';
 $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON s.rowid = f.fk_soc';
 
-$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')';       // TODO We should use p.entity that does not exists yet in this table
+$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')'; // TODO We should use p.entity that does not exists yet in this table
 if ($socid > 0) {
     $sql .= " AND EXISTS (SELECT f.fk_soc FROM " . MAIN_DB_PREFIX . "facture_fourn as f, " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as pf";
     $sql .= " WHERE p.rowid = pf.fk_paiementfourn AND pf.fk_facturefourn = f.rowid AND f.fk_soc = " . ((int) $socid) . ")";