From bec25fb45c8f62886158d2758c214437b4bfe011 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Sun, 27 Jan 2019 01:28:32 +0100 Subject: [PATCH 1/3] Remove absolut divs and add Dolistore POS category link to TakePOS --- htdocs/langs/en_US/cashdesk.lang | 3 +- htdocs/takepos/admin/setup.php | 8 +- htdocs/takepos/css/pos.css | 69 ++++++++++++-- .../takepos/img/marketplace/cashcontrol.jpg | Bin 80604 -> 0 bytes .../takepos/img/marketplace/takeposmobile.jpg | Bin 57525 -> 0 bytes htdocs/takepos/invoice.php | 2 +- htdocs/takepos/takepos.php | 85 +++++++++--------- 7 files changed, 116 insertions(+), 51 deletions(-) delete mode 100644 htdocs/takepos/img/marketplace/cashcontrol.jpg delete mode 100644 htdocs/takepos/img/marketplace/takeposmobile.jpg diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index e948f15f2b0..69137bfd998 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -52,4 +52,5 @@ CashFenceDone=Cash fence done for the period NbOfInvoices=Nb of invoices Paymentnumpad=Payment Num Pad Numberspad=Numbers Pad -BillsCoinsPad=Bills and Coins Pad \ No newline at end of file +BillsCoinsPad=Bills and Coins Pad +DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr \ No newline at end of file diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 2216d0b7659..88b6151621b 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -273,14 +273,14 @@ print '

