alxarafe / alixar

public/htdocs/fichinter/card.php

Spacing +3 added lines, -3 removed lines

@@ -387,7 +387,7 @@ 
                                                     $mult = 3600 * 24 * 7;
                                                     break;
                                                 case 'm':
-                                                    $mult = (int)3600 * 24 * (365 / 12); // Average month duration
+                                                    $mult = (int) 3600 * 24 * (365 / 12); // Average month duration
                                                     break;
                                                 case 'y':
                                                     $mult = 3600 * 24 * 365;
@@ -1076,7 +1076,7 @@ 
     } else {
         print '<form name="fichinter" action="' . $_SERVER['PHP_SELF'] . '" method="POST">';
         print '<input type="hidden" name="token" value="' . newToken() . '">';
-        print '<input type="hidden" name="action" value="create">';     // We go back to create action
+        print '<input type="hidden" name="action" value="create">'; // We go back to create action
         print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
 
         print dol_get_fiche_head('');
@@ -1365,7 +1365,7 @@ 
         $sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
         $sql .= ' ft.date as date_intervention';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'fichinterdet as ft';
-        $sql .= ' WHERE ft.fk_fichinter = ' . ((int)$object->id);
+        $sql .= ' WHERE ft.fk_fichinter = ' . ((int) $object->id);
         if (getDolGlobalString('FICHINTER_HIDE_EMPTY_DURATION')) {
             $sql .= ' AND ft.duree <> 0';
         }

public/htdocs/mrp/mo_card.php

Spacing +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
         $objectbomchildline = new BOMLine($db);
 
         foreach ($TBomLineId as $id_bom_line) {
-            $object = new Mo($db);  // modified by the actions_addupdatedelete.inc.php
+            $object = new Mo($db); // modified by the actions_addupdatedelete.inc.php
 
             $objectbomchildline->fetch($id_bom_line);
 
@@ -180,7 +180,7 @@ 
             $res = $object->add_object_linked('mo', $mo_parent->id);
         }
 
-        header("Location: " . dol_buildpath('/mrp/mo_card.php?id=' . ((int)$mo_parent->id), 1));
+        header("Location: " . dol_buildpath('/mrp/mo_card.php?id=' . ((int) $mo_parent->id), 1));
         exit;
     } elseif ($action == 'confirm_cancel' && $confirm == 'yes' && !empty($permissiontoadd)) {
         $also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);

public/htdocs/core/lib/loan.lib.php

Spacing +2 added lines, -2 removed lines

@@ -114,8 +114,8 @@
     $mens = price2num($mens);
     $capital = price2num($capital);
     $rate = price2num($rate);
-    $numactualloadterm = ((int)$numactualloadterm);
-    $nbterm = ((int)$nbterm);
+    $numactualloadterm = ((int) $numactualloadterm);
+    $nbterm = ((int) $nbterm);
 
     // If mensuality is 0 we don't pay interests and remaining capital not modified
     if ($mens == 0) {

public/htdocs/fourn/facture/card.php

Spacing +29 added lines, -29 removed lines

@@ -197,7 +197,7 @@ 
     // Action clone object
     if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
         $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
-        '@phan-var-force FactureFournisseur $objectutil';  // Same object type for cloned object
+        '@phan-var-force FactureFournisseur $objectutil'; // Same object type for cloned object
 
         if (GETPOST('newsupplierref', 'alphanohtml')) {
             $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
@@ -672,7 +672,7 @@ 
                 $sql = 'SELECT SUM(pf.amount) as total_paiements';
                 $sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiementfourn_facturefourn as pf, ' . MAIN_DB_PREFIX . 'paiementfourn as p';
                 $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (' . getEntity('c_paiement') . ')';
-                $sql .= ' WHERE pf.fk_facturefourn = ' . ((int)$object->id);
+                $sql .= ' WHERE pf.fk_facturefourn = ' . ((int) $object->id);
                 $sql .= ' AND pf.fk_paiementfourn = p.rowid';
                 $sql .= ' AND p.entity IN (' . getEntity('invoice') . ')';
 
@@ -689,7 +689,7 @@ 
                 $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
                 $sql .= " re.description, re.fk_invoice_supplier_source";
                 $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
-                $sql .= " WHERE fk_invoice_supplier = " . ((int)$object->id);
+                $sql .= " WHERE fk_invoice_supplier = " . ((int) $object->id);
                 $resql = $db->query($sql);
                 if (!empty($resql)) {
                     while ($obj = $db->fetch_object($resql)) {
@@ -711,12 +711,12 @@ 
             }
             if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
                 foreach ($amount_ht as $tva_tx => $xxx) {
-                    $discount->amount_ht = abs((float)$amount_ht[$tva_tx]);
-                    $discount->amount_tva = abs((float)$amount_tva[$tva_tx]);
-                    $discount->amount_ttc = abs((float)$amount_ttc[$tva_tx]);
-                    $discount->multicurrency_amount_ht = abs((float)$multicurrency_amount_ht[$tva_tx]);
-                    $discount->multicurrency_amount_tva = abs((float)$multicurrency_amount_tva[$tva_tx]);
-                    $discount->multicurrency_amount_ttc = abs((float)$multicurrency_amount_ttc[$tva_tx]);
+                    $discount->amount_ht = abs((float) $amount_ht[$tva_tx]);
+                    $discount->amount_tva = abs((float) $amount_tva[$tva_tx]);
+                    $discount->amount_ttc = abs((float) $amount_ttc[$tva_tx]);
+                    $discount->multicurrency_amount_ht = abs((float) $multicurrency_amount_ht[$tva_tx]);
+                    $discount->multicurrency_amount_tva = abs((float) $multicurrency_amount_tva[$tva_tx]);
+                    $discount->multicurrency_amount_ttc = abs((float) $multicurrency_amount_ttc[$tva_tx]);
 
                     // Clean vat code
                     $reg = array();
@@ -726,7 +726,7 @@ 
                         $tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx); // Remove code into vatrate.
                     }
 
-                    $discount->tva_tx = abs((float)$tva_tx);
+                    $discount->tva_tx = abs((float) $tva_tx);
                     $discount->vat_src_code = $vat_src_code;
 
                     $result = $discount->create($user);
@@ -782,7 +782,7 @@ 
         $db->begin();
 
         $error = 0;
-        $tmpproject = 0;  // Ensure a value
+        $tmpproject = 0; // Ensure a value
 
         // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -790,7 +790,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'));
@@ -829,7 +829,7 @@ 
                 $object->ref_supplier = GETPOST('ref_supplier', 'alpha');
                 $object->socid = GETPOSTINT('socid');
                 $object->label = GETPOST('label', 'alphanohtml');
-                $object->libelle = $object->label;  // deprecated
+                $object->libelle = $object->label; // deprecated
                 $object->date = $dateinvoice;
                 $object->date_echeance = $datedue;
                 $object->note_public = GETPOST('note_public', 'restricthtml');
@@ -903,7 +903,7 @@ 
                 $object->subtype = GETPOST('subtype', 'alphanohtml');
                 $object->socid = GETPOSTINT('socid');
                 $object->label = GETPOST('label', 'alphanohtml');
-                $object->libelle = $object->label;  // Deprecated
+                $object->libelle = $object->label; // Deprecated
                 $object->date = $dateinvoice;
                 $object->date_echeance = $datedue;
                 $object->note_public = GETPOST('note_public', 'restricthtml');
@@ -1013,7 +1013,7 @@ 
                 $object->cond_reglement_id = (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
                 $object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
                 $object->fk_account = GETPOSTINT('fk_account');
-                $object->amount = (float)price2num(GETPOST('amount'));  // FIXME: FactureFournisseur::$amount is deprecated and not used?
+                $object->amount = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used?
                 //$object->remise_absolue       = price2num(GETPOST('remise_absolue'), 'MU');
                 //$object->remise_percent       = price2num(GETPOST('remise_percent'), '', 2);
                 $object->fk_incoterms = GETPOSTINT('incoterm_id');
@@ -1073,7 +1073,7 @@ 
                 $object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
                 $object->socid = GETPOSTINT('socid');
                 $object->label = GETPOST('label', 'alphanohtml');
-                $object->libelle = $object->label;   // deprecated
+                $object->libelle = $object->label; // deprecated
                 $object->date = $dateinvoice;
                 $object->date_echeance = $datedue;
                 $object->note_public = GETPOST('note_public', 'restricthtml');
@@ -1176,7 +1176,7 @@ 
                                 if ($typeamount == 'amount') {
                                     $amount = $valuedeposit;
                                 } else {
-                                    $amount = $srcobject->total_ttc * ((float)$valuedeposit / 100);
+                                    $amount = $srcobject->total_ttc * ((float) $valuedeposit / 100);
                                 }
 
                                 $TTotalByTva = array();
@@ -1214,7 +1214,7 @@ 
                                             if ($qualified) {
                                                 $totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
                                                 $tva_tx = $lines[$i]->tva_tx;
-                                                $amountdeposit[$tva_tx] += ($lines[$i]->total_ht * (float)$valuedeposit) / 100;
+                                                $amountdeposit[$tva_tx] += ($lines[$i]->total_ht * (float) $valuedeposit) / 100;
                                             }
                                         }
 
@@ -1299,7 +1299,7 @@ 
                                     0,
                                     $object->lines[0]->date_start,
                                     $object->lines[0]->date_end,
-                                    array(),  // array_options
+                                    array(), // array_options
                                     0,
                                     0,
                                     '',
@@ -1584,7 +1584,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);
@@ -1808,7 +1808,7 @@ 
                 $pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
             } else {
                 $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-                $pu_ht = price2num((float)$pu_ttc / (1 + ((float)$tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
+                $pu_ht = price2num((float) $pu_ttc / (1 + ((float) $tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
             }
             $price_base_type = 'HT';
             $pu_devise = price2num($price_ht_devise, 'CU');
@@ -2082,7 +2082,7 @@ 
 // Mode creation
 if ($action == 'create') {
     $facturestatic = new FactureFournisseur($db);
-    $selectedLines = array();  // Ensure initialised
+    $selectedLines = array(); // Ensure initialised
 
     print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
 
@@ -2277,7 +2277,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";
@@ -2361,7 +2361,7 @@ 
 
             $sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
             $sql .= ' FROM ' . MAIN_DB_PREFIX . 'facture_fourn_rec as r';
-            $sql .= ' WHERE r.fk_soc = ' . (int)$invoice_predefined->socid;
+            $sql .= ' WHERE r.fk_soc = ' . (int) $invoice_predefined->socid;
 
             $resql = $db->query($sql);
             if ($resql) {
@@ -2941,7 +2941,7 @@ 
             // TODO We should not need this. Also data comes from not reliable value of $object->multicurrency_total_ttc that may be wrong if it was
             // calculated by summing lines that were in a currency for some of them and into another for others (lines from discount/down payment into another currency for example)
             if ($resteapayer == 0 && $multicurrency_resteapayer != 0 && $object->multicurrency_code != $conf->currency) {
-                $resteapayer = price2num((float)$multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
+                $resteapayer = price2num((float) $multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
             }
         }
 
@@ -3229,7 +3229,7 @@ 
         // Thirdparty
         $morehtmlref .= '<br>' . $object->thirdparty->getNomUrl(1, 'supplier');
         if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
-            $morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="' . constant('BASE_URL') . '/fourn/facture/list.php?socid=' . ((int)$object->thirdparty->id) . '&search_company=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherBills") . '</a>)</div>';
+            $morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="' . constant('BASE_URL') . '/fourn/facture/list.php?socid=' . ((int) $object->thirdparty->id) . '&search_company=' . urlencode($object->thirdparty->name) . '">' . $langs->trans("OtherBills") . '</a>)</div>';
         }
         // Project
         if (isModEnabled('project')) {
@@ -3238,7 +3238,7 @@ 
             if ($permissiontoadd) {
                 $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
                 if ($action != 'classify') {
-                    $morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . ((int)$object->id) . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+                    $morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . ((int) $object->id) . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
                 }
                 $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
             } else {
@@ -3672,7 +3672,7 @@ 
             $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'bank_account as ba ON b.fk_account = ba.rowid';
             $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_paiement as c ON p.fk_paiement = c.id';
             $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'paiementfourn_facturefourn as pf ON pf.fk_paiementfourn = p.rowid';
-            $sql .= ' WHERE pf.fk_facturefourn = ' . ((int)$object->id);
+            $sql .= ' WHERE pf.fk_facturefourn = ' . ((int) $object->id);
             $sql .= ' ORDER BY p.datep, p.tms';
 
             $result = $db->query($sql);
@@ -3793,7 +3793,7 @@ 
                 $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
                 $sql .= " re.description, re.fk_invoice_supplier_source";
                 $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";
-                $sql .= " WHERE fk_invoice_supplier = " . ((int)$object->id);
+                $sql .= " WHERE fk_invoice_supplier = " . ((int) $object->id);
                 $resql = $db->query($sql);
                 if ($resql) {
                     $num = $db->num_rows($resql);

Dolibarr/Code/Core/Classes/FormOther.php

Spacing +8 added lines, -8 removed lines

@@ -414,7 +414,7 @@ 
         $sql .= " FROM " . $this->db->prefix() . "export_model";
         $sql .= " WHERE type = '" . $this->db->escape($type) . "'";
         if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {  // EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
-            $sql .= " AND fk_user IN (0, " . ((int)$fk_user) . ")";
+            $sql .= " AND fk_user IN (0, " . ((int) $fk_user) . ")";
         }
         $sql .= " ORDER BY label";
         $result = $this->db->query($sql);
@@ -477,7 +477,7 @@ 
         $sql .= " FROM " . $this->db->prefix() . "import_model";
         $sql .= " WHERE type = '" . $this->db->escape($type) . "'";
         if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {  // EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
-            $sql .= " AND fk_user IN (0, " . ((int)$fk_user) . ")";
+            $sql .= " AND fk_user IN (0, " . ((int) $fk_user) . ")";
         }
         $sql .= " ORDER BY label";
         $result = $this->db->query($sql);
@@ -643,7 +643,7 @@ 
         }
 
         for ($i = $start; $i <= $end; $i += $increment) {
-            if ($selected != '' && (int)$selected == $i) {
+            if ($selected != '' && (int) $selected == $i) {
                 $return .= '<option value="' . $i . '" selected>';
             } else {
                 $return .= '<option value="' . $i . '">';
@@ -779,10 +779,10 @@ 
         }
 
         if (!$user->hasRight('user', 'user', 'lire')) {
-            $sql_usr .= " AND u.rowid = " . ((int)$user->id);
+            $sql_usr .= " AND u.rowid = " . ((int) $user->id);
         }
         if (!empty($user->socid)) {
-            $sql_usr .= " AND u.fk_soc = " . ((int)$user->socid);
+            $sql_usr .= " AND u.fk_soc = " . ((int) $user->socid);
         }
         if (getDolGlobalString('USER_HIDE_NONEMPLOYEE_IN_COMBOBOX')) {
             $sql_usr .= " AND u.employee <> 0";
@@ -815,7 +815,7 @@ 
                 $sql_usr .= " WHERE u2.entity IN (" . getEntity('user') . ")";
             }
 
-            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc = " . ((int)$user->socid);
+            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc = " . ((int) $user->socid);
 
             //Add hook to filter on user (for example on usergroup define in custom modules)
             if (!empty($reshook)) {
@@ -1254,9 +1254,9 @@ 
 
         $color = substr($color, 1, 6);
 
-        $red = hexdec(substr($color, 0, 2));    // Red channel conversion
+        $red = hexdec(substr($color, 0, 2)); // Red channel conversion
         $green = hexdec(substr($color, 2, 2)); // Green channel conversion
-        $blue = hexdec(substr($color, 4, 2));  // Blue channel conversion
+        $blue = hexdec(substr($color, 4, 2)); // Blue channel conversion
 
         $couleur = imagecolorallocate($image, $red, $green, $blue);
         //print $red.$green.$blue;

public/htdocs/contact/consumption.php

Spacing +12 added lines, -12 removed lines

@@ -219,7 +219,7 @@ 
     $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
     $tables_from = MAIN_DB_PREFIX . 'fichinterdet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'fichinter as f ON d.fk_fichinter=f.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
     $where = ' WHERE f.entity IN (' . getEntity('intervention') . ')';
     $dateprint = 'f.datec';
@@ -230,7 +230,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'facturedet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture as f ON d.fk_facture=f.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
     $where = " WHERE f.entity IN (" . getEntity('invoice') . ")";
     $dateprint = 'f.datef';
@@ -242,7 +242,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'propaldet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'propal as c ON d.fk_propal=c.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
     $where = ' WHERE c.entity IN (' . getEntity('propal') . ')';
     $dateprint = 'c.datep';
@@ -254,7 +254,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'commandedet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'commande as c ON d.fk_commande=c.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
     $where = ' WHERE c.entity IN (' . getEntity('order') . ')';
     $dateprint = 'c.date_commande';
@@ -266,7 +266,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'facture_fourn_det d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
     $where = ' WHERE f.entity IN (' . getEntity($documentstatic->element) . ')';
     $dateprint = 'f.datef';
@@ -290,7 +290,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'commande_fournisseurdet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'commande_fournisseur as c ON d.fk_commande=c.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
     $where = ' WHERE c.entity IN (' . getEntity($documentstatic->element) . ')';
     $dateprint = 'c.date_valid';
@@ -303,7 +303,7 @@ 
     $tables_from = MAIN_DB_PREFIX . 'contratdet d';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'contrat as c ON d.fk_contrat=c.rowid';
     $tables_from .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product p ON d.fk_product=p.rowid';
-    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int)$object->id);
+    $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople = ' . ((int) $object->id);
     $tables_from .= ' INNER JOIN ' . MAIN_DB_PREFIX . "c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
     $where = ' WHERE c.entity IN (' . getEntity('contrat') . ')';
     $dateprint = 'c.date_valid';
@@ -374,7 +374,7 @@ 
 $param .= "&year=" . urlencode($year);
 $param .= "&sprod_fulldescr=" . urlencode($sprod_fulldescr);
 if (!empty($socid)) {
-    $param .= "&socid=" . urlencode((string)($socid));
+    $param .= "&socid=" . urlencode((string) ($socid));
 }
 $param .= "&type_element=" . urlencode($type_element);
 
@@ -388,12 +388,12 @@ 
 
     $num = $db->num_rows($resql);
 
-    $param = (!empty($socid) ? "&socid=" . urlencode((string)($socid)) : "") . "&type_element=" . urlencode((string)($type_element)) . "&id=" . urlencode((string)($id));
+    $param = (!empty($socid) ? "&socid=" . urlencode((string) ($socid)) : "") . "&type_element=" . urlencode((string) ($type_element)) . "&id=" . urlencode((string) ($id));
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
         $param .= '&contextpage=' . urlencode($contextpage);
     }
     if ($limit > 0 && $limit != $conf->liste_limit) {
-        $param .= '&limit=' . ((int)$limit);
+        $param .= '&limit=' . ((int) $limit);
     }
     if ($sprod_fulldescr) {
         $param .= "&sprod_fulldescr=" . urlencode($sprod_fulldescr);
@@ -402,10 +402,10 @@ 
         $param .= "&sref=" . urlencode($sref);
     }
     if ($month) {
-        $param .= "&month=" . urlencode((string)($month));
+        $param .= "&month=" . urlencode((string) ($month));
     }
     if ($year) {
-        $param .= "&year=" . urlencode((string)($year));
+        $param .= "&year=" . urlencode((string) ($year));
     }
     if ($optioncss != '') {
         $param .= '&optioncss=' . urlencode($optioncss);

public/htdocs/contact/canvas/actions_contactcard_common.class.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
             // Town
             $this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-            if (dol_strlen(trim((string)$this->object->country_id)) == 0) {
+            if (dol_strlen(trim((string) $this->object->country_id)) == 0) {
                 $this->object->country_id = $objsoc->country_id;
             }
 
@@ -315,7 +315,7 @@ 
 
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id) {
-            $sql = "SELECT code, label FROM " . MAIN_DB_PREFIX . "c_country WHERE rowid = " . ((int)$this->object->country_id);
+            $sql = "SELECT code, label FROM " . MAIN_DB_PREFIX . "c_country WHERE rowid = " . ((int) $this->object->country_id);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $obj = $this->db->fetch_object($resql);

public/htdocs/contact/perso.php

Spacing +3 added lines, -3 removed lines

@@ -203,7 +203,7 @@ 
         $maxfilesizearray = getMaxFileSizeArray();
         $maxmin = $maxfilesizearray['maxmin'];
         if ($maxmin > 0) {
-            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
         }
         print '<input type="file" class="flat" name="photo" id="photoinput">';
         print '</td></tr>';
@@ -300,8 +300,8 @@ 
 
         print ' &nbsp; ';
         //var_dump($birthdatearray);
-        $ageyear = (int)convertSecondToTime($now - $object->birthday, 'year') - 1970;
-        $agemonth = (int)convertSecondToTime($now - $object->birthday, 'month') - 1;
+        $ageyear = (int) convertSecondToTime($now - $object->birthday, 'year') - 1970;
+        $agemonth = (int) convertSecondToTime($now - $object->birthday, 'month') - 1;
         if ($ageyear >= 2) {
             print '(' . $ageyear . ' ' . $langs->trans("DurationYears") . ')';
         } elseif ($agemonth >= 2) {

public/htdocs/contact/card.php

Spacing +34 added lines, -34 removed lines

@@ -215,32 +215,32 @@ 
 
         $object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity);
         $object->socid = $socid;
-        $object->lastname = (string)GETPOST("lastname", 'alpha');
-        $object->firstname = (string)GETPOST("firstname", 'alpha');
-        $object->civility_code = (string)GETPOST("civility_code", 'alpha');
-        $object->poste = (string)GETPOST("poste", 'alpha');
-        $object->address = (string)GETPOST("address", 'alpha');
-        $object->zip = (string)GETPOST("zipcode", 'alpha');
-        $object->town = (string)GETPOST("town", 'alpha');
+        $object->lastname = (string) GETPOST("lastname", 'alpha');
+        $object->firstname = (string) GETPOST("firstname", 'alpha');
+        $object->civility_code = (string) GETPOST("civility_code", 'alpha');
+        $object->poste = (string) GETPOST("poste", 'alpha');
+        $object->address = (string) GETPOST("address", 'alpha');
+        $object->zip = (string) GETPOST("zipcode", 'alpha');
+        $object->town = (string) GETPOST("town", 'alpha');
         $object->country_id = GETPOSTINT("country_id");
         $object->state_id = GETPOSTINT("state_id");
         $object->socialnetworks = array();
         if (isModEnabled('socialnetworks')) {
             foreach ($socialnetworks as $key => $value) {
                 if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                    $object->socialnetworks[$key] = (string)GETPOST($key, 'alphanohtml');
+                    $object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
                 }
             }
         }
-        $object->email = (string)GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+        $object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
         $object->no_email = GETPOSTINT("no_email");
-        $object->phone_pro = (string)GETPOST("phone_pro", 'alpha');
-        $object->phone_perso = (string)GETPOST("phone_perso", 'alpha');
-        $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha');
-        $object->fax = (string)GETPOST("fax", 'alpha');
+        $object->phone_pro = (string) GETPOST("phone_pro", 'alpha');
+        $object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
+        $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
+        $object->fax = (string) GETPOST("fax", 'alpha');
         $object->priv = GETPOSTINT("priv");
-        $object->note_public = (string)GETPOST("note_public", 'restricthtml');
-        $object->note_private = (string)GETPOST("note_private", 'restricthtml');
+        $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+        $object->note_private = (string) GETPOST("note_private", 'restricthtml');
         $object->roles = GETPOST("roles", 'array');
 
         $object->statut = 1; //Default status to Actif
@@ -313,7 +313,7 @@ 
         if (empty($error) && $id > 0) {
             $db->commit();
             if (!empty($backtopage)) {
-                $url = str_replace('__ID__', (string)$id, $backtopage);
+                $url = str_replace('__ID__', (string) $id, $backtopage);
             } else {
                 $url = 'card.php?id=' . $id;
             }
@@ -413,34 +413,34 @@ 
             $object->oldcopy = clone $object;
 
             $object->socid = $socid;
-            $object->lastname = (string)GETPOST("lastname", 'alpha');
-            $object->firstname = (string)GETPOST("firstname", 'alpha');
-            $object->civility_code = (string)GETPOST("civility_code", 'alpha');
-            $object->poste = (string)GETPOST("poste", 'alpha');
-
-            $object->address = (string)GETPOST("address", 'alpha');
-            $object->zip = (string)GETPOST("zipcode", 'alpha');
-            $object->town = (string)GETPOST("town", 'alpha');
+            $object->lastname = (string) GETPOST("lastname", 'alpha');
+            $object->firstname = (string) GETPOST("firstname", 'alpha');
+            $object->civility_code = (string) GETPOST("civility_code", 'alpha');
+            $object->poste = (string) GETPOST("poste", 'alpha');
+
+            $object->address = (string) GETPOST("address", 'alpha');
+            $object->zip = (string) GETPOST("zipcode", 'alpha');
+            $object->town = (string) GETPOST("town", 'alpha');
             $object->state_id = GETPOSTINT("state_id");
             $object->country_id = GETPOSTINT("country_id");
 
-            $object->email = (string)GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+            $object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
             $object->no_email = GETPOSTINT("no_email");
             $object->socialnetworks = array();
             if (isModEnabled('socialnetworks')) {
                 foreach ($socialnetworks as $key => $value) {
                     if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                        $object->socialnetworks[$key] = (string)GETPOST($key, 'alphanohtml');
+                        $object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
                     }
                 }
             }
-            $object->phone_pro = (string)GETPOST("phone_pro", 'alpha');
-            $object->phone_perso = (string)GETPOST("phone_perso", 'alpha');
-            $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha');
-            $object->fax = (string)GETPOST("fax", 'alpha');
-            $object->priv = (string)GETPOSTINT("priv");
-            $object->note_public = (string)GETPOST("note_public", 'restricthtml');
-            $object->note_private = (string)GETPOST("note_private", 'restricthtml');
+            $object->phone_pro = (string) GETPOST("phone_pro", 'alpha');
+            $object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
+            $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
+            $object->fax = (string) GETPOST("fax", 'alpha');
+            $object->priv = (string) GETPOSTINT("priv");
+            $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+            $object->note_private = (string) GETPOST("note_private", 'restricthtml');
 
             $object->roles = GETPOST("roles", 'array'); // Note GETPOSTISSET("role") is null when combo is empty
 
@@ -1262,7 +1262,7 @@ 
             $maxfilesizearray = getMaxFileSizeArray();
             $maxmin = $maxfilesizearray['maxmin'];
             if ($maxmin > 0) {
-                print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+                print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
             }
             print '<input type="file" class="flat maxwidth200" name="photo" id="photoinput">';
             print '</td></tr>';