'; // Marketplace print "\n"; print "\n"; -print ''; +print ''; print ''; print ''; print "\n"; -$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html'; -print ''; -print ''; +$url='https://www.dolistore.com/45-pos'; + print ''; +print ''; print ''; print ''; diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css index 15a2993f593..122f55ac974 100644 --- a/htdocs/takepos/css/pos.css +++ b/htdocs/takepos/css/pos.css @@ -2,10 +2,7 @@ html,body { padding:0; margin:0; height:100%; -} - -body { - width:100%; + width:100%; } .row { @@ -90,7 +87,7 @@ div.wrapper{ div.wrapper2{ float:left; /* important */ position:relative; /* important(so we can absolutely position the description div */ - width:10.2%; + width:10.9%; height:23%; margin-top:0.5%; margin-bottom:0.5%; @@ -126,6 +123,68 @@ div.description{ } } +.container{ + width: 98%; + height: 98%; + margin: 0 auto; + overflow: visible; + box-sizing: border-box; +} + +.row1{ + margin: 0 auto; + width: 100%; + height: 34%; +} + +.row2{ + margin: 0 auto; + width: 100%; + height: 66%; +} + +.div1{ + height:100%; + width: 33%; + float: left; + text-align: center; + box-sizing: border-box; +} + +.div2{ + height: 100%; + width: 33%; + font-size: 0; + float: left; + text-align: center; + padding-left: 10px; + box-sizing: border-box; +} + +.div3{ + height: 100%; + width: 33%; + float: left; + text-align: center; + box-sizing: border-box; +} + +.div4{ + height: 100%; + width: 34%; + float: left; + box-sizing: border-box; + font-size: 6px; +} + +.div5{ + height: 100%; + width: 66%; + float: left; + box-sizing: border-box; + font-size: 6px; +} + p.description_content{ padding:10px; margin:0px; diff --git a/htdocs/takepos/img/marketplace/cashcontrol.jpg b/htdocs/takepos/img/marketplace/cashcontrol.jpg deleted file mode 100644 index 66240218dff5cd3557993179a6185ab3bada8d1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80604 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 A$N&HU diff --git a/htdocs/takepos/img/marketplace/takeposmobile.jpg b/htdocs/takepos/img/marketplace/takeposmobile.jpg deleted file mode 100644 index 918f7c49d5e265b53ae235be41d784b35a889d82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57525 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�Uq6)r@jYGrOE?a9E0E)r< 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 CVQ 0) { if ($line->special_code == "3") { print ' order'; } print '" id="' . $line->rowid . '">'; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 83f21a506ea..c8d9b3f07bc 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -55,7 +55,7 @@ $head=' top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); ?> - + @@ -353,27 +353,30 @@ $( document ).ready(function() { -
-
+
+
-
- - - - - - - - - - - - - - - - -
+
+
+ +
+ + + + + + + + + + + + + + + + +
-
+
'.$menu['title'].''; } ?> -
- -
+
+
+
+
-
id='catdiv'> - width="98%" id='catimg'/> -
-
-
-
+
id='catdiv'> + width="98%" id='catimg'/> +
+
+
+
-
+
-
+
-
onclick="MoreProducts('less');" onclick="MoreProducts('more');" > - width="95%" id='proimg'/> -
-
-
-
+
onclick="MoreProducts('less');" onclick="MoreProducts('more');" > + width="95%" id='proimg'/> +
+
+
+
+
+
- Date: Sun, 27 Jan 2019 14:37:37 +0100 Subject: [PATCH 2/3] typo in fournisseur.product.class.php --- htdocs/fourn/class/fournisseur.product.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index d721a4a9254..9dfd7dcf264 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -329,11 +329,11 @@ class ProductFournisseur extends Product if ($resql) { // Call trigger - $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE',$user); + $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user); if ($result < 0) $error++; // End call triggers if (! $error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) { - $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrenc, $multicurrency_code); + $result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code); if ($result < 0) { $error++; } From f0cdf300d1299b107f70f089d15a5c3656c52dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 27 Jan 2019 15:20:16 +0100 Subject: [PATCH 3/3] Squiz.Functions.FunctionDeclarationArgumentSpacing --- dev/setup/codesniffer/ruleset.xml | 11 +- dev/translation/autotranslator.class.php | 8 +- htdocs/accountancy/admin/accountmodel.php | 2 +- htdocs/accountancy/admin/categories_list.php | 2 +- htdocs/accountancy/admin/journals_list.php | 2 +- .../class/accountancycategory.class.php | 14 +- .../class/accountingaccount.class.php | 6 +- .../class/accountingjournal.class.php | 6 +- .../accountancy/class/bookkeeping.class.php | 22 +- htdocs/adherents/class/adherent.class.php | 32 +-- .../adherents/class/adherent_type.class.php | 10 +- .../adherents/class/adherentstats.class.php | 6 +- htdocs/adherents/class/api_members.class.php | 2 +- htdocs/adherents/class/subscription.class.php | 8 +- htdocs/admin/dict.php | 2 +- .../admin/dolistore/class/dolistore.class.php | 2 +- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/website.php | 2 +- htdocs/api/class/api.class.php | 4 +- htdocs/api/class/api_login.class.php | 2 +- htdocs/asset/class/asset.class.php | 6 +- htdocs/asset/class/asset_type.class.php | 8 +- htdocs/blockedlog/class/authority.class.php | 2 +- htdocs/blockedlog/class/blockedlog.class.php | 12 +- htdocs/cashdesk/class/Facturation.class.php | 32 +-- htdocs/categories/class/categorie.class.php | 26 +-- htdocs/comm/action/class/actioncomm.class.php | 18 +- .../action/class/actioncommreminder.class.php | 4 +- .../comm/action/class/cactioncomm.class.php | 4 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/pertype.php | 2 +- htdocs/comm/action/peruser.php | 2 +- .../mailing/class/advtargetemailing.class.php | 14 +- .../html.formadvtargetemailing.class.php | 14 +- htdocs/comm/mailing/class/mailing.class.php | 10 +- .../comm/propal/class/api_proposals.class.php | 4 +- htdocs/comm/propal/class/propal.class.php | 68 +++--- .../comm/propal/class/propalestats.class.php | 4 +- htdocs/commande/class/api_orders.class.php | 6 +- htdocs/commande/class/commande.class.php | 62 ++--- htdocs/commande/class/commandestats.class.php | 6 +- htdocs/compta/bank/class/account.class.php | 30 +-- .../bank/class/api_bankaccounts.class.php | 2 +- .../bank/class/paymentvarious.class.php | 10 +- .../cashcontrol/class/cashcontrol.class.php | 6 +- .../deplacement/class/deplacement.class.php | 10 +- .../class/deplacementstats.class.php | 6 +- .../facture/class/api_invoices.class.php | 14 +- .../facture/class/facture-rec.class.php | 24 +- htdocs/compta/facture/class/facture.class.php | 56 ++--- .../facture/class/facturestats.class.php | 6 +- .../facture/class/paymentterm.class.php | 6 +- .../compta/localtax/class/localtax.class.php | 8 +- .../cheque/class/remisecheque.class.php | 14 +- .../compta/paiement/class/paiement.class.php | 26 +-- .../class/bonprelevement.class.php | 24 +- .../class/ligneprelevement.class.php | 4 +- .../class/rejetprelevement.class.php | 4 +- .../salaries/class/paymentsalary.class.php | 10 +- .../salaries/class/salariesstats.class.php | 6 +- .../sociales/class/cchargesociales.class.php | 6 +- .../sociales/class/chargesociales.class.php | 8 +- .../class/paymentsocialcontribution.class.php | 14 +- htdocs/compta/tva/class/tva.class.php | 10 +- htdocs/contact/class/contact.class.php | 14 +- htdocs/contrat/class/api_contracts.class.php | 4 +- htdocs/contrat/class/contrat.class.php | 44 ++-- htdocs/core/ajax/ajaxdirtree.php | 2 +- htdocs/core/boxes/box_actions.php | 6 +- htdocs/core/boxes/box_activity.php | 6 +- htdocs/core/boxes/box_bookmarks.php | 6 +- htdocs/core/boxes/box_clients.php | 6 +- htdocs/core/boxes/box_commandes.php | 6 +- htdocs/core/boxes/box_comptes.php | 6 +- htdocs/core/boxes/box_contacts.php | 6 +- htdocs/core/boxes/box_contracts.php | 6 +- htdocs/core/boxes/box_external_rss.php | 6 +- htdocs/core/boxes/box_factures.php | 6 +- htdocs/core/boxes/box_factures_fourn.php | 6 +- htdocs/core/boxes/box_factures_fourn_imp.php | 6 +- htdocs/core/boxes/box_factures_imp.php | 6 +- htdocs/core/boxes/box_ficheinter.php | 6 +- htdocs/core/boxes/box_fournisseurs.php | 6 +- htdocs/core/boxes/box_goodcustomers.php | 6 +- .../boxes/box_graph_invoices_permonth.php | 6 +- .../box_graph_invoices_supplier_permonth.php | 6 +- .../core/boxes/box_graph_orders_permonth.php | 6 +- .../box_graph_orders_supplier_permonth.php | 6 +- .../boxes/box_graph_product_distribution.php | 6 +- .../boxes/box_graph_propales_permonth.php | 6 +- .../core/boxes/box_last_modified_ticket.php | 2 +- htdocs/core/boxes/box_last_ticket.php | 2 +- htdocs/core/boxes/box_lastlogin.php | 6 +- htdocs/core/boxes/box_members.php | 6 +- htdocs/core/boxes/box_produits.php | 6 +- .../core/boxes/box_produits_alerte_stock.php | 6 +- htdocs/core/boxes/box_project.php | 6 +- htdocs/core/boxes/box_propales.php | 6 +- htdocs/core/boxes/box_prospect.php | 6 +- htdocs/core/boxes/box_services_contracts.php | 6 +- htdocs/core/boxes/box_services_expired.php | 6 +- htdocs/core/boxes/box_supplier_orders.php | 4 +- htdocs/core/boxes/box_task.php | 6 +- htdocs/core/boxes/modules_boxes.php | 6 +- htdocs/core/class/CMailFile.class.php | 8 +- htdocs/core/class/CSMSFile.class.php | 2 +- htdocs/core/class/canvas.class.php | 6 +- htdocs/core/class/ccountry.class.php | 8 +- htdocs/core/class/comment.class.php | 8 +- .../core/class/commondocgenerator.class.php | 18 +- htdocs/core/class/commoninvoice.class.php | 18 +- htdocs/core/class/commonobject.class.php | 108 ++++----- htdocs/core/class/commonobjectline.class.php | 2 +- .../class/commonstickergenerator.class.php | 10 +- htdocs/core/class/coreobject.class.php | 6 +- htdocs/core/class/cstate.class.php | 8 +- htdocs/core/class/ctypent.class.php | 8 +- htdocs/core/class/ctyperesource.class.php | 4 +- htdocs/core/class/discount.class.php | 12 +- htdocs/core/class/doleditor.class.php | 4 +- htdocs/core/class/dolgeoip.class.php | 2 +- htdocs/core/class/dolgraph.class.php | 10 +- htdocs/core/class/dolreceiptprinter.class.php | 4 +- .../core/class/emailsenderprofile.class.php | 8 +- htdocs/core/class/events.class.php | 4 +- htdocs/core/class/extrafields.class.php | 26 +-- htdocs/core/class/fileupload.class.php | 2 +- htdocs/core/class/fiscalyear.class.php | 4 +- htdocs/core/class/google.class.php | 2 +- htdocs/core/class/hookmanager.class.php | 2 +- htdocs/core/class/html.form.class.php | 156 ++++++------- .../core/class/html.formaccounting.class.php | 8 +- htdocs/core/class/html.formactions.class.php | 6 +- htdocs/core/class/html.formadmin.class.php | 8 +- htdocs/core/class/html.formbarcode.class.php | 10 +- htdocs/core/class/html.formcompany.class.php | 26 +-- htdocs/core/class/html.formcontract.class.php | 4 +- htdocs/core/class/html.formcron.class.php | 2 +- htdocs/core/class/html.formfile.class.php | 16 +- .../class/html.formintervention.class.php | 2 +- htdocs/core/class/html.formmail.class.php | 12 +- htdocs/core/class/html.formmailing.class.php | 2 +- htdocs/core/class/html.formmargin.class.php | 4 +- htdocs/core/class/html.formorder.class.php | 4 +- htdocs/core/class/html.formother.class.php | 40 ++-- htdocs/core/class/html.formprojet.class.php | 10 +- htdocs/core/class/html.formpropal.class.php | 2 +- htdocs/core/class/html.formsms.class.php | 2 +- .../class/html.formsocialcontrib.class.php | 2 +- htdocs/core/class/html.formticket.class.php | 8 +- htdocs/core/class/html.formwebsite.class.php | 6 +- htdocs/core/class/infobox.class.php | 4 +- htdocs/core/class/interfaces.class.php | 4 +- htdocs/core/class/ldap.class.php | 20 +- htdocs/core/class/link.class.php | 8 +- htdocs/core/class/menu.class.php | 4 +- htdocs/core/class/menubase.class.php | 8 +- htdocs/core/class/notify.class.php | 6 +- htdocs/core/class/openid.class.php | 8 +- htdocs/core/class/rssparser.class.php | 4 +- htdocs/core/class/smtps.class.php | 12 +- htdocs/core/class/stats.class.php | 16 +- htdocs/core/class/translate.class.php | 24 +- htdocs/core/class/utils.class.php | 8 +- htdocs/core/class/vcard.class.php | 14 +- htdocs/core/datepicker.php | 2 +- htdocs/core/db/Database.interface.php | 2 +- htdocs/core/db/DoliDB.class.php | 12 +- htdocs/core/db/mssql.class.php | 40 ++-- htdocs/core/db/mysqli.class.php | 32 +-- htdocs/core/db/pgsql.class.php | 38 ++-- htdocs/core/db/sqlite3.class.php | 34 +-- .../filemanagerdol/connectors/php/basexml.php | 2 +- .../connectors/php/commands.php | 4 +- .../core/filemanagerdol/connectors/php/io.php | 10 +- .../filemanagerdol/connectors/php/util.php | 8 +- htdocs/core/lib/accounting.lib.php | 2 +- htdocs/core/lib/admin.lib.php | 20 +- htdocs/core/lib/agenda.lib.php | 6 +- htdocs/core/lib/ajax.lib.php | 12 +- htdocs/core/lib/barcode.lib.php | 6 +- htdocs/core/lib/categories.lib.php | 2 +- htdocs/core/lib/company.lib.php | 18 +- htdocs/core/lib/date.lib.php | 22 +- htdocs/core/lib/doc.lib.php | 2 +- htdocs/core/lib/doleditor.lib.php | 2 +- htdocs/core/lib/ecm.lib.php | 2 +- htdocs/core/lib/files.lib.php | 44 ++-- htdocs/core/lib/functions.lib.php | 214 +++++++++--------- htdocs/core/lib/functions2.lib.php | 42 ++-- htdocs/core/lib/functionsnumtoword.lib.php | 4 +- htdocs/core/lib/geturl.lib.php | 2 +- htdocs/core/lib/images.lib.php | 4 +- htdocs/core/lib/import.lib.php | 2 +- htdocs/core/lib/invoice2.lib.php | 2 +- htdocs/core/lib/ldap.lib.php | 4 +- htdocs/core/lib/memory.lib.php | 4 +- htdocs/core/lib/modulebuilder.lib.php | 4 +- htdocs/core/lib/parsemd.lib.php | 2 +- htdocs/core/lib/payments.lib.php | 8 +- htdocs/core/lib/pdf.lib.php | 50 ++-- htdocs/core/lib/price.lib.php | 2 +- htdocs/core/lib/product.lib.php | 4 +- htdocs/core/lib/project.lib.php | 12 +- htdocs/core/lib/report.lib.php | 2 +- htdocs/core/lib/security.lib.php | 14 +- htdocs/core/lib/security2.lib.php | 10 +- htdocs/core/lib/sendings.lib.php | 2 +- htdocs/core/lib/signature.lib.php | 4 +- htdocs/core/lib/tax.lib.php | 4 +- htdocs/core/lib/ticket.lib.php | 2 +- htdocs/core/lib/treeview.lib.php | 4 +- htdocs/core/lib/usergroups.lib.php | 2 +- htdocs/core/lib/website.lib.php | 8 +- htdocs/core/lib/ws.lib.php | 2 +- htdocs/core/lib/xcal.lib.php | 8 +- htdocs/core/login/functions_dolibarr.php | 2 +- htdocs/core/login/functions_empty.php | 2 +- htdocs/core/login/functions_forceuser.php | 2 +- htdocs/core/login/functions_http.php | 2 +- htdocs/core/login/functions_ldap.php | 2 +- htdocs/core/login/functions_openid.php | 2 +- htdocs/core/menus/standard/auguria.lib.php | 6 +- htdocs/core/menus/standard/auguria_menu.php | 4 +- htdocs/core/menus/standard/eldy.lib.php | 6 +- htdocs/core/menus/standard/eldy_menu.php | 4 +- htdocs/core/menus/standard/empty.php | 4 +- htdocs/core/modules/DolibarrModules.class.php | 12 +- htdocs/core/modules/action/modules_action.php | 4 +- htdocs/core/modules/action/rapport.pdf.php | 2 +- .../core/modules/bank/doc/pdf_ban.modules.php | 6 +- .../bank/doc/pdf_sepamandate.modules.php | 6 +- htdocs/core/modules/bank/modules_bank.php | 2 +- .../barcode/doc/phpbarcode.modules.php | 4 +- .../barcode/doc/tcpdfbarcode.modules.php | 4 +- .../barcode/mod_barcode_product_standard.php | 4 +- .../modules/barcode/modules_barcode.class.php | 4 +- .../modules/cheque/doc/pdf_blochet.class.php | 2 +- .../modules/cheque/mod_chequereceipt_mint.php | 4 +- .../cheque/mod_chequereceipt_thyme.php | 4 +- .../modules/cheque/modules_chequereceipts.php | 4 +- .../doc/doc_generic_order_odt.modules.php | 2 +- .../commande/doc/pdf_einstein.modules.php | 8 +- .../commande/doc/pdf_eratosthene.modules.php | 10 +- .../commande/doc/pdf_proforma.modules.php | 2 +- .../modules/commande/mod_commande_marbre.php | 4 +- .../modules/commande/mod_commande_saphir.php | 4 +- .../modules/commande/modules_commande.php | 4 +- .../doc/doc_generic_contract_odt.modules.php | 2 +- .../contract/doc/pdf_strato.modules.php | 6 +- .../modules/contract/mod_contract_magre.php | 4 +- .../modules/contract/mod_contract_olive.php | 2 +- .../modules/contract/mod_contract_serpis.php | 4 +- .../modules/contract/modules_contract.php | 2 +- .../modules/dons/html_cerfafr.modules.php | 4 +- htdocs/core/modules/dons/modules_don.php | 2 +- .../doc/doc_generic_shipment_odt.modules.php | 2 +- .../expedition/doc/pdf_merou.modules.php | 8 +- .../expedition/doc/pdf_rouget.modules.php | 8 +- .../expedition/mod_expedition_ribera.php | 4 +- .../expedition/mod_expedition_safor.php | 4 +- .../modules/expedition/modules_expedition.php | 2 +- .../doc/pdf_standard.modules.php | 6 +- .../expensereport/modules_expensereport.php | 4 +- .../modules/export/export_csv.modules.php | 6 +- .../modules/export/export_excel.modules.php | 6 +- .../export/export_excelnew.modules.php | 6 +- .../modules/export/export_tsv.modules.php | 6 +- htdocs/core/modules/export/modules_export.php | 2 +- .../doc/doc_generic_invoice_odt.modules.php | 2 +- .../modules/facture/doc/pdf_crabe.modules.php | 6 +- .../facture/doc/pdf_sponge.modules.php | 8 +- .../core/modules/facture/mod_facture_mars.php | 4 +- .../modules/facture/mod_facture_mercure.php | 4 +- .../modules/facture/mod_facture_terre.php | 4 +- .../core/modules/facture/modules_facture.php | 4 +- .../fichinter/doc/pdf_soleil.modules.php | 6 +- htdocs/core/modules/fichinter/mod_arctic.php | 4 +- htdocs/core/modules/fichinter/mod_pacific.php | 4 +- .../modules/fichinter/modules_fichinter.php | 4 +- .../modules/holiday/mod_holiday_madonna.php | 2 +- .../core/modules/holiday/modules_holiday.php | 2 +- .../modules/import/import_csv.modules.php | 8 +- .../modules/import/import_xlsx.modules.php | 8 +- htdocs/core/modules/import/modules_import.php | 2 +- .../livraison/doc/pdf_typhon.modules.php | 6 +- .../modules/livraison/mod_livraison_jade.php | 4 +- .../livraison/mod_livraison_saphir.php | 6 +- .../modules/livraison/modules_livraison.php | 2 +- .../mailings/advthirdparties.modules.php | 6 +- .../modules/mailings/contacts1.modules.php | 2 +- .../core/modules/mailings/example.modules.php | 2 +- .../core/modules/mailings/fraise.modules.php | 2 +- .../core/modules/mailings/pomme.modules.php | 2 +- .../modules/mailings/thirdparties.modules.php | 2 +- .../thirdparties_services_expired.modules.php | 2 +- .../modules/mailings/xinputfile.modules.php | 2 +- .../modules/mailings/xinputuser.modules.php | 2 +- .../modules/member/doc/pdf_standard.class.php | 6 +- htdocs/core/modules/member/modules_cards.php | 4 +- htdocs/core/modules/modAdherent.class.php | 2 +- htdocs/core/modules/modApi.class.php | 2 +- htdocs/core/modules/modAsset.class.php | 2 +- htdocs/core/modules/modBanque.class.php | 2 +- htdocs/core/modules/modBarcode.class.php | 2 +- htdocs/core/modules/modBlockedLog.class.php | 2 +- htdocs/core/modules/modCashDesk.class.php | 2 +- htdocs/core/modules/modCategorie.class.php | 2 +- htdocs/core/modules/modCommande.class.php | 2 +- htdocs/core/modules/modComptabilite.class.php | 2 +- htdocs/core/modules/modContrat.class.php | 2 +- htdocs/core/modules/modDav.class.php | 2 +- htdocs/core/modules/modDeplacement.class.php | 2 +- .../modules/modDocumentGeneration.class.php | 2 +- htdocs/core/modules/modDon.class.php | 2 +- .../core/modules/modEmailCollector.class.php | 2 +- htdocs/core/modules/modExpedition.class.php | 2 +- .../core/modules/modExpenseReport.class.php | 2 +- htdocs/core/modules/modExternalRss.class.php | 4 +- htdocs/core/modules/modFicheinter.class.php | 2 +- htdocs/core/modules/modFournisseur.class.php | 2 +- htdocs/core/modules/modHRM.class.php | 2 +- htdocs/core/modules/modLabel.class.php | 2 +- htdocs/core/modules/modLoan.class.php | 2 +- htdocs/core/modules/modMailing.class.php | 2 +- htdocs/core/modules/modNotification.class.php | 2 +- htdocs/core/modules/modOauth.class.php | 2 +- htdocs/core/modules/modOpenSurvey.class.php | 2 +- htdocs/core/modules/modPrelevement.class.php | 2 +- htdocs/core/modules/modProduct.class.php | 2 +- htdocs/core/modules/modProductBatch.class.php | 2 +- htdocs/core/modules/modProjet.class.php | 2 +- htdocs/core/modules/modPropale.class.php | 2 +- .../core/modules/modReceiptPrinter.class.php | 2 +- htdocs/core/modules/modReception.class.php | 2 +- htdocs/core/modules/modSalaries.class.php | 2 +- htdocs/core/modules/modService.class.php | 2 +- htdocs/core/modules/modSociete.class.php | 2 +- htdocs/core/modules/modStock.class.php | 2 +- .../modules/modSupplierProposal.class.php | 2 +- htdocs/core/modules/modTakePos.class.php | 2 +- htdocs/core/modules/modTax.class.php | 2 +- htdocs/core/modules/modUser.class.php | 2 +- htdocs/core/modules/modWebsite.class.php | 2 +- htdocs/core/modules/modWorkflow.class.php | 2 +- .../core/modules/payment/mod_payment_ant.php | 4 +- .../modules/payment/mod_payment_cicada.php | 4 +- .../core/modules/payment/modules_payment.php | 2 +- .../modules/printing/modules_printing.php | 2 +- .../modules/printing/printgcp.modules.php | 2 +- .../modules/printing/printipp.modules.php | 2 +- .../doc/pdf_standardlabel.class.php | 6 +- .../printsheet/doc/pdf_tcpdflabel.class.php | 4 +- .../modules/printsheet/modules_labels.php | 4 +- .../doc/doc_generic_product_odt.modules.php | 2 +- .../product/doc/pdf_standard.modules.php | 8 +- .../product/mod_codeproduct_elephant.php | 4 +- .../product/mod_codeproduct_leopard.php | 2 +- .../modules/product/modules_product.class.php | 8 +- .../modules_product_batch.class.php | 2 +- .../doc/doc_generic_project_odt.modules.php | 18 +- .../project/doc/pdf_baleine.modules.php | 6 +- .../project/doc/pdf_beluga.modules.php | 6 +- .../project/doc/pdf_timespent.modules.php | 6 +- .../modules/project/mod_project_simple.php | 2 +- .../modules/project/mod_project_universal.php | 2 +- .../core/modules/project/modules_project.php | 2 +- .../task/doc/doc_generic_task_odt.modules.php | 18 +- .../modules/project/task/mod_task_simple.php | 4 +- .../project/task/mod_task_universal.php | 4 +- .../modules/project/task/modules_task.php | 2 +- .../doc/doc_generic_proposal_odt.modules.php | 2 +- .../modules/propale/doc/pdf_azur.modules.php | 6 +- .../modules/propale/doc/pdf_cyan.modules.php | 8 +- .../modules/propale/mod_propale_marbre.php | 4 +- .../modules/propale/mod_propale_saphir.php | 2 +- .../core/modules/propale/modules_propale.php | 4 +- .../doc/doc_generic_reception_odt.modules.php | 2 +- .../reception/doc/pdf_squille.modules.php | 8 +- .../modules/reception/mod_reception_beryl.php | 4 +- .../reception/mod_reception_moonstone.php | 4 +- .../modules/reception/modules_reception.php | 2 +- .../societe/doc/doc_generic_odt.modules.php | 2 +- .../societe/mod_codeclient_elephant.php | 6 +- .../societe/mod_codeclient_leopard.php | 2 +- .../modules/societe/mod_codeclient_monkey.php | 6 +- .../societe/mod_codecompta_aquarium.php | 4 +- .../societe/mod_codecompta_panicum.php | 4 +- .../modules/societe/modules_societe.class.php | 16 +- .../doc/doc_generic_stock_odt.modules.php | 2 +- .../stock/doc/pdf_standard.modules.php | 8 +- .../stock/doc/pdf_stdmovement.modules.php | 8 +- .../core/modules/stock/modules_movement.php | 2 +- htdocs/core/modules/stock/modules_stock.php | 2 +- .../mod_facture_fournisseur_cactus.php | 4 +- .../mod_facture_fournisseur_tulip.php | 4 +- .../modules_facturefournisseur.php | 4 +- .../pdf/pdf_canelle.modules.php | 6 +- .../mod_commande_fournisseur_muguet.php | 4 +- .../mod_commande_fournisseur_orchidee.php | 4 +- .../modules_commandefournisseur.php | 2 +- .../pdf/pdf_muscadet.modules.php | 6 +- .../doc/pdf_standard.modules.php | 6 +- .../mod_supplier_payment_brodator.php | 4 +- .../mod_supplier_payment_bronan.php | 4 +- .../modules_supplier_payment.php | 4 +- ..._generic_supplier_proposal_odt.modules.php | 2 +- .../doc/pdf_aurore.modules.php | 6 +- .../mod_supplier_proposal_marbre.php | 4 +- .../mod_supplier_proposal_saphir.php | 2 +- .../modules_supplier_proposal.php | 4 +- .../core/modules/syslog/mod_syslog_file.php | 4 +- .../user/doc/doc_generic_user_odt.modules.php | 4 +- .../core/modules/user/modules_user.class.php | 2 +- .../doc/doc_generic_usergroup_odt.modules.php | 2 +- .../usergroup/modules_usergroup.class.php | 2 +- htdocs/cron/class/cronjob.class.php | 14 +- htdocs/dav/dav.class.php | 2 +- htdocs/don/class/api_donations.class.php | 2 +- htdocs/don/class/don.class.php | 24 +- htdocs/don/class/donstats.class.php | 4 +- htdocs/don/class/paymentdonation.class.php | 14 +- htdocs/ecm/class/ecmdirectory.class.php | 18 +- htdocs/ecm/class/ecmfiles.class.php | 10 +- htdocs/ecm/class/htmlecm.form.class.php | 2 +- .../class/emailcollector.class.php | 8 +- .../class/emailcollectoraction.class.php | 6 +- .../class/emailcollectorfilter.class.php | 6 +- .../expedition/class/api_shipments.class.php | 2 +- htdocs/expedition/class/expedition.class.php | 32 +-- .../class/expeditionbatch.class.php | 4 +- .../class/expeditionstats.class.php | 4 +- .../class/expensereport.class.php | 50 ++-- .../class/expensereport_ik.class.php | 6 +- .../class/expensereport_rule.class.php | 2 +- .../class/expensereportstats.class.php | 6 +- .../class/paymentexpensereport.class.php | 12 +- htdocs/exports/class/export.class.php | 4 +- htdocs/exports/export.php | 2 +- .../class/api_interventions.class.php | 2 +- htdocs/fichinter/class/fichinter.class.php | 28 +-- .../fichinter/class/fichinterstats.class.php | 6 +- .../class/api_supplier_invoices.class.php | 4 +- .../fourn/class/api_supplier_orders.class.php | 4 +- .../class/fournisseur.commande.class.php | 46 ++-- .../fournisseur.commande.dispatch.class.php | 14 +- .../fourn/class/fournisseur.facture.class.php | 34 +-- .../fourn/class/fournisseur.product.class.php | 16 +- htdocs/fourn/class/paiementfourn.class.php | 22 +- htdocs/ftp/index.php | 4 +- htdocs/holiday/class/holiday.class.php | 44 ++-- htdocs/hrm/class/establishment.class.php | 6 +- htdocs/imports/class/import.class.php | 6 +- htdocs/imports/import.php | 4 +- htdocs/index.php | 2 +- htdocs/install/inc.php | 6 +- htdocs/install/step1.php | 4 +- htdocs/install/upgrade2.php | 86 +++---- htdocs/livraison/class/livraison.class.php | 10 +- htdocs/loan/class/loan.class.php | 6 +- htdocs/loan/class/loanschedule.class.php | 4 +- htdocs/loan/class/paymentloan.class.php | 6 +- .../mailmanspip/class/mailmanspip.class.php | 4 +- htdocs/main.inc.php | 18 +- .../template/class/actions_mymodule.class.php | 2 +- .../template/class/myobject.class.php | 8 +- .../mailinglist_mymodule_myobject.modules.php | 2 +- .../core/modules/modMyModule.class.php | 2 +- .../class/multicurrency.class.php | 6 +- .../class/opensurveysondage.class.php | 12 +- htdocs/opensurvey/fonctions.php | 2 +- htdocs/paybox/lib/paybox.lib.php | 2 +- htdocs/paypal/lib/paypal.lib.php | 10 +- .../product/actions_card_product.class.php | 2 +- .../service/actions_card_service.class.php | 4 +- htdocs/product/class/api_products.class.php | 2 +- .../product/class/html.formproduct.class.php | 14 +- htdocs/product/class/product.class.php | 80 +++---- htdocs/product/class/productbatch.class.php | 10 +- .../class/propalmergepdfproduct.class.php | 10 +- .../class/price_expression.class.php | 6 +- .../class/price_global_variable.class.php | 6 +- .../price_global_variable_updater.class.php | 10 +- .../inventory/class/inventory.class.php | 6 +- .../product/inventory/lib/inventory.lib.php | 2 +- htdocs/product/stock/class/entrepot.class.php | 14 +- .../stock/class/mouvementstock.class.php | 16 +- .../product/stock/class/productlot.class.php | 6 +- .../class/productstockentrepot.class.php | 10 +- htdocs/projet/class/api_projects.class.php | 6 +- htdocs/projet/class/api_tasks.class.php | 6 +- htdocs/projet/class/project.class.php | 30 +-- htdocs/projet/class/projectstats.class.php | 10 +- htdocs/projet/class/task.class.php | 36 +-- htdocs/projet/class/taskstats.class.php | 2 +- htdocs/projet/ganttchart.inc.php | 2 +- htdocs/public/members/new.php | 2 +- htdocs/reception/class/reception.class.php | 24 +- .../reception/class/receptionstats.class.php | 2 +- htdocs/resource/class/dolresource.class.php | 26 +-- .../class/html.formresource.class.php | 4 +- .../canvas/actions_card_common.class.php | 4 +- .../company/actions_card_company.class.php | 4 +- .../actions_card_individual.class.php | 4 +- htdocs/societe/class/address.class.php | 12 +- .../societe/class/api_thirdparties.class.php | 12 +- htdocs/societe/class/client.class.php | 2 +- .../class/companybankaccount.class.php | 8 +- .../class/companypaymentmode.class.php | 8 +- htdocs/societe/class/societe.class.php | 52 ++--- htdocs/societe/class/societeaccount.class.php | 10 +- htdocs/stripe/class/stripe.class.php | 10 +- htdocs/stripe/lib/stripe.lib.php | 6 +- .../class/supplier_proposal.class.php | 36 +-- htdocs/support/inc.php | 4 +- htdocs/ticket/class/actions_ticket.class.php | 2 +- htdocs/ticket/class/ticket.class.php | 2 +- htdocs/user/class/user.class.php | 50 ++-- htdocs/user/class/userbankaccount.class.php | 6 +- htdocs/user/class/usergroup.class.php | 24 +- htdocs/webservices/server_actioncomm.php | 6 +- htdocs/webservices/server_category.php | 2 +- htdocs/webservices/server_contact.php | 8 +- htdocs/webservices/server_invoice.php | 10 +- htdocs/webservices/server_order.php | 10 +- htdocs/webservices/server_other.php | 2 +- .../webservices/server_productorservice.php | 12 +- htdocs/webservices/server_project.php | 2 +- .../webservices/server_supplier_invoice.php | 4 +- htdocs/webservices/server_thirdparty.php | 10 +- htdocs/webservices/server_user.php | 6 +- htdocs/website/class/website.class.php | 12 +- htdocs/website/class/websitepage.class.php | 10 +- .../email_expire_services_to_customers.php | 2 +- ...ail_expire_services_to_representatives.php | 2 +- scripts/cron/cron_run_jobs.php | 2 +- .../email_unpaid_invoices_to_customers.php | 2 +- ...ail_unpaid_invoices_to_representatives.php | 2 +- test/phpunit/FactureRecTest.php | 2 +- test/phpunit/FactureTest.php | 2 +- test/phpunit/UserTest.php | 2 +- 541 files changed, 2338 insertions(+), 2329 deletions(-) diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index 879d791b8e9..2f1f0735a26 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -65,7 +65,7 @@ 0 - + diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php index 123b7f6157d..cb70e9541dc 100644 --- a/dev/translation/autotranslator.class.php +++ b/dev/translation/autotranslator.class.php @@ -50,7 +50,7 @@ class autoTranslator * @param string $_apikey Api key * @return void */ - function __construct($_destlang,$_refLang,$_langDir,$_limittofile,$_apikey) + function __construct($_destlang, $_refLang, $_langDir, $_limittofile, $_apikey) { // Set enviorment variables @@ -156,7 +156,7 @@ class autoTranslator * @param string $my_destlang Target language code * @return void */ - private function updateTranslationFile($destPath,$file,$my_destlang) + private function updateTranslationFile($destPath, $file, $my_destlang) { $this->_time_end = date('Y-m-d H:i:s'); @@ -183,7 +183,7 @@ class autoTranslator * @param string $my_destlang Target language code * @return void */ - private function createTranslationFile($path,$my_destlang) + private function createTranslationFile($path, $my_destlang) { $fp = fopen($path, 'w+'); fwrite($fp, "/*\n"); @@ -205,7 +205,7 @@ class autoTranslator * @param string $my_destlang Language code (ie: fr_FR) * @return int 0=Nothing translated, 1=Record translated */ - private function translateFileLine($content,$file,$key,$value,$my_destlang) + private function translateFileLine($content, $file, $key, $value, $my_destlang) { //print "key =".$key."\n"; diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index e5f1d211f3b..a5b39744e06 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -811,7 +811,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return void */ -function fieldListAccountModel($fieldlist, $obj='', $tabname='', $context='') +function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf,$langs,$db; global $form; diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 1f10403f798..80880c7bbb3 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -813,7 +813,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return void */ -function fieldListAccountingCategories($fieldlist, $obj='', $tabname='', $context='') +function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf,$langs,$db; global $form, $mysoc; diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index 49745676eb3..4611a0ba906 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -696,7 +696,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return void */ -function fieldListJournal($fieldlist, $obj='', $tabname='', $context='') +function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf,$langs,$db; global $form, $mysoc; diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 5b3282a3b29..70752f6d268 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -142,7 +142,7 @@ class AccountancyCategory // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -239,7 +239,7 @@ class AccountancyCategory // extends CommonObject * @param string $label Label * @return int <0 if KO, >0 if OK */ - function fetch($id, $code='', $label='') + function fetch($id, $code = '', $label = '') { $sql = "SELECT"; $sql.= " t.rowid,"; @@ -299,7 +299,7 @@ class AccountancyCategory // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; $error=0; @@ -379,7 +379,7 @@ class AccountancyCategory // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -726,7 +726,7 @@ class AccountancyCategory // extends CommonObject * @param int $year Specifig year - Can be empty * @return integer <0 if KO, >= 0 if OK */ - public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code='nofilter', $month=0, $year=0) + public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code = 'nofilter', $month = 0, $year = 0) { global $conf; @@ -796,7 +796,7 @@ class AccountancyCategory // extends CommonObject * @param int $categorytype -1=All, 0=Only non computed groups, 1=Only computed groups * @return array|int Array of groups or -1 if error */ - public function getCats($categorytype=-1) + public function getCats($categorytype = -1) { global $conf, $mysoc; @@ -853,7 +853,7 @@ class AccountancyCategory // extends CommonObject * @param string $predefinedgroupwhere Sql criteria filter to select accounting accounts * @return array|int Array of accounting accounts or -1 if error */ - public function getCptsCat($cat_id, $predefinedgroupwhere='') + public function getCptsCat($cat_id, $predefinedgroupwhere = '') { global $conf, $mysoc; $sql = ''; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 886e19577fb..38f4e49f2a6 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -466,7 +466,7 @@ class AccountingAccount extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1) { global $langs, $conf, $user; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; @@ -632,7 +632,7 @@ class AccountingAccount extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -645,7 +645,7 @@ class AccountingAccount extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index 9bd21a4a5c4..94cfbf3bd66 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -213,7 +213,7 @@ class AccountingJournal extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0) + function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0) { global $langs, $conf, $user; @@ -270,7 +270,7 @@ class AccountingJournal extends CommonObject * @param int $mode 0=libelle long, 1=libelle court * @return string Label of type */ - function getLibType($mode=0) + function getLibType($mode = 0) { return $this->LibType($this->nature,$mode); } @@ -283,7 +283,7 @@ class AccountingJournal extends CommonObject * @param int $mode 0=libelle long, 1=libelle court * @return string Label of type */ - function LibType($nature,$mode=0) + function LibType($nature, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 297fe0e3e9c..047628a7b96 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -411,7 +411,7 @@ class BookKeeping extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1) { global $db, $conf, $langs; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -470,7 +470,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, Id of created object if OK */ - public function createStd(User $user, $notrigger = false, $mode='') + public function createStd(User $user, $notrigger = false, $mode = '') { global $conf; @@ -641,7 +641,7 @@ class BookKeeping extends CommonObject * * @return int <0 if KO, 0 if not found, >0 if OK */ - public function fetch($id, $ref = null, $mode='') + public function fetch($id, $ref = null, $mode = '') { global $conf; @@ -1090,7 +1090,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, >0 if OK */ - public function update(User $user, $notrigger = false, $mode='') + public function update(User $user, $notrigger = false, $mode = '') { $error = 0; @@ -1225,7 +1225,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return number <0 if KO, >0 if OK */ - public function updateByMvt($piece_num='', $field='', $value='', $mode='') + public function updateByMvt($piece_num = '', $field = '', $value = '', $mode = '') { $error=0; @@ -1260,7 +1260,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, >0 if OK */ - public function delete(User $user, $notrigger = false, $mode='') + public function delete(User $user, $notrigger = false, $mode = '') { dol_syslog(__METHOD__, LOG_DEBUG); @@ -1338,7 +1338,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, >0 if OK */ - function deleteByYearAndJournal($delyear='', $journal='', $mode='') + function deleteByYearAndJournal($delyear = '', $journal = '', $mode = '') { global $conf; @@ -1500,7 +1500,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, >0 if OK */ - public function fetchPerMvt($piecenum, $mode='') + public function fetchPerMvt($piecenum, $mode = '') { global $conf; @@ -1536,7 +1536,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return string Next numero to use */ - public function getNextNumMvt($mode='') + public function getNextNumMvt($mode = '') { global $conf; @@ -1565,7 +1565,7 @@ class BookKeeping extends CommonObject * @param string $mode Mode * @return int <0 if KO, >0 if OK */ - function fetchAllPerMvt($piecenum, $mode='') + function fetchAllPerMvt($piecenum, $mode = '') { global $conf; @@ -1687,7 +1687,7 @@ class BookKeeping extends CommonObject * @param string $piece_num Piece num * @return int int <0 if KO, >0 if OK */ - public function transformTransaction($direction=0,$piece_num='') + public function transformTransaction($direction = 0, $piece_num = '') { $error = 0; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 3a698c6b042..ab8fbe8ca06 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -246,7 +246,7 @@ class Adherent extends CommonObject * @param string $moreinheader Add more html headers * @return int <0 if KO, >0 if OK */ - function send_an_email($text, $subject, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=-1, $errors_to='', $moreinheader='') + function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '') { // phpcs:enable global $conf,$langs; @@ -358,7 +358,7 @@ class Adherent extends CommonObject * @param string $morphy Nature of the adherent (physical or moral) * @return string Label */ - function getmorphylib($morphy='') + function getmorphylib($morphy = '') { global $langs; if (! $morphy) { $morphy=$this->morphy; } @@ -374,7 +374,7 @@ class Adherent extends CommonObject * @param int $notrigger 1 ne declenche pas les triggers, 0 sinon * @return int <0 if KO, >0 if OK */ - function create($user,$notrigger=0) + function create($user, $notrigger = 0) { global $conf,$langs; @@ -500,7 +500,7 @@ class Adherent extends CommonObject * @param string $action Current action for hookmanager * @return int <0 if KO, >0 if OK */ - function update($user,$notrigger=0,$nosyncuser=0,$nosyncuserpass=0,$nosyncthirdparty=0,$action='update') + function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update') { global $conf, $langs, $hookmanager; @@ -817,7 +817,7 @@ class Adherent extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, 0=nothing to do, >0 if OK */ - function delete($rowid, $user, $notrigger=0) + function delete($rowid, $user, $notrigger = 0) { global $conf, $langs; @@ -927,7 +927,7 @@ class Adherent extends CommonObject * @param int $nosyncuser Do not synchronize linked user * @return string If OK return clear password, 0 if no change, < 0 if error */ - function setPassword($user, $password='', $isencrypted=0, $notrigger=0, $nosyncuser=0) + function setPassword($user, $password = '', $isencrypted = 0, $notrigger = 0, $nosyncuser = 0) { global $conf, $langs; @@ -1147,7 +1147,7 @@ class Adherent extends CommonObject * @param string $lastname Lastname * @return void */ - function fetch_name($firstname,$lastname) + function fetch_name($firstname, $lastname) { // phpcs:enable global $conf; @@ -1183,7 +1183,7 @@ class Adherent extends CommonObject * @param bool $fetch_subscriptions To load member subscriptions * @return int >0 if OK, 0 if not found, <0 if KO */ - function fetch($rowid,$ref='',$fk_soc='',$ref_ext='',$fetch_optionals=true,$fetch_subscriptions=true) + function fetch($rowid, $ref = '', $fk_soc = '', $ref_ext = '', $fetch_optionals = true, $fetch_subscriptions = true) { global $langs; @@ -1400,7 +1400,7 @@ class Adherent extends CommonObject * @param int $datesubend Date end subscription * @return int rowid of record added, <0 if KO */ - function subscription($date, $amount, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0) + function subscription($date, $amount, $accountid = 0, $operation = '', $label = '', $num_chq = '', $emetteur_nom = '', $emetteur_banque = '', $datesubend = 0) { global $conf,$langs,$user; @@ -1486,7 +1486,7 @@ class Adherent extends CommonObject * @param string $autocreatethirdparty Auto create new thirdparty if member not yet linked to a thirdparty and we request an option that generate invoice. * @return int <0 if KO, >0 if OK */ - function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom='', $emetteur_banque='', $autocreatethirdparty=0) + function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom = '', $emetteur_banque = '', $autocreatethirdparty = 0) { global $conf, $langs, $user, $mysoc; @@ -2018,7 +2018,7 @@ class Adherent extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine avec URL */ - function getNomUrl($withpictoimg=0, $maxlen=0, $option='card', $mode='', $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1) { global $conf, $langs; @@ -2109,7 +2109,7 @@ class Adherent extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$this->need_subscription,$this->datefin,$mode); } @@ -2124,7 +2124,7 @@ class Adherent extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ - function LibStatut($statut,$need_subscription,$date_end_subscription,$mode=0) + function LibStatut($statut, $need_subscription, $date_end_subscription, $mode = 0) { // phpcs:enable global $langs; @@ -2307,7 +2307,7 @@ class Adherent extends CommonObject * @param null|array $moreparams Array to provide more information * @return int 0 if KO, 1 if OK */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null) + public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null) { global $conf,$langs; @@ -2400,7 +2400,7 @@ class Adherent extends CommonObject * 2=Return key only (uid=qqq) * @return string DN */ - function _load_ldap_dn($info,$mode=0) + function _load_ldap_dn($info, $mode = 0) { // phpcs:enable global $conf; @@ -2694,7 +2694,7 @@ class Adherent extends CommonObject * @param string $daysbeforeendlist Nb of days before end of subscription (negative number = after subscription). Can be a list of delay, separated by a semicolon, for example '10;5;0;-5' * @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK) */ - public function sendReminderForExpiredSubscription($daysbeforeendlist='10') + public function sendReminderForExpiredSubscription($daysbeforeendlist = '10') { global $conf, $langs, $mysoc, $user; diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 984cf49d44d..263012df782 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -103,7 +103,7 @@ class AdherentType extends CommonObject * @param int $notrigger 1=do not execute triggers, 0 otherwise * @return int >0 if OK, < 0 if KO */ - function create($user,$notrigger=0) + function create($user, $notrigger = 0) { global $conf; @@ -170,7 +170,7 @@ class AdherentType extends CommonObject * @param int $notrigger 1=do not execute triggers, 0 otherwise * @return int >0 if OK, < 0 if KO */ - function update($user,$notrigger=0) + function update($user, $notrigger = 0) { global $conf, $hookmanager; @@ -356,7 +356,7 @@ class AdherentType extends CommonObject * 2=Return array of members id only * @return mixed Array of members or -1 on error */ - function listMembersForMemberType($excludefilter='', $mode=0) + function listMembersForMemberType($excludefilter = '', $mode = 0) { global $conf, $user; @@ -411,7 +411,7 @@ class AdherentType extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto=0, $maxlen=0, $notooltip=0) + function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0) { global $langs; @@ -449,7 +449,7 @@ class AdherentType extends CommonObject * 2=Return key only (uid=qqq) * @return string DN */ - function _load_ldap_dn($info,$mode=0) + function _load_ldap_dn($info, $mode = 0) { // phpcs:enable global $conf; diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index 310a40c52b3..f5ef24fb465 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -52,7 +52,7 @@ class AdherentStats extends Stats * @param int $socid Id third party * @param int $userid Id user for filter */ - function __construct($db, $socid=0, $userid=0) + function __construct($db, $socid = 0, $userid = 0) { global $user, $conf; @@ -85,7 +85,7 @@ class AdherentStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of nb each month */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { global $user; @@ -126,7 +126,7 @@ class AdherentStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of amount each month */ - function getAmountByMonth($year, $format=0) + function getAmountByMonth($year, $format = 0) { global $user; diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php index 2da35df7e2c..a728ffe78d3 100644 --- a/htdocs/adherents/class/api_members.class.php +++ b/htdocs/adherents/class/api_members.class.php @@ -361,7 +361,7 @@ class Members extends DolibarrApi * * @url POST {id}/subscriptions */ - function createSubscription($id, $start_date, $end_date, $amount, $label='') + function createSubscription($id, $start_date, $end_date, $amount, $label = '') { if(! DolibarrApiAccess::$user->rights->adherent->cotisation->creer) { throw new RestException(401); diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index 96876eb82b6..319dbb1f75b 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -207,7 +207,7 @@ $type=$this->fk_type; * @param int $notrigger 0=Disable triggers * @return int <0 if KO, >0 if OK */ - function update($user, $notrigger=0) + function update($user, $notrigger = 0) { $error = 0; @@ -263,7 +263,7 @@ $type=$this->fk_type; * @param bool $notrigger false=launch triggers after, true=disable triggers * @return int <0 if KO, 0 if not found, >0 if OK */ - function delete($user, $notrigger=false) + function delete($user, $notrigger = false) { $error = 0; @@ -356,7 +356,7 @@ $type=$this->fk_type; * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $notooltip=0, $option='', $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $notooltip = 0, $option = '', $morecss = '', $save_lastsearch_value = -1) { global $langs; @@ -395,7 +395,7 @@ $type=$this->fk_type; * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return ''; } diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index fc3b8f15f39..df61d33092a 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1755,7 +1755,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return string '' or value of entity into table */ -function fieldList($fieldlist, $obj='', $tabname='', $context='') +function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf,$langs,$db,$mysoc; global $form; diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php index 553ce2e54e0..e676423e6b0 100644 --- a/htdocs/admin/dolistore/class/dolistore.class.php +++ b/htdocs/admin/dolistore/class/dolistore.class.php @@ -54,7 +54,7 @@ class Dolistore * * @param boolean $debug Enable debug of request on screen */ - function __construct($debug=false) + function __construct($debug = false) { global $conf, $langs; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index da31a794374..a6b2e89cc1a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -947,7 +947,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return void */ -function fieldList($fieldlist, $obj='', $tabname='', $context='') +function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf, $langs, $user, $db; global $form; diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index e36b8d59df3..e4cc568ea03 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -659,7 +659,7 @@ $db->close(); * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @return void */ -function fieldListWebsites($fieldlist, $obj='', $tabname='', $context='') +function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '') { global $conf,$langs,$db; global $form; diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php index 6d6ef4578cd..10341ce170c 100644 --- a/htdocs/api/class/api.class.php +++ b/htdocs/api/class/api.class.php @@ -46,7 +46,7 @@ class DolibarrApi * @param string $cachedir Cache dir * @param boolean $refreshCache Update cache */ - function __construct($db, $cachedir='', $refreshCache=false) + function __construct($db, $cachedir = '', $refreshCache = false) { global $conf, $dolibarr_main_url_root; @@ -222,7 +222,7 @@ class DolibarrApi * @return bool * @throws RestException */ - static function _checkAccessToResource($resource, $resource_id=0, $dbtablename='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid') + static function _checkAccessToResource($resource, $resource_id = 0, $dbtablename = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid') { // Features/modules to check diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php index 86d1cfff87c..01b0fdd56da 100644 --- a/htdocs/api/class/api_login.class.php +++ b/htdocs/api/class/api_login.class.php @@ -55,7 +55,7 @@ class Login * @url GET / * @url POST / */ - public function index($login, $password, $entity='', $reset=0) + public function index($login, $password, $entity = '', $reset = 0) { global $conf, $dolibarr_main_authentication, $dolibarr_auto_user; diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 335a9f6e9d1..93f2e88f725 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -312,7 +312,7 @@ class Asset extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1) { global $db, $conf, $langs; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -369,7 +369,7 @@ class Asset extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -382,7 +382,7 @@ class Asset extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label of status */ - static function LibStatut($status,$mode=0) + static function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php index 51d76d75155..54421b8910f 100644 --- a/htdocs/asset/class/asset_type.class.php +++ b/htdocs/asset/class/asset_type.class.php @@ -89,7 +89,7 @@ class AssetType extends CommonObject * @param int $notrigger 1=do not execute triggers, 0 otherwise * @return int >0 if OK, < 0 if KO */ - function create($user,$notrigger=0) + function create($user, $notrigger = 0) { global $conf; @@ -166,7 +166,7 @@ class AssetType extends CommonObject * @param int $notrigger 1=do not execute triggers, 0 otherwise * @return int >0 if OK, < 0 if KO */ - function update($user,$notrigger=0) + function update($user, $notrigger = 0) { global $conf, $hookmanager; @@ -350,7 +350,7 @@ class AssetType extends CommonObject * 2=Return array of asset id only * @return mixed Array of asset or -1 on error */ - function listAssetForAssetType($excludefilter='', $mode=0) + function listAssetForAssetType($excludefilter = '', $mode = 0) { global $conf, $user; @@ -405,7 +405,7 @@ class AssetType extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto=0, $maxlen=0, $notooltip=0) + function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0) { global $langs; diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php index 0d0fc183b6c..c200bd4d9e5 100644 --- a/htdocs/blockedlog/class/authority.class.php +++ b/htdocs/blockedlog/class/authority.class.php @@ -142,7 +142,7 @@ class BlockedLogAuthority * @param string $signature Signature of object to load * @return int >0 if OK, <0 if KO, 0 if not found */ - public function fetch($id, $signature='') + public function fetch($id, $signature = '') { global $langs; diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index bc65c72260d..25c95e2346c 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -725,7 +725,7 @@ class BlockedLog * @param string $mode 0=unserialize, 1=json_decode * @return string Value unserialized */ - public function dolDecodeBlockedData($data, $mode=0) + public function dolDecodeBlockedData($data, $mode = 0) { try { @@ -763,7 +763,7 @@ class BlockedLog * @param int $forcesignature Force signature (for example '0000000000' when we disabled the module) * @return int <0 if KO, >0 if OK */ - public function create($user, $forcesignature='') + public function create($user, $forcesignature = '') { global $conf,$langs,$hookmanager; @@ -878,7 +878,7 @@ class BlockedLog * @param string $previoushash If previous signature hash is known, we can provide it to avoid to make a search of it in database. * @return boolean True if OK, False if KO */ - public function checkSignature($previoushash='') + public function checkSignature($previoushash = '') { if (empty($previoushash)) { @@ -921,7 +921,7 @@ class BlockedLog * @param int $beforeid ID of a record * @return string Hash of previous record (if beforeid is defined) or hash of last record (if beforeid is 0) */ - public function getPreviousHash($withlock=0, $beforeid=0) + public function getPreviousHash($withlock = 0, $beforeid = 0) { global $conf; @@ -972,7 +972,7 @@ class BlockedLog * @param string $search_code search code * @return array|int Array of object log or <0 if error */ - public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref='', $search_amount='', $search_code='') + public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref = '', $search_amount = '', $search_code = '') { global $conf, $cachedlogs; @@ -1070,7 +1070,7 @@ class BlockedLog * @param int $ignoresystem Ignore system events for the test * @return bool */ - function alreadyUsed($ignoresystem=0) + function alreadyUsed($ignoresystem = 0) { global $conf; diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index ea6ac7a47bd..dca01ea667e 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -283,7 +283,7 @@ class Facturation * @param int $aId Id * @return id */ - public function id($aId=null) + public function id($aId = null) { if ( !$aId ) @@ -308,7 +308,7 @@ class Facturation * @param string $aRef Ref * @return string Ref */ - public function ref($aRef=null) + public function ref($aRef = null) { if (is_null($aRef)) @@ -331,7 +331,7 @@ class Facturation * @param int $aQte Qty * @return int Qty */ - public function qte($aQte=null) + public function qte($aQte = null) { if (is_null($aQte)) { @@ -354,7 +354,7 @@ class Facturation * @param string $aStock Stock * @return string Stock */ - public function stock($aStock=null) + public function stock($aStock = null) { if (is_null($aStock)) @@ -377,7 +377,7 @@ class Facturation * @param string $aRemisePercent Discount * @return string Discount */ - public function remisePercent($aRemisePercent=null) + public function remisePercent($aRemisePercent = null) { if (is_null($aRemisePercent)) @@ -400,7 +400,7 @@ class Facturation * @param int $aMontantRemise Amount * @return string Amount */ - public function montantRemise($aMontantRemise=null) + public function montantRemise($aMontantRemise = null) { if (is_null($aMontantRemise)) { @@ -421,7 +421,7 @@ class Facturation * @param int $aPrix Price * @return string Stock */ - public function prix($aPrix=null) + public function prix($aPrix = null) { if (is_null($aPrix)) { @@ -442,7 +442,7 @@ class Facturation * @param int $aTva Vat * @return int Vat */ - public function tva($aTva=null) + public function tva($aTva = null) { if (is_null($aTva)) { @@ -462,7 +462,7 @@ class Facturation * @param string $aNumFacture Invoice ref * @return string Invoice ref */ - public function numInvoice($aNumFacture=null) + public function numInvoice($aNumFacture = null) { if (is_null($aNumFacture)) { @@ -482,7 +482,7 @@ class Facturation * @param int $aModeReglement Payment mode * @return int Payment mode */ - public function getSetPaymentMode($aModeReglement=null) + public function getSetPaymentMode($aModeReglement = null) { if (is_null($aModeReglement)) { @@ -503,7 +503,7 @@ class Facturation * @param int $aMontantEncaisse Amount * @return int Amount */ - public function montantEncaisse($aMontantEncaisse=null) + public function montantEncaisse($aMontantEncaisse = null) { if (is_null($aMontantEncaisse)) { @@ -524,7 +524,7 @@ class Facturation * @param int $aMontantRendu Amount * @return int Amount */ - public function montantRendu($aMontantRendu=null) + public function montantRendu($aMontantRendu = null) { if (is_null($aMontantRendu)) { @@ -545,7 +545,7 @@ class Facturation * @param date $aPaiementLe Date * @return date Date */ - public function paiementLe($aPaiementLe=null) + public function paiementLe($aPaiementLe = null) { if (is_null($aPaiementLe)) { @@ -565,7 +565,7 @@ class Facturation * @param int $aTotalHt Total amount * @return int Total amount */ - public function prixTotalHt($aTotalHt=null) + public function prixTotalHt($aTotalHt = null) { if (is_null($aTotalHt)) { @@ -585,7 +585,7 @@ class Facturation * @param int $aMontantTva Amount vat * @return int Amount vat */ - public function montantTva($aMontantTva=null) + public function montantTva($aMontantTva = null) { if (is_null($aMontantTva)) { @@ -605,7 +605,7 @@ class Facturation * @param int $aTotalTtc Amount ttc * @return int Amount ttc */ - public function prixTotalTtc($aTotalTtc=null) + public function prixTotalTtc($aTotalTtc = null) { if (is_null($aTotalTtc)) { diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e4d95d490ed..138c5f154fa 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -234,7 +234,7 @@ class Categorie extends CommonObject * @param string $type Type of category ('product', '...') or (0, 1, ...) * @return int <0 if KO, >0 if OK */ - function fetch($id, $label='', $type=null) + function fetch($id, $label = '', $type = null) { global $conf; @@ -501,7 +501,7 @@ class Categorie extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 KO >0 OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf,$langs; @@ -691,7 +691,7 @@ class Categorie extends CommonObject * * @return int 1 if OK, -1 if KO */ - function del_type($obj,$type) + function del_type($obj, $type) { // phpcs:enable global $user,$langs,$conf; @@ -749,7 +749,7 @@ class Categorie extends CommonObject * @return array|int -1 if KO, array of instance of object if OK * @see containsObject */ - function getObjectsInCateg($type, $onlyids=0) + function getObjectsInCateg($type, $onlyids = 0) { $objs = array(); @@ -821,7 +821,7 @@ class Categorie extends CommonObject * @param int $page Page number * @return array|int Array of categories, 0 if no cat, -1 on error */ - function getListForItem($id, $type='customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) + function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) { global $conf; @@ -990,7 +990,7 @@ class Categorie extends CommonObject * * @return array|int Array of categories. this->cats and this->motherof are set, -1 on error */ - function get_full_arbo($type, $markafterid=0) + function get_full_arbo($type, $markafterid = 0) { // phpcs:enable global $conf, $langs; @@ -1076,7 +1076,7 @@ class Categorie extends CommonObject * @param int $protection Deep counter to avoid infinite loop * @return void */ - function build_path_from_id_categ($id_categ,$protection=1000) + function build_path_from_id_categ($id_categ, $protection = 1000) { // phpcs:enable dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG); @@ -1143,7 +1143,7 @@ class Categorie extends CommonObject * @param boolean $parent Just parent categories if true * @return array|int Table of Object Category, -1 on error */ - function get_all_categories($type=null, $parent=false) + function get_all_categories($type = null, $parent = false) { // phpcs:enable if (! is_numeric($type)) $type = $this->MAP_ID[$type]; @@ -1232,7 +1232,7 @@ class Categorie extends CommonObject * @param int $type Type of category (0, 1, ...) * @return array */ - function get_main_categories($type=null) + function get_main_categories($type = null) { // phpcs:enable return $this->get_all_categories($type, true); @@ -1248,7 +1248,7 @@ class Categorie extends CommonObject * @param int $nocolor 0 * @return array */ - function print_all_ways($sep = " >> ", $url='', $nocolor=0) + function print_all_ways($sep = " >> ", $url = '', $nocolor = 0) { // phpcs:enable $ways = array(); @@ -1376,7 +1376,7 @@ class Categorie extends CommonObject * labels, 'id'= Get array of category IDs * @return array|int Array of category objects or < 0 if KO */ - function containing($id, $type, $mode='object') + function containing($id, $type, $mode = 'object') { $cats = array(); @@ -1522,7 +1522,7 @@ class Categorie extends CommonObject * @param int $maxlength Max length of text * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$option='',$maxlength=0) + function getNomUrl($withpicto = 0, $option = '', $maxlength = 0) { global $langs; @@ -1608,7 +1608,7 @@ class Categorie extends CommonObject * @param int $nbmax Nombre maximum de photos (0=pas de max) * @return array Tableau de photos */ - function liste_photos($dir,$nbmax=0) + function liste_photos($dir, $nbmax = 0) { // phpcs:enable include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 05d5fa43c86..949639341da 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -566,7 +566,7 @@ class ActionComm extends CommonObject * @param string $ref_ext Ref ext to get * @return int <0 if KO, >0 if OK */ - function fetch($id, $ref='',$ref_ext='') + function fetch($id, $ref = '', $ref_ext = '') { global $langs; @@ -761,7 +761,7 @@ class ActionComm extends CommonObject * @param int $notrigger 1 = disable triggers, 0 = enable triggers * @return int <0 if KO, >0 if OK */ - function delete($notrigger=0) + function delete($notrigger = 0) { global $user,$langs,$conf; @@ -838,7 +838,7 @@ class ActionComm extends CommonObject * @param int $notrigger 1 = disable triggers, 0 = enable triggers * @return int <0 if KO, >0 if OK */ - function update($user,$notrigger=0) + function update($user, $notrigger = 0) { global $langs,$conf,$hookmanager; @@ -999,7 +999,7 @@ class ActionComm extends CommonObject * @param string $limit Limit number of answers * @return array or string Error string if KO, array with actions if OK */ - static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='', $sortfield='a.datep', $sortorder='DESC', $limit=0) + static function getActions($db, $socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0) { global $conf, $langs; @@ -1051,7 +1051,7 @@ class ActionComm extends CommonObject * @param int $load_state_board Charge indicateurs this->nb de tableau de bord * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK */ - function load_board($user, $load_state_board=0) + function load_board($user, $load_state_board = 0) { // phpcs:enable global $conf, $langs; @@ -1164,7 +1164,7 @@ class ActionComm extends CommonObject * @param int $hidenastatus 1=Show nothing if status is "Not applicable" * @return string String with status */ - function getLibStatut($mode,$hidenastatus=0) + function getLibStatut($mode, $hidenastatus = 0) { return $this->LibStatut($this->percentage,$mode,$hidenastatus,$this->datep); } @@ -1179,7 +1179,7 @@ class ActionComm extends CommonObject * @param int $datestart Date start of event * @return string Label */ - function LibStatut($percent,$mode,$hidenastatus=0,$datestart='') + function LibStatut($percent, $mode, $hidenastatus = 0, $datestart = '') { // phpcs:enable global $langs; @@ -1257,7 +1257,7 @@ class ActionComm extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $maxlength=0, $classname='', $option='', $overwritepicto=0, $notooltip=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $maxlength = 0, $classname = '', $option = '', $overwritepicto = 0, $notooltip = 0, $save_lastsearch_value = -1) { global $conf, $langs, $user, $hookmanager, $action; @@ -1391,7 +1391,7 @@ class ActionComm extends CommonObject * @param array $filters Array of filters. Exemple array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...) * @return int <0 if error, nb of events in new file if ok */ - function build_exportfile($format,$type,$cachedelay,$filename,$filters) + function build_exportfile($format, $type, $cachedelay, $filename, $filters) { // phpcs:enable global $conf,$langs,$dolibarr_main_url_root,$mysoc; diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php index 6631d0e375d..4d5536e50fc 100644 --- a/htdocs/comm/action/class/actioncommreminder.class.php +++ b/htdocs/comm/action/class/actioncommreminder.class.php @@ -178,7 +178,7 @@ class ActionCommReminder extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -191,7 +191,7 @@ class ActionCommReminder extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label of status */ - static function LibStatut($status,$mode=0) + static function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index d6c25f6d4c1..8efb6ab0515 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -130,7 +130,7 @@ class CActionComm * @param int $shortlabel 1=Get short label instead of long label * @return mixed Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode. */ - function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0, $morefilter='', $shortlabel=0) + function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0) { // phpcs:enable global $langs,$conf; @@ -223,7 +223,7 @@ class CActionComm * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Picto only * @return string Label of action type */ - function getNomUrl($withpicto=0) + function getNomUrl($withpicto = 0) { global $langs; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index a73731699f2..3d062298f53 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1277,7 +1277,7 @@ $db->close(); * @param string $nonew 0=Add "new entry button", 1=No "new entry button", -1=Only "new entry button" * @return void */ -function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $nonew=0) +function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $nonew = 0) { global $user, $conf, $langs; global $action, $filter, $filtert, $status, $actioncode, $usergroup; // Filters used into search form diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index 67a4534ca14..0c2f3f95c4f 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -757,7 +757,7 @@ $db->close(); * @param bool $var true or false for alternat style on tr/td * @return void */ -function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false) +function show_day_events_pertype($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $showheader = false, $colorsbytype = array(), $var = false) { global $db; global $user, $conf, $langs, $hookmanager, $action; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 9e2a7278a27..6271a9a3880 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -905,7 +905,7 @@ $db->close(); * @param bool $var true or false for alternat style on tr/td * @return void */ -function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array(), $var=false) +function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $showheader = false, $colorsbytype = array(), $var = false) { global $db; global $user, $conf, $langs, $hookmanager, $action; diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 83833304d44..2f88cb2dd9c 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -108,7 +108,7 @@ class AdvanceTargetingMailing extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -260,7 +260,7 @@ class AdvanceTargetingMailing extends CommonObject * @param int $id Id object * @return int <0 if KO, >0 if OK */ - function fetch_by_mailing($id=0) + function fetch_by_mailing($id = 0) { // phpcs:enable global $langs; @@ -327,7 +327,7 @@ class AdvanceTargetingMailing extends CommonObject * @param string $type_element Type target * @return int <0 if KO, >0 if OK */ - function fetch_by_element($id=0, $type_element='mailing') + function fetch_by_element($id = 0, $type_element = 'mailing') { // phpcs:enable global $langs; @@ -390,7 +390,7 @@ class AdvanceTargetingMailing extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user, $notrigger=0) + function update($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -466,7 +466,7 @@ class AdvanceTargetingMailing extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -525,7 +525,7 @@ class AdvanceTargetingMailing extends CommonObject * @param array $arrayquery All element to Query * @return int <0 if KO, >0 if OK */ - function savequery($user,$arrayquery) + function savequery($user, $arrayquery) { global $langs,$conf; @@ -946,7 +946,7 @@ class AdvanceTargetingMailing extends CommonObject * For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima * @return string Sql to use for the where condition */ - public function transformToSQL($column_to_test,$criteria) + public function transformToSQL($column_to_test, $criteria) { $return_sql_criteria = '('; diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php index 19b1ce3e9b4..369c0536a33 100644 --- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php +++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php @@ -92,7 +92,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array or Code or Label of preselected country * @return string HTML string with select */ - function multiselectCountry($htmlname = 'country_id', $selected_array=array()) + function multiselectCountry($htmlname = 'country_id', $selected_array = array()) { global $conf, $langs; @@ -194,7 +194,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array selected array * @return string combo list code */ - function multiselectselectLanguage($htmlname='', $selected_array=array()) + function multiselectselectLanguage($htmlname = '', $selected_array = array()) { global $conf,$langs; @@ -290,7 +290,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array Array * @return string HTML combo */ - function multiselectCivility($htmlname='civilite_id',$selected_array = array()) + function multiselectCivility($htmlname = 'civilite_id', $selected_array = array()) { global $conf,$langs,$user; $langs->load("dict"); @@ -356,7 +356,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array value selected * @return string HTML combo */ - function multiselectCustomerCategories($htmlname='cust_cat',$selected_array = array()) + function multiselectCustomerCategories($htmlname = 'cust_cat', $selected_array = array()) { return $this->multiselectCategories($htmlname,$selected_array,2); } @@ -368,7 +368,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array value selected * @return string HTML combo */ - function multiselectContactCategories($htmlname='contact_cat',$selected_array = array()) + function multiselectContactCategories($htmlname = 'contact_cat', $selected_array = array()) { return $this->multiselectCategories($htmlname,$selected_array,4); } @@ -381,7 +381,7 @@ class FormAdvTargetEmailing extends Form * @param int $type Type * @return string HTML combo */ - public function multiselectCategories($htmlname='',$selected_array = array(), $type=0) + public function multiselectCategories($htmlname = '', $selected_array = array(), $type = 0) { global $conf,$langs,$user; $langs->load("dict"); @@ -427,7 +427,7 @@ class FormAdvTargetEmailing extends Form * @param string $type_element Type element. Example: 'mailing' * @return string HTML combo */ - public function selectAdvtargetemailingTemplate($htmlname='template_id', $selected=0, $showempty=0, $type_element='mailing') + public function selectAdvtargetemailingTemplate($htmlname = 'template_id', $selected = 0, $showempty = 0, $type_element = 'mailing') { global $conf, $user, $langs; diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index b807ea23334..7e1073a0f2a 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -271,7 +271,7 @@ class Mailing extends CommonObject * @param int $option2 Not used * @return int New id of clone */ - function createFromClone($fromid,$option1,$option2) + function createFromClone($fromid, $option1, $option2) { global $user,$langs; @@ -536,7 +536,7 @@ class Mailing extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1) { global $db, $conf, $langs, $hookmanager; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -607,7 +607,7 @@ class Mailing extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -620,7 +620,7 @@ class Mailing extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; @@ -670,7 +670,7 @@ class Mailing extends CommonObject * @param strin $desc Desc error * @return string Label */ - public static function libStatutDest($statut,$mode=0,$desc='') + public static function libStatutDest($statut, $mode = 0, $desc = '') { global $langs; $langs->load('mails'); diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index a03624f3122..6ce38f8c432 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -559,7 +559,7 @@ class Proposals extends DolibarrApi * * @return array */ - function validate($id, $notrigger=0) + function validate($id, $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); @@ -607,7 +607,7 @@ class Proposals extends DolibarrApi * * @return array */ - function close($id, $status, $note_private='', $notrigger=0) + function close($id, $status, $note_private = '', $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 55dd950abf2..d1d3fb086bd 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -239,7 +239,7 @@ class Propal extends CommonObject * @param int $socid Id third party * @param int $propalid Id proposal */ - function __construct($db, $socid="", $propalid=0) + function __construct($db, $socid = "", $propalid = 0) { global $conf,$langs; @@ -267,7 +267,7 @@ class Propal extends CommonObject * TODO Replace calls to this function by generation objet Ligne * inserted into table $this->products */ - function add_product($idproduct, $qty, $remise_percent=0) + function add_product($idproduct, $qty, $remise_percent = 0) { // phpcs:enable global $conf, $mysoc; @@ -434,7 +434,7 @@ class Propal extends CommonObject * @return int >0 if OK, <0 if KO * @see add_product */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise=0, $fk_remise_except=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0) { global $mysoc, $conf, $langs; @@ -663,7 +663,7 @@ class Propal extends CommonObject * @param int $notrigger disable line update trigger * @return int 0 if OK, <0 if KO */ - function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0) + function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0) { global $mysoc; @@ -869,7 +869,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >=0 if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf,$hookmanager; $error=0; @@ -1216,7 +1216,7 @@ class Propal extends CommonObject * @param int $socid Id of thirdparty * @return int New id of clone */ - function createFromClone($socid=0) + function createFromClone($socid = 0) { global $user,$conf,$hookmanager; @@ -1340,7 +1340,7 @@ class Propal extends CommonObject * @param string $ref Ref of proposal * @return int >0 if OK, <0 if KO */ - function fetch($rowid,$ref='') + function fetch($rowid, $ref = '') { $sql = "SELECT p.rowid, p.ref, p.entity, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc"; @@ -1504,7 +1504,7 @@ class Propal extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf; @@ -1599,7 +1599,7 @@ class Propal extends CommonObject * @param int $only_product Return only physical products * @return int <0 if KO, >0 if OK */ - function fetch_lines($only_product=0) + function fetch_lines($only_product = 0) { // phpcs:enable $this->lines=array(); @@ -1718,7 +1718,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0=execute triggers * @return int <0 if KO, 0=Nothing done, >=0 if OK */ - function valid($user, $notrigger=0) + function valid($user, $notrigger = 0) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -1842,7 +1842,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_date($user, $date, $notrigger=0) + function set_date($user, $date, $notrigger = 0) { // phpcs:enable if (empty($date)) @@ -1911,7 +1911,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_echeance($user, $date_fin_validite, $notrigger=0) + function set_echeance($user, $date_fin_validite, $notrigger = 0) { // phpcs:enable if (! empty($user->rights->propal->creer)) @@ -1973,7 +1973,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function set_date_livraison($user, $date_livraison, $notrigger=0) + function set_date_livraison($user, $date_livraison, $notrigger = 0) { // phpcs:enable if (! empty($user->rights->propal->creer)) @@ -2035,7 +2035,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_availability($user, $id, $notrigger=0) + function set_availability($user, $id, $notrigger = 0) { // phpcs:enable if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT) @@ -2106,7 +2106,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_demand_reason($user, $id, $notrigger=0) + function set_demand_reason($user, $id, $notrigger = 0) { // phpcs:enable if (! empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT) @@ -2179,7 +2179,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function set_ref_client($user, $ref_client, $notrigger=0) + function set_ref_client($user, $ref_client, $notrigger = 0) { // phpcs:enable if (! empty($user->rights->propal->creer)) @@ -2244,7 +2244,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function set_remise_percent($user, $remise, $notrigger=0) + function set_remise_percent($user, $remise, $notrigger = 0) { // phpcs:enable $remise=trim($remise)?trim($remise):0; @@ -2311,7 +2311,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function set_remise_absolue($user, $remise, $notrigger=0) + function set_remise_absolue($user, $remise, $notrigger = 0) { // phpcs:enable $remise=trim($remise)?trim($remise):0; @@ -2380,7 +2380,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function reopen($user, $statut, $note='', $notrigger=0) + function reopen($user, $statut, $note = '', $notrigger = 0) { $this->statut = $statut; @@ -2441,7 +2441,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @return int <0 if KO, >0 if OK */ - function cloture($user, $statut, $note="", $notrigger=0) + function cloture($user, $statut, $note = "", $notrigger = 0) { global $langs,$conf; @@ -2544,7 +2544,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 si ko, >0 si ok */ - function classifyBilled(User $user, $notrigger=0) + function classifyBilled(User $user, $notrigger = 0) { $error=0; @@ -2600,7 +2600,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_draft($user, $notrigger=0) + function set_draft($user, $notrigger = 0) { // phpcs:enable $error=0; @@ -2665,7 +2665,7 @@ class Propal extends CommonObject * @param string $sortorder Sort order * @return int -1 if KO, array with result if OK */ - function liste_array($shortlist=0, $draft=0, $notcurrentuser=0, $socid=0, $limit=0, $offset=0, $sortfield='p.datep', $sortorder='DESC') + function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC') { // phpcs:enable global $user; @@ -2833,7 +2833,7 @@ class Propal extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int 1 if ok, otherwise if error */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -2957,7 +2957,7 @@ class Propal extends CommonObject * @return int >0 if OK, <0 if KO * @deprecated use set_availability */ - function availability($availability_id, $notrigger=0) + function availability($availability_id, $notrigger = 0) { global $user; @@ -3028,7 +3028,7 @@ class Propal extends CommonObject * @return int >0 si ok, <0 si ko * @deprecated use set_demand_reason */ - function demand_reason($demand_reason_id, $notrigger=0) + function demand_reason($demand_reason_id, $notrigger = 0) { // phpcs:enable global $user; @@ -3153,7 +3153,7 @@ class Propal extends CommonObject * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut, $mode); } @@ -3166,7 +3166,7 @@ class Propal extends CommonObject * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label */ - function LibStatut($statut,$mode=1) + function LibStatut($statut, $mode = 1) { // phpcs:enable global $conf; @@ -3213,7 +3213,7 @@ class Propal extends CommonObject * @param int $mode "opened" for proposal to close, "signed" for proposal to invoice * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK */ - function load_board($user,$mode) + function load_board($user, $mode) { // phpcs:enable global $conf, $langs; @@ -3495,7 +3495,7 @@ class Propal extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $get_params='', $notooltip=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1) { global $langs, $conf, $user; @@ -3585,7 +3585,7 @@ class Propal extends CommonObject * @param null|array $moreparams Array to provide more information * @return int 0 if KO, 1 if OK */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null) + public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null) { global $conf,$langs; @@ -3854,7 +3854,7 @@ class PropaleLigne extends CommonObjectLine * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function insert($notrigger=0) + function insert($notrigger = 0) { global $conf,$user; @@ -3997,7 +3997,7 @@ class PropaleLigne extends CommonObjectLine * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function delete(User $user, $notrigger=0) + function delete(User $user, $notrigger = 0) { global $conf; @@ -4051,7 +4051,7 @@ class PropaleLigne extends CommonObjectLine * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function update($notrigger=0) + function update($notrigger = 0) { global $conf,$user; diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index bdd4a9dfba2..4286bb17448 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -56,7 +56,7 @@ class PropaleStats extends Stats * @param int $userid Id user for filter (creation user) * @param string $mode Option ('customer', 'supplier') */ - function __construct($db, $socid=0, $userid=0, $mode='customer') + function __construct($db, $socid = 0, $userid = 0, $mode = 'customer') { global $user, $conf; @@ -106,7 +106,7 @@ class PropaleStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array with number by month */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { global $user; diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 1135a5c2502..c531948f4cd 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -496,7 +496,7 @@ class Orders extends DolibarrApi * * @return array */ - function validate($id, $idwarehouse=0, $notrigger=0) + function validate($id, $idwarehouse = 0, $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->commande->creer) { throw new RestException(401); @@ -629,7 +629,7 @@ class Orders extends DolibarrApi * * @return int */ - function close($id, $notrigger=0) + function close($id, $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->commande->creer) { throw new RestException(401); @@ -675,7 +675,7 @@ class Orders extends DolibarrApi * * @return array */ - function settodraft($id, $idwarehouse=-1) + function settodraft($id, $idwarehouse = -1) { if(! DolibarrApiAccess::$user->rights->commande->creer) { throw new RestException(401); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 8934e293973..894f9c5c687 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -313,7 +313,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <=0 if OK, 0=Nothing done, >0 if KO */ - function valid($user, $idwarehouse=0, $notrigger=0) + function valid($user, $idwarehouse = 0, $notrigger = 0) { global $conf,$langs; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -474,7 +474,7 @@ class Commande extends CommonOrder * @param int $idwarehouse Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on) * @return int <0 if KO, >0 if OK */ - function set_draft($user, $idwarehouse=-1) + function set_draft($user, $idwarehouse = -1) { //phpcs:enable global $conf,$langs; @@ -617,7 +617,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @return int <0 if KO, >0 if OK */ - function cloture($user, $notrigger=0) + function cloture($user, $notrigger = 0) { global $conf; @@ -677,7 +677,7 @@ class Commande extends CommonOrder * @param int $idwarehouse Id warehouse to use for stock change. * @return int <0 if KO, >0 if OK */ - function cancel($idwarehouse=-1) + function cancel($idwarehouse = -1) { global $conf,$user,$langs; @@ -758,7 +758,7 @@ class Commande extends CommonOrder * @param int $notrigger Disable all triggers * @return int <0 if KO, >0 if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf,$langs; $error=0; @@ -1060,7 +1060,7 @@ class Commande extends CommonOrder * @param int $socid Id of thirdparty * @return int New id of clone */ - function createFromClone($socid=0) + function createFromClone($socid = 0) { global $user,$hookmanager; @@ -1302,7 +1302,7 @@ class Commande extends CommonOrder * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise = 0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0) { global $mysoc, $conf, $langs, $user; @@ -1531,7 +1531,7 @@ class Commande extends CommonOrder * TODO Remplacer les appels a cette fonction par generation objet Ligne * insere dans tableau $this->products */ - function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $date_end='') + function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '') { // phpcs:enable global $conf, $mysoc; @@ -1616,7 +1616,7 @@ class Commande extends CommonOrder * @param string $ref_int Internal reference of other object * @return int >0 if OK, <0 if KO, 0 if not found */ - function fetch($id, $ref='', $ref_ext='', $ref_int='') + function fetch($id, $ref = '', $ref_ext = '', $ref_int = '') { // Check parameters @@ -1845,7 +1845,7 @@ class Commande extends CommonOrder * @param int $only_product Return only physical products * @return int <0 if KO, >0 if OK */ - function fetch_lines($only_product=0) + function fetch_lines($only_product = 0) { // phpcs:enable $this->lines=array(); @@ -2027,7 +2027,7 @@ class Commande extends CommonOrder * @param int $filtre_statut Filter on shipment status * @return int <0 if KO, Nb of lines found if OK */ - function loadExpeditions($filtre_statut=-1) + function loadExpeditions($filtre_statut = -1) { $this->expeditions = array(); @@ -2103,7 +2103,7 @@ class Commande extends CommonOrder * * TODO FONCTION NON FINIE A FINIR */ - function stock_array($filtre_statut=self::STATUS_CANCELED) + function stock_array($filtre_statut = self::STATUS_CANCELED) { // phpcs:enable $this->stocks = array(); @@ -2143,7 +2143,7 @@ class Commande extends CommonOrder * @param int $lineid Id of line to delete * @return int >0 if OK, 0 if nothing to do, <0 if KO */ - function deleteline($user=null, $lineid=0) + function deleteline($user = null, $lineid = 0) { if ($this->statut == self::STATUS_DRAFT) { @@ -2221,7 +2221,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_remise($user, $remise, $notrigger=0) + function set_remise($user, $remise, $notrigger = 0) { // phpcs:enable $remise=trim($remise)?trim($remise):0; @@ -2289,7 +2289,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_remise_absolue($user, $remise, $notrigger=0) + function set_remise_absolue($user, $remise, $notrigger = 0) { // phpcs:enable $remise=trim($remise)?trim($remise):0; @@ -2357,7 +2357,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_date($user, $date, $notrigger=0) + function set_date($user, $date, $notrigger = 0) { // phpcs:enable if ($user->rights->commande->creer) @@ -2423,7 +2423,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 si ko, >0 si ok */ - function set_date_livraison($user, $date_livraison, $notrigger=0) + function set_date_livraison($user, $date_livraison, $notrigger = 0) { // phpcs:enable if ($user->rights->commande->creer) @@ -2494,7 +2494,7 @@ class Commande extends CommonOrder * @param string $sortorder Sort order * @return int -1 if KO, array with result if OK */ - function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='c.date_commande', $sortorder='DESC') + function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC') { // phpcs:enable global $user; @@ -2562,7 +2562,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int >0 if OK, <0 if KO */ - function availability($availability_id, $notrigger=0) + function availability($availability_id, $notrigger = 0) { global $user; @@ -2633,7 +2633,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int >0 if ok, <0 if ko */ - function demand_reason($demand_reason_id, $notrigger=0) + function demand_reason($demand_reason_id, $notrigger = 0) { // phpcs:enable global $user; @@ -2706,7 +2706,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_ref_client($user, $ref_client, $notrigger=0) + function set_ref_client($user, $ref_client, $notrigger = 0) { // phpcs:enable if ($user->rights->commande->creer) @@ -2769,7 +2769,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function classifyBilled(User $user, $notrigger=0) + function classifyBilled(User $user, $notrigger = 0) { $error = 0; @@ -2904,7 +2904,7 @@ class Commande extends CommonOrder * @param int $notrigger disable line update trigger * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null, $pu_ht_devise = 0, $notrigger=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0) { global $conf, $mysoc, $langs, $user; @@ -3094,7 +3094,7 @@ class Commande extends CommonOrder * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf; @@ -3189,7 +3189,7 @@ class Commande extends CommonOrder * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <=0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -3408,7 +3408,7 @@ class Commande extends CommonOrder * @param int $donotshowbilled Do not show billed status after order status * @return string Label of status */ - function LibStatut($statut,$billed,$mode,$donotshowbilled=0) + function LibStatut($statut, $billed, $mode, $donotshowbilled = 0) { // phpcs:enable global $langs, $conf; @@ -3501,7 +3501,7 @@ class Commande extends CommonOrder * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1) { global $conf, $langs, $user; @@ -3782,7 +3782,7 @@ class Commande extends CommonOrder * @param null|array $moreparams Array to provide more information * @return int 0 if KO, 1 if OK */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null) + public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null) { global $conf,$langs; @@ -4022,7 +4022,7 @@ class OrderLine extends CommonOrderLine * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 si ko, >0 si ok */ - function delete(User $user, $notrigger=0) + function delete(User $user, $notrigger = 0) { global $conf, $langs; @@ -4083,7 +4083,7 @@ class OrderLine extends CommonOrderLine * @param int $notrigger 1 = disable triggers * @return int <0 if KO, >0 if OK */ - function insert($user=null, $notrigger=0) + function insert($user = null, $notrigger = 0) { global $langs, $conf; @@ -4228,7 +4228,7 @@ class OrderLine extends CommonOrderLine * @param int $notrigger 1 = disable triggers * @return int <0 si ko, >0 si ok */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf,$langs; diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php index 3c6ec07c6cb..edd072854d3 100644 --- a/htdocs/commande/class/commandestats.class.php +++ b/htdocs/commande/class/commandestats.class.php @@ -55,7 +55,7 @@ class CommandeStats extends Stats * @param string $mode Option ('customer', 'supplier') * @param int $userid Id user for filter (creation user) */ - function __construct($db, $socid, $mode, $userid=0) + function __construct($db, $socid, $mode, $userid = 0) { global $user, $conf; @@ -101,7 +101,7 @@ class CommandeStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array with number by month */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { global $user; @@ -144,7 +144,7 @@ class CommandeStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array with amount by month */ - function getAmountByMonth($year, $format=0) + function getAmountByMonth($year, $format = 0) { global $user; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 80a0c6f819b..cb00e201bc6 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -352,7 +352,7 @@ class Account extends CommonObject * @param string $type To search using type * @return array|int Array of links array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> ) or -1 on error */ - function get_url($fk_bank='', $url_id='', $type='') + function get_url($fk_bank = '', $url_id = '', $type = '') { // phpcs:enable $lines = array(); @@ -417,7 +417,7 @@ class Account extends CommonObject * @param int $datev Date value * @return int Rowid of added entry, <0 if KO */ - function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur='',$banque='', $accountancycode='', $datev=null) + function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null) { // Deprecation warning if (is_numeric($oper)) { @@ -525,7 +525,7 @@ class Account extends CommonObject * @param int $notrigger 1=Disable triggers * @return int < 0 if KO, > 0 if OK */ - function create(User $user, $notrigger=0) + function create(User $user, $notrigger = 0) { global $langs,$conf, $hookmanager; @@ -860,7 +860,7 @@ class Account extends CommonObject * @param string $ref Ref of bank account to get * @return int <0 if KO, >0 if OK */ - function fetch($id, $ref='') + function fetch($id, $ref = '') { global $conf; @@ -1076,7 +1076,7 @@ class Account extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->clos,$mode); } @@ -1163,7 +1163,7 @@ class Account extends CommonObject * @param int $option 1=Exclude future operation date (this is to exclude input made in advance and have real account sold) * @return int Current sold (value date <= today) */ - function solde($option=0) + function solde($option = 0) { $solde=0; @@ -1329,7 +1329,7 @@ class Account extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $mode='', $option='', $save_lastsearch_value=-1, $notooltip=0) + function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0) { global $conf, $langs, $user; @@ -1549,7 +1549,7 @@ class Account extends CommonObject * @return array * @see useDetailedBBAN */ - public function getFieldsToShow($includeibanbic=0) + public function getFieldsToShow($includeibanbic = 0) { //Get the required properties depending on the country $detailedBBAN = $this->useDetailedBBAN(); @@ -1765,7 +1765,7 @@ class AccountLine extends CommonObject * @param string $num External num to load (ex: num of transaction for paypal fee) * @return int <0 if KO, 0 if OK but not found, >0 if OK and found */ - function fetch($rowid,$ref='',$num='') + function fetch($rowid, $ref = '', $num = '') { global $conf; @@ -2011,7 +2011,7 @@ class AccountLine extends CommonObject * @param int $conciliated 1=Set transaction to conciliated, 0=Keep transaction non conciliated * @return int <0 if KO, >0 if OK */ - function update_conciliation(User $user, $cat, $conciliated=1) + function update_conciliation(User $user, $cat, $conciliated = 1) { // phpcs:enable global $conf,$langs; @@ -2075,7 +2075,7 @@ class AccountLine extends CommonObject * @param int $sign 1 or -1 * @return int >0 if OK, 0 if KO */ - function datev_change($rowid,$sign=1) + function datev_change($rowid, $sign = 1) { // phpcs:enable $sql = "SELECT datev FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid; @@ -2142,7 +2142,7 @@ class AccountLine extends CommonObject * @param int $sign 1 or -1 * @return int >0 if OK, 0 if KO */ - function dateo_change($rowid,$sign=1) + function dateo_change($rowid, $sign = 1) { // phpcs:enable $sql = "SELECT dateo FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid; @@ -2257,7 +2257,7 @@ class AccountLine extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$maxlen=0,$option='',$notooltip=0) + function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0) { global $langs; @@ -2298,7 +2298,7 @@ class AccountLine extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -2311,7 +2311,7 @@ class AccountLine extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php index ffe01f41e7a..feaaccaa50f 100644 --- a/htdocs/compta/bank/class/api_bankaccounts.class.php +++ b/htdocs/compta/bank/class/api_bankaccounts.class.php @@ -325,7 +325,7 @@ class BankAccounts extends DolibarrApi * * @url POST {id}/lines */ - function addLine($id, $date, $type, $label, $amount, $category=0, $cheque_number='', $cheque_writer='', $cheque_bank='') + function addLine($id, $date, $type, $label, $amount, $category = 0, $cheque_number = '', $cheque_writer = '', $cheque_bank = '') { if (! DolibarrApiAccess::$user->rights->banque->modifier) { throw new RestException(401); diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php index 47edacb2410..cb8f21ecc5a 100644 --- a/htdocs/compta/bank/class/paymentvarious.class.php +++ b/htdocs/compta/bank/class/paymentvarious.class.php @@ -111,7 +111,7 @@ class PaymentVarious extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; @@ -181,7 +181,7 @@ class PaymentVarious extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=null) + function fetch($id, $user = null) { global $langs; $sql = "SELECT"; @@ -505,7 +505,7 @@ class PaymentVarious extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -518,7 +518,7 @@ class PaymentVarious extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Libelle */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; @@ -567,7 +567,7 @@ class PaymentVarious extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $save_lastsearch_value=-1, $notooltip=0) + function getNomUrl($withpicto = 0, $option = '', $save_lastsearch_value = -1, $notooltip = 0) { global $db, $conf, $langs, $hookmanager; global $langs; diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php index d0a10ec94da..946658208df 100644 --- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php +++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php @@ -295,7 +295,7 @@ class CashControl extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label of status */ - public function getLibStatut($mode=0) + public function getLibStatut($mode = 0) { return $this->LibStatut($this->status, $mode); } @@ -308,7 +308,7 @@ class CashControl extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label of status */ - public function LibStatut($status, $mode=0) + public function LibStatut($status, $mode = 0) { // phpcs:enable if (empty($this->labelstatus)) @@ -364,7 +364,7 @@ class CashControl extends CommonObject * @param int $notooltip No tooltip * @return string String with URL */ - public function getNomUrl($withpicto=0, $option='', $maxlength=0, $save_lastsearch_value=-1, $notooltip=0) + public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0) { global $conf, $langs, $hookmanager; include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 2c21c2694ae..60108eed794 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -245,7 +245,7 @@ class Deplacement extends CommonObject * @param string $ref Ref of record * @return int <0 if KO, >0 if OK */ - function fetch($id, $ref='') + function fetch($id, $ref = '') { $sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement"; @@ -316,7 +316,7 @@ class Deplacement extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -329,7 +329,7 @@ class Deplacement extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Libelle */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; @@ -374,7 +374,7 @@ class Deplacement extends CommonObject * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ - function getNomUrl($withpicto=0) + function getNomUrl($withpicto = 0) { global $langs; @@ -400,7 +400,7 @@ class Deplacement extends CommonObject * @param int $active Active or not * @return array */ - function listOfTypes($active=1) + function listOfTypes($active = 1) { global $langs; diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php index ae93eb094d9..542fe49e503 100644 --- a/htdocs/compta/deplacement/class/deplacementstats.class.php +++ b/htdocs/compta/deplacement/class/deplacementstats.class.php @@ -50,7 +50,7 @@ class DeplacementStats extends Stats * @param mixed $userid Id user for filter or array of user ids * @return void */ - function __construct($db, $socid=0, $userid=0) + function __construct($db, $socid = 0, $userid = 0) { global $conf; @@ -96,7 +96,7 @@ class DeplacementStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of values */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { $sql = "SELECT MONTH(dated) as dm, count(*)"; $sql.= " FROM ".$this->from; @@ -118,7 +118,7 @@ class DeplacementStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of values */ - function getAmountByMonth($year, $format=0) + function getAmountByMonth($year, $format = 0) { $sql = "SELECT date_format(dated,'%m') as dm, sum(".$this->field.")"; $sql.= " FROM ".$this->from; diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 04c2bedeb41..e145ed477aa 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -104,7 +104,7 @@ class Invoices extends DolibarrApi * * @throws RestException */ - function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') + function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '') { global $db, $conf; @@ -600,7 +600,7 @@ class Invoices extends DolibarrApi * @throws 500 * */ - function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger=0) + function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->facture->creer) { throw new RestException(401); @@ -650,7 +650,7 @@ class Invoices extends DolibarrApi * @throws 500 * */ - function settodraft($id, $idwarehouse=-1) + function settodraft($id, $idwarehouse = -1) { if(! DolibarrApiAccess::$user->rights->facture->creer) { throw new RestException(401); @@ -702,7 +702,7 @@ class Invoices extends DolibarrApi * * @return array */ - function validate($id, $idwarehouse=0, $notrigger=0) + function validate($id, $idwarehouse = 0, $notrigger = 0) { if(! DolibarrApiAccess::$user->rights->facture->creer) { throw new RestException(401); @@ -753,7 +753,7 @@ class Invoices extends DolibarrApi * @throws 404 * @throws 500 */ - function settopaid($id, $close_code='', $close_note='') + function settopaid($id, $close_code = '', $close_note = '') { if(! DolibarrApiAccess::$user->rights->facture->creer) { throw new RestException(401); @@ -994,7 +994,7 @@ class Invoices extends DolibarrApi * @throws 401 * @throws 404 */ - function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') + function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement = '', $comment = '', $chqemetteur = '', $chqbank = '') { global $conf; @@ -1114,7 +1114,7 @@ class Invoices extends DolibarrApi * @throws 403 * @throws 404 */ - function addPaymentDistributed($arrayofamounts, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') + function addPaymentDistributed($arrayofamounts, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement = '', $comment = '', $chqemetteur = '', $chqbank = '') { global $conf; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 5090132632e..39df40cc260 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -321,7 +321,7 @@ class FactureRec extends CommonInvoice * @param int $ref_int Internal reference of other object * @return int >0 if OK, <0 if KO, 0 if not found */ - function fetch($rowid, $ref='', $ref_ext='', $ref_int='') + function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '') { $sql = 'SELECT f.rowid, f.entity, f.titre, f.suspended, f.fk_soc, f.amount, f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc'; $sql.= ', f.remise_percent, f.remise_absolue, f.remise'; @@ -573,7 +573,7 @@ class FactureRec extends CommonInvoice * @param int $idwarehouse Id warehouse to use for stock change. * @return int <0 if KO, >0 if OK */ - function delete(User $user, $notrigger=0, $idwarehouse=-1) + function delete(User $user, $notrigger = 0, $idwarehouse = -1) { $rowid=$this->id; @@ -644,7 +644,7 @@ class FactureRec extends CommonInvoice * @param int $date_end_fill 1=Flag to fill end date when generating invoice * @return int <0 if KO, Id of line if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null, $pu_ht_devise=0, $date_start_fill=0, $date_end_fill=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $date_start_fill = 0, $date_end_fill = 0) { global $mysoc; @@ -826,7 +826,7 @@ class FactureRec extends CommonInvoice * @param int $date_end_fill 1=Flag to fill end date when generating invoice * @return int <0 if KO, Id of line if OK */ - function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null, $pu_ht_devise = 0, $notrigger=0, $date_start_fill=0, $date_end_fill=0) + function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0) { global $mysoc; @@ -1002,7 +1002,7 @@ class FactureRec extends CommonInvoice * @param int $forcevalidation 1=Force validation of invoice whatever is template auto_validate flag. * @return int 0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK) */ - function createRecurringInvoices($restrictioninvoiceid=0, $forcevalidation=0) + function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidation = 0) { global $conf, $langs, $db, $user, $hookmanager; @@ -1159,7 +1159,7 @@ class FactureRec extends CommonInvoice * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0,$option='',$max=0,$short=0,$moretitle='',$notooltip='',$save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1) { global $langs; @@ -1210,7 +1210,7 @@ class FactureRec extends CommonInvoice * @param integer $alreadypaid Not used on recurring invoices * @return string Label of status */ - function getLibStatut($mode=0, $alreadypaid=-1) + function getLibStatut($mode = 0, $alreadypaid = -1) { return $this->LibStatut($this->frequency?1:0, $this->suspended, $mode, $alreadypaid, empty($this->type)?0:$this->type); @@ -1227,7 +1227,7 @@ class FactureRec extends CommonInvoice * @param int $type Type invoice * @return string Label of status */ - function LibStatut($recur, $status, $mode=0, $alreadypaid=-1, $type=0) + function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0) { // phpcs:enable global $langs; @@ -1328,7 +1328,7 @@ class FactureRec extends CommonInvoice * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines * @return void */ - function initAsSpecimen($option='') + function initAsSpecimen($option = '') { global $user,$langs,$conf; @@ -1480,7 +1480,7 @@ class FactureRec extends CommonInvoice * @param string $unit unit of frequency (d, m, y) * @return int <0 if KO, >0 if OK */ - function setFrequencyAndUnit($frequency,$unit) + function setFrequencyAndUnit($frequency, $unit) { if (! $this->table_element) { @@ -1523,7 +1523,7 @@ class FactureRec extends CommonInvoice * @param int $increment_nb_gen_done 0 do nothing more, >0 increment nb_gen_done * @return int <0 if KO, >0 if OK */ - function setNextDate($date, $increment_nb_gen_done=0) + function setNextDate($date, $increment_nb_gen_done = 0) { if (! $this->table_element) { @@ -1823,7 +1823,7 @@ class FactureLigneRec extends CommonInvoiceLine * @param int $notrigger No trigger * @return int <0 if KO, Id of line if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3e4335774c9..bc689118426 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -289,7 +289,7 @@ class Facture extends CommonInvoice * @param int $forceduedate 1=Do not recalculate due date from payment condition but force it with value * @return int <0 if KO, >0 if OK */ - function create(User $user, $notrigger=0, $forceduedate=0) + function create(User $user, $notrigger = 0, $forceduedate = 0) { global $langs,$conf,$mysoc,$hookmanager; $error=0; @@ -854,7 +854,7 @@ class Facture extends CommonInvoice * @param int $invertdetail Reverse sign of amounts for lines * @return int <0 if KO, >0 if OK */ - function createFromCurrent(User $user, $invertdetail=0) + function createFromCurrent(User $user, $invertdetail = 0) { global $conf; @@ -945,7 +945,7 @@ class Facture extends CommonInvoice * @param int $socid Id of thirdparty * @return int New id of clone */ - function createFromClone($socid=0) + function createFromClone($socid = 0) { global $user,$hookmanager, $conf; @@ -1162,7 +1162,7 @@ class Facture extends CommonInvoice * @param int $withpicto Add download picto into link * @return string HTML link to file */ - function getDirectExternalLink($withpicto=0) + function getDirectExternalLink($withpicto = 0) { global $dolibarr_main_url_root; @@ -1193,7 +1193,7 @@ class Facture extends CommonInvoice * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $max=0, $short=0, $moretitle='', $notooltip=0, $addlinktonotes=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1) { global $langs, $conf, $user, $form; @@ -1301,7 +1301,7 @@ class Facture extends CommonInvoice * @param bool $fetch_situation Fetch the previous and next situation in $tab_previous_situation_invoice and $tab_next_situation_invoice * @return int >0 if OK, <0 if KO, 0 if not found */ - function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $fetch_situation=false) + function fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $fetch_situation = false) { global $conf; @@ -1604,7 +1604,7 @@ class Facture extends CommonInvoice * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf; @@ -1819,7 +1819,7 @@ class Facture extends CommonInvoice * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_ref_client($ref_client, $notrigger=0) + function set_ref_client($ref_client, $notrigger = 0) { // phpcs:enable global $user; @@ -1884,7 +1884,7 @@ class Facture extends CommonInvoice * @param int $idwarehouse Id warehouse to use for stock change. * @return int <0 if KO, 0=Refused, >0 if OK */ - function delete($user, $notrigger=0, $idwarehouse=-1) + function delete($user, $notrigger = 0, $idwarehouse = -1) { global $langs,$conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -2058,7 +2058,7 @@ class Facture extends CommonInvoice * @param string $close_note Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple) * @return int <0 if KO, >0 if OK */ - function set_paid($user, $close_code='', $close_note='') + function set_paid($user, $close_code = '', $close_note = '') { // phpcs:enable $error=0; @@ -2168,7 +2168,7 @@ class Facture extends CommonInvoice * @param string $close_note Comment * @return int <0 if KO, >0 if OK */ - function set_canceled($user, $close_code='', $close_note='') + function set_canceled($user, $close_code = '', $close_note = '') { // phpcs:enable @@ -2231,7 +2231,7 @@ class Facture extends CommonInvoice * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK */ - function validate($user, $force_number='', $idwarehouse=0, $notrigger=0) + function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0) { global $conf,$langs; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -2529,7 +2529,7 @@ class Facture extends CommonInvoice * @param int $idwarehouse Id warehouse to use for stock change. * @return int <0 if KO, >0 if OK */ - function set_draft($user,$idwarehouse=-1) + function set_draft($user, $idwarehouse = -1) { // phpcs:enable global $conf,$langs; @@ -2649,7 +2649,7 @@ class Facture extends CommonInvoice * @param double $pu_ht_devise Unit price in currency * @return int <0 if KO, Id of line if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id=0, $fk_unit = null, $pu_ht_devise = 0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = 0, $fk_remise_except = '', $price_base_type = 'HT', $pu_ttc = 0, $type = self::TYPE_STANDARD, $rang = -1, $special_code = 0, $origin = '', $origin_id = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $situation_percent = 100, $fk_prev_id = 0, $fk_unit = null, $pu_ht_devise = 0) { // Deprecation warning if ($label) { @@ -2879,7 +2879,7 @@ class Facture extends CommonInvoice * @param int $notrigger disable line update trigger * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=100, $fk_unit = null, $pu_ht_devise = 0, $notrigger=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0) { global $conf,$user; // Deprecation warning @@ -3197,7 +3197,7 @@ class Facture extends CommonInvoice * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if ko, >0 if ok */ - function set_remise($user, $remise, $notrigger=0) + function set_remise($user, $remise, $notrigger = 0) { // phpcs:enable // Clean parameters @@ -3263,7 +3263,7 @@ class Facture extends CommonInvoice * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function set_remise_absolue($user, $remise, $notrigger=0) + function set_remise_absolue($user, $remise, $notrigger = 0) { // phpcs:enable if (empty($remise)) $remise=0; @@ -3330,7 +3330,7 @@ class Facture extends CommonInvoice * @param string $mode 'next' for next value or 'last' for last value * @return string free ref or last ref */ - function getNextNumRef($soc,$mode='next') + function getNextNumRef($soc, $mode = 'next') { global $conf, $langs; $langs->load("bills"); @@ -3472,7 +3472,7 @@ class Facture extends CommonInvoice * @param string $sortorder Sort order * @return int -1 if KO, array with result if OK */ - function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $offset=0, $sortfield='f.datef,f.rowid', $sortorder='DESC') + function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC') { // phpcs:enable global $conf,$user; @@ -3543,7 +3543,7 @@ class Facture extends CommonInvoice * @param int $socid Id thirdparty * @return array Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1) */ - function list_replacable_invoices($socid=0) + function list_replacable_invoices($socid = 0) { // phpcs:enable global $conf; @@ -3593,7 +3593,7 @@ class Facture extends CommonInvoice * @param int $socid Id thirdparty * @return array Array of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>) */ - function list_qualified_avoir_invoices($socid=0) + function list_qualified_avoir_invoices($socid = 0) { // phpcs:enable global $conf; @@ -3668,7 +3668,7 @@ class Facture extends CommonInvoice * @param float $amount Amount we request direct debit for * @return int <0 if KO, >0 if OK */ - function demande_prelevement($fuser, $amount=0) + function demande_prelevement($fuser, $amount = 0) { // phpcs:enable @@ -3894,7 +3894,7 @@ class Facture extends CommonInvoice * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines * @return void */ - function initAsSpecimen($option='') + function initAsSpecimen($option = '') { global $langs; @@ -4110,7 +4110,7 @@ class Facture extends CommonInvoice * @param null|array $moreparams Array to provide more information * @return int <0 if KO, >0 if OK */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null) + public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null) { global $conf,$langs; @@ -4215,7 +4215,7 @@ class Facture extends CommonInvoice * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function setFinal(User $user, $notrigger=0) + function setFinal(User $user, $notrigger = 0) { $error=0; @@ -4512,7 +4512,7 @@ class FactureLigne extends CommonInvoiceLine * @param int $noerrorifdiscountalreadylinked 1=Do not make error if lines is linked to a discount and discount already linked to another * @return int <0 if KO, >0 if OK */ - function insert($notrigger=0, $noerrorifdiscountalreadylinked=0) + function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0) { global $langs,$user,$conf; @@ -4729,7 +4729,7 @@ class FactureLigne extends CommonInvoiceLine * @param int $notrigger Disable triggers * @return int <0 if KO, >0 if OK */ - function update($user='',$notrigger=0) + function update($user = '', $notrigger = 0) { global $user,$conf; @@ -4945,7 +4945,7 @@ class FactureLigne extends CommonInvoiceLine * @param bool $include_credit_note Include credit note or not * @return int >= 0 */ - function get_prev_progress($invoiceid, $include_credit_note=true) + function get_prev_progress($invoiceid, $include_credit_note = true) { // phpcs:enable if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") { diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index 4cf9477613e..ea065d81636 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -53,7 +53,7 @@ class FactureStats extends Stats * @param string $mode Option ('customer', 'supplier') * @param int $userid Id user for filter (creation user) */ - function __construct($db, $socid, $mode, $userid=0) + function __construct($db, $socid, $mode, $userid = 0) { global $user, $conf; @@ -100,7 +100,7 @@ class FactureStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of values */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { global $user; @@ -145,7 +145,7 @@ class FactureStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array with amount by month */ - function getAmountByMonth($year, $format=0) + function getAmountByMonth($year, $format = 0) { global $user; diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 55a3e40b55f..3d4f0881de2 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -82,7 +82,7 @@ class PaymentTerm // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -268,7 +268,7 @@ class PaymentTerm // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; @@ -345,7 +345,7 @@ class PaymentTerm // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 49c95c26c2e..d80b9cc4783 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -163,7 +163,7 @@ class Localtax extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf, $langs; @@ -628,7 +628,7 @@ class Localtax extends CommonObject * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $option='') + function getNomUrl($withpicto = 0, $option = '') { global $langs; @@ -652,7 +652,7 @@ class Localtax extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -665,7 +665,7 @@ class Localtax extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($status, $mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 28973d3c4e2..34dd599f35a 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -84,7 +84,7 @@ class RemiseCheque extends CommonObject * @param string $ref Ref record * @return int <0 if KO, > 0 if OK */ - function fetch($id,$ref='') + function fetch($id, $ref = '') { global $conf; @@ -299,7 +299,7 @@ class RemiseCheque extends CommonObject * @param User $user Utilisateur qui effectue l'operation * @return int */ - function delete($user='') + function delete($user = '') { global $conf; @@ -416,7 +416,7 @@ class RemiseCheque extends CommonObject * @param string $mode 'next' for next value or 'last' for last value * @return string free ref or last ref */ - function getNextNumRef($mode='next') + function getNextNumRef($mode = 'next') { global $conf, $db, $langs, $mysoc; $langs->load("bills"); @@ -988,7 +988,7 @@ class RemiseCheque extends CommonObject * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines * @return void */ - function initAsSpecimen($option='') + function initAsSpecimen($option = '') { global $user,$langs,$conf; @@ -1013,7 +1013,7 @@ class RemiseCheque extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1) { global $conf, $langs; @@ -1064,7 +1064,7 @@ class RemiseCheque extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -1077,7 +1077,7 @@ class RemiseCheque extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto * @return string Libelle du statut */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index c4cb529d895..4e729e9c37b 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -157,7 +157,7 @@ class Paiement extends CommonObject * @param int $fk_bank Id of bank line associated to payment * @return int <0 if KO, 0 if not found, >0 if OK */ - public function fetch($id, $ref='', $fk_bank='') + public function fetch($id, $ref = '', $fk_bank = '') { $sql = 'SELECT p.rowid, p.ref, p.datep as dp, p.amount, p.statut, p.ext_payment_id, p.ext_payment_site, p.fk_bank,'; $sql.= ' c.code as type_code, c.libelle as type_libelle,'; @@ -224,7 +224,7 @@ class Paiement extends CommonObject * @param int $closepaidinvoices 1=Also close payed invoices to paid, 0=Do nothing more * @return int id of created payment, < 0 if error */ - function create($user, $closepaidinvoices=0) + function create($user, $closepaidinvoices = 0) { global $conf, $langs; @@ -488,7 +488,7 @@ class Paiement extends CommonObject * @param int $notrigger No trigger * @return int <0 si ko, >0 si ok */ - function delete($notrigger=0) + function delete($notrigger = 0) { global $conf, $user, $langs; @@ -598,7 +598,7 @@ class Paiement extends CommonObject * @param int $notrigger No trigger * @return int <0 if KO, bank_line_id if OK */ - function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque,$notrigger=0) + function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0) { global $conf,$langs,$user; @@ -897,7 +897,7 @@ class Paiement extends CommonObject * @param User $user User making validation * @return int <0 if KO, >0 if OK */ - function valide(User $user=null) + function valide(User $user = null) { $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id; @@ -921,7 +921,7 @@ class Paiement extends CommonObject * @param User $user User making reject * @return int <0 if KO, >0 if OK */ - function reject(User $user=null) + function reject(User $user = null) { $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 2 WHERE rowid = '.$this->id; @@ -989,7 +989,7 @@ class Paiement extends CommonObject * @param string $filter Critere de filtre * @return array Tableau des id de factures */ - function getBillsArray($filter='') + function getBillsArray($filter = '') { $sql = 'SELECT fk_facture'; $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; @@ -1027,7 +1027,7 @@ class Paiement extends CommonObject * @param string $mode 'next' for next value or 'last' for last value * @return string free ref or last ref */ - function getNextNumRef($soc,$mode='next') + function getNextNumRef($soc, $mode = 'next') { global $conf, $db, $langs; $langs->load("bills"); @@ -1138,7 +1138,7 @@ class Paiement extends CommonObject * @param string $option ''=Create a specimen invoice with lines, 'nolines'=No lines * @return void */ - function initAsSpecimen($option='') + function initAsSpecimen($option = '') { global $user,$langs,$conf; @@ -1164,7 +1164,7 @@ class Paiement extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $option='', $mode='withlistofinvoices', $notooltip=0) + function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0) { global $conf, $langs; @@ -1222,7 +1222,7 @@ class Paiement extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -1235,7 +1235,7 @@ class Paiement extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage @@ -1286,7 +1286,7 @@ class Paiement extends CommonObject * @param int $force_thirdparty_id Force thirdparty id * @return int <0 if KO, >0 if OK */ - function fetch_thirdparty($force_thirdparty_id=0) + function fetch_thirdparty($force_thirdparty_id = 0) { // phpcs:enable include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 3f7dd23059d..f39ed254df3 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -81,7 +81,7 @@ class BonPrelevement extends CommonObject * @param DoliDB $db Database handler * @param string $filename Filename of withdraw receipt */ - function __construct($db, $filename='') + function __construct($db, $filename = '') { global $conf,$langs; @@ -276,7 +276,7 @@ class BonPrelevement extends CommonObject * @param string $ref Ref of direct debit * @return int >0 if OK, <0 if KO */ - function fetch($rowid, $ref='') + function fetch($rowid, $ref = '') { global $conf; @@ -630,7 +630,7 @@ class BonPrelevement extends CommonObject * @param int $amounts If you want to get the amount of the order for each invoice * @return array Id of invoices */ - private function getListInvoices($amounts=0) + private function getListInvoices($amounts = 0) { global $conf; @@ -731,7 +731,7 @@ class BonPrelevement extends CommonObject * @param int $agence dolibarr mysoc agence * @return int 0 if OK, <0 if KO */ - function delete($user=null) + function delete($user = null) { $this->db->begin(); @@ -1178,7 +1178,7 @@ class BonPrelevement extends CommonObject * @param string $option link target * @return string URL of target */ - function getNomUrl($withpicto=0,$option='') + function getNomUrl($withpicto = 0, $option = '') { global $langs; @@ -1299,7 +1299,7 @@ class BonPrelevement extends CommonObject * @param string $executiondate Date to execute transfer * @return int 0 if OK, <0 if KO */ - function generate($format='ALL',$executiondate='') + function generate($format = 'ALL', $executiondate = '') { global $conf,$langs,$mysoc; @@ -1493,7 +1493,7 @@ class BonPrelevement extends CommonObject * @param string $rib_dom rib domiciliation * @return void */ - function EnregDestinataire($rowid, $client_nom, $rib_banque, $rib_guichet, $rib_number, $amount, $ref, $facid, $rib_dom='') + function EnregDestinataire($rowid, $client_nom, $rib_banque, $rib_guichet, $rib_number, $amount, $ref, $facid, $rib_dom = '') { // phpcs:enable fputs($this->file, "06"); @@ -1726,7 +1726,7 @@ class BonPrelevement extends CommonObject * @param string $format FRST or RCUR or ALL * @return string String with SEPA Sender */ - function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n', $format='FRST') + function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf = '\n', $format = 'FRST') { // phpcs:enable // SEPA INITIALISATION @@ -1905,7 +1905,7 @@ class BonPrelevement extends CommonObject * @param int $mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -1918,7 +1918,7 @@ class BonPrelevement extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable if (empty($this->labelstatut)) diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 7e100022c7a..d47eb32504a 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -123,7 +123,7 @@ class LignePrelevement * @param int $mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -136,7 +136,7 @@ class LignePrelevement * @param int $mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto * @return string Label */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 4797121a24c..46b4242944b 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -82,7 +82,7 @@ class RejetPrelevement * @param int $facturation Facturation * @return void */ - function create($user, $id, $motif, $date_rejet, $bonid, $facturation=0) + function create($user, $id, $motif, $date_rejet, $bonid, $facturation = 0) { global $langs,$conf; @@ -282,7 +282,7 @@ class RejetPrelevement * @return array Array List of invoices related to the withdrawal line * @TODO A withdrawal line is today linked to one and only one invoice. So the function should return only one object ? */ - private function getListInvoices($amounts=0) + private function getListInvoices($amounts = 0) { global $conf; diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 76a8284daff..8f55b5804cc 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -108,7 +108,7 @@ class PaymentSalary extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; @@ -189,7 +189,7 @@ class PaymentSalary extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=null) + function fetch($id, $user = null) { global $langs; $sql = "SELECT"; @@ -544,7 +544,7 @@ class PaymentSalary extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1) { global $db, $conf, $langs, $hookmanager; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -652,7 +652,7 @@ class PaymentSalary extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -665,7 +665,7 @@ class PaymentSalary extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage diff --git a/htdocs/compta/salaries/class/salariesstats.class.php b/htdocs/compta/salaries/class/salariesstats.class.php index 82a8d094148..0c91ee29309 100644 --- a/htdocs/compta/salaries/class/salariesstats.class.php +++ b/htdocs/compta/salaries/class/salariesstats.class.php @@ -49,7 +49,7 @@ class SalariesStats extends Stats * @param mixed $userid Id user for filter or array of user ids * @return void */ - function __construct($db, $socid=0, $userid=0) + function __construct($db, $socid = 0, $userid = 0) { global $conf; @@ -94,7 +94,7 @@ class SalariesStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of values */ - function getNbByMonth($year, $format=0) + function getNbByMonth($year, $format = 0) { $sql = "SELECT MONTH(datep) as dm, count(*)"; $sql.= " FROM ".$this->from; @@ -116,7 +116,7 @@ class SalariesStats extends Stats * @param int $format 0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month * @return array Array of values */ - function getAmountByMonth($year, $format=0) + function getAmountByMonth($year, $format = 0) { $sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")"; $sql.= " FROM ".$this->from; diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php index 9e13ffcd8a5..f7c829294f8 100644 --- a/htdocs/compta/sociales/class/cchargesociales.class.php +++ b/htdocs/compta/sociales/class/cchargesociales.class.php @@ -404,7 +404,7 @@ class Cchargesociales * @param string $morecss Add more css on link * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='') + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '') { global $langs, $conf, $db; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -438,7 +438,7 @@ class Cchargesociales * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -451,7 +451,7 @@ class Cchargesociales * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index cca5a4d7dd2..1828e750914 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -93,7 +93,7 @@ class ChargeSociales extends CommonObject * @param string $ref Ref * @return int <0 KO >0 OK */ - function fetch($id, $ref='') + function fetch($id, $ref = '') { $sql = "SELECT cs.rowid, cs.date_ech"; $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key"; @@ -419,7 +419,7 @@ class ChargeSociales extends CommonObject * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ - function getLibStatut($mode=0,$alreadypaid=-1) + function getLibStatut($mode = 0, $alreadypaid = -1) { return $this->LibStatut($this->paye,$mode,$alreadypaid); } @@ -433,7 +433,7 @@ class ChargeSociales extends CommonObject * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ - function LibStatut($statut,$mode=0,$alreadypaid=-1) + function LibStatut($statut, $mode = 0, $alreadypaid = -1) { // phpcs:enable global $langs; @@ -491,7 +491,7 @@ class ChargeSociales extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string String with link */ - function getNomUrl($withpicto=0, $maxlen=0, $notooltip=0, $short=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1) { global $langs, $conf, $user, $form; diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 74ddce68230..bd678904df6 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -104,7 +104,7 @@ class PaymentSocialContribution extends CommonObject * @param int $closepaidcontrib 1=Also close payed contributions to paid, 0=Do nothing more * @return int <0 if KO, id of payment if OK */ - function create($user, $closepaidcontrib=0) + function create($user, $closepaidcontrib = 0) { global $conf, $langs; @@ -292,7 +292,7 @@ class PaymentSocialContribution extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; $error=0; @@ -379,7 +379,7 @@ class PaymentSocialContribution extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -540,7 +540,7 @@ class PaymentSocialContribution extends CommonObject * @param string $emetteur_banque Name of bank * @return int <0 if KO, >0 if OK */ - function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque) + function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque) { global $conf; @@ -656,7 +656,7 @@ class PaymentSocialContribution extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -669,7 +669,7 @@ class PaymentSocialContribution extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage @@ -720,7 +720,7 @@ class PaymentSocialContribution extends CommonObject * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$maxlen=0) + function getNomUrl($withpicto = 0, $maxlen = 0) { global $langs; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 33d48de8bfc..5da7b0e144c 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -173,7 +173,7 @@ class Tva extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user, $notrigger=0) + function update($user, $notrigger = 0) { global $conf, $langs; @@ -241,7 +241,7 @@ class Tva extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=null) + function fetch($id, $user = null) { global $langs; $sql = "SELECT"; @@ -687,7 +687,7 @@ class Tva extends CommonObject * @param string $morecss More CSS * @return string Chaine with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='') + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '') { global $langs, $conf; @@ -813,7 +813,7 @@ class Tva extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -826,7 +826,7 @@ class Tva extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle du statut */ - function LibStatut($status,$mode=0) + function LibStatut($status, $mode = 0) { // phpcs:enable global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index a5297750386..d5b5afa4433 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -313,7 +313,7 @@ class Contact extends CommonObject * @param int $nosyncuser No sync linked user (external users and contacts are linked) * @return int <0 if KO, >0 if OK */ - function update($id, $user=null, $notrigger=0, $action='update', $nosyncuser=0) + function update($id, $user = null, $notrigger = 0, $action = 'update', $nosyncuser = 0) { global $conf, $langs, $hookmanager; @@ -501,7 +501,7 @@ class Contact extends CommonObject * 2=Return key only (uid=qqq) * @return string DN */ - function _load_ldap_dn($info,$mode=0) + function _load_ldap_dn($info, $mode = 0) { // phpcs:enable global $conf; @@ -597,7 +597,7 @@ class Contact extends CommonObject * @param int $notrigger 0=no, 1=yes * @return int <0 if KO, >=0 if OK */ - function update_perso($id, $user=null, $notrigger=0) + function update_perso($id, $user = null, $notrigger = 0) { // phpcs:enable $error=0; @@ -686,7 +686,7 @@ class Contact extends CommonObject * @param string $email Email * @return int -1 if KO, 0 if OK but not found, 1 if OK */ - function fetch($id, $user=null, $ref_ext='', $email='') + function fetch($id, $user = null, $ref_ext = '', $email = '') { global $langs; @@ -931,7 +931,7 @@ class Contact extends CommonObject * @param int $notrigger Disable all trigger * @return int <0 if KO, >0 if OK */ - function delete($notrigger=0) + function delete($notrigger = 0) { global $conf, $langs, $user; @@ -1124,7 +1124,7 @@ class Contact extends CommonObject * @param int $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $maxlen=0, $moreparam='', $save_lastsearch_value=-1, $notooltip=0) + function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0) { global $conf, $langs, $hookmanager; @@ -1231,7 +1231,7 @@ class Contact extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Libelle */ - function LibStatut($statut,$mode) + function LibStatut($statut, $mode) { // phpcs:enable global $langs; diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 585d5399771..8631becc515 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -555,7 +555,7 @@ class Contracts extends DolibarrApi * "notrigger": 0 * } */ - function validate($id, $notrigger=0) + function validate($id, $notrigger = 0) { if (! DolibarrApiAccess::$user->rights->contrat->creer) { throw new RestException(401); @@ -601,7 +601,7 @@ class Contracts extends DolibarrApi * "notrigger": 0 * } */ - function close($id, $notrigger=0) + function close($id, $notrigger = 0) { if (! DolibarrApiAccess::$user->rights->contrat->creer) { throw new RestException(401); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 5929ec034d1..5dce6cb4bd4 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -261,7 +261,7 @@ class Contrat extends CommonObject * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ - function active_line($user, $line_id, $date, $date_end='', $comment='') + function active_line($user, $line_id, $date, $date_end = '', $comment = '') { // phpcs:enable $result = $this->lines[$this->lines_id_index_mapper[$line_id]]->active_line($user, $date, $date_end, $comment); @@ -284,7 +284,7 @@ class Contrat extends CommonObject * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ - function close_line($user, $line_id, $date_end, $comment='') + function close_line($user, $line_id, $date_end, $comment = '') { // phpcs:enable $result=$this->lines[$this->lines_id_index_mapper[$line_id]]->close_line($user, $date_end, $comment); @@ -307,7 +307,7 @@ class Contrat extends CommonObject * @return int <0 if KO, >0 if OK * @see closeAll */ - function activateAll($user, $date_start='', $notrigger=0, $comment='') + function activateAll($user, $date_start = '', $notrigger = 0, $comment = '') { if (empty($date_start)) $date_start = dol_now(); @@ -363,7 +363,7 @@ class Contrat extends CommonObject * @return int <0 if KO, >0 if OK * @see activateAll */ - function closeAll(User $user, $notrigger=0, $comment='') + function closeAll(User $user, $notrigger = 0, $comment = '') { $this->db->begin(); @@ -419,7 +419,7 @@ class Contrat extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int <0 if KO, >0 if OK */ - function validate(User $user, $force_number='', $notrigger=0) + function validate(User $user, $force_number = '', $notrigger = 0) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; global $langs, $conf; @@ -547,7 +547,7 @@ class Contrat extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0=execute triggers * @return int <0 if KO, >0 if OK */ - function reopen($user, $notrigger=0) + function reopen($user, $notrigger = 0) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; global $langs, $conf; @@ -614,7 +614,7 @@ class Contrat extends CommonObject * @param string $ref_supplier Supplier ref * @return int <0 if KO, 0 if not found, Id of contract if OK */ - function fetch($id, $ref='', $ref_customer='', $ref_supplier='') + function fetch($id, $ref = '', $ref_customer = '', $ref_supplier = '') { $sql = "SELECT rowid, statut, ref, fk_soc, mise_en_service as datemise,"; $sql.= " ref_supplier, ref_customer,"; @@ -1242,7 +1242,7 @@ class Contrat extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user, $notrigger=0) + function update($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -1360,7 +1360,7 @@ class Contrat extends CommonObject * @param string $rang Position * @return int <0 if KO, >0 if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null, $rang=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null, $rang = 0) { global $user, $langs, $conf, $mysoc; $error=0; @@ -1570,7 +1570,7 @@ class Contrat extends CommonObject * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int < 0 si erreur, > 0 si ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx = 0.0, $localtax2tx = 0.0, $date_debut_reel = '', $date_fin_reel = '', $price_base_type = 'HT', $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null) { global $user, $conf, $langs, $mysoc; @@ -1840,7 +1840,7 @@ class Contrat extends CommonObject * @param int $mode 0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length * @return string Label */ - function LibStatut($statut,$mode) + function LibStatut($statut, $mode) { // phpcs:enable global $langs; @@ -1909,7 +1909,7 @@ class Contrat extends CommonObject * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1) + function getNomUrl($withpicto = 0, $maxlength = 0, $notooltip = 0, $save_lastsearch_value = -1) { global $conf, $langs, $user; @@ -2022,7 +2022,7 @@ class Contrat extends CommonObject * @param int $statut Status of lines to get * @return array Array of line's rowid */ - function array_detail($statut=-1) + function array_detail($statut = -1) { // phpcs:enable $tab=array(); @@ -2059,7 +2059,7 @@ class Contrat extends CommonObject * @param string $option 'all' or 'others' * @return array Array of contracts id */ - function getListOfContracts($option='all') + function getListOfContracts($option = 'all') { $tab=array(); @@ -2100,7 +2100,7 @@ class Contrat extends CommonObject * @param string $mode "inactive" pour services a activer, "expired" pour services expires * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK */ - function load_board($user,$mode) + function load_board($user, $mode) { // phpcs:enable global $conf, $langs; @@ -2336,7 +2336,7 @@ class Contrat extends CommonObject * @param null|array $moreparams Array to provide more information * @return int 0 if KO, 1 if OK */ - public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null) + public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null) { global $conf,$langs; @@ -2382,7 +2382,7 @@ class Contrat extends CommonObject * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @return int New id of clone */ - function createFromClone($socid = 0, $notrigger=0) + function createFromClone($socid = 0, $notrigger = 0) { global $db, $user, $langs, $conf, $hookmanager, $extrafields; @@ -2658,7 +2658,7 @@ class ContratLigne extends CommonObjectLine * @param string $moreatt More attribute * @return string Libelle */ - static function LibStatut($statut,$mode,$expired=-1,$moreatt='') + static function LibStatut($statut, $mode, $expired = -1, $moreatt = '') { // phpcs:enable global $langs; @@ -2720,7 +2720,7 @@ class ContratLigne extends CommonObjectLine * @param int $maxlength Max length * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$maxlength=0) + function getNomUrl($withpicto = 0, $maxlength = 0) { global $langs; @@ -2747,7 +2747,7 @@ class ContratLigne extends CommonObjectLine * @param string $ref Ref of contract * @return int <0 if KO, >0 if OK */ - function fetch($id, $ref='') + function fetch($id, $ref = '') { // Check parameters @@ -2879,7 +2879,7 @@ class ContratLigne extends CommonObjectLine * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user, $notrigger=0) + function update($user, $notrigger = 0) { global $conf, $langs, $mysoc; @@ -3257,7 +3257,7 @@ class ContratLigne extends CommonObjectLine * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @return int <0 if KO, >0 if OK */ - function close_line($user, $date_end, $comment = '', $notrigger=0) + function close_line($user, $date_end, $comment = '', $notrigger = 0) { // phpcs:enable global $langs, $conf; diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php index d90a3f5f316..1e4dde7e0a4 100644 --- a/htdocs/core/ajax/ajaxdirtree.php +++ b/htdocs/core/ajax/ajaxdirtree.php @@ -337,7 +337,7 @@ if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close(); * @param int $depth Depth * @return void */ -function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth=0) +function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth = 0) { global $conf, $db, $langs, $form; global $dolibarr_main_data_root; diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index aea85fd111e..55804430113 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -54,7 +54,7 @@ class box_actions extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $user; @@ -69,7 +69,7 @@ class box_actions extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -189,7 +189,7 @@ class box_actions extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { global $langs, $conf; $out = parent::showBox($this->info_box_head, $this->info_box_contents); diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index 413dc43d8b2..e18114a5bc7 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -53,7 +53,7 @@ class box_activity extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $conf, $user; @@ -74,7 +74,7 @@ class box_activity extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -457,7 +457,7 @@ class box_activity extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php index c3a29877104..ec091956701 100644 --- a/htdocs/core/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -50,7 +50,7 @@ class box_bookmarks extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -65,7 +65,7 @@ class box_bookmarks extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; $langs->load("boxes"); @@ -157,7 +157,7 @@ class box_bookmarks extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index 9b1e4e34261..c4e34a72e9b 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -54,7 +54,7 @@ class box_clients extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf, $user; @@ -72,7 +72,7 @@ class box_clients extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; $langs->load("boxes"); @@ -173,7 +173,7 @@ class box_clients extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index 3f86909f04a..795bf36bd0b 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -54,7 +54,7 @@ class box_commandes extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -69,7 +69,7 @@ class box_commandes extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -198,7 +198,7 @@ class box_commandes extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index 5a5c2f59986..0f0d0f83fed 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -56,7 +56,7 @@ class box_comptes extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf, $user; @@ -75,7 +75,7 @@ class box_comptes extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -184,7 +184,7 @@ class box_comptes extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index 2d9d7e9461b..2654607e2eb 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -56,7 +56,7 @@ class box_contacts extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -71,7 +71,7 @@ class box_contacts extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; $langs->load("boxes"); @@ -185,7 +185,7 @@ class box_contacts extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 7239fa78919..bd499855cc4 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -53,7 +53,7 @@ class box_contracts extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -68,7 +68,7 @@ class box_contracts extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -189,7 +189,7 @@ class box_contracts extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index fa7d35f6db0..d7165198201 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -56,7 +56,7 @@ class box_external_rss extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { $this->db=$db; $this->paramdef=$param; @@ -69,7 +69,7 @@ class box_external_rss extends ModeleBoxes * @param int $cachedelay Delay we accept for cache file * @return void */ - function loadBox($max=5, $cachedelay=3600) + function loadBox($max = 5, $cachedelay = 3600) { global $user, $langs, $conf; $langs->load("boxes"); @@ -195,7 +195,7 @@ class box_external_rss extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index ae4a32fad7c..b45c530a085 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -52,7 +52,7 @@ class box_factures extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -67,7 +67,7 @@ class box_factures extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -209,7 +209,7 @@ class box_factures extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 617f041d7d2..cc8cd3bd1da 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -53,7 +53,7 @@ class box_factures_fourn extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -68,7 +68,7 @@ class box_factures_fourn extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -214,7 +214,7 @@ class box_factures_fourn extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index bd8fde32aab..181994fc1e3 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -52,7 +52,7 @@ class box_factures_fourn_imp extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -67,7 +67,7 @@ class box_factures_fourn_imp extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -201,7 +201,7 @@ class box_factures_fourn_imp extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 11331f7f3e7..6193924ebc7 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -55,7 +55,7 @@ class box_factures_imp extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -70,7 +70,7 @@ class box_factures_imp extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -207,7 +207,7 @@ class box_factures_imp extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 76d1414f53f..b4016bb3758 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -53,7 +53,7 @@ class box_ficheinter extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -68,7 +68,7 @@ class box_ficheinter extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=10) + function loadBox($max = 10) { global $user, $langs, $db, $conf; @@ -166,7 +166,7 @@ class box_ficheinter extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index c66c7f674c2..aa04d312f54 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -53,7 +53,7 @@ class box_fournisseurs extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -68,7 +68,7 @@ class box_fournisseurs extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; $langs->load("boxes"); @@ -160,7 +160,7 @@ class box_fournisseurs extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php index 138326d6c01..0cca908f5d8 100644 --- a/htdocs/core/boxes/box_goodcustomers.php +++ b/htdocs/core/boxes/box_goodcustomers.php @@ -55,7 +55,7 @@ class box_goodcustomers extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf, $user; @@ -74,7 +74,7 @@ class box_goodcustomers extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; $langs->load("boxes"); @@ -169,7 +169,7 @@ class box_goodcustomers extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php index fd0b4e593c0..b288912915d 100644 --- a/htdocs/core/boxes/box_graph_invoices_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_permonth.php @@ -48,7 +48,7 @@ class box_graph_invoices_permonth extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -63,7 +63,7 @@ class box_graph_invoices_permonth extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -275,7 +275,7 @@ class box_graph_invoices_permonth extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php index f13b19259c9..be4b8722cf2 100644 --- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php @@ -48,7 +48,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -63,7 +63,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -274,7 +274,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php index fefa90c5fea..390499bd359 100644 --- a/htdocs/core/boxes/box_graph_orders_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_permonth.php @@ -48,7 +48,7 @@ class box_graph_orders_permonth extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -63,7 +63,7 @@ class box_graph_orders_permonth extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -273,7 +273,7 @@ class box_graph_orders_permonth extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php index e388d226fd2..098cbb4d038 100644 --- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -48,7 +48,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -63,7 +63,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -272,7 +272,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php index 9dc4c162e0f..bc4a3130151 100644 --- a/htdocs/core/boxes/box_graph_product_distribution.php +++ b/htdocs/core/boxes/box_graph_product_distribution.php @@ -51,7 +51,7 @@ class box_graph_product_distribution extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user, $conf; @@ -70,7 +70,7 @@ class box_graph_product_distribution extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -412,7 +412,7 @@ class box_graph_product_distribution extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php index f28b0ec2c99..4abd3a8725a 100644 --- a/htdocs/core/boxes/box_graph_propales_permonth.php +++ b/htdocs/core/boxes/box_graph_propales_permonth.php @@ -48,7 +48,7 @@ class box_graph_propales_permonth extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -63,7 +63,7 @@ class box_graph_propales_permonth extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -276,7 +276,7 @@ class box_graph_propales_permonth extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php index 9ce7dd91605..34281d13c82 100644 --- a/htdocs/core/boxes/box_last_modified_ticket.php +++ b/htdocs/core/boxes/box_last_modified_ticket.php @@ -187,7 +187,7 @@ class box_last_modified_ticket extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php index a824a707168..a1a52c3070d 100644 --- a/htdocs/core/boxes/box_last_ticket.php +++ b/htdocs/core/boxes/box_last_ticket.php @@ -187,7 +187,7 @@ class box_last_ticket extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php index c8149c6384b..d1ae1e7abf4 100644 --- a/htdocs/core/boxes/box_lastlogin.php +++ b/htdocs/core/boxes/box_lastlogin.php @@ -53,7 +53,7 @@ class box_lastlogin extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $conf; @@ -66,7 +66,7 @@ class box_lastlogin extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -109,7 +109,7 @@ class box_lastlogin extends ModeleBoxes * @param int $nooutput No print, only return string * @return void */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index b0f999f54f1..8ffa90de5a4 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -55,7 +55,7 @@ class box_members extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf, $user; @@ -74,7 +74,7 @@ class box_members extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; $langs->load("boxes"); @@ -178,7 +178,7 @@ class box_members extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index 3dd66eb1da2..bb64e46ecc4 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -55,7 +55,7 @@ class box_produits extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $conf, $user; @@ -73,7 +73,7 @@ class box_produits extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf, $hookmanager; @@ -226,7 +226,7 @@ class box_produits extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php index 896ceb93df6..b14cc2e659f 100644 --- a/htdocs/core/boxes/box_produits_alerte_stock.php +++ b/htdocs/core/boxes/box_produits_alerte_stock.php @@ -57,7 +57,7 @@ class box_produits_alerte_stock extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf,$user; @@ -75,7 +75,7 @@ class box_produits_alerte_stock extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf, $hookmanager; @@ -238,7 +238,7 @@ class box_produits_alerte_stock extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index a48543a00f6..3784294298a 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -51,7 +51,7 @@ class box_project extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $user, $langs; @@ -70,7 +70,7 @@ class box_project extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -195,7 +195,7 @@ class box_project extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 2b3426f21b8..aa3a9f8fb00 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -54,7 +54,7 @@ class box_propales extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -69,7 +69,7 @@ class box_propales extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -188,7 +188,7 @@ class box_propales extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index a4382f86048..2c58bdbe1c3 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -56,7 +56,7 @@ class box_prospect extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $conf, $user; @@ -74,7 +74,7 @@ class box_prospect extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -176,7 +176,7 @@ class box_prospect extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 708b781f092..264b95d5c65 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -54,7 +54,7 @@ class box_services_contracts extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -69,7 +69,7 @@ class box_services_contracts extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -241,7 +241,7 @@ class box_services_contracts extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index ed62e127816..0bae23fef95 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -52,7 +52,7 @@ class box_services_expired extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -67,7 +67,7 @@ class box_services_expired extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $user, $langs, $db, $conf; @@ -185,7 +185,7 @@ class box_services_expired extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 4621950843e..142fd2820be 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -52,7 +52,7 @@ class box_supplier_orders extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param) + function __construct($db, $param) { global $user; @@ -184,7 +184,7 @@ class box_supplier_orders extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index cf1e799e486..bfcf5d2c301 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -54,7 +54,7 @@ class box_task extends ModeleBoxes * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { global $user, $langs; @@ -73,7 +73,7 @@ class box_task extends ModeleBoxes * @param int $max Maximum number of records to load * @return void */ - function loadBox($max=5) + function loadBox($max = 5) { global $conf, $user, $langs, $db; @@ -152,7 +152,7 @@ class box_task extends ModeleBoxes * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 9ae35403ec7..971c04848c7 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -115,7 +115,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box * @param DoliDB $db Database handler * @param string $param More parameters */ - function __construct($db,$param='') + function __construct($db, $param = '') { $this->db=$db; } @@ -204,7 +204,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box * @param int $nooutput No print, only return string * @return string */ - function showBox($head = null, $contents = null, $nooutput=0) + function showBox($head = null, $contents = null, $nooutput = 0) { global $langs, $user, $conf; @@ -385,7 +385,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box * @param array $forcedirwidget null=All default directories. This parameter is used by modulebuilder module only. * @return array Array list of widget */ - static function getWidgetsList($forcedirwidget=null) + static function getWidgetsList($forcedirwidget = null) { global $conf, $langs, $db; diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 52d98790dcc..499bd8deb29 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -119,7 +119,7 @@ class CMailFile * @param string $sendcontext 'standard', 'emailing', ... (used to define with sending mode and parameters to use) * @param string $replyto Reply-to email (will be set to same value than From by default if not provided) */ - function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='') + function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '') { global $conf, $dolibarr_main_data_root; @@ -1178,7 +1178,7 @@ class CMailFile * @param array $mimefilename_list Tableau * @return string Chaine fichiers encodes */ - function write_files($filename_list,$mimetype_list,$mimefilename_list) + function write_files($filename_list, $mimetype_list, $mimefilename_list) { // phpcs:enable $out = ''; @@ -1259,7 +1259,7 @@ class CMailFile * @param int $port Example: 25, 465 * @return int Socket id if ok, 0 if KO */ - function check_server_port($host,$port) + function check_server_port($host, $port) { // phpcs:enable global $conf; @@ -1457,7 +1457,7 @@ class CMailFile * If format 3: '' or '"John Doe" ' or '"=?UTF-8?B?Sm9obiBEb2U=?=" ' * If format 4: 'John Doe' or 'john@doe.com' if no label exists */ - static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0) + static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0) { global $conf; diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php index 86ffed48551..893c08b9257 100644 --- a/htdocs/core/class/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -59,7 +59,7 @@ class CSMSFile * @param int $priority Priority * @param int $class Class */ - function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1) + function __construct($to, $from, $msg, $deliveryreceipt = 0, $deferred = 0, $priority = 3, $class = 1) { global $conf; diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 4694a5e4652..f822b178536 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -60,7 +60,7 @@ class Canvas * @param DoliDB $db Database handler * @param string $actiontype Action type ('create', 'view', 'edit', 'list') */ - function __construct($db, $actiontype='view') + function __construct($db, $actiontype = 'view') { $this->db = $db; @@ -142,7 +142,7 @@ class Canvas * @param string $ref Object ref (if id not provided) * @return void */ - function assign_values(&$action='view', $id=0, $ref='') + function assign_values(&$action = 'view', $id = 0, $ref = '') { // phpcs:enable if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref); @@ -204,7 +204,7 @@ class Canvas * @return mixed Return return code of doActions of canvas * @see http://wiki.dolibarr.org/index.php/Canvas_development */ - function doActions(&$action='view', $id=0) + function doActions(&$action = 'view', $id = 0) { if (method_exists($this->control,'doActions')) { diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index f07916a7511..e93af622a27 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -86,7 +86,7 @@ class Ccountry // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -165,7 +165,7 @@ class Ccountry // extends CommonObject * @param string $code Code * @return int >0 if OK, 0 if not found, <0 if KO */ - function fetch($id,$code='') + function fetch($id, $code = '') { global $langs; $sql = "SELECT"; @@ -214,7 +214,7 @@ class Ccountry // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; $error=0; @@ -285,7 +285,7 @@ class Ccountry // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php index 332f7e115ef..ddcce49cef4 100644 --- a/htdocs/core/class/comment.class.php +++ b/htdocs/core/class/comment.class.php @@ -82,7 +82,7 @@ class Comment extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; @@ -155,7 +155,7 @@ class Comment extends CommonObject * @param int $ref ref object * @return int <0 if KO, 0 if not found, >0 if OK */ - function fetch($id, $ref='') + function fetch($id, $ref = '') { global $langs; @@ -213,7 +213,7 @@ class Comment extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <=0 if KO, >0 if OK */ - function update(User $user, $notrigger=0) + function update(User $user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -278,7 +278,7 @@ class Comment extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 726e95214cb..d4007235295 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -69,7 +69,7 @@ abstract class CommonDocGenerator * @param Translate $outputlangs Language object for output * @return array Array of substitution key->code */ - function get_substitutionarray_user($user,$outputlangs) + function get_substitutionarray_user($user, $outputlangs) { // phpcs:enable global $conf; @@ -107,7 +107,7 @@ abstract class CommonDocGenerator * @param Translate $outputlangs Language object for output * @return array Array of substitution key->code */ - function get_substitutionarray_mysoc($mysoc,$outputlangs) + function get_substitutionarray_mysoc($mysoc, $outputlangs) { // phpcs:enable global $conf; @@ -167,7 +167,7 @@ abstract class CommonDocGenerator * @param Translate $outputlangs Language object for output * @return array Array of substitution key->code */ - function get_substitutionarray_thirdparty($object,$outputlangs) + function get_substitutionarray_thirdparty($object, $outputlangs) { // phpcs:enable global $conf; @@ -361,7 +361,7 @@ abstract class CommonDocGenerator * @param string $array_key Name of the key for return array * @return array Array of substitution */ - function get_substitutionarray_object($object,$outputlangs,$array_key='object') + function get_substitutionarray_object($object, $outputlangs, $array_key = 'object') { // phpcs:enable global $conf; @@ -604,7 +604,7 @@ abstract class CommonDocGenerator * @param array $array_key Name of the key for return array * @return array Array of substitution */ - function get_substitutionarray_shipment($object,$outputlangs,$array_key='object') + function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object') { // phpcs:enable global $conf; @@ -716,7 +716,7 @@ abstract class CommonDocGenerator * @param boolean $recursive Want to fetch child array or child object * @return array Array of substitution key->code */ - function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true) + function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true) { // phpcs:enable $array_other = array(); @@ -747,7 +747,7 @@ abstract class CommonDocGenerator * @param Translate $outputlangs Lang object to use for output * @return array Substitution array */ - function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs) + function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs) { // phpcs:enable global $conf; @@ -834,7 +834,7 @@ abstract class CommonDocGenerator * @param int $hidebottom Hide bottom * @return void */ - function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0) + function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0) { if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y); $pdf->line($x+$l, $y, $x+$l, $y+$h); @@ -870,7 +870,7 @@ abstract class CommonDocGenerator * @param int $hideref Do not show ref * @return null */ - function prepareArrayColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0) + function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0) { global $conf; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index cd346dd95e2..5615ecf3b20 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -97,7 +97,7 @@ abstract class CommonInvoice extends CommonObject * @param int $multicurrency Return multicurrency_amount instead of amount * @return double Remain of amount to pay */ - function getRemainToPay($multicurrency=0) + function getRemainToPay($multicurrency = 0) { $alreadypaid=0; $alreadypaid+=$this->getSommePaiement($multicurrency); @@ -112,7 +112,7 @@ abstract class CommonInvoice extends CommonObject * @param int $multicurrency Return multicurrency_amount instead of amount * @return int Amount of payment already done, <0 if KO */ - function getSommePaiement($multicurrency=0) + function getSommePaiement($multicurrency = 0) { $table='paiement_facture'; $field='fk_facture'; @@ -149,7 +149,7 @@ abstract class CommonInvoice extends CommonObject * @param int $multicurrency Return multicurrency_amount instead of amount * @return int <0 if KO, Sum of deposits amount otherwise */ - function getSumDepositsUsed($multicurrency=0) + function getSumDepositsUsed($multicurrency = 0) { if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') { @@ -178,7 +178,7 @@ abstract class CommonInvoice extends CommonObject * @param int $multicurrency Return multicurrency_amount instead of amount * @return int <0 if KO, Sum of credit notes and deposits amount otherwise */ - function getSumCreditNotesUsed($multicurrency=0) + function getSumCreditNotesUsed($multicurrency = 0) { require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; @@ -233,7 +233,7 @@ abstract class CommonInvoice extends CommonObject * @param string $option filtre sur statut ('', 'validated', ...) * @return int <0 si KO, 0 si aucune facture ne remplace, id facture sinon */ - function getIdReplacingInvoice($option='') + function getIdReplacingInvoice($option = '') { $sql = 'SELECT rowid'; $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element; @@ -274,7 +274,7 @@ abstract class CommonInvoice extends CommonObject * @param string $filtertype 1 to filter on type of payment == 'PRE' * @return array Array with list of payments */ - function getListOfPayments($filtertype='') + function getListOfPayments($filtertype = '') { $retarray=array(); @@ -447,7 +447,7 @@ abstract class CommonInvoice extends CommonObject * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label of status */ - function getLibStatut($mode=0, $alreadypaid=-1) + function getLibStatut($mode = 0, $alreadypaid = -1) { return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type); } @@ -463,7 +463,7 @@ abstract class CommonInvoice extends CommonObject * @param int $type Type invoice * @return string Label of status */ - function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0) + function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = 0) { // phpcs:enable global $langs; @@ -593,7 +593,7 @@ abstract class CommonInvoice extends CommonObject * @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. * @return date Date limite de reglement si ok, <0 si ko */ - function calculate_date_lim_reglement($cond_reglement=0) + function calculate_date_lim_reglement($cond_reglement = 0) { // phpcs:enable if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 945d257b8eb..d262bf87ac4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -417,7 +417,7 @@ abstract class CommonObject * @param string $ref_ext Ref ext of object to check * @return int <0 if KO, 0 if OK but not found, >0 if OK and exists */ - static function isExistingObject($element, $id, $ref='', $ref_ext='') + static function isExistingObject($element, $id, $ref = '', $ref_ext = '') { global $db,$conf; @@ -505,7 +505,7 @@ abstract class CommonObject * @param int $maxlen Maximum length * @return string String with full name */ - function getFullName($langs,$option=0,$nameorder=-1,$maxlen=0) + function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0) { //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."
\n"; $lastname=$this->lastname; @@ -532,7 +532,7 @@ abstract class CommonObject * @param int $withregion 1=Add region into address string * @return string Full address string */ - function getFullAddress($withcountry=0, $sep="\n", $withregion=0) + function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0) { if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) { @@ -682,7 +682,7 @@ abstract class CommonObject * @param int $relativelink 0=Return full external link, 1=Return link relative to root of file * @return string Link or empty string if there is no download link */ - function getLastMainDocLink($modulepart, $initsharekey=0, $relativelink=0) + function getLastMainDocLink($modulepart, $initsharekey = 0, $relativelink = 0) { global $user, $dolibarr_main_url_root; @@ -779,7 +779,7 @@ abstract class CommonObject * @param int $notrigger Disable all triggers * @return int <0 if KO, >0 if OK */ - function add_contact($fk_socpeople, $type_contact, $source='external',$notrigger=0) + function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0) { // phpcs:enable global $user,$langs; @@ -901,7 +901,7 @@ abstract class CommonObject * @param string $source Nature of contact ('internal' or 'external') * @return int >0 if OK, <0 if KO */ - function copy_linked_contact($objFrom, $source='internal') + function copy_linked_contact($objFrom, $source = 'internal') { // phpcs:enable $contacts = $objFrom->liste_contact(-1, $source); @@ -926,7 +926,7 @@ abstract class CommonObject * @param int $fk_socpeople Id of soc_people to update (not modified if 0) * @return int <0 if KO, >= 0 if OK */ - function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0) + function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0) { // phpcs:enable // Insert into database @@ -955,7 +955,7 @@ abstract class CommonObject * @param int $notrigger Disable all triggers * @return int >0 if OK, <0 if KO */ - function delete_contact($rowid, $notrigger=0) + function delete_contact($rowid, $notrigger = 0) { // phpcs:enable global $user; @@ -994,7 +994,7 @@ abstract class CommonObject * @param string $code Type of contact (code or id) * @return int >0 if OK, <0 if KO */ - function delete_linked_contact($source='',$code='') + function delete_linked_contact($source = '', $code = '') { // phpcs:enable $temp = array(); @@ -1033,7 +1033,7 @@ abstract class CommonObject * @param string $code Filter on this code of contact type ('SHIPPING', 'BILLING', ...) * @return array|int Array of contacts, -1 if error */ - function liste_contact($statut=-1,$source='external',$list=0,$code='') + function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '') { // phpcs:enable global $langs; @@ -1143,7 +1143,7 @@ abstract class CommonObject * @param string $code Type of contact (Example: 'CUSTOMER', 'SERVICE') * @return array Array list of type of contacts (id->label if option=0, code->label if option=1) */ - function liste_type_contact($source='internal', $order='position', $option=0, $activeonly=0, $code='') + function liste_type_contact($source = 'internal', $order = 'position', $option = 0, $activeonly = 0, $code = '') { // phpcs:enable global $langs; @@ -1197,7 +1197,7 @@ abstract class CommonObject * @param int $status limited to a certain status * @return array List of id for such contacts */ - function getIdContact($source,$code,$status=0) + function getIdContact($source, $code, $status = 0) { global $conf; @@ -1257,7 +1257,7 @@ abstract class CommonObject * @param int $contactid Id du contact. Use this->contactid if empty. * @return int <0 if KO, >0 if OK */ - function fetch_contact($contactid=null) + function fetch_contact($contactid = null) { // phpcs:enable if (empty($contactid)) $contactid=$this->contactid; @@ -1278,7 +1278,7 @@ abstract class CommonObject * @param int $force_thirdparty_id Force thirdparty id * @return int <0 if KO, >0 if OK */ - function fetch_thirdparty($force_thirdparty_id=0) + function fetch_thirdparty($force_thirdparty_id = 0) { // phpcs:enable global $conf; @@ -1542,7 +1542,7 @@ abstract class CommonObject * @return int <0 if KO, >0 if OK * @see updateExtraField() */ - function setValueFrom($field, $value, $table='', $id=null, $format='', $id_field='', $fuser=null, $trigkey='', $fk_user_field='fk_user_modif') + function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif') { global $user,$langs,$conf; @@ -1621,7 +1621,7 @@ abstract class CommonObject * @param int $nodbprefix Do not include DB prefix to forge table name * @return int <0 if KO, >0 if OK */ - function load_previous_next_ref($filter, $fieldid, $nodbprefix=0) + function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0) { // phpcs:enable global $conf, $user; @@ -1745,7 +1745,7 @@ abstract class CommonObject * @return array Array of id of contacts (if source=external or internal) * Array of id of third parties with at least one contact on object (if source=thirdparty) */ - function getListContactId($source='external') + function getListContactId($source = 'external') { $contactAlreadySelected = array(); $tab = $this->liste_contact(-1,$source); @@ -1892,7 +1892,7 @@ abstract class CommonObject * @param int $mode mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency * @return int >0 if OK, <0 if KO */ - function setMulticurrencyRate($rate, $mode=1) + function setMulticurrencyRate($rate, $mode = 1) { dol_syslog(get_class($this).'::setMulticurrencyRate('.$id.')'); if ($this->statut >= 0 || $this->element == 'societe') @@ -2068,7 +2068,7 @@ abstract class CommonObject * * @return int 1 if OK, 0 if KO */ - function setShippingMethod($shipping_method_id, $notrigger=false, $userused=null) + function setShippingMethod($shipping_method_id, $notrigger = false, $userused = null) { global $user; @@ -2192,7 +2192,7 @@ abstract class CommonObject * @param User $userused Object user * @return int 1 if OK, 0 if KO */ - function setBankAccount($fk_account, $notrigger=false, $userused=null) + function setBankAccount($fk_account, $notrigger = false, $userused = null) { global $user; @@ -2257,7 +2257,7 @@ abstract class CommonObject * @param boolean $fk_parent_line Table with fk_parent_line field or not * @return int <0 if KO, >0 if OK */ - function line_order($renum=false, $rowidorder='ASC', $fk_parent_line=true) + function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true) { // phpcs:enable if (! $this->table_element_line) @@ -2376,7 +2376,7 @@ abstract class CommonObject * @param boolean $fk_parent_line Table with fk_parent_line field or not * @return void */ - function line_up($rowid, $fk_parent_line=true) + function line_up($rowid, $fk_parent_line = true) { // phpcs:enable $this->line_order(false, 'ASC', $fk_parent_line); @@ -2396,7 +2396,7 @@ abstract class CommonObject * @param boolean $fk_parent_line Table with fk_parent_line field or not * @return void */ - function line_down($rowid, $fk_parent_line=true) + function line_down($rowid, $fk_parent_line = true) { // phpcs:enable $this->line_order(false, 'ASC', $fk_parent_line); @@ -2418,7 +2418,7 @@ abstract class CommonObject * @param int $rang Position * @return void */ - function updateRangOfLine($rowid,$rang) + function updateRangOfLine($rowid, $rang) { $fieldposition = 'rang'; if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position'; @@ -2457,7 +2457,7 @@ abstract class CommonObject * @param int $rang Position * @return void */ - function updateLineUp($rowid,$rang) + function updateLineUp($rowid, $rang) { if ($rang > 1) { @@ -2491,7 +2491,7 @@ abstract class CommonObject * @param int $max Max * @return void */ - function updateLineDown($rowid,$rang,$max) + function updateLineDown($rowid, $rang, $max) { if ($rang < $max) { @@ -2563,7 +2563,7 @@ abstract class CommonObject * @param int $fk_parent_line Parent line id * @return int Max value of rang in table of lines */ - function line_max($fk_parent_line=0) + function line_max($fk_parent_line = 0) { // phpcs:enable // Search the last rang with fk_parent_line @@ -2645,7 +2645,7 @@ abstract class CommonObject * @param string $suffix '', '_public' or '_private' * @return int <0 if KO, >0 if OK */ - function update_note($note, $suffix='') + function update_note($note, $suffix = '') { // phpcs:enable global $user; @@ -2716,7 +2716,7 @@ abstract class CommonObject * @param Societe $seller If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object. * @return int <0 if KO, >0 if OK */ - function update_price($exclspec=0,$roundingadjust='none',$nodatabaseupdate=0,$seller=null) + function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null) { // phpcs:enable global $conf, $hookmanager, $action; @@ -2953,7 +2953,7 @@ abstract class CommonObject * @return int <=0 if KO, >0 if OK * @see fetchObjectLinked(), updateObjectLinked(), deleteObjectLinked() */ - function add_object_linked($origin=null, $origin_id=null) + function add_object_linked($origin = null, $origin_id = null) { // phpcs:enable $origin = (! empty($origin) ? $origin : $this->origin); @@ -3014,7 +3014,7 @@ abstract class CommonObject * @return int <0 if KO, >0 if OK * @see add_object_linked(), updateObjectLinked(), deleteObjectLinked() */ - function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR',$alsosametype=1,$orderby='sourcetype',$loadalsoobjects=1) + function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1) { global $conf; @@ -3218,7 +3218,7 @@ abstract class CommonObject * @return int >0 if OK, <0 if KO * @see add_object_linked(), fetObjectLinked(), deleteObjectLinked() */ - function updateObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='') + function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '') { $updatesource=false; $updatetarget=false; @@ -3265,7 +3265,7 @@ abstract class CommonObject * @return int >0 if OK, <0 if KO * @see add_object_linked, updateObjectLinked, fetchObjectLinked */ - function deleteObjectLinked($sourceid=null, $sourcetype='', $targetid=null, $targettype='', $rowid='') + function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '') { $deletesource=false; $deletetarget=false; @@ -3326,7 +3326,7 @@ abstract class CommonObject * @param string $trigkey Trigger key to use for trigger * @return int <0 if KO, >0 if OK */ - function setStatut($status, $elementId=null, $elementType='', $trigkey='') + function setStatut($status, $elementId = null, $elementType = '', $trigkey = '') { global $user,$langs,$conf; @@ -3414,7 +3414,7 @@ abstract class CommonObject * @param string $ref Record ref * @return int <0 if KO, 0 if nothing done, >0 if OK */ - function getCanvas($id=0,$ref='') + function getCanvas($id = 0, $ref = '') { global $conf; @@ -3474,7 +3474,7 @@ abstract class CommonObject * @param int $id Force id of object * @return int <0 if KO, 0 if not used, >0 if already used */ - function isObjectUsed($id=0) + function isObjectUsed($id = 0) { global $langs; @@ -3543,7 +3543,7 @@ abstract class CommonObject * @param int $predefined -1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service * @return int <0 if KO, 0 if no predefined products, nb of lines with predefined products if found */ - function hasProductsOrServices($predefined=-1) + function hasProductsOrServices($predefined = -1) { $nb=0; @@ -3881,7 +3881,7 @@ abstract class CommonObject * @param int $dateSelector 1=Show also date range input fields * @return void */ - function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) + function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0) { global $conf, $hookmanager, $langs, $user; // TODO We should not use global var for this ! @@ -4035,7 +4035,7 @@ abstract class CommonObject * @param int $extrafieldsline Object of extrafield line attribute * @return void */ - function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0) + function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafieldsline = 0) { global $conf,$langs,$user,$object,$hookmanager; global $form,$bc,$bcdd; @@ -4153,7 +4153,7 @@ abstract class CommonObject * @param string $restrictlist ''=All lines, 'services'=Restrict to services only * @return void */ - function printOriginLinesList($restrictlist='') + function printOriginLinesList($restrictlist = '') { global $langs, $hookmanager, $conf; @@ -4207,7 +4207,7 @@ abstract class CommonObject * @param string $restrictlist ''=All lines, 'services'=Restrict to services only (strike line if not) * @return void */ - function printOriginLine($line, $var, $restrictlist='') + function printOriginLine($line, $var, $restrictlist = '') { global $langs, $conf; @@ -4353,7 +4353,7 @@ abstract class CommonObject * @param int $mandatory Mandatory or not * @return int <=0 if KO, >0 if OK */ - function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0) + function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0) { // phpcs:enable $this->db->begin(); @@ -4397,7 +4397,7 @@ abstract class CommonObject * @param int $notrigger Disable all triggers * @return int >0 if OK, <0 if KO */ - function delete_resource($rowid, $element, $notrigger=0) + function delete_resource($rowid, $element, $notrigger = 0) { // phpcs:enable global $user; @@ -4460,7 +4460,7 @@ abstract class CommonObject * @return int >0 if OK, <0 if KO * @see addFileIntoDatabaseIndex() */ - protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams=null) + protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null) { global $conf, $langs, $user; @@ -4742,7 +4742,7 @@ abstract class CommonObject * @param string $alternatevalue Alternate value to use * @return string|string[] Default value (can be an array if the GETPOST return an array) **/ - function getDefaultCreateValueFor($fieldname, $alternatevalue=null) + function getDefaultCreateValueFor($fieldname, $alternatevalue = null) { global $conf, $_POST; @@ -4818,7 +4818,7 @@ abstract class CommonObject * @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters. * @return int <0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded */ - function fetch_optionals($rowid=null, $optionsArray=null) + function fetch_optionals($rowid = null, $optionsArray = null) { // phpcs:enable if (empty($rowid)) $rowid=$this->id; @@ -4962,7 +4962,7 @@ abstract class CommonObject * @return int -1=error, O=did nothing, 1=OK * @see updateExtraField(), setValueFrom() */ - function insertExtraFields($trigger='', $userused=null) + function insertExtraFields($trigger = '', $userused = null) { global $conf,$langs,$user; @@ -5208,7 +5208,7 @@ abstract class CommonObject * @return int -1=error, O=did nothing, 1=OK * @see setValueFrom(), insertExtraFields() */ - function updateExtraField($key, $trigger=null, $userused=null) + function updateExtraField($key, $trigger = null, $userused = null) { global $conf,$langs,$user; @@ -5342,7 +5342,7 @@ abstract class CommonObject * @param string|int $morecss Value for css to define style/length of field. May also be a numeric. * @return string */ - function showInputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss=0) + function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0) { global $conf,$langs,$form; @@ -5953,7 +5953,7 @@ abstract class CommonObject * @param mixed $showsize Value for css to define size. May also be a numeric. * @return string */ - function showOutputField($val, $key, $value, $moreparam='', $keysuffix='', $keyprefix='', $showsize=0) + function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $showsize = 0) { global $conf,$langs,$form; @@ -6324,7 +6324,7 @@ abstract class CommonObject * @param string $onetrtd All fields in same tr td * @return string */ - function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='', $keyprefix='', $onetrtd=0) + function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0) { global $db, $conf, $langs, $action, $form; @@ -6531,7 +6531,7 @@ abstract class CommonObject * @param int $ignoreerrors Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old thirdparty may already exists on new one) * @return bool True if success, False if error */ - public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors=0) + public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0) { foreach ($tables as $table) { @@ -6647,7 +6647,7 @@ abstract class CommonObject * @param int $usesharelink Use the public shared link of image (if not available, the 'nophoto' image will be shown instead) * @return string Html code to show photo. Number of photos shown is saved in this->nbphoto */ - function show_photos($modulepart, $sdir, $size=0, $nbmax=0, $nbbyrow=5, $showfilename=0, $showaction=0, $maxHeight=120, $maxWidth=160, $nolink=0, $notitle=0, $usesharelink=0) + function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0) { // phpcs:enable global $conf,$user,$langs; @@ -7349,7 +7349,7 @@ abstract class CommonObject * @param int $forcechilddeletion 0=no, 1=Force deletion of children * @return int <=0 if KO, >0 if OK */ - public function deleteCommon(User $user, $notrigger=false, $forcechilddeletion=0) + public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0) { $error=0; diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 91d4245ff88..891ea5e4bc6 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -57,7 +57,7 @@ abstract class CommonObjectLine extends CommonObject * @param string $type Label type (long or short) * @return string|int <0 if ko, label if ok */ - public function getLabelOfUnit($type='long') + public function getLabelOfUnit($type = 'long') { global $langs; diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php index d5bf6f3317e..2cbf6a9ecb7 100644 --- a/htdocs/core/class/commonstickergenerator.class.php +++ b/htdocs/core/class/commonstickergenerator.class.php @@ -107,7 +107,7 @@ abstract class CommonStickerGenerator * @param string $outputdir Output directory for pdf file * @return int 1=OK, 0=KO */ - abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir=''); + abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = ''); // phpcs:enable /** @@ -118,7 +118,7 @@ abstract class CommonStickerGenerator * @param array $param Associative array containing label content and optional parameters * @return void */ - abstract function addSticker(&$pdf,$outputlangs,$param); + abstract function addSticker(&$pdf, $outputlangs, $param); // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps /** @@ -129,7 +129,7 @@ abstract class CommonStickerGenerator * @param int $pt point * @return void */ - function Set_Char_Size(&$pdf,$pt) + function Set_Char_Size(&$pdf, $pt) { // phpcs:enable if ($pt > 3) { @@ -152,7 +152,7 @@ abstract class CommonStickerGenerator * @param int $nbPointilles Nb pointilles * @return void */ - function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15) + function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15) { // phpcs:enable $pdf->SetLineWidth($epaisseur); @@ -195,7 +195,7 @@ abstract class CommonStickerGenerator * @param int $taille Size * @return void */ - function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4) + function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4) { // phpcs:enable $pdf->SetDrawColor(192,192,192); diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php index 5129ac54ece..b6cff34b0f3 100644 --- a/htdocs/core/class/coreobject.class.php +++ b/htdocs/core/class/coreobject.class.php @@ -123,7 +123,7 @@ class CoreObject extends CommonObject * @param bool $try_to_load Force the fetch if an id is given * @return int */ - public function addChild($tabName, $id=0, $key='id', $try_to_load = false) + public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false) { if(!empty($id)) { @@ -154,7 +154,7 @@ class CoreObject extends CommonObject * @param string $key Attribute name of the object id * @return bool */ - public function removeChild($tabName, $id, $key='id') + public function removeChild($tabName, $id, $key = 'id') { foreach ($this->{$tabName} as &$object) { @@ -370,7 +370,7 @@ class CoreObject extends CommonObject * @param string $format Output date format * @return string */ - public function getDate($field, $format='') + public function getDate($field, $format = '') { if(empty($this->{$field})) return ''; else diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php index 4320446d7b5..6ad6523f199 100644 --- a/htdocs/core/class/cstate.class.php +++ b/htdocs/core/class/cstate.class.php @@ -92,7 +92,7 @@ class Cstate // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -168,7 +168,7 @@ class Cstate // extends CommonObject * @param string $code Code * @return int <0 if KO, >0 if OK */ - function fetch($id,$code='') + function fetch($id, $code = '') { global $langs; $sql = "SELECT"; @@ -212,7 +212,7 @@ class Cstate // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; $error=0; @@ -281,7 +281,7 @@ class Cstate // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index db8ed461727..ffaccbfe964 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -76,7 +76,7 @@ class Ctypent // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ - function create($user, $notrigger=0) + function create($user, $notrigger = 0) { global $conf, $langs; $error=0; @@ -166,7 +166,7 @@ class Ctypent // extends CommonObject * @param string $label Label * @return int <0 if KO, >0 if OK */ - function fetch($id,$code='',$label='') + function fetch($id, $code = '', $label = '') { global $langs; $sql = "SELECT"; @@ -214,7 +214,7 @@ class Ctypent // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; $error=0; @@ -285,7 +285,7 @@ class Ctypent // extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function delete($user, $notrigger=0) + function delete($user, $notrigger = 0) { global $conf, $langs; $error=0; diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 95c642772e2..4ceb7ed37c8 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -159,7 +159,7 @@ class Ctyperesource * * @return int <0 if KO, 0 if not found, >0 if OK */ - public function fetch($id,$code='',$label='') + public function fetch($id, $code = '', $label = '') { dol_syslog(__METHOD__, LOG_DEBUG); @@ -223,7 +223,7 @@ class Ctyperesource * * @return int <0 if KO, >0 if OK */ - public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND') + public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') { dol_syslog(__METHOD__, LOG_DEBUG); diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index 48c426a830f..b47a324838a 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -109,7 +109,7 @@ class DiscountAbsolute * @param int $fk_invoice_supplier_source fk_invoice_supplier_source * @return int <0 if KO, =0 if not found, >0 if OK */ - function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0) + function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0) { global $conf; @@ -396,7 +396,7 @@ class DiscountAbsolute * @param int $rowidinvoice Invoice id (To use discount as a credit note to reduc payment of invoice) * @return int <0 if KO, >0 if OK */ - function link_to_invoice($rowidline,$rowidinvoice) + function link_to_invoice($rowidline, $rowidinvoice) { // phpcs:enable // Check parameters @@ -484,7 +484,7 @@ class DiscountAbsolute * @param int $discount_type 0 => customer discount, 1 => supplier discount * @return int <0 if KO, amount otherwise */ - function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0) + function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0) { global $conf; @@ -527,7 +527,7 @@ class DiscountAbsolute * @param int $multicurrency Return multicurrency_amount instead of amount * @return int <0 if KO, Sum of credit notes and deposits amount otherwise */ - function getSumDepositsUsed($invoice, $multicurrency=0) + function getSumDepositsUsed($invoice, $multicurrency = 0) { dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG); @@ -573,7 +573,7 @@ class DiscountAbsolute * @param int $multicurrency Return multicurrency_amount instead of amount * @return int <0 if KO, Sum of credit notes and excess received amount otherwise */ - function getSumCreditNotesUsed($invoice, $multicurrency=0) + function getSumCreditNotesUsed($invoice, $multicurrency = 0) { dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG); @@ -619,7 +619,7 @@ class DiscountAbsolute * @param string $option Where to link to ('invoice' or 'discount') * @return string String with URL */ - function getNomUrl($withpicto,$option='invoice') + function getNomUrl($withpicto, $option = 'invoice') { global $langs; diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 548721be05f..5d375e420f4 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -64,7 +64,7 @@ class DolEditor * @param string $cols Size of cols for textarea tool (textarea number of cols '70' or percent 'x%') * @param int $readonly 0=Read/Edit, 1=Read only */ - function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0) + function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0) { global $conf,$langs; @@ -149,7 +149,7 @@ class DolEditor * @param string $option For ACE editor, set the source language ('html', 'php', 'javascript', ...) * @return void|string */ - function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='') + function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '') { // phpcs:enable global $conf,$langs; diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php index a57e4e844ec..d5b486f3430 100644 --- a/htdocs/core/class/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -41,7 +41,7 @@ class DolGeoIP * @param string $type 'country' or 'city' * @param string $datfile Data file */ - function __construct($type,$datfile) + function __construct($type, $datfile) { if ($type == 'country') { diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 42386494a37..c7dc7991a4a 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -88,7 +88,7 @@ class DolGraph * * @param string $library 'jflot' (default) or 'artichow' (no more supported) */ - function __construct($library='jflot') + function __construct($library = 'jflot') { global $conf; global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; @@ -658,7 +658,7 @@ class DolGraph * @param string $fileurl Url path to show image if saved onto disk * @return integer|null */ - function draw($file, $fileurl='') + function draw($file, $fileurl = '') { if (empty($file)) { @@ -690,7 +690,7 @@ class DolGraph * @param string $fileurl Url path to show image if saved onto disk * @return void */ - private function draw_artichow($file,$fileurl) + private function draw_artichow($file, $fileurl) { // phpcs:enable global $artichow_defaultfont; @@ -1127,7 +1127,7 @@ class DolGraph * @param int $shownographyet Show graph to say there is not enough data * @return string HTML string to show graph */ - function show($shownographyet=0) + function show($shownographyet = 0) { global $langs; @@ -1149,7 +1149,7 @@ class DolGraph * @param string $defaultsize Value we want as default size * @return int Value of width or height to use by default */ - static function getDefaultGraphSizeForStats($direction,$defaultsize='') + static function getDefaultGraphSizeForStats($direction, $defaultsize = '') { global $conf; diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index f38afc67807..19de8abb3f6 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -311,7 +311,7 @@ class dolReceiptPrinter extends Escpos * @param string $htmlname select html name * @return int 0 if OK; >0 if KO */ - function selectTypePrinter($selected='', $htmlname='printertypeid') + function selectTypePrinter($selected = '', $htmlname = 'printertypeid') { global $langs; @@ -335,7 +335,7 @@ class dolReceiptPrinter extends Escpos * @param string $htmlname select html name * @return int 0 if OK; >0 if KO */ - function selectProfilePrinter($selected='', $htmlname='printerprofileid') + function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid') { global $langs; diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php index 3a1fba460c4..3ce9623a05d 100644 --- a/htdocs/core/class/emailsenderprofile.class.php +++ b/htdocs/core/class/emailsenderprofile.class.php @@ -277,7 +277,7 @@ class EmailSenderProfile extends CommonObject * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @return string String with URL */ - function getNomUrl($withpicto=0) + function getNomUrl($withpicto = 0) { global $db, $conf, $langs; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -309,7 +309,7 @@ class EmailSenderProfile extends CommonObject * @param int $withpicto Add download picto into link * @return string HTML link to file */ - function getDirectExternalLink($withpicto=0) + function getDirectExternalLink($withpicto = 0) { return 'todo'; } @@ -320,7 +320,7 @@ class EmailSenderProfile extends CommonObject * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto * @return string Label of status */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->status,$mode); } @@ -333,7 +333,7 @@ class EmailSenderProfile extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto * @return string Label of status */ - static function LibStatut($status,$mode=0) + static function LibStatut($status, $mode = 0) { global $langs; diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 68e029dae4b..ecaaba8f4c7 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -183,7 +183,7 @@ class Events // extends CommonObject * @param int $notrigger 0=no, 1=yes (no update trigger) * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user = null, $notrigger = 0) { global $conf, $langs; @@ -220,7 +220,7 @@ class Events // extends CommonObject * @param User $user User that load * @return int <0 if KO, >0 if OK */ - function fetch($id, $user=null) + function fetch($id, $user = null) { global $langs; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index cc1fae502b3..6d26522bb97 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -171,7 +171,7 @@ class ExtraFields * @param string $enabled Condition to have the field enabled or not * @return int <=0 if KO, >0 if OK */ - function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1') + function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1') { if (empty($attrname)) return -1; if (empty($label)) return -1; @@ -221,7 +221,7 @@ class ExtraFields * @param string $computed Computed value * @return int <=0 if KO, >0 if OK */ - private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='') + private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '') { if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'contact') $elementtype='socpeople'; @@ -317,7 +317,7 @@ class ExtraFields * @param string $enabled Condition to have the field enabled or not * @return int <=0 if KO, >0 if OK */ - private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1') + private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1') { // phpcs:enable global $conf,$user; @@ -414,7 +414,7 @@ class ExtraFields * @param string $elementtype Element type ('member', 'product', 'thirdparty', 'contact', ...) * @return int < 0 if KO, 0 if nothing is done, 1 if OK */ - function delete($attrname, $elementtype='member') + function delete($attrname, $elementtype = 'member') { if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'contact') $elementtype='socpeople'; @@ -472,7 +472,7 @@ class ExtraFields * @param string $elementtype Element type ('member', 'product', 'thirdparty', ...) * @return int < 0 if KO, 0 if nothing is done, 1 if OK */ - private function delete_label($attrname, $elementtype='member') + private function delete_label($attrname, $elementtype = 'member') { // phpcs:enable global $conf; @@ -529,7 +529,7 @@ class ExtraFields * @param int $totalizable Is extrafield totalizable on list * @return int >0 if OK, <=0 if KO */ - function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0) + function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0) { if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'contact') $elementtype='socpeople'; @@ -639,7 +639,7 @@ class ExtraFields * @param int $totalizable Is extrafield totalizable on list * @return int <=0 if KO, >0 if OK */ - private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0) + private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0) { // phpcs:enable global $conf, $user; @@ -770,7 +770,7 @@ class ExtraFields * @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required. * @return array Array of attributes keys+label for all extra fields. */ - function fetch_name_optionals_label($elementtype,$forceload=false) + function fetch_name_optionals_label($elementtype, $forceload = false) { // phpcs:enable global $conf; @@ -893,7 +893,7 @@ class ExtraFields * @param string $extrafieldsobjectkey If defined (for example $object->table_element), use the new method to get extrafields data * @return string */ - function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='') + function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '') { global $conf,$langs,$form; @@ -1508,7 +1508,7 @@ class ExtraFields * @param string $extrafieldsobjectkey If defined (for example $object->table_element), use the new method to get extrafields data * @return string Formated value */ - function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='') + function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '') { global $conf,$langs; @@ -1820,7 +1820,7 @@ class ExtraFields * @param string $extrafieldsobjectkey If defined, use the new method to get extrafields data * @return string Formated value */ - function getAlignFlag($key, $extrafieldsobjectkey='') + function getAlignFlag($key, $extrafieldsobjectkey = '') { global $conf,$langs; @@ -1890,7 +1890,7 @@ class ExtraFields * @param string $onlykey Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset. * @return int 1 if array_options set, 0 if no value, -1 if error (field required missing for example) */ - function setOptionalsFromPost($extralabels, &$object, $onlykey='') + function setOptionalsFromPost($extralabels, &$object, $onlykey = '') { global $_POST, $langs; $nofillrequired='';// For error when required field left blank @@ -1989,7 +1989,7 @@ class ExtraFields * @param string $keysuffix Suffix string to add into name and id of field (can be used to avoid duplicate names) * @return array|int array_options set or 0 if no value */ - function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='') + function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '') { global $_POST; diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php index 027fdda0514..66f6e19102c 100644 --- a/htdocs/core/class/fileupload.class.php +++ b/htdocs/core/class/fileupload.class.php @@ -41,7 +41,7 @@ class FileUpload * @param int $fk_element fk_element * @param string $element element */ - function __construct($options=null,$fk_element=null,$element=null) + function __construct($options = null, $fk_element = null, $element = null) { global $db, $conf; global $object; diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php index c1c288cbf79..cf6a3cf345d 100644 --- a/htdocs/core/class/fiscalyear.class.php +++ b/htdocs/core/class/fiscalyear.class.php @@ -264,7 +264,7 @@ class Fiscalyear extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Label */ - function getLibStatut($mode=0) + function getLibStatut($mode = 0) { return $this->LibStatut($this->statut,$mode); } @@ -277,7 +277,7 @@ class Fiscalyear extends CommonObject * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Label */ - function LibStatut($statut,$mode=0) + function LibStatut($statut, $mode = 0) { // phpcs:enable global $langs; diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php index 615729ba9c3..797f0a14af1 100644 --- a/htdocs/core/class/google.class.php +++ b/htdocs/core/class/google.class.php @@ -44,7 +44,7 @@ class GoogleAPI * @param DoliDB $db Database handler * @param string $key Google key */ - function __construct($db,$key) + function __construct($db, $key) { $this->db=$db; $this->key=$key; diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 98193f1e32e..47edef4011d 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -136,7 +136,7 @@ class HookManager * All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller. * $this->error or this->errors are also defined by class called by this function if error. */ - function executeHooks($method, $parameters=array(), &$object='', &$action='') + function executeHooks($method, $parameters = array(), &$object = '', &$action = '') { if (! is_array($this->hooks) || empty($this->hooks)) return ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 228c9fa1538..c737c7b791e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -102,7 +102,7 @@ class Form * @param string $paramid Key of parameter for id ('id', 'socid') * @return string HTML edit field */ - function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata='string', $moreparam='', $fieldrequired=0, $notabletag=0, $paramid='id') + function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id') { global $conf,$langs; @@ -164,7 +164,7 @@ class Form * @param string $paramid Key of parameter for id ('id', 'socid') * @return string HTML edit field */ - function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $custommsg=null, $moreparam='', $notabletag=0, $formatfunc='', $paramid='id') + function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id') { global $conf,$langs,$db; @@ -306,7 +306,7 @@ class Form * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage') * @return string HTML edit in place */ - private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $custommsg=null) + private function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null) { global $conf; @@ -441,7 +441,7 @@ class Form * @see Use function textwithpicto if you can. * TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip */ - function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger='', $forcenowrap=0) + function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0) { global $conf; @@ -526,7 +526,7 @@ class Form * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only) * @return string HTML code of text, picto, tooltip */ - function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='', $forcenowrap=0) + function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger = '', $forcenowrap = 0) { global $conf, $langs; @@ -578,7 +578,7 @@ class Form * @param int $alwaysvisible 1=select button always visible * @return string Select list */ - function selectMassAction($selected, $arrayofaction, $alwaysvisible=0) + function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0) { global $conf,$langs,$hookmanager; @@ -678,7 +678,7 @@ class Form * @param int $addspecialentries 1=Add dedicated entries for group of countries (like 'European Economic Community', ...) * @return string HTML string with select */ - function select_country($selected='', $htmlname='country_id', $htmloption='', $maxlength=0, $morecss='minwidth300', $usecodeaskey='', $showempty=1, $disablefavorites=0, $addspecialentries=0) + function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0) { // phpcs:enable global $conf,$langs,$mysoc; @@ -791,7 +791,7 @@ class Form * @param array $events Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled'))) * @return string HTML string with select and input */ - function select_incoterms($selected='', $location_incoterms='', $page='', $htmlname='incoterm_id', $htmloption='', $forcecombo=1, $events=array()) + function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array()) { // phpcs:enable global $conf,$langs; @@ -884,7 +884,7 @@ class Form * @param integer $forceall 1=Force to show products and services in combo list, whatever are activated modules, 0=No force, 2=Force to show only Products, 3=Force to show only services, -1=Force none (and set hidden field to 'service') * @return void */ - function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0) + function select_type_of_lines($selected = '', $htmlname = 'type', $showempty = 0, $hidetext = 0, $forceall = 0) { // phpcs:enable global $db,$langs,$user,$conf; @@ -987,7 +987,7 @@ class Form * @param int $showempty Add an empty field * @return void */ - function select_type_fees($selected='',$htmlname='type',$showempty=0) + function select_type_fees($selected = '', $htmlname = 'type', $showempty = 0) { // phpcs:enable global $user, $langs; @@ -1031,7 +1031,7 @@ class Form * @return string Return select box for thirdparty. * @deprecated 3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0) */ - function select_thirdparty($selected='', $htmlname='socid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0) + function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0) { // phpcs:enable return $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0, $limit); @@ -1057,7 +1057,7 @@ class Form * @param bool $multiple add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter) * @return string HTML string with select box for thirdparty. */ - function select_company($selected='', $htmlname='socid', $filter='', $showempty='', $showtype=0, $forcecombo=0, $events=array(), $limit=0, $morecss='minwidth100', $moreparam='', $selected_input_value='', $hidelabel=1, $ajaxoptions=array(), $multiple=false) + function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false) { // phpcs:enable global $conf,$user,$langs; @@ -1121,7 +1121,7 @@ class Form * @param bool $multiple add [] in the name of element and add 'multiple' attribut * @return string HTML string with */ - function select_thirdparty_list($selected='',$htmlname='socid',$filter='',$showempty='', $showtype=0, $forcecombo=0, $events=array(), $filterkey='', $outputmode=0, $limit=0, $morecss='minwidth100', $moreparam='', $multiple=false) + function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false) { // phpcs:enable global $conf,$user,$langs; @@ -1295,7 +1295,7 @@ class Form * @param int $maxvalue Max value for lines that can be selected * @return int Return number of qualifed lines in list */ - function select_remises($selected, $htmlname, $filter, $socid, $maxvalue=0) + function select_remises($selected, $htmlname, $filter, $socid, $maxvalue = 0) { // phpcs:enable global $langs,$conf; @@ -1382,7 +1382,7 @@ class Form * @return int <0 if KO, Nb of contact in list if OK * @deprected You can use selectcontacts directly (warning order of param was changed) */ - function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $events=array(), $options_only=false, $moreparam='', $htmlid='') + function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '') { // phpcs:enable print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid); @@ -1412,7 +1412,7 @@ class Form * @param bool $multiple add [] in the name of element and add 'multiple' attribut * @return int <0 if KO, Nb of contact in list if OK */ - function selectcontacts($socid, $selected='', $htmlname='contactid', $showempty=0, $exclude='', $limitto='', $showfunction=0, $moreclass='', $options_only=false, $showsoc=0, $forcecombo=0, $events=array(), $moreparam='', $htmlid='', $multiple=false) + function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false) { global $conf,$langs,$hookmanager,$action; @@ -1559,7 +1559,7 @@ class Form * @deprecated Use select_dolusers instead * @see select_dolusers() */ - function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude=null,$disabled=0,$include='',$enableonly='',$force_entity='0') + function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0') { // phpcs:enable print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity); @@ -1589,7 +1589,7 @@ class Form * @return string HTML select string * @see select_dolgroups */ - function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $show_every=0, $enableonlytext='', $morecss='', $noactive=0, $outputmode=0, $multiple=false) + function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false) { // phpcs:enable global $conf,$user,$langs; @@ -1797,7 +1797,7 @@ class Form * @return string HTML select string * @see select_dolgroups */ - function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude=null, $disabled=0, $include='', $enableonly='', $force_entity='0', $maxlength=0, $showstatus=0, $morefilter='', $showproperties=0, $listofuserid=array(), $listofcontactid=array(), $listofotherid=array()) + function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array()) { // phpcs:enable global $conf, $user, $langs; @@ -1890,7 +1890,7 @@ class Form * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...]) * @return void */ - function select_produits($selected='', $htmlname='productid', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=0, $ajaxoptions=array(), $socid=0, $showempty='1', $forcecombo=0, $morecss='', $hidepriceinlabel=0, $warehouseStatus='', $selected_combinations = array()) + function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array()) { // phpcs:enable global $langs,$conf; @@ -2032,7 +2032,7 @@ class Form * 'warehouseinternal' = select products from warehouses for internal correct/transfer only * @return array Array of keys for json */ - function select_produits_list($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$filterkey='',$status=1,$finished=2,$outputmode=0,$socid=0,$showempty='1',$forcecombo=0,$morecss='',$hidepriceinlabel=0, $warehouseStatus='') + function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '') { // phpcs:enable global $langs,$conf,$user,$db; @@ -2324,7 +2324,7 @@ class Form * @param int $hidepriceinlabel Hide price in label * @return void */ - private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel=0) + private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0) { global $langs,$conf,$user,$db; @@ -2546,7 +2546,7 @@ class Form * @param string $morecss More CSS * @return void */ - function select_produits_fournisseurs($socid, $selected='', $htmlname='productid', $filtertype='', $filtre='', $ajaxoptions=array(), $hidelabel=0, $alsoproductwithnosupplierprice=0, $morecss='') + function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '') { // phpcs:enable global $langs,$conf; @@ -2592,7 +2592,7 @@ class Form * @param string $morecss Add more CSS * @return array Array of keys for json */ - function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0,$limit=100,$alsoproductwithnosupplierprice=0,$morecss='') + function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '') { // phpcs:enable global $langs,$conf,$db; @@ -2816,7 +2816,7 @@ class Form * @param int $selected_supplier Pre-selected supplier if more than 1 result * @return void */ - function select_product_fourn_price($productid, $htmlname='productfournpriceid', $selected_supplier='') + function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '') { // phpcs:enable global $langs,$conf; @@ -2930,7 +2930,7 @@ class Form * @param int $showempty Add an empty field * @return integer|null */ - function select_address($selected, $socid, $htmlname='address_id',$showempty=0) + function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0) { // phpcs:enable // looking for users @@ -3081,7 +3081,7 @@ class Form * @param int $addempty Add empty entry * @return void */ - function selectAvailabilityDelay($selected='',$htmlname='availid',$filtertype='',$addempty=0) + function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0) { global $langs,$user; @@ -3167,7 +3167,7 @@ class Form * @param int $addempty Add an empty entry * @return void */ - function selectInputReason($selected='',$htmlname='demandreasonid',$exclude='',$addempty=0) + function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0) { global $langs,$user; @@ -3263,7 +3263,7 @@ class Form * @param string $morecss Add more CSS on select tag * @return void */ - function select_conditions_paiements($selected=0, $htmlname='condid', $filtertype=-1, $addempty=0, $noinfoadmin=0, $morecss='') + function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '') { // phpcs:enable global $langs, $user, $conf; @@ -3310,7 +3310,7 @@ class Form * @param string $morecss Add more CSS on select tag * @return void */ - function select_types_paiements($selected='', $htmlname='paiementtype', $filtertype='', $format=0, $empty=1, $noadmininfo=0, $maxlength=0, $active=1, $morecss='') + function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '') { // phpcs:enable global $langs,$user; @@ -3364,7 +3364,7 @@ class Form * @param string $htmlname Nom de la zone select * @return string Code of HTML select to chose tax or not */ - function selectPriceBaseType($selected='',$htmlname='price_base_type') + function selectPriceBaseType($selected = '', $htmlname = 'price_base_type') { global $langs; @@ -3402,7 +3402,7 @@ class Form * @param string $moreattrib To add more attribute on select * @return void */ - function selectShippingMethod($selected='',$htmlname='shipping_method_id',$filtre='',$useempty=0,$moreattrib='') + function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '') { global $langs, $conf, $user; @@ -3455,7 +3455,7 @@ class Form * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries. * @return void */ - function formSelectShippingMethod($page, $selected='', $htmlname='shipping_method_id', $addempty=0) + function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0) { global $langs, $db; @@ -3540,7 +3540,7 @@ class Form * @param int $showempty Add a nempty line * @return string HTML select */ - function selectUnits($selected = '', $htmlname = 'units', $showempty=0) + function selectUnits($selected = '', $htmlname = 'units', $showempty = 0) { global $langs; @@ -3591,7 +3591,7 @@ class Form * @param int $showcurrency Show currency in label * @return int <0 if error, Num of bank account found if OK (0, 1, 2, ...) */ - function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0,$moreattrib='',$showcurrency=0) + function select_comptes($selected = '', $htmlname = 'accountid', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0) { // phpcs:enable global $langs, $conf; @@ -3661,7 +3661,7 @@ class Form * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries. * @return void */ - function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempty=0) + function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0) { global $langs; if ($htmlname != "none") { @@ -3699,7 +3699,7 @@ class Form * @return string * @see select_categories */ - function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0, $outputmode=0) + function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $excludeafterid = 0, $outputmode = 0) { // phpcs:enable global $conf, $langs; @@ -3790,7 +3790,7 @@ class Form * @deprecated * @see formconfirm() */ - function form_confirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500) + function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500) { // phpcs:enable dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING); @@ -3821,7 +3821,7 @@ class Form * @param int $disableformtag 1=Disable form tag. Can be used if we are already inside a
section. * @return string HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form */ - function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice='', $useajax=0, $height=210, $width=500, $disableformtag=0) + function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 210, $width = 500, $disableformtag = 0) { global $langs,$conf; global $useglobalvars; @@ -4101,7 +4101,7 @@ class Form * @param int $nooutput No print is done. String is returned. * @return string Return html content */ - function form_project($page, $socid, $selected='', $htmlname='projectid', $discard_closed=0, $maxlength=20, $forcefocus=0, $nooutput=0) + function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0) { // phpcs:enable global $langs; @@ -4157,7 +4157,7 @@ class Form * @param int $addempty Add empty entry * @return void */ - function form_conditions_reglement($page, $selected='', $htmlname='cond_reglement_id', $addempty=0) + function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0) { // phpcs:enable global $langs; @@ -4192,7 +4192,7 @@ class Form * @param int $addempty Ajoute entree vide * @return void */ - function form_availability($page, $selected='', $htmlname='availability', $addempty=0) + function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0) { // phpcs:enable global $langs; @@ -4227,7 +4227,7 @@ class Form * @param int $addempty Add empty entry * @return void */ - function formInputReason($page, $selected='', $htmlname='demandreason', $addempty=0) + function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0) { global $langs; if ($htmlname != "none") @@ -4271,7 +4271,7 @@ class Form * @return string * @see selectDate */ - function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0) + function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0) { // phpcs:enable global $langs; @@ -4312,7 +4312,7 @@ class Form * @param array $include List of users id to include * @return void */ - function form_users($page, $selected='', $htmlname='userid', $exclude='', $include='') + function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '') { // phpcs:enable global $langs; @@ -4353,7 +4353,7 @@ class Form * @param int $addempty 1=Add empty entry * @return void */ - function form_modes_reglement($page, $selected='', $htmlname='mode_reglement_id', $filtertype='', $active=1, $addempty=0) + function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0) { // phpcs:enable global $langs; @@ -4387,7 +4387,7 @@ class Form * @param string $htmlname Name of select html field * @return void */ - function form_multicurrency_code($page, $selected='', $htmlname='multicurrency_code') + function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code') { // phpcs:enable global $langs; @@ -4417,7 +4417,7 @@ class Form * @param string $currency Currency code to explain the rate * @return void */ - function form_multicurrency_rate($page, $rate='', $htmlname='multicurrency_tx', $currency='') + function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '') { // phpcs:enable global $langs, $mysoc, $conf; @@ -4466,7 +4466,7 @@ class Form * @param int $discount_type 0 => customer discount, 1 => supplier discount * @return void */ - function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter='', $maxvalue=0, $more='', $hidelist=0, $discount_type=0) + function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0) { // phpcs:enable global $conf,$langs; @@ -4557,7 +4557,7 @@ class Form * @param string $htmlname Name of HTML select. If 'none', we just show contact link. * @return void */ - function form_contacts($page, $societe, $selected='', $htmlname='contactid') + function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid') { // phpcs:enable global $langs, $conf; @@ -4608,7 +4608,7 @@ class Form * @param int $nooutput No print output. Return it only. * @return void */ - function form_thirdparty($page, $selected='', $htmlname='socid', $filter='',$showempty=0, $showtype=0, $forcecombo=0, $events=array(), $nooutput=0) + function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0) { // phpcs:enable global $langs; @@ -4651,7 +4651,7 @@ class Form * @deprecated * @return void */ - function select_currency($selected='',$htmlname='currency_id') + function select_currency($selected = '', $htmlname = 'currency_id') { // phpcs:enable print $this->selectCurrency($selected,$htmlname); @@ -4664,7 +4664,7 @@ class Form * @param string $htmlname name of HTML select list * @return string */ - function selectCurrency($selected='',$htmlname='currency_id') + function selectCurrency($selected = '', $htmlname = 'currency_id') { global $conf,$langs,$user; @@ -4707,7 +4707,7 @@ class Form * @param integer $useempty 1=Add empty line * @return string */ - function selectMultiCurrency($selected='', $htmlname='multicurrency_code', $useempty=0) + function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0) { global $db,$conf,$langs,$user; @@ -4844,7 +4844,7 @@ class Form * @param int $mode 0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key * @return string */ - function load_tva($htmlname='tauxtva', $selectedrate='', $societe_vendeuse='', $societe_acheteuse='', $idprod=0, $info_bits=0, $type='', $options_only=false, $mode=0) + function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0) { // phpcs:enable global $langs,$conf,$mysoc; @@ -5044,7 +5044,7 @@ class Form * @deprecated * @see form_date, select_month, select_year, select_dayofweek */ - function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='') + function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '') { // phpcs:enable $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof); @@ -5077,7 +5077,7 @@ class Form * @return string Html for selectDate * @see form_date, select_month, select_year, select_dayofweek */ - function selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $disabled=0, $fullday='', $addplusone='', $adddateof='') + function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '') { global $conf,$langs; @@ -5440,7 +5440,7 @@ class Form * @param int $nooutput Do not output html string but return it * @return string|void */ - function select_duration($prefix, $iSecond='', $disabled=0, $typehour='select', $minunderhours=0, $nooutput=0) + function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0) { // phpcs:enable global $langs; @@ -5528,7 +5528,7 @@ class Form * @return string Return HTML string * @see selectForFormsList select_thirdparty */ - function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0) + function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0) { global $conf, $user; @@ -5598,7 +5598,7 @@ class Form * @return string Return HTML string * @see selectForForms */ - function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty='', $searchkey='', $placeholder='', $morecss='', $moreparams='', $forcecombo=0, $outputmode=0) + function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0) { global $conf, $langs, $user; @@ -5735,7 +5735,7 @@ class Form * @return string HTML select string. * @see multiselectarray, selectArrayAjax, selectArrayFilter */ - static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='', $addjscombo=0, $moreparamonempty='',$disablebademail=0, $nohtmlescape=0) + static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 0, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0) { global $conf, $langs; @@ -5845,7 +5845,7 @@ class Form * @return string HTML select string * @see selectArrayFilter, ajax_combobox in ajax.lib.php */ - static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0) + static function selectArrayAjax($htmlname, $url, $id = '', $moreparam = '', $moreparamtourl = '', $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0) { global $conf, $langs; global $delayedhtmlcontent; @@ -5947,7 +5947,7 @@ class Form * @return string HTML select string * @see selectArrayAjax, ajax_combobox in ajax.lib.php */ - static function selectArrayFilter($htmlname, $array, $id='', $moreparam='', $disableFiltering=0, $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0) + static function selectArrayFilter($htmlname, $array, $id = '', $moreparam = '', $disableFiltering = 0, $disabled = 0, $minimumInputLength = 1, $morecss = '', $callurlonselect = 0, $placeholder = '', $acceptdelayedhtml = 0) { global $conf, $langs; global $delayedhtmlcontent; @@ -6065,7 +6065,7 @@ class Form * @return string HTML multiselect string * @see selectarray, selectArrayAjax, selectArrayFilter */ - static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $morecss='', $translate=0, $width=0, $moreattrib='', $elemtype='', $placeholder='', $addjscombo=-1) + static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1) { global $conf, $langs; @@ -6264,7 +6264,7 @@ class Form * @param int $rendermode 0=Default, use multiselect. 1=Emulate multiselect (recommended) * @return string String with categories */ - function showCategories($id, $type, $rendermode=0) + function showCategories($id, $type, $rendermode = 0) { global $db; @@ -6309,7 +6309,7 @@ class Form * @param array $compatibleImportElementsList Array of compatibles elements object for "import from" action * @return int <0 if KO, >=0 if OK */ - function showLinkedObjectBlock($object, $morehtmlright='',$compatibleImportElementsList=false) + function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false) { global $conf,$langs,$hookmanager; global $bc; @@ -6457,7 +6457,7 @@ class Form * @param array $excludelinksto Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion. * @return string <0 if KO, >0 if OK */ - function showLinkToObjectBlock($object, $restrictlinksto=array(), $excludelinksto=array()) + function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array()) { global $conf, $langs, $hookmanager; global $bc; @@ -6630,7 +6630,7 @@ class Form * @param int $useempty 1=Add empty line * @return string See option */ - function selectyesno($htmlname, $value='', $option=0, $disabled=false, $useempty=0) + function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0) { global $langs; @@ -6672,7 +6672,7 @@ class Form * @param int $useempty Affiche valeur vide dans liste * @return void */ - function select_export_model($selected='',$htmlname='exportmodelid',$type='',$useempty=0) + function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0) { // phpcs:enable $sql = "SELECT rowid, label"; @@ -6730,7 +6730,7 @@ class Form * @param string $morehtmlright More html code to show after ref. * @return string Portion HTML with ref + navigation buttons */ - function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0,$morehtmlleft='',$morehtmlstatus='',$morehtmlright='') + function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '') { global $langs,$conf,$hookmanager; @@ -6880,7 +6880,7 @@ class Form * @param int $width Width of photo * @return string HTML code to output barcode */ - function showbarcode(&$object,$width=100) + function showbarcode(&$object, $width = 100) { global $conf; @@ -6917,7 +6917,7 @@ class Form * @param string $forcecapture Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if empty. * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1, $cache=0, $forcecapture='') + static function showphoto($modulepart, $object, $width = 100, $height = 0, $caneditfield = 0, $cssclass = 'photowithmargin', $imagesize = '', $addlinktofullsize = 1, $cache = 0, $forcecapture = '') { global $conf,$langs; @@ -7076,7 +7076,7 @@ class Form * @return string * @see select_dolusers */ - function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='0', $multiple=false) + function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false) { // phpcs:enable global $conf,$user,$langs; @@ -7191,7 +7191,7 @@ class Form * @param int $calljsfunction 0=default. 1=call function initCheckForSelect() after changing status of checkboxes * @return string */ - function showCheckAddButtons($cssclass='checkforaction', $calljsfunction=0) + function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0) { global $conf, $langs; @@ -7230,7 +7230,7 @@ class Form * @param int $calljsfunction 0=default. 1=call function initCheckForSelect() after changing status of checkboxes * @return string */ - function showFilterAndCheckAddButtons($addcheckuncheckall=0, $cssclass='checkforaction', $calljsfunction=0) + function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0) { $out.=$this->showFilterButtons(); if ($addcheckuncheckall) @@ -7252,7 +7252,7 @@ class Form * @param array $params param to give * @return string */ - function selectExpenseCategories($selected='', $htmlname='fk_c_exp_tax_cat', $useempty=0, $excludeid=array(), $target='', $default_selected=0, $params=array()) + function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array()) { global $db, $conf, $langs, $user; @@ -7341,7 +7341,7 @@ class Form * @param integer $useempty 1=Add empty line * @return string */ - function selectExpenseRanges($selected='', $htmlname='fk_range', $useempty=0) + function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0) { global $db,$conf,$langs; @@ -7378,7 +7378,7 @@ class Form * @param integer $useid 0=use 'code' as key, 1=use 'id' as key * @return string */ - function selectExpense($selected='', $htmlname='fk_c_type_fees', $useempty=0, $allchoice=1, $useid=0) + function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0) { global $db,$langs; diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index 5ffaf0463a6..41476fb4966 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -70,7 +70,7 @@ class FormAccounting extends Form * @param int $disabledajaxcombo Disable ajax combo box. * @return string String with HTML select */ - function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0) + function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0) { // phpcs:enable global $conf,$langs; @@ -151,7 +151,7 @@ class FormAccounting extends Form * @param int $allcountries All countries * @return void */ - function select_accounting_category($selected='',$htmlname='account_category', $useempty=0, $maxlen=0, $help=1, $allcountries=0) + function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0) { // phpcs:enable global $db,$langs,$user,$mysoc; @@ -267,7 +267,7 @@ class FormAccounting extends Form * @param string $usecache Key to use to store result into a cache. Next call with same key will reuse the cache. * @return string String with HTML select */ - function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='') + function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '') { // phpcs:enable global $conf, $langs; @@ -356,7 +356,7 @@ class FormAccounting extends Form * @param string $morecss More css * @return string String with HTML select */ - function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200') + function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200') { // phpcs:enable diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 15db641a5ec..2f345bb20e4 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -64,7 +64,7 @@ class FormActions * @param string $morecss More css on select field * @return void */ - function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100') + function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100') { // phpcs:enable global $langs,$conf; @@ -168,7 +168,7 @@ class FormActions * @param string $morehtmlright More html text on right of title line * @return int <0 if KO, >=0 if OK */ - function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='') + function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '') { global $langs,$conf,$user; global $bc; @@ -327,7 +327,7 @@ class FormActions * @param int $nooutput 1=No output * @return string */ - function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0) + function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0) { // phpcs:enable global $langs,$user,$form,$conf; diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 32a421a7b61..e96ec257c93 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -59,7 +59,7 @@ class FormAdmin * @param int $forcecombo Force to use combo box (so no ajax beautify effect) * @return string Return HTML select string with list of languages */ - function select_language($selected='', $htmlname='lang_id', $showauto=0, $filter=null, $showempty='', $showwarning=0, $disabled=0, $morecss='', $showcode=0, $forcecombo=0) + function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0, $forcecombo = 0) { // phpcs:enable global $langs; @@ -131,7 +131,7 @@ class FormAdmin * @param string $moreattrib More attributes on html select tag * @return integer|null */ - function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='') + function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '') { // phpcs:enable global $langs,$conf; @@ -293,7 +293,7 @@ class FormAdmin * @param string $htmlname Nom de la zone select * @return void */ - function select_timezone($selected,$htmlname) + function select_timezone($selected, $htmlname) { // phpcs:enable global $langs,$conf; @@ -349,7 +349,7 @@ class FormAdmin * @param int $showempty Add empty value * @return string Return HTML output */ - function select_paper_format($selected='',$htmlname='paperformat_id',$filter=0,$showempty=0) + function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0) { // phpcs:enable global $langs; diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 65a3213bad8..f7a7199ab03 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -60,7 +60,7 @@ class FormBarCode * @param int $idForm Id du formulaire * @return string HTML select string */ - function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode') + function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode') { global $conf, $langs; @@ -123,7 +123,7 @@ class FormBarCode * @return void * @deprecated */ - function select_barcode_type($selected='', $htmlname='barcodetype_id', $useempty=0) + function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0) { // phpcs:enable print $this->selectBarcodeType($selected, $htmlname, $useempty); @@ -137,7 +137,7 @@ class FormBarCode * @param int $useempty Display empty value in select * @return string */ - function selectBarcodeType($selected='', $htmlname='barcodetype_id', $useempty=0) + function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0) { global $langs, $conf; @@ -193,7 +193,7 @@ class FormBarCode * @return void * @deprecated */ - function form_barcode_type($page, $selected='', $htmlname='barcodetype_id') + function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id') { // phpcs:enable print $this->formBarcodeType($page, $selected, $htmlname); @@ -207,7 +207,7 @@ class FormBarCode * @param string $htmlname Nom du formulaire select * @return string */ - function formBarcodeType($page, $selected='', $htmlname='barcodetype_id') + function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id') { global $langs, $conf; $out = ''; diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index 9d0bded74b6..065b241095a 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -60,7 +60,7 @@ class FormCompany * @param string $filter Add a SQL filter to select * @return array Array of types */ - function typent_array($mode=0, $filter='') + function typent_array($mode = 0, $filter = '') { // phpcs:enable global $langs,$mysoc; @@ -103,7 +103,7 @@ class FormCompany * @param string $filter Add a SQL filter to select * @return array Array of types d'effectifs */ - function effectif_array($mode=0, $filter='') + function effectif_array($mode = 0, $filter = '') { // phpcs:enable $effs = array(); @@ -145,7 +145,7 @@ class FormCompany * @param int $empty Add empty value in list * @return void */ - function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0) + function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0) { // phpcs:enable global $user, $langs; @@ -199,7 +199,7 @@ class FormCompany * @param string $htmlname Id of department * @return void */ - function select_departement($selected='',$country_codeid=0, $htmlname='state_id') + function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id') { // phpcs:enable print $this->select_state($selected,$country_codeid, $htmlname); @@ -219,7 +219,7 @@ class FormCompany * @return string String with HTML select * @see select_country */ - function select_state($selected='',$country_codeid=0, $htmlname='state_id') + function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id') { // phpcs:enable global $conf,$langs,$user; @@ -332,7 +332,7 @@ class FormCompany * @param string $htmlname Name of HTML select field * @return void */ - function select_region($selected='',$htmlname='region_id') + function select_region($selected = '', $htmlname = 'region_id') { // phpcs:enable global $conf,$langs; @@ -398,7 +398,7 @@ class FormCompany * @param string $morecss Add more css on SELECT element * @return string String with HTML select */ - function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100') + function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100') { // phpcs:enable global $conf,$langs,$user; @@ -459,7 +459,7 @@ class FormCompany * @deprecated Use print xxx->select_juridicalstatus instead * @see select_juridicalstatus() */ - function select_forme_juridique($selected='', $country_codeid=0, $filter='') + function select_forme_juridique($selected = '', $country_codeid = 0, $filter = '') { // phpcs:enable print $this->select_juridicalstatus($selected, $country_codeid, $filter); @@ -476,7 +476,7 @@ class FormCompany * @param string $htmlname HTML name of select * @return string String with HTML select */ - function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code') + function select_juridicalstatus($selected = '', $country_codeid = 0, $filter = '', $htmlname = 'forme_juridique_code') { // phpcs:enable global $conf,$langs,$user; @@ -581,7 +581,7 @@ class FormCompany * @param string $morecss More CSS on select component * @return int The selected third party ID */ - function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='') + function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '') { global $conf, $langs; @@ -740,7 +740,7 @@ class FormCompany * @param string $morecss Add more css to select component * @return void */ - function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='') + function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '') { global $user, $langs; @@ -774,7 +774,7 @@ class FormCompany * @param string $morecss More css * @return string */ - function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='') + function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '') { // phpcs:enable global $conf; @@ -805,7 +805,7 @@ class FormCompany * @param string $morecss More css * @return string HTML string with prof id */ - function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent') + function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent') { // phpcs:enable global $conf,$langs; diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php index 5bdb00cfc40..f09758aec2d 100644 --- a/htdocs/core/class/html.formcontract.class.php +++ b/htdocs/core/class/html.formcontract.class.php @@ -60,7 +60,7 @@ class FormContract * @param int $showempty Show empty line * @return int Nbr of project if OK, <0 if KO */ - function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1) + function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1) { // phpcs:enable global $db,$user,$conf,$langs; @@ -177,7 +177,7 @@ class FormContract * @param int $showempty Show empty line * @return int Nbr of project if OK, <0 if KO */ - function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1) + function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1) { global $langs; diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php index 94747481cb0..13cf88e9aa2 100644 --- a/htdocs/core/class/html.formcron.class.php +++ b/htdocs/core/class/html.formcron.class.php @@ -58,7 +58,7 @@ class FormCron extends Form * @param integer $readonly Select is read only or not * @return string HTML select field */ - function select_typejob($htmlname,$selected=0,$readonly=0) + function select_typejob($htmlname, $selected = 0, $readonly = 0) { // phpcs:enable global $langs; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index d8af718bb04..5bd33520420 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -77,7 +77,7 @@ class FormFile * @param string $sectiondir If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be) * @return int <0 if KO, >0 if OK */ - function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='') + function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '') { // phpcs:enable global $conf,$langs, $hookmanager; @@ -255,7 +255,7 @@ class FormFile * @return int <0 if KO, number of shown files if OK * @deprecated Use print xxx->showdocuments() instead. */ - function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='') + function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '') { // phpcs:enable $this->numoffiles=0; @@ -288,7 +288,7 @@ class FormFile * @param int $hideifempty Hide section of generated files if there is no file * @return string Output string with HTML array of documents (might be empty string) */ - function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0) + function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0) { // Deprecation warning if (! empty($iconPDF)) { @@ -887,7 +887,7 @@ class FormFile * @param string $filter Filter filenames on this regex string (Example: '\.pdf$') * @return string Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles */ - function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='') + function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '') { global $conf, $langs; @@ -1022,7 +1022,7 @@ class FormFile * @return int <0 if KO, nb of files shown if OK * @see list_of_autoecmfiles */ - function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0) + function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0) { // phpcs:enable global $user, $conf, $langs, $hookmanager; @@ -1412,7 +1412,7 @@ class FormFile * @return int <0 if KO, nb of files shown if OK * @see list_of_documents */ - function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0) + function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permtodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0) { // phpcs:enable global $user, $conf, $langs, $form; @@ -1695,7 +1695,7 @@ class FormFile * @param string $param More param to add into URL * @return int Number of links */ - public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='') + public function listOfLinks($object, $permtodelete = 1, $action = null, $selected = null, $param = '') { global $user, $conf, $langs, $user; global $sortfield, $sortorder; @@ -1831,7 +1831,7 @@ class FormFile * @param string $param More param on http links * @return string $out Output string with HTML */ - public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='') + public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '') { global $langs, $conf; diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php index ae35b74fad9..a9602f8a158 100644 --- a/htdocs/core/class/html.formintervention.class.php +++ b/htdocs/core/class/html.formintervention.class.php @@ -60,7 +60,7 @@ class FormIntervention * @param int $showempty Show empty line * @return int Nbre of project if OK, <0 if KO */ - function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1) + function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1) { // phpcs:enable global $db,$user,$conf,$langs; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 2cb10056cc3..ac4ce55ebba 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -183,7 +183,7 @@ class FormMail extends Form * @param string $type Mime type (can be dol_mimetype($file)) * @return void */ - function add_attached_files($path, $file='', $type='') + function add_attached_files($path, $file = '', $type = '') { // phpcs:enable $listofpaths=array(); @@ -268,7 +268,7 @@ class FormMail extends Form * @param string $removefileaction Name of action when removing file attachments * @return void */ - function show_form($addfileaction='addfile',$removefileaction='removefile') + function show_form($addfileaction = 'addfile', $removefileaction = 'removefile') { // phpcs:enable print $this->get_form($addfileaction,$removefileaction); @@ -285,7 +285,7 @@ class FormMail extends Form * @param string $removefileaction Name of action when removing file attachments * @return string Form to show */ - function get_form($addfileaction='addfile', $removefileaction='removefile') + function get_form($addfileaction = 'addfile', $removefileaction = 'removefile') { // phpcs:enable global $conf, $langs, $user, $hookmanager, $form; @@ -1143,7 +1143,7 @@ class FormMail extends Form * @param string $label Label of template * @return ModelMail One instance of ModelMail */ - public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='') + public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '') { $ret = new ModelMail(); @@ -1267,7 +1267,7 @@ class FormMail extends Form * @param int $active 1=Only active template, 0=Only disabled, -1=All * @return int <0 if KO, nb of records found if OK */ - public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active=1) + public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1) { $ret=array(); @@ -1378,7 +1378,7 @@ class FormMail extends Form * @param Object $object Object if applicable * @return array Array of substitution values for emails. */ - static function getAvailableSubstitKey($mode='formemail', $object=null) + static function getAvailableSubstitKey($mode = 'formemail', $object = null) { global $conf, $langs; diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php index 067692f5094..95c2c057b40 100644 --- a/htdocs/core/class/html.formmailing.class.php +++ b/htdocs/core/class/html.formmailing.class.php @@ -40,7 +40,7 @@ class FormMailing extends Form * @param integer $show_empty Show empty option * @return string HTML select */ - public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0) + public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0) { global $langs; diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php index cdd827145b0..8492237d68f 100644 --- a/htdocs/core/class/html.formmargin.class.php +++ b/htdocs/core/class/html.formmargin.class.php @@ -59,7 +59,7 @@ class FormMargin * @param boolean $force_price True of not * @return array Array with info */ - function getMarginInfosArray($object, $force_price=false) + function getMarginInfosArray($object, $force_price = false) { global $conf, $db; @@ -191,7 +191,7 @@ class FormMargin * @param boolean $force_price Force price * @return void */ - function displayMarginInfos($object, $force_price=false) + function displayMarginInfos($object, $force_price = false) { global $langs, $conf, $user; diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index 781b3f76e4f..c16f292d10d 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.class.php @@ -39,7 +39,7 @@ class FormOrder extends Form * @param string $hmlname Name of HTML select element * @return void */ - public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status') + public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status') { $options = array(); @@ -74,7 +74,7 @@ class FormOrder extends Form * @param int $addempty 0=list with no empty value, 1=list with empty value * @return array Tableau des sources de commandes */ - public function selectInputMethod($selected='',$htmlname='source_id',$addempty=0) + public function selectInputMethod($selected = '', $htmlname = 'source_id', $addempty = 0) { global $langs; diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 8ca0b988fda..ce3fe126a51 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -67,7 +67,7 @@ class FormOther * @param int $fk_user Utilisateur créant le modèle * @return void */ - function select_export_model($selected='', $htmlname='exportmodelid', $type='', $useempty=0, $fk_user=null) + function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null) { // phpcs:enable $sql = "SELECT rowid, label"; @@ -119,7 +119,7 @@ class FormOther * @param int $useempty Affiche valeur vide dans liste * @return void */ - function select_import_model($selected='', $htmlname='importmodelid', $type='', $useempty=0) + function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0) { // phpcs:enable $sql = "SELECT rowid, label"; @@ -168,7 +168,7 @@ class FormOther * @param string $htmlname Name of combo list * @return integer */ - function select_ecotaxes($selected='', $htmlname='ecotaxe_id') + function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id') { // phpcs:enable global $langs; @@ -227,7 +227,7 @@ class FormOther * @param string $country_code Country Code * @return string HTML select list */ - function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='') + function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '') { // phpcs:enable global $langs; @@ -290,7 +290,7 @@ class FormOther * @param int $showempty Add also an empty line * @return string HTML select string */ - function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0) + function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0) { // phpcs:enable $return = '
TakePOS Marketplace'.$langs->trans("WebSiteDesc").''.$langs->trans("URL").'
TakePOS for mobile devices'.$langs->trans("DolistorePosCategory").''.$url.'
' . $line->product_label . $line->desc . '' . $line->product_label . $line->desc . '' . $line->qty . '' . price($line->total_ttc) . '