From 96afcaa476dd77dd0ecc765ba13cb8ecfdaadfeb Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 30 Jun 2024 21:02:50 +0200 Subject: [PATCH] Better comments (#30200) * Fix language * Fix language * Fix language * Fix language * Fix language * Fix language * Fix language * CI Missing language key * Update eventorganization.lang --------- Co-authored-by: Laurent Destailleur --- htdocs/accountancy/admin/account.php | 2 +- htdocs/accountancy/admin/accountmodel.php | 2 +- htdocs/accountancy/admin/categories_list.php | 2 +- htdocs/accountancy/admin/fiscalyear.php | 2 +- htdocs/accountancy/admin/fiscalyear_card.php | 4 ++-- htdocs/accountancy/admin/journals_list.php | 2 +- htdocs/accountancy/bookkeeping/balance.php | 2 +- htdocs/accountancy/bookkeeping/export.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 2 +- htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/accountancy/closure/index.php | 2 +- htdocs/accountancy/customer/list.php | 2 +- htdocs/accountancy/expensereport/list.php | 2 +- htdocs/accountancy/index.php | 2 +- .../accountancy/journal/expensereportsjournal.php | 4 ++-- htdocs/accountancy/journal/purchasesjournal.php | 12 ++++++------ htdocs/accountancy/journal/sellsjournal.php | 14 +++++++------- htdocs/accountancy/journal/variousjournal.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- htdocs/adherents/agenda.php | 4 ++-- htdocs/adherents/card.php | 2 +- htdocs/adherents/index.php | 2 +- htdocs/adherents/list.php | 2 +- htdocs/adherents/messaging.php | 4 ++-- htdocs/adherents/note.php | 2 +- htdocs/adherents/partnership.php | 4 ++-- htdocs/adherents/subscription.php | 2 +- htdocs/adherents/subscription/card.php | 6 +++--- htdocs/adherents/subscription/list.php | 2 +- htdocs/adherents/type.php | 2 +- htdocs/adherents/type_ldap.php | 2 +- htdocs/admin/agenda_other.php | 2 +- htdocs/admin/company.php | 2 +- htdocs/admin/company_socialnetworks.php | 2 +- htdocs/admin/defaultvalues.php | 2 +- htdocs/admin/dict.php | 2 +- htdocs/admin/emailcollector_card.php | 4 ++-- htdocs/admin/emailcollector_list.php | 2 +- htdocs/admin/expensereport_rules.php | 2 +- htdocs/admin/index.php | 2 +- htdocs/admin/invoice_situation.php | 2 +- htdocs/admin/ldap.php | 2 +- htdocs/admin/mails_senderprofile_list.php | 2 +- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/modulehelp.php | 2 +- htdocs/admin/modules.php | 4 ++-- htdocs/admin/system/modules.php | 2 +- htdocs/admin/translation.php | 2 +- htdocs/admin/webhook.php | 2 +- htdocs/admin/website.php | 2 +- htdocs/admin/website_options.php | 2 +- htdocs/asset/accountancy_codes.php | 4 ++-- htdocs/asset/agenda.php | 4 ++-- htdocs/asset/card.php | 4 ++-- htdocs/asset/depreciation.php | 4 ++-- htdocs/asset/depreciation_options.php | 4 ++-- htdocs/asset/disposal.php | 4 ++-- htdocs/asset/document.php | 4 ++-- htdocs/asset/list.php | 2 +- htdocs/asset/model/accountancy_codes.php | 4 ++-- htdocs/asset/model/agenda.php | 4 ++-- htdocs/asset/model/card.php | 4 ++-- htdocs/asset/model/depreciation_options.php | 4 ++-- htdocs/asset/model/list.php | 2 +- htdocs/asset/model/note.php | 6 +++--- htdocs/asset/note.php | 6 +++--- htdocs/asset/tpl/accountancy_codes_edit.tpl.php | 2 +- htdocs/asset/tpl/accountancy_codes_view.tpl.php | 2 +- htdocs/asset/tpl/depreciation_options_edit.tpl.php | 2 +- htdocs/asset/tpl/depreciation_options_view.tpl.php | 2 +- htdocs/asset/tpl/depreciation_view.tpl.php | 2 +- htdocs/barcode/printsheet.php | 2 +- htdocs/bom/bom_agenda.php | 4 ++-- htdocs/bom/bom_card.php | 4 ++-- htdocs/bom/bom_document.php | 4 ++-- htdocs/bom/bom_list.php | 2 +- htdocs/bom/bom_net_needs.php | 6 +++--- htdocs/bom/bom_note.php | 8 ++++---- htdocs/bom/tpl/objectline_create.tpl.php | 2 +- htdocs/bom/tpl/objectline_edit.tpl.php | 2 +- htdocs/bom/tpl/objectline_title.tpl.php | 2 +- htdocs/bom/tpl/objectline_view.tpl.php | 2 +- htdocs/bookcal/admin/setup.php | 2 +- htdocs/bookcal/availabilities_agenda.php | 4 ++-- htdocs/bookcal/availabilities_card.php | 4 ++-- htdocs/bookcal/availabilities_contact.php | 4 ++-- htdocs/bookcal/availabilities_document.php | 4 ++-- htdocs/bookcal/availabilities_list.php | 2 +- htdocs/bookcal/availabilities_note.php | 6 +++--- htdocs/bookcal/calendar_agenda.php | 4 ++-- htdocs/bookcal/calendar_card.php | 4 ++-- htdocs/bookcal/calendar_contact.php | 4 ++-- htdocs/bookcal/calendar_document.php | 4 ++-- htdocs/bookcal/calendar_list.php | 2 +- htdocs/bookcal/calendar_note.php | 6 +++--- htdocs/categories/card.php | 2 +- htdocs/categories/edit.php | 2 +- htdocs/categories/index.php | 2 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/card.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/list.php | 2 +- htdocs/comm/action/pertype.php | 2 +- htdocs/comm/action/peruser.php | 2 +- htdocs/comm/card.php | 2 +- htdocs/comm/index.php | 2 +- htdocs/comm/mailing/card.php | 4 ++-- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/mailing/list.php | 2 +- htdocs/comm/mailing/note.php | 6 +++--- htdocs/comm/propal/agenda.php | 4 ++-- htdocs/comm/propal/card.php | 6 +++--- htdocs/comm/propal/index.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/comm/propal/note.php | 4 ++-- htdocs/commande/agenda.php | 4 ++-- htdocs/commande/card.php | 10 +++++----- htdocs/commande/contact.php | 2 +- htdocs/commande/document.php | 2 +- htdocs/commande/index.php | 2 +- htdocs/commande/list.php | 2 +- htdocs/commande/list_det.php | 2 +- htdocs/commande/note.php | 4 ++-- htdocs/compta/accounting-files.php | 2 +- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/card.php | 2 +- htdocs/compta/bank/categ.php | 2 +- htdocs/compta/bank/document.php | 2 +- htdocs/compta/bank/graph.php | 2 +- htdocs/compta/bank/list.php | 2 +- htdocs/compta/bank/releve.php | 4 ++-- htdocs/compta/bank/treso.php | 2 +- htdocs/compta/bank/various_payment/card.php | 2 +- htdocs/compta/bank/various_payment/list.php | 2 +- htdocs/compta/cashcontrol/cashcontrol_card.php | 4 ++-- htdocs/compta/cashcontrol/cashcontrol_list.php | 2 +- htdocs/compta/charges/index.php | 2 +- htdocs/compta/deplacement/card.php | 2 +- htdocs/compta/facture/agenda-rec.php | 4 ++-- htdocs/compta/facture/agenda.php | 4 ++-- htdocs/compta/facture/card-rec.php | 8 ++++---- htdocs/compta/facture/card.php | 8 ++++---- htdocs/compta/facture/invoicetemplate_list.php | 4 ++-- htdocs/compta/facture/list.php | 2 +- htdocs/compta/facture/note.php | 2 +- htdocs/compta/index.php | 2 +- htdocs/compta/localtax/card.php | 2 +- htdocs/compta/localtax/clients.php | 2 +- htdocs/compta/localtax/index.php | 2 +- htdocs/compta/paiement.php | 2 +- htdocs/compta/paiement/card.php | 4 ++-- htdocs/compta/paiement/cheque/list.php | 2 +- htdocs/compta/paiement/info.php | 2 +- htdocs/compta/paiement/list.php | 2 +- htdocs/compta/prelevement/card.php | 2 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/recap-compta.php | 4 ++-- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/sociales/card.php | 4 ++-- htdocs/compta/sociales/list.php | 2 +- htdocs/compta/sociales/note.php | 2 +- htdocs/compta/sociales/payments.php | 2 +- htdocs/compta/tva/card.php | 4 ++-- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/list.php | 2 +- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/contact/agenda.php | 2 +- htdocs/contact/card.php | 4 ++-- htdocs/contact/consumption.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contact/note.php | 4 ++-- htdocs/contact/project.php | 2 +- htdocs/contrat/agenda.php | 2 +- htdocs/contrat/card.php | 6 +++--- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/index.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/contrat/messaging.php | 4 ++-- htdocs/contrat/note.php | 4 ++-- htdocs/contrat/services_list.php | 2 +- htdocs/core/ajax/onlineSign.php | 2 +- htdocs/core/lib/company.lib.php | 2 +- htdocs/core/lib/functions.lib.php | 2 +- htdocs/core/lib/security.lib.php | 2 +- htdocs/core/modules/import/import_csv.modules.php | 2 +- htdocs/core/modules/import/import_xlsx.modules.php | 2 +- .../modules/movement/doc/pdf_standard.modules.php | 2 +- htdocs/core/tpl/commonfields_add.tpl.php | 2 +- htdocs/core/tpl/commonfields_edit.tpl.php | 2 +- htdocs/core/tpl/commonfields_view.tpl.php | 2 +- htdocs/core/tpl/extrafields_add.tpl.php | 2 +- htdocs/core/tpl/extrafields_edit.tpl.php | 2 +- htdocs/core/tpl/extrafields_view.tpl.php | 2 +- htdocs/core/tpl/formlayoutai.tpl.php | 2 +- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/core/tpl/objectline_title.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 2 +- htdocs/cron/list.php | 2 +- htdocs/delivery/card.php | 6 +++--- htdocs/don/card.php | 2 +- htdocs/don/index.php | 2 +- htdocs/don/list.php | 2 +- htdocs/don/note.php | 2 +- htdocs/don/paiement/list.php | 2 +- htdocs/ecm/file_note.php | 2 +- htdocs/ecm/index.php | 2 +- htdocs/ecm/index_auto.php | 2 +- htdocs/ecm/index_medias.php | 2 +- .../eventorganization/conferenceorbooth_card.php | 4 ++-- .../conferenceorbooth_contact.php | 4 ++-- .../conferenceorbooth_document.php | 4 ++-- .../eventorganization/conferenceorbooth_list.php | 2 +- .../conferenceorboothattendee_card.php | 4 ++-- .../conferenceorboothattendee_list.php | 2 +- .../conferenceorboothattendee_note.php | 6 +++--- htdocs/expedition/card.php | 6 +++--- htdocs/expedition/index.php | 2 +- htdocs/expedition/list.php | 2 +- htdocs/expedition/note.php | 2 +- htdocs/expedition/shipment.php | 2 +- htdocs/expensereport/card.php | 10 +++++----- htdocs/expensereport/document.php | 2 +- htdocs/expensereport/index.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/expensereport/note.php | 2 +- htdocs/expensereport/payment/list.php | 2 +- htdocs/fichinter/agenda.php | 4 ++-- htdocs/fichinter/card.php | 6 +++--- htdocs/fichinter/index.php | 2 +- htdocs/fichinter/list.php | 2 +- htdocs/fichinter/note.php | 2 +- htdocs/fourn/card.php | 2 +- htdocs/fourn/commande/card.php | 8 ++++---- htdocs/fourn/commande/index.php | 2 +- htdocs/fourn/commande/list.php | 2 +- htdocs/fourn/commande/note.php | 2 +- htdocs/fourn/facture/card-rec.php | 8 ++++---- htdocs/fourn/facture/card.php | 8 ++++---- htdocs/fourn/facture/list-rec.php | 4 ++-- htdocs/fourn/facture/list.php | 2 +- htdocs/fourn/facture/note.php | 4 ++-- htdocs/fourn/facture/paiement.php | 2 +- htdocs/fourn/paiement/card.php | 4 ++-- htdocs/fourn/paiement/info.php | 2 +- htdocs/fourn/paiement/list.php | 2 +- htdocs/fourn/product/list.php | 2 +- htdocs/fourn/recap-fourn.php | 2 +- htdocs/holiday/card.php | 2 +- htdocs/holiday/card_group.php | 2 +- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/holiday/view_log.php | 2 +- htdocs/hrm/core/tpl/objectline_title.tpl.php | 2 +- htdocs/hrm/core/tpl/objectline_view.tpl.php | 2 +- htdocs/hrm/establishment/card.php | 2 +- htdocs/hrm/establishment/info.php | 4 ++-- htdocs/hrm/evaluation_agenda.php | 4 ++-- htdocs/hrm/evaluation_card.php | 4 ++-- htdocs/hrm/evaluation_contact.php | 4 ++-- htdocs/hrm/evaluation_document.php | 4 ++-- htdocs/hrm/evaluation_list.php | 2 +- htdocs/hrm/evaluation_note.php | 6 +++--- htdocs/hrm/index.php | 4 ++-- htdocs/hrm/job_agenda.php | 4 ++-- htdocs/hrm/job_card.php | 4 ++-- htdocs/hrm/job_document.php | 4 ++-- htdocs/hrm/job_list.php | 2 +- htdocs/hrm/job_note.php | 6 +++--- htdocs/hrm/position.php | 4 ++-- htdocs/hrm/position_agenda.php | 4 ++-- htdocs/hrm/position_card.php | 6 +++--- htdocs/hrm/position_document.php | 4 ++-- htdocs/hrm/position_list.php | 2 +- htdocs/hrm/position_note.php | 6 +++--- htdocs/hrm/skill_agenda.php | 4 ++-- htdocs/hrm/skill_card.php | 6 +++--- htdocs/hrm/skill_document.php | 4 ++-- htdocs/hrm/skill_list.php | 2 +- htdocs/hrm/skill_note.php | 6 +++--- htdocs/hrm/skill_tab.php | 4 ++-- htdocs/imports/import.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/intracommreport/card.php | 4 ++-- htdocs/intracommreport/list.php | 2 +- .../knowledgemanagement/knowledgerecord_agenda.php | 4 ++-- .../knowledgemanagement/knowledgerecord_card.php | 4 ++-- .../knowledgerecord_contact.php | 4 ++-- .../knowledgerecord_document.php | 4 ++-- .../knowledgemanagement/knowledgerecord_list.php | 2 +- .../knowledgemanagement/knowledgerecord_note.php | 6 +++--- htdocs/langs/en_US/eventorganization.lang | 4 ++-- htdocs/loan/list.php | 2 +- htdocs/loan/note.php | 2 +- htdocs/main.inc.php | 2 +- htdocs/margin/agentMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/margin/tabs/thirdpartyMargins.php | 2 +- htdocs/master.inc.php | 4 ++-- htdocs/modulebuilder/template/admin/setup.php | 2 +- htdocs/modulebuilder/template/myobject_agenda.php | 4 ++-- htdocs/modulebuilder/template/myobject_card.php | 4 ++-- htdocs/modulebuilder/template/myobject_contact.php | 4 ++-- .../modulebuilder/template/myobject_document.php | 4 ++-- htdocs/modulebuilder/template/myobject_list.php | 2 +- htdocs/modulebuilder/template/myobject_note.php | 6 +++--- htdocs/mrp/index.php | 2 +- htdocs/mrp/mo_agenda.php | 4 ++-- htdocs/mrp/mo_card.php | 6 +++--- htdocs/mrp/mo_document.php | 4 ++-- htdocs/mrp/mo_list.php | 2 +- htdocs/mrp/mo_movements.php | 6 +++--- htdocs/mrp/mo_note.php | 6 +++--- htdocs/mrp/mo_production.php | 6 +++--- htdocs/multicurrency/multicurrency_rate.php | 4 ++-- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/index.php | 2 +- htdocs/opensurvey/list.php | 2 +- htdocs/partnership/partnership_agenda.php | 4 ++-- htdocs/partnership/partnership_card.php | 4 ++-- htdocs/partnership/partnership_contact.php | 4 ++-- htdocs/partnership/partnership_document.php | 4 ++-- htdocs/partnership/partnership_list.php | 2 +- htdocs/partnership/partnership_note.php | 6 +++--- htdocs/product/agenda.php | 2 +- htdocs/product/card.php | 2 +- htdocs/product/composition/card.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/index.php | 2 +- htdocs/product/inventory/card.php | 4 ++-- htdocs/product/inventory/inventory.php | 4 ++-- htdocs/product/inventory/list.php | 2 +- htdocs/product/list.php | 2 +- htdocs/product/messaging.php | 4 ++-- htdocs/product/note.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/price_suppliers.php | 2 +- htdocs/product/reassort.php | 2 +- htdocs/product/reassortlot.php | 2 +- htdocs/product/stats/bom.php | 2 +- htdocs/product/stats/card.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/expedition.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/facturerec.php | 2 +- htdocs/product/stats/mo.php | 2 +- htdocs/product/stats/propal.php | 2 +- htdocs/product/stats/reception.php | 2 +- htdocs/product/stats/supplier_proposal.php | 2 +- htdocs/product/stock/card.php | 2 +- htdocs/product/stock/index.php | 2 +- htdocs/product/stock/list.php | 4 ++-- htdocs/product/stock/movement_card.php | 2 +- htdocs/product/stock/movement_list.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/productlot_card.php | 6 +++--- htdocs/product/stock/productlot_document.php | 2 +- htdocs/product/stock/productlot_list.php | 2 +- htdocs/product/stock/productlot_note.php | 6 +++--- htdocs/product/stock/replenish.php | 2 +- .../product/stock/stats/commande_fournisseur.php | 2 +- htdocs/product/stock/stats/expedition.php | 2 +- htdocs/product/stock/stats/mo.php | 2 +- htdocs/product/stock/stats/reception.php | 2 +- htdocs/product/stock/stockatdate.php | 2 +- .../stock/stocktransfer/stocktransfer_agenda.php | 4 ++-- .../stock/stocktransfer/stocktransfer_card.php | 4 ++-- .../stock/stocktransfer/stocktransfer_document.php | 4 ++-- .../stock/stocktransfer/stocktransfer_list.php | 2 +- .../stock/stocktransfer/stocktransfer_note.php | 6 +++--- htdocs/product/stock/tpl/extrafields_add.tpl.php | 2 +- htdocs/product/traduction.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/card.php | 4 ++-- htdocs/projet/comment.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/document.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/index.php | 2 +- htdocs/projet/list.php | 2 +- htdocs/projet/note.php | 4 ++-- htdocs/projet/tasks.php | 4 ++-- htdocs/projet/tasks/comment.php | 2 +- htdocs/projet/tasks/list.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/projet/tasks/time.php | 4 ++-- htdocs/public/agenda/agendaexport.php | 2 +- htdocs/public/company/new.php | 2 +- htdocs/public/demo/index.php | 2 +- htdocs/public/eventorganization/attendee_new.php | 2 +- htdocs/public/members/new.php | 2 +- htdocs/public/onlinesign/newonlinesign.php | 2 +- htdocs/public/partnership/new.php | 2 +- htdocs/public/project/new.php | 2 +- htdocs/public/project/suggestbooth.php | 2 +- htdocs/public/project/suggestconference.php | 2 +- htdocs/public/ticket/create_ticket.php | 2 +- htdocs/public/ticket/list.php | 2 +- htdocs/public/ticket/view.php | 2 +- htdocs/reception/card.php | 6 +++--- htdocs/reception/document.php | 2 +- htdocs/reception/index.php | 2 +- htdocs/reception/list.php | 2 +- htdocs/reception/note.php | 4 ++-- .../recruitment/recruitmentcandidature_agenda.php | 4 ++-- htdocs/recruitment/recruitmentcandidature_card.php | 4 ++-- .../recruitmentcandidature_document.php | 4 ++-- htdocs/recruitment/recruitmentcandidature_list.php | 2 +- htdocs/recruitment/recruitmentcandidature_note.php | 6 +++--- .../recruitment/recruitmentjobposition_agenda.php | 4 ++-- .../recruitmentjobposition_applications.php | 4 ++-- htdocs/recruitment/recruitmentjobposition_card.php | 4 ++-- .../recruitmentjobposition_document.php | 4 ++-- htdocs/recruitment/recruitmentjobposition_list.php | 4 ++-- htdocs/recruitment/recruitmentjobposition_note.php | 6 +++--- htdocs/resource/agenda.php | 4 ++-- htdocs/resource/card.php | 2 +- htdocs/resource/contact.php | 2 +- htdocs/resource/document.php | 2 +- htdocs/resource/element_resource.php | 2 +- htdocs/resource/list.php | 2 +- htdocs/resource/note.php | 6 +++--- htdocs/salaries/card.php | 2 +- htdocs/salaries/document.php | 2 +- htdocs/salaries/info.php | 2 +- htdocs/salaries/list.php | 2 +- htdocs/salaries/payments.php | 2 +- htdocs/salaries/virement_request.php | 2 +- htdocs/societe/agenda.php | 4 ++-- htdocs/societe/card.php | 2 +- htdocs/societe/consumption.php | 2 +- htdocs/societe/contact.php | 2 +- htdocs/societe/document.php | 2 +- htdocs/societe/index.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/societe/messaging.php | 4 ++-- htdocs/societe/note.php | 4 ++-- htdocs/societe/notify/card.php | 2 +- htdocs/societe/paymentmodes.php | 2 +- htdocs/societe/price.php | 2 +- htdocs/societe/project.php | 2 +- htdocs/societe/societecontact.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/supplier_proposal/card.php | 8 ++++---- htdocs/supplier_proposal/index.php | 2 +- htdocs/supplier_proposal/list.php | 2 +- htdocs/supplier_proposal/note.php | 4 ++-- htdocs/takepos/ajax/ajax.php | 2 +- htdocs/ticket/card.php | 6 +++--- htdocs/ticket/index.php | 2 +- htdocs/ticket/list.php | 2 +- htdocs/user/agenda_extsites.php | 2 +- htdocs/user/bank.php | 2 +- htdocs/user/card.php | 2 +- htdocs/user/clicktodial.php | 2 +- htdocs/user/document.php | 2 +- htdocs/user/group/card.php | 4 ++-- htdocs/user/group/list.php | 2 +- htdocs/user/group/perms.php | 2 +- htdocs/user/home.php | 4 ++-- htdocs/user/ldap.php | 2 +- htdocs/user/list.php | 2 +- htdocs/user/messaging.php | 4 ++-- htdocs/user/note.php | 4 ++-- htdocs/user/param_ihm.php | 2 +- htdocs/user/perms.php | 2 +- htdocs/variants/card.php | 4 ++-- htdocs/variants/list.php | 2 +- .../tpl/productattributevalueline_create.tpl.php | 2 +- .../tpl/productattributevalueline_edit.tpl.php | 2 +- .../tpl/productattributevalueline_title.tpl.php | 2 +- .../tpl/productattributevalueline_view.tpl.php | 2 +- htdocs/webhook/target_card.php | 4 ++-- htdocs/webhook/target_list.php | 2 +- htdocs/webportal/admin/configcss.php | 2 +- htdocs/webportal/admin/setup.php | 2 +- htdocs/webportal/admin/setup_theme.php | 2 +- htdocs/webportal/class/controller.class.php | 2 +- .../class/html.formcardwebportal.class.php | 4 ++-- .../class/html.formlistwebportal.class.php | 2 +- htdocs/website/websiteaccount_card.php | 4 ++-- htdocs/workstation/workstation_agenda.php | 4 ++-- htdocs/workstation/workstation_card.php | 4 ++-- htdocs/workstation/workstation_document.php | 4 ++-- htdocs/workstation/workstation_list.php | 2 +- htdocs/workstation/workstation_note.php | 6 +++--- 503 files changed, 737 insertions(+), 737 deletions(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 2eea530e96e..cee3ee55a99 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -103,7 +103,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) { $accounting = new AccountingAccount($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('accountancyadminaccount')); diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index ffb1fc80767..0f5b8213ab9 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -88,7 +88,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) { } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin')); // This page is a generic page to edit dictionaries diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 1891b492296..3e3a85c672e 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -72,7 +72,7 @@ $pagenext = $page + 1; $search_country_id = GETPOST('search_country_id', 'int'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin')); // This page is a generic page to edit dictionaries diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index d1ba74b8b56..0a2901ceca7 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -58,7 +58,7 @@ static $tmpstatut2label = array( '1' => 'CloseFiscalYear' ); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Fiscalyear($db); $hookmanager->initHooks(array('fiscalyearlist')); diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 7e1d4fc7f87..16792a05747 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -51,12 +51,12 @@ if (!empty($backtopagejsfields)) { $error = 0; -// Initialize technical objects +// Initialize a technical objects $object = new Fiscalyear($db); $extrafields = new ExtraFields($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // List of status static $tmpstatus2label = array( diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php index 475d9f4220e..6b201fe8e13 100644 --- a/htdocs/accountancy/admin/journals_list.php +++ b/htdocs/accountancy/admin/journals_list.php @@ -82,7 +82,7 @@ $error = 0; $search_country_id = GETPOST('search_country_id', 'int'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin')); // This page is a generic page to edit dictionaries diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 02678032298..fc21dd6945e 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -82,7 +82,7 @@ if ($sortfield == "") { $sortfield = "t.numero_compte"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new BookKeeping($db); $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php index 2a5d2b96fe8..4d8d804c479 100644 --- a/htdocs/accountancy/bookkeeping/export.php +++ b/htdocs/accountancy/bookkeeping/export.php @@ -153,7 +153,7 @@ if ($sortfield == "") { $sortfield = "t.piece_num,t.rowid"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new BookKeeping($db); $hookmanager->initHooks(array('bookkeepingexport')); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index f7456e719a3..b3b42d93125 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -158,7 +158,7 @@ if ($sortfield == "") { $sortfield = "t.piece_num,t.rowid"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new BookKeeping($db); $hookmanager->initHooks(array('bookkeepinglist')); diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index eb6f0b3282d..7f9d5a12b52 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -133,7 +133,7 @@ if ($sortfield == "") { $sortfield = "t.doc_date,t.rowid"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new BookKeeping($db); $formfile = new FormFile($db); $hookmanager->initHooks(array($context_default)); diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index 025430976cc..1dd8002ce93 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -49,7 +49,7 @@ if (!$user->hasRight('accounting', 'fiscalyear', 'write')) { accessforbidden(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('accountancyclosure')); $object = new BookKeeping($db); diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index ccafecb446b..a4b757ef958 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -101,7 +101,7 @@ if (!$sortorder) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('accountancycustomerlist')); $formaccounting = new FormAccounting($db); diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 1c2e3f9e20c..667a20347df 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -95,7 +95,7 @@ if (!$sortorder) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('accountancyexpensereportlist')); $formaccounting = new FormAccounting($db); diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php index 0577cac80fa..714d8635692 100644 --- a/htdocs/accountancy/index.php +++ b/htdocs/accountancy/index.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Load translation files required by the page $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict")); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('accountancyindex')); // Security check diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index dc3791c3327..775f1b2960f 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -81,7 +81,7 @@ $errorforinvoice = array(); $accountingaccount = new AccountingAccount($db); -// Get information of journal +// Get information of a journal $accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic->fetch($id_journal); $journal = $accountingjournalstatic->code; @@ -178,7 +178,7 @@ if ($result) { $compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); - // Define array to display all VAT rates that use this accounting account $compta_tva + // Define an array to display all VAT rates that use this accounting account $compta_tva if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) { $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')); } diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index b02727da212..6b19752351b 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -84,7 +84,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action); $accountingaccount = new AccountingAccount($db); -// Get information of journal +// Get information of a journal $accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic->fetch($id_journal); $journal = $accountingjournalstatic->code; @@ -230,7 +230,7 @@ if ($result) { $compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_counterpart_tva_npr = getDolGlobalString('ACCOUNTING_COUNTERPART_VAT_NPR', 'NotDefined'); - // Define array to display all VAT rates that use this accounting account $compta_tva + // Define an array to display all VAT rates that use this accounting account $compta_tva if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) { $def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')); } @@ -408,7 +408,7 @@ if ($action == 'writebookkeeping' && !$error) { $totalcredit = 0; $totaldebit = 0; - $db->begin(); // We accept transaction into loop so if we hang, we can continue transfer from last error + $db->begin(); // We accept transaction into loop, so if we hang, we can continue transfer from the last error $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; @@ -425,7 +425,7 @@ if ($action == 'writebookkeeping' && !$error) { $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; @@ -796,7 +796,7 @@ if ($action == 'exportcsv' && !$error) { // ISO and not UTF8 ! $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; @@ -1049,7 +1049,7 @@ if (empty($action) || $action == 'view') { $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 2b360c09ba1..46f986c08ac 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -86,7 +86,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action); $accountingaccount = new AccountingAccount($db); -// Get information of journal +// Get information of a journal $accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic->fetch($id_journal); $journal = $accountingjournalstatic->code; @@ -437,7 +437,7 @@ if ($action == 'writebookkeeping' && !$error) { $totalcredit = 0; $totaldebit = 0; - $db->begin(); // We accept transaction into loop so if we hang, we can continue transfer from last error + $db->begin(); // We accept transaction into loop, so if we hang, we can continue transfer from the last error $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; @@ -453,7 +453,7 @@ if ($action == 'writebookkeeping' && !$error) { $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; @@ -463,7 +463,7 @@ if ($action == 'writebookkeeping' && !$error) { } } - // If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted) + // If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating a replacement is not possible if invoice is accounted) if ($replacedinvoice == 1) { $db->rollback(); continue; @@ -487,7 +487,7 @@ if ($action == 'writebookkeeping' && !$error) { $bookkeeping->date_creation = $now; $bookkeeping->doc_type = 'customer_invoice'; $bookkeeping->fk_doc = $key; - $bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add + $bookkeeping->fk_docdet = 0; // Useless, can be several lines that are the source of this record to add $bookkeeping->thirdparty_code = $companystatic->code_client; $bookkeeping->subledger_account = $tabcompany[$key]['code_compta']; @@ -863,7 +863,7 @@ if ($action == 'exportcsv' && !$error) { // ISO and not UTF8 ! $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; @@ -1115,7 +1115,7 @@ if (empty($action) || $action == 'view') { $date = dol_print_date($val["date"], 'day'); - // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + // Is it a replaced invoice? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php index 49194a41eb9..78a38fac98e 100644 --- a/htdocs/accountancy/journal/variousjournal.php +++ b/htdocs/accountancy/journal/variousjournal.php @@ -44,7 +44,7 @@ if ($in_bookkeeping == '') { $in_bookkeeping = 'notyet'; } -// Get information of journal +// Get information of a journal $object = new AccountingJournal($db); $result = $object->fetch($id_journal); if ($result > 0) { diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 4d04a33b5d0..b2262067683 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -98,7 +98,7 @@ if (!$sortorder) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('accountancysupplierlist')); $formaccounting = new FormAccounting($db); diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 5c1a65c895c..286a66ea493 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -72,13 +72,13 @@ $search_agenda_label = GETPOST('search_agenda_label'); // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $objcanvas = null; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('memberagenda', 'globalcard')); // Security check $result = restrictedArea($user, 'adherent', $id); -// Initialize technical objects +// Initialize a technical objects $object = new Adherent($db); $result = $object->fetch($id); if ($result > 0) { diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a0b39255837..bed2df3a64c 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -90,7 +90,7 @@ if (!empty($canvas)) { $objcanvas->getCanvas('adherent', 'membercard', $canvas); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('membercard', 'globalcard')); // Fetch object diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 214060ad2d2..bd08c394026 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -42,7 +42,7 @@ $langs->loadLangs(array("companies", "members")); $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('membersindex')); diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 13d956aa38a..0f969a97bbc 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -126,7 +126,7 @@ if (!$sortfield) { $object = new Adherent($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('memberlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/adherents/messaging.php b/htdocs/adherents/messaging.php index 091522a8432..545b3f9b57c 100644 --- a/htdocs/adherents/messaging.php +++ b/htdocs/adherents/messaging.php @@ -72,14 +72,14 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendathirdparty', 'globalcard')); // Security check $result = restrictedArea($user, 'adherent', $id); -// Initialize technical objects +// Initialize a technical objects $object = new Adherent($db); $result = $object->fetch($id); if ($result > 0) { diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 180eee496b2..b76a08e6d82 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -91,7 +91,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php index 9edc0603ce2..d72825a11a6 100644 --- a/htdocs/adherents/partnership.php +++ b/htdocs/adherents/partnership.php @@ -51,7 +51,7 @@ if ($id > 0) { $object->fetch($id); } -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $adht = new AdherentType($db); @@ -74,7 +74,7 @@ foreach ($object->fields as $key => $val) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('partnership', 'read'); $permissiontoadd = $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 62f8ae41968..68db734ff14 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -82,7 +82,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $errmsg = ''; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('subscription')); // PDF diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index ad1f0633c96..fff38874217 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -71,11 +71,11 @@ if ($cancel) { $action = ''; } -//include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once +//include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' -include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' -//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once +//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'update' && !$cancel) { diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php index c80b54be482..3d6488787d4 100644 --- a/htdocs/adherents/subscription/list.php +++ b/htdocs/adherents/subscription/list.php @@ -75,7 +75,7 @@ if (!$sortfield) { $sortfield = "c.dateadh"; } -// Initialize technical objects +// Initialize a technical objects $object = new Subscription($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('subscriptionlist')); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index c8807066da6..1e750b71289 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -92,7 +92,7 @@ $comment = GETPOST("comment", 'restricthtml'); $mail_valid = GETPOST("mail_valid", 'restricthtml'); $caneditamount = GETPOSTINT("caneditamount"); -// Initialize technical objects +// Initialize a technical objects $object = new AdherentType($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('membertypecard', 'globalcard')); diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php index 88301150f13..78af4a6c483 100644 --- a/htdocs/adherents/type_ldap.php +++ b/htdocs/adherents/type_ldap.php @@ -42,7 +42,7 @@ $result = restrictedArea($user, 'adherent', $id, 'adherent_type'); $object = new AdherentType($db); $object->fetch($id); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('membertypeldapcard', 'globalcard')); /* diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 2dcb16e4747..994537b515d 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -204,7 +204,7 @@ print dol_get_fiche_head($head, 'other', $langs->trans("Agenda"), -1, 'action'); * Miscellaneous */ -// Define array def of models +// Define an array def of models $def = array(); $sql = "SELECT nom"; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index efac82e2ce8..b337a0922f8 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -59,7 +59,7 @@ $maxwidthmini = $tmparraysize['maxwidthmini']; $maxheightmini = $tmparraysize['maxheightmini']; $quality = $tmparraysize['quality']; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admincompany', 'globaladmin')); diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php index e5178c97de1..887bf83120d 100644 --- a/htdocs/admin/company_socialnetworks.php +++ b/htdocs/admin/company_socialnetworks.php @@ -43,7 +43,7 @@ if (!$user->admin) { } $listofnetworks = getArrayOfSocialNetworks(); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('adminsocialnetworkscompany', 'globaladmin')); /* diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php index 198c3cd2ba2..ff93e3f229a 100644 --- a/htdocs/admin/defaultvalues.php +++ b/htdocs/admin/defaultvalues.php @@ -73,7 +73,7 @@ $urlpage = GETPOST('urlpage', 'alphanohtml'); $key = GETPOST('key', 'alphanohtml'); $value = GETPOST('value', 'restricthtml'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admindefaultvalues', 'globaladmin')); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 6e42db441d7..00bdb4e6446 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -133,7 +133,7 @@ if (!GETPOSTISSET('search_country_id') && $search_country_id == '' && ($id == DI $search_country_id = $mysoc->country_id; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin', 'dictionaryadmin')); $allowed = $user->admin; diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index fdc44b83b7a..02bc1f00c81 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -64,7 +64,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $operationid = GETPOSTINT('operationid'); -// Initialize technical objects +// Initialize a technical objects $object = new EmailCollector($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->emailcollector->dir_output.'/temp/massgeneration/'.$user->id; @@ -92,7 +92,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php index 7199bac6d5a..baf017ecfe6 100644 --- a/htdocs/admin/emailcollector_list.php +++ b/htdocs/admin/emailcollector_list.php @@ -64,7 +64,7 @@ $pagenext = $page + 1; //if (! $sortfield) $sortfield="p.date_fin"; //if (! $sortorder) $sortorder="DESC"; -// Initialize technical objects +// Initialize a technical objects $object = new EmailCollector($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->emailcollector->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php index 87b87bca191..4e4ef01d9f0 100644 --- a/htdocs/admin/expensereport_rules.php +++ b/htdocs/admin/expensereport_rules.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.ph // Load translation files required by the page $langs->loadLangs(array("admin", "other", "trips", "errors", "dict")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules')); $object = new ExpenseReportRule($db); diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index f4539b0f5d0..8f908ad238b 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -34,7 +34,7 @@ if (!$user->admin) { accessforbidden(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('homesetup')); diff --git a/htdocs/admin/invoice_situation.php b/htdocs/admin/invoice_situation.php index 017b3461bb5..f394b606f7b 100644 --- a/htdocs/admin/invoice_situation.php +++ b/htdocs/admin/invoice_situation.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php'; // Load translation files required by the page $langs->loadLangs(array('admin', 'errors', 'other', 'bills')); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('situationinvoicesetup', 'globalsetup')); // Access control diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 314b64b150a..89d6480e0d4 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -42,7 +42,7 @@ if (!$user->admin) { $action = GETPOST('action', 'aZ09'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('adminldap', 'globaladmin')); diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index 1173ebbf883..2976bf969ff 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -60,7 +60,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new EmailSenderProfile($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->admin->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 56126f2f56b..cb695dfbe74 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -99,7 +99,7 @@ if (empty($sortorder)) { $sortorder = 'ASC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('emailtemplates')); diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php index 92be78f550f..6136984ee5c 100644 --- a/htdocs/admin/modulehelp.php +++ b/htdocs/admin/modulehelp.php @@ -155,7 +155,7 @@ foreach ($modulesdir as $dir) { ksort($arrayofnatures); } - // Define array $categ with categ with at least one qualified module + // Define an array $categ with categ with at least one qualified module if ($modulequalified > 0) { $modules[$i] = $objMod; $filename[$i] = $modName; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index dd9909163a6..3d560a7a724 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -112,7 +112,7 @@ if (!GETPOST('buttonreset', 'alpha')) { $dirins = DOL_DOCUMENT_ROOT.'/custom'; $urldolibarrmodules = 'https://www.dolistore.com/'; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('adminmodules', 'globaladmin')); // Increase limit of time. Works only if we are not in safe mode @@ -464,7 +464,7 @@ foreach ($modulesdir as $dir) { } ksort($arrayofnatures); - // Define array $categ with categ with at least one qualified module + // Define an array $categ with categ with at least one qualified module $filename[$i] = $modName; $modules[$modName] = $objMod; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 64a8cd08923..aaccfab2278 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -52,7 +52,7 @@ if (!$sortorder) { $sortorder = "asc"; } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('moduleoverview')); $form = new Form($db); $object = new stdClass(); diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 651d4faffcf..e6d9a251fd9 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -70,7 +70,7 @@ if (!$sortorder) { $sortorder = 'ASC,ASC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admintranslation', 'globaladmin')); diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php index 632a0963a64..840864b06c5 100644 --- a/htdocs/admin/webhook.php +++ b/htdocs/admin/webhook.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook.lib.php'; // Translations $langs->loadLangs(array("admin", "webhook")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('webhooksetup', 'globalsetup')); // Access control diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index c61eefda37c..86362039daf 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -67,7 +67,7 @@ if (empty($sortorder)) { $sortorder = 'ASC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('website')); // Name of SQL tables of dictionaries diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index e3d5c2958ad..026735f2f93 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -51,7 +51,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('admin')); $arrayofparameters = array('WEBSITE_USE_WEBSITE_ACCOUNTS'=>array('css'=>'minwidth200')); diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php index f68e835a1ff..3a784387e0c 100644 --- a/htdocs/asset/accountancy_codes.php +++ b/htdocs/asset/accountancy_codes.php @@ -40,7 +40,7 @@ $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $assetaccountancycodes = new AssetAccountancyCodes($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); @@ -51,7 +51,7 @@ $hookmanager->initHooks(array('assetaccountancycodes', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/" . $object->id; } diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php index 1669e7b688f..e7a1aa062fe 100644 --- a/htdocs/asset/agenda.php +++ b/htdocs/asset/agenda.php @@ -68,7 +68,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; @@ -77,7 +77,7 @@ $hookmanager->initHooks(array('assetagenda', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 24af02996b7..75b72fb03a7 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -42,7 +42,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'as $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; @@ -67,7 +67,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('asset', 'read'); $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php index f20ccdbe7e7..26909d26289 100644 --- a/htdocs/asset/depreciation.php +++ b/htdocs/asset/depreciation.php @@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); $extrafields = new ExtraFields($db); @@ -48,7 +48,7 @@ $hookmanager->initHooks(array('assetdepreciation', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id; } diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php index 6202e4f2b6f..7fe8e940b4e 100644 --- a/htdocs/asset/depreciation_options.php +++ b/htdocs/asset/depreciation_options.php @@ -39,7 +39,7 @@ $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); $extrafields = new ExtraFields($db); @@ -49,7 +49,7 @@ $hookmanager->initHooks(array('assetdepreciationoptions', 'globalcard')); // Not $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/" . $object->id; } diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php index 6ef7433061d..f97b1c5463d 100644 --- a/htdocs/asset/disposal.php +++ b/htdocs/asset/disposal.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; @@ -46,7 +46,7 @@ $hookmanager->initHooks(array('assetdisposal', 'globalcard')); // Note that conf $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php index bf585199df1..64c3795dd8e 100644 --- a/htdocs/asset/document.php +++ b/htdocs/asset/document.php @@ -58,7 +58,7 @@ if (!$sortfield) { $sortfield = "name"; } -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; @@ -67,7 +67,7 @@ $hookmanager->initHooks(array('assetdocument', 'globalcard')); // Note that conf $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index d397d3c312c..e06bc80ff60 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -58,7 +58,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php index 61db2261bb1..b19b5c0e889 100644 --- a/htdocs/asset/model/accountancy_codes.php +++ b/htdocs/asset/model/accountancy_codes.php @@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $assetaccountancycodes = new AssetAccountancyCodes($db); $extrafields = new ExtraFields($db); @@ -48,7 +48,7 @@ $hookmanager->initHooks(array('assetmodelaccountancycodes', 'globalcard')); // N $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/" . $object->id; } diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php index 247d52408bf..97984569c3d 100644 --- a/htdocs/asset/model/agenda.php +++ b/htdocs/asset/model/agenda.php @@ -68,7 +68,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; @@ -77,7 +77,7 @@ $hookmanager->initHooks(array('assetmodelagenda', 'globalcard')); // Note that c $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/model/" . $object->id; } diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php index d0d413d543e..762e676f98a 100644 --- a/htdocs/asset/model/card.php +++ b/htdocs/asset/model/card.php @@ -44,7 +44,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'as $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); $assetaccountancycodes = new AssetAccountancyCodes($db); @@ -71,7 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read'))); $permissiontoadd = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write'))); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php index 5beeb1a7a33..5919450549a 100644 --- a/htdocs/asset/model/depreciation_options.php +++ b/htdocs/asset/model/depreciation_options.php @@ -39,7 +39,7 @@ $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $assetdepreciationoptions = new AssetDepreciationOptions($db); $extrafields = new ExtraFields($db); @@ -49,7 +49,7 @@ $hookmanager->initHooks(array('assetmodeldeprectationoptions', 'globalcard')); / $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/" . $object->id; } diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php index b787fc95605..42ebf0f158c 100644 --- a/htdocs/asset/model/list.php +++ b/htdocs/asset/model/list.php @@ -56,7 +56,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php index e704b6ae390..fb1a8fbf9b3 100644 --- a/htdocs/asset/model/note.php +++ b/htdocs/asset/model/note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new AssetModel($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id; @@ -46,7 +46,7 @@ $hookmanager->initHooks(array('assetmodelnote', 'globalcard')); // Note that con $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1] . "/" . $object->id; } @@ -82,7 +82,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php index a87f252acc9..8fd2b0a61e4 100644 --- a/htdocs/asset/note.php +++ b/htdocs/asset/note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Asset($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id; @@ -46,7 +46,7 @@ $hookmanager->initHooks(array('assetnote', 'globalcard')); // Note that conf->ho $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id; } @@ -75,7 +75,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php index d0bd4f0c468..43da58f395c 100644 --- a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php +++ b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formAssetAccountancyCode. Need to have the following variables defined: * $object (asset, assetmodel, ...) * $assetaccountancycodes * $action diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php index b48f642c4c2..cb429c79399 100644 --- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php +++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formAssetAccountancyCode. Need to have the following variables defined: * $object (asset, assetmodel, ...) * $assetaccountancycodes * $action diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php index 2741da86c2b..b704725acad 100644 --- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php +++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formAssetAccountancyCode. Need to have the following variables defined: * $object (asset, assetmodel, ...) * $assetaccountancycodes * $action diff --git a/htdocs/asset/tpl/depreciation_options_view.tpl.php b/htdocs/asset/tpl/depreciation_options_view.tpl.php index c801d74505e..a99d0ec3090 100644 --- a/htdocs/asset/tpl/depreciation_options_view.tpl.php +++ b/htdocs/asset/tpl/depreciation_options_view.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formAssetAccountancyCode. Need to have the following variables defined: * $object (asset, assetmodel, ...) * $assetaccountancycodes * $action diff --git a/htdocs/asset/tpl/depreciation_view.tpl.php b/htdocs/asset/tpl/depreciation_view.tpl.php index 424d989665f..3480a91b0b5 100644 --- a/htdocs/asset/tpl/depreciation_view.tpl.php +++ b/htdocs/asset/tpl/depreciation_view.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formAssetAccountancyCode. Need to have the following variables defined: * $object (asset, assetmodel, ...) * $assetaccountancycodes * $action diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index 92581f000f0..16004ad8e9f 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -70,7 +70,7 @@ if (!$user->hasRight('barcode', 'read')) { } restrictedArea($user, 'barcode'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('printsheettools')); $parameters = array(); diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php index c4588e3151b..4da795ce0d6 100644 --- a/htdocs/bom/bom_agenda.php +++ b/htdocs/bom/bom_agenda.php @@ -73,7 +73,7 @@ if (!$sortorder) { $sortorder = 'DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id; @@ -83,7 +83,7 @@ $hookmanager->initHooks(array('bomagenda', 'globalcard')); // Note that conf->ho $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = (!empty($conf->bom->multidir_output[$object->entity]) ? $conf->bom->multidir_output[$object->entity] : $conf->bom->dir_output)."/".$object->id; } diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index c5456de0a21..cec3da13cd6 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -52,7 +52,7 @@ $hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolG $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0)); $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0)); -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id; @@ -76,7 +76,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. if ($object->id > 0) { $object->calculateCosts(); } diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php index 00d7c81f38e..80cbb279725 100644 --- a/htdocs/bom/bom_document.php +++ b/htdocs/bom/bom_document.php @@ -64,7 +64,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id; @@ -73,7 +73,7 @@ $hookmanager->initHooks(array('bomdocument', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bom->multidir_output[$object->entity ? $object->entity : 1]."/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php index bf1e2a87269..e0bc390b5c6 100644 --- a/htdocs/bom/bom_list.php +++ b/htdocs/bom/bom_list.php @@ -62,7 +62,7 @@ $pagenext = $page + 1; //if (! $sortfield) $sortfield="p.date_fin"; //if (! $sortorder) $sortorder="DESC"; -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php index c2660ace0cb..52e2e0e1340 100644 --- a/htdocs/bom/bom_net_needs.php +++ b/htdocs/bom/bom_net_needs.php @@ -43,11 +43,11 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bo $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); -// Initialize technical objects for hooks +// Initialize a technical objects for hooks $hookmanager->initHooks(array('bomnetneeds')); // Note that conf->hooks_modules contains array // Massaction @@ -71,7 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. if ($object->id > 0) { $object->calculateCosts(); } diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php index 1ef9ffa7355..143df51372b 100644 --- a/htdocs/bom/bom_note.php +++ b/htdocs/bom/bom_note.php @@ -37,11 +37,11 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new BOM($db); $extrafields = new ExtraFields($db); -// Initialize technical objects for hooks +// Initialize a technical objects for hooks $hookmanager->initHooks(array('bomnote', 'globalcard')); // Note that conf->hooks_modules contains array // Massactions @@ -56,7 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); //$result = restrictedArea($user, 'bom', $id); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = (!empty($conf->bom->multidir_output[$object->entity]) ? $conf->bom->multidir_output[$object->entity] : $conf->bom->dir_output)."/".$object->id; } @@ -80,7 +80,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php index 84ff482d3a1..510372ae572 100644 --- a/htdocs/bom/tpl/objectline_create.tpl.php +++ b/htdocs/bom/tpl/objectline_create.tpl.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php index e5686a86e90..8394cb4c0ad 100644 --- a/htdocs/bom/tpl/objectline_edit.tpl.php +++ b/htdocs/bom/tpl/objectline_edit.tpl.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php index 2511279573c..a357628eba0 100644 --- a/htdocs/bom/tpl/objectline_title.tpl.php +++ b/htdocs/bom/tpl/objectline_title.tpl.php @@ -20,7 +20,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php index 4b369f88f19..1eb5af99455 100644 --- a/htdocs/bom/tpl/objectline_view.tpl.php +++ b/htdocs/bom/tpl/objectline_view.tpl.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php index 817fffbd625..f67819497c3 100644 --- a/htdocs/bookcal/admin/setup.php +++ b/htdocs/bookcal/admin/setup.php @@ -37,7 +37,7 @@ require_once '../lib/bookcal.lib.php'; // Translations $langs->loadLangs(array("admin", "agenda")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bookcalsetup', 'globalsetup')); // Access control diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php index 88c0935c86d..082c2f93698 100644 --- a/htdocs/bookcal/availabilities_agenda.php +++ b/htdocs/bookcal/availabilities_agenda.php @@ -71,7 +71,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('availabilitiesagenda', 'globalcard')); // Note th $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php index 068aa133be3..bcb42c44e12 100644 --- a/htdocs/bookcal/availabilities_card.php +++ b/htdocs/bookcal/availabilities_card.php @@ -46,7 +46,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -71,7 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. //avoid warning on missing/undef entity $object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php index cfd91d3b2f6..0b6c992de8b 100644 --- a/htdocs/bookcal/availabilities_contact.php +++ b/htdocs/bookcal/availabilities_contact.php @@ -38,7 +38,7 @@ $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -47,7 +47,7 @@ $hookmanager->initHooks(array('availabilitiescontact', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // There is several ways to check permission. // Set $enablepermissioncheck to 1 to enable a minimum low level of checks diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php index 433d92b144f..27ecf64e926 100644 --- a/htdocs/bookcal/availabilities_document.php +++ b/htdocs/bookcal/availabilities_document.php @@ -59,7 +59,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -68,7 +68,7 @@ $hookmanager->initHooks(array('availabilitiesdocument', 'globalcard')); // Note $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[$object->entity ? $object->entity : $conf->entity]."/availabilities/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php index dd7d6df9b2e..e3565ce9da3 100644 --- a/htdocs/bookcal/availabilities_list.php +++ b/htdocs/bookcal/availabilities_list.php @@ -64,7 +64,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php index 3f7bf24edee..fbac83db11f 100644 --- a/htdocs/bookcal/availabilities_note.php +++ b/htdocs/bookcal/availabilities_note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Availabilities($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -46,7 +46,7 @@ $hookmanager->initHooks(array('availabilitiesnote', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -88,7 +88,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php index 7ef31ec2c3e..b9390ede6fc 100644 --- a/htdocs/bookcal/calendar_agenda.php +++ b/htdocs/bookcal/calendar_agenda.php @@ -71,7 +71,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('calendaragenda', 'globalcard')); // Note that con $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php index 55884aecaea..f9ca47c6edc 100644 --- a/htdocs/bookcal/calendar_card.php +++ b/htdocs/bookcal/calendar_card.php @@ -54,7 +54,7 @@ if (!empty($backtopagejsfields)) { $dol_openinpopup = $tmpbacktopagejsfields[0]; } -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -79,7 +79,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); diff --git a/htdocs/bookcal/calendar_contact.php b/htdocs/bookcal/calendar_contact.php index 4eb679a97f3..5252a0f4d7c 100644 --- a/htdocs/bookcal/calendar_contact.php +++ b/htdocs/bookcal/calendar_contact.php @@ -40,7 +40,7 @@ $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -49,7 +49,7 @@ $hookmanager->initHooks(array('calendarcontact', 'globalcard')); // Note that co $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // There is several ways to check permission. // Set $enablepermissioncheck to 1 to enable a minimum low level of checks diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php index 32aaf416f35..cb4a379c559 100644 --- a/htdocs/bookcal/calendar_document.php +++ b/htdocs/bookcal/calendar_document.php @@ -61,7 +61,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -70,7 +70,7 @@ $hookmanager->initHooks(array('calendardocument', 'globalcard')); // Note that c $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[$object->entity ? $object->entity : $conf->entity]."/calendar/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php index a67858255bb..6d70a8cf159 100644 --- a/htdocs/bookcal/calendar_list.php +++ b/htdocs/bookcal/calendar_list.php @@ -62,7 +62,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/bookcal/calendar_note.php b/htdocs/bookcal/calendar_note.php index 7eb44b892e2..f18872e6ae1 100644 --- a/htdocs/bookcal/calendar_note.php +++ b/htdocs/bookcal/calendar_note.php @@ -39,7 +39,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Calendar($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->bookcal->dir_output.'/temp/massgeneration/'.$user->id; @@ -48,7 +48,7 @@ $hookmanager->initHooks(array('calendarnote', 'globalcard')); // Note that conf- $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->bookcal->multidir_output[empty($object->entity) ? $conf->entity : $object->entity]."/".$object->id; } @@ -90,7 +90,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php index a92b7c44efb..16df2233d80 100644 --- a/htdocs/categories/card.php +++ b/htdocs/categories/card.php @@ -91,7 +91,7 @@ $object = new Categorie($db); $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('categorycard')); $error = 0; diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index 7fc4d4c8a10..f93254da64b 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -72,7 +72,7 @@ if (is_numeric($type)) { $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('categorycard')); $error = 0; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index a49c2a88bb5..b96e8aca175 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -46,7 +46,7 @@ if (is_numeric($type)) { $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('categoryindex')); if (!$user->hasRight('categorie', 'lire')) { diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 857812b890f..74a1f0c4cfe 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -89,7 +89,7 @@ if (is_numeric($type)) { $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('categorycard', 'globalcard')); /* diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 20be4780af2..8b70bb73c80 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -135,7 +135,7 @@ if ($id > 0 && $action != 'add') { // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('actioncard', 'globalcard')); $parameters = array('socid' => $socid); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9989d6874bb..f5d00194b95 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1321,7 +1321,7 @@ class ActionComm extends CommonObject dol_syslog(get_class()."::getActions", LOG_DEBUG); - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context if (!is_object($hookmanager)) { include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager = new HookManager($this->db); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index fb8c8dd2417..8ba2928a911 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -62,7 +62,7 @@ if ($id > 0) { $object->fetch_thirdparty(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('actioncard', 'globalcard')); // Get parameters diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index af345ae89f5..5e856817426 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -168,7 +168,7 @@ $object = new ActionComm($db); // Load translation files required by the page $langs->loadLangs(array('agenda', 'other', 'commercial')); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agenda')); $result = restrictedArea($user, 'agenda', 0, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id'); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index 0b16f28193e..bfae8aa535a 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -39,7 +39,7 @@ $langs->load("commercial"); $id = GETPOSTINT('id'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('actioncard', 'globalcard')); // Security check diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 420ff107c5f..7faf66f0f2d 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -99,7 +99,7 @@ $usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", $showbirthday = empty($conf->use_javascript_ajax) ? (GETPOSTINT("search_showbirthday") ? GETPOSTINT("search_showbirthday") : GETPOSTINT("showbirthday")) : 1; $search_categ_cus = GETPOST("search_categ_cus", "intcomma", 3) ? GETPOST("search_categ_cus", "intcomma", 3) : 0; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new ActionComm($db); $hookmanager->initHooks(array('agendalist')); diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index 849f71c18fa..5493734447a 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -186,7 +186,7 @@ $object = new ActionComm($db); // Load translation files required by the page $langs->loadLangs(array('users', 'agenda', 'other', 'commercial')); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agenda')); $result = restrictedArea($user, 'agenda', 0, '', 'myactions'); diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 30f0d61d41a..1ee52af1ccc 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -183,7 +183,7 @@ $object = new ActionComm($db); // Load translation files required by the page $langs->loadLangs(array('users', 'agenda', 'other', 'commercial')); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agenda')); $result = restrictedArea($user, 'agenda', 0, '', 'myactions'); diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 2586f80790d..162425c8037 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -119,7 +119,7 @@ $formfile = new FormFile($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartycomm', 'globalcard')); $now = dol_now(); diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 8ce75b5cd6e..95f218a4ab0 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -46,7 +46,7 @@ if (isModEnabled('intervention')) { require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager = new HookManager($db); $hookmanager->initHooks(array('commercialindex')); diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index c4778c4cd3d..d1c654b91ba 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -51,7 +51,7 @@ $cancel = GETPOST('cancel', 'aZ09'); $urlfrom = GETPOST('urlfrom'); $backtopageforcancel = GETPOST('backtopageforcancel'); -// Initialize technical objects +// Initialize a technical objects $object = new Mailing($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('mailingcard', 'globalcard')); @@ -60,7 +60,7 @@ $hookmanager->initHooks(array('mailingcard', 'globalcard')); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions) $object->substitutionarray = FormMail::getAvailableSubstitKey('emailing'); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index e2eab3e3e2a..3ea3c35eed1 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -71,7 +71,7 @@ $modulesdir = dolGetModulesDirs('/mailings'); $object = new Mailing($db); $result = $object->fetch($id); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ciblescard', 'globalcard')); $sqlmessage = ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index c7d446e184e..7d04bc5de6c 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('mailingindex')); // Load translation files required by the page diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php index a1f3df49b18..d317f33e8b0 100644 --- a/htdocs/comm/mailing/list.php +++ b/htdocs/comm/mailing/list.php @@ -61,7 +61,7 @@ $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : $search_messtype = GETPOST("search_messtype", "alpha"); $filteremail = GETPOST('filteremail', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Mailing($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes diff --git a/htdocs/comm/mailing/note.php b/htdocs/comm/mailing/note.php index 6b7a5153bd7..1b9a8bf39ba 100644 --- a/htdocs/comm/mailing/note.php +++ b/htdocs/comm/mailing/note.php @@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Mailing($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mailing->dir_output.'/temp/massgeneration/'.$user->id; @@ -47,7 +47,7 @@ $hookmanager->initHooks(array('mailingnote', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mailing->multidir_output[$object->entity]."/".$object->id; } @@ -71,7 +71,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php index 657f2e639f9..cf73c2f8039 100644 --- a/htdocs/comm/propal/agenda.php +++ b/htdocs/comm/propal/agenda.php @@ -67,7 +67,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Propal($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->propal->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; @@ -76,7 +76,7 @@ $hookmanager->initHooks(array('propalagenda', 'globalcard')); // Note that conf- $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->propal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 4677c889530..397a6ac51df 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('propalcard', 'globalcard')); $usercanread = $user->hasRight("propal", "lire"); @@ -178,9 +178,9 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) { diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index cc1ffc5486e..f54ab4a4387 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager = new HookManager($db); $hookmanager->initHooks(array('proposalindex')); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index d7d5aa122f1..15ef7de9d7a 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -181,7 +181,7 @@ $result = restrictedArea($user, $module, $objectid, $dbtable); $diroutputmassaction = $conf->propal->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Propal($db); $hookmanager->initHooks(array('propallist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index e412b5d1077..00e2f40119f 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -54,7 +54,7 @@ if ($user->socid > 0) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('propalnote')); restrictedArea($user, 'propal', $object->id, 'propal'); @@ -74,7 +74,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php index 79fc46673d1..b8d5e64e7a0 100644 --- a/htdocs/commande/agenda.php +++ b/htdocs/commande/agenda.php @@ -67,7 +67,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Commande($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; @@ -76,7 +76,7 @@ $hookmanager->initHooks(array('orderagenda', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->commande->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 04ad85e5743..07a30f51661 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -104,7 +104,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ordercard', 'globalcard')); $result = restrictedArea($user, 'commande', $id); @@ -116,7 +116,7 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' // Permissions / Rights $usercanread = $user->hasRight("commande", "lire"); @@ -180,11 +180,11 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) { diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 6a0e015b903..3b20df2931e 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09'); if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ordercontact', 'globalcard')); $result = restrictedArea($user, 'commande', $id, ''); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 06ada04a04f..ed2f577389e 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -81,7 +81,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('orderdocument', 'globalcard')); $result = restrictedArea($user, 'commande', $id, ''); diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 61be815d34d..115e7a7726c 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -45,7 +45,7 @@ if (!$user->hasRight('commande', 'lire')) { $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('ordersindex')); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 1202547aeda..cc77b1e36f4 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -148,7 +148,7 @@ if (!$sortorder) { $show_shippable_command = GETPOST('show_shippable_command', 'aZ09'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Commande($db); $hookmanager->initHooks(array('orderlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 9860cc003b4..03350ec8936 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -154,7 +154,7 @@ if (!$sortorder) { $show_shippable_command = GETPOST('show_shippable_command', 'aZ09'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Commande($db); $hookmanager->initHooks(array('orderlistdetail')); $extrafields = new ExtraFields($db); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 32169870e02..650db74072e 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -47,7 +47,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ordernote')); $result = restrictedArea($user, 'commande', $id, ''); @@ -74,7 +74,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php index e20eeed6436..b836a10eea3 100644 --- a/htdocs/compta/accounting-files.php +++ b/htdocs/compta/accounting-files.php @@ -74,7 +74,7 @@ $date_stop = dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYe $action = GETPOST('action', 'aZ09'); $projectid = GETPOSTINT('projectid'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('comptafileslist', 'globallist')); // Load variable for pagination diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index ff8260fce9d..25b1cd431bc 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -40,7 +40,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 160); $id = GETPOST('account') ? GETPOST('account', 'alpha') : GETPOST('id'); $ref = GETPOST('ref'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bankannualreport', 'globalcard')); // Security check diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 7d9e42387a0..620ecbae808 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -141,7 +141,7 @@ if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid')) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('banktransactionlist', $contextpage)); $extrafields = new ExtraFields($db); diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 3b945e244bc..26f60ad3e75 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -65,7 +65,7 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bankcard', 'globalcard')); // Security check diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 816b26b3ea4..eb182338658 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -44,7 +44,7 @@ $categid = GETPOST('categid'); $label = GETPOST("label"); -// Initialize technical objects +// Initialize a technical objects $bankcateg = new BankCateg($db); diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 55f3f8457f1..3c38b99de66 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -38,7 +38,7 @@ $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'alpha'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bankaccountdocuments', 'globalcard')); // Security check diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 97e362145ae..1ff527ec2c8 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -36,7 +36,7 @@ $langs->loadLangs(array('banks', 'categories')); $WIDTH = DolGraph::getDefaultGraphSizeForStats('width', 768); $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 200); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bankstats', 'globalcard')); // Security check diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 64c4d7d5fc6..b1bb5851e89 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -91,7 +91,7 @@ if (!$sortorder) { $sortorder = 'ASC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Account($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('bankaccountlist')); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 3b9a882fffc..4dab4a912a0 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -62,7 +62,7 @@ $newbankreceipt = GETPOST('newbankreceipt', 'alpha'); $rel = GETPOST("rel", 'alphanohtml'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('bankaccountstatement', 'globalcard')); if ($user->hasRight('banque', 'consolidate') && $action == 'dvnext' && !empty($dvid)) { @@ -101,7 +101,7 @@ if ($id > 0 || !empty($ref)) { $id = $object->id; // Force the search field on id of account } -// Initialize technical object to manage context to save list fields +// Initialize a technical object to manage context to save list fields $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id); // Security check diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index c43d85e1f60..e9add12186e 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -55,7 +55,7 @@ $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', $vline = GETPOST('vline'); $page = GETPOSTISSET("page") ? GETPOST("page") : 0; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('banktreso', 'globalcard')); diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 0eeab1735c3..20f9198c74f 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -71,7 +71,7 @@ $result = restrictedArea($user, 'banque', '', '', ''); $object = new PaymentVarious($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('variouscard', 'globalcard')); $permissiontoadd = $user->hasRight('banque', 'modifier'); diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php index 192f07814df..f264fd9b0b6 100644 --- a/htdocs/compta/bank/various_payment/list.php +++ b/htdocs/compta/bank/various_payment/list.php @@ -89,7 +89,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new PaymentVarious($db); $extrafields = new ExtraFields($db); //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 33fb4950351..2f30749fddf 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -86,11 +86,11 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('cashcontrolcard', 'globalcard')); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check if ($user->socid > 0) { // Protection if external user diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index 984686af4d6..d5cdc5bc832 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -59,7 +59,7 @@ $pagenext = $page + 1; //if (! $sortfield) $sortfield="p.date_fin"; //if (! $sortorder) $sortorder="DESC"; -// Initialize technical objects +// Initialize a technical objects $object = new CashControl($db); $extrafields = new ExtraFields($db); //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 047f90e543f..05038d07ff0 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('specialexpensesindex')); // Load translation files required by the page diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 04c50f82ffe..b4aed3ce32e 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -50,7 +50,7 @@ $confirm = GETPOST('confirm', 'alpha'); $object = new Deplacement($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('tripsandexpensescard', 'globalcard')); $permissionnote = $user->hasRight('deplacement', 'creer'); // Used by the include of actions_setnotes.inc.php diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php index 4931852fcbf..93a623c3097 100644 --- a/htdocs/compta/facture/agenda-rec.php +++ b/htdocs/compta/facture/agenda-rec.php @@ -68,7 +68,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new FactureRec($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('invoicerecagenda', 'globalcard')); // Note that conf->hooks_modules contains array @@ -76,7 +76,7 @@ $hookmanager->initHooks(array('invoicerecagenda', 'globalcard')); // Note that c $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->facture->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php index 4bbf9d8e8ac..3f4b9823040 100644 --- a/htdocs/compta/facture/agenda.php +++ b/htdocs/compta/facture/agenda.php @@ -67,7 +67,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Facture($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->facture->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; @@ -76,7 +76,7 @@ $hookmanager->initHooks(array('invoiceagenda', 'globalcard')); // Note that conf $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->facture->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index ac7b1cddcbb..e6652acf311 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -101,7 +101,7 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add') { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('invoicereccard', 'globalcard')); $extrafields = new ExtraFields($db); @@ -184,11 +184,11 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; // Set note - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Mass actions /*$objectclass='MyObject'; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 4d6ca31a36c..72238eab75e 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref)) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('invoicecard', 'globalcard')); // Permissions @@ -212,11 +212,11 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) { diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php index 54102500e9e..c4c22878520 100644 --- a/htdocs/compta/facture/invoicetemplate_list.php +++ b/htdocs/compta/facture/invoicetemplate_list.php @@ -110,7 +110,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new FactureRec($db); $extrafields = new ExtraFields($db); @@ -121,7 +121,7 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add') { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('invoicereclist')); // Fetch optionals attributes and labels diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 5660de4a1e2..87826db56cc 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -177,7 +177,7 @@ $diroutputmassaction = $conf->facture->dir_output.'/temp/massgeneration/'.$user- $now = dol_now(); $error = 0; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Facture($db); $hookmanager->initHooks(array($contextpage)); $extrafields = new ExtraFields($db); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index d7f9408ed07..7ca76f63352 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -71,7 +71,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 7094ad7a68d..79d2d0cb5d0 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -73,7 +73,7 @@ $maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->glo $maxLatestEditCount = 5; $maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD; -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('invoiceindex')); diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 0a6e43cded5..3e939d40f1b 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -52,7 +52,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges'); $object = new Localtax($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('localtaxvatcard', 'globalcard')); diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index 16d1af4f562..0d883a5bb23 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -211,7 +211,7 @@ if ($calc == 0 || $calc == 2) { $parameters["direction"] = 'sell'; $parameters["type"] = 'localtax'.$local; - // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array + // Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 1c277b80f3f..c7fcf9218f3 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -441,7 +441,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) { // $ $parameters["month"] = $m; $parameters["type"] = 'localtax'.$localTaxType; - // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array + // Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index eb761f7aa88..292b3e476f5 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -75,7 +75,7 @@ if ($facid > 0) { $ret = $object->fetch($facid); } -// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('paiementcard', 'globalcard')); $formquestion = array(); diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 5ab29978608..17c8b73f075 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -55,11 +55,11 @@ if ($socid < 0) { } $object = new Paiement($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('paymentcard', 'globalcard')); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, $object->element, $object->id, 'paiement'); // This also test permission on read invoice diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index f1ec919283f..40e9c1e7dd8 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -96,7 +96,7 @@ $arrayfields = array( $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('chequelist')); $object = new RemiseCheque($db); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 476e650552d..0e55d526a34 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -40,7 +40,7 @@ $confirm = GETPOST('confirm', 'alpha'); $object = new Paiement($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, $object->element, $object->id, 'paiement', ''); diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php index 45e93d5836e..106fe1d56f4 100644 --- a/htdocs/compta/paiement/list.php +++ b/htdocs/compta/paiement/list.php @@ -116,7 +116,7 @@ $arrayfields = array( $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('paymentlist')); $object = new Paiement($db); diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 3433fc9d144..d3d83f01f88 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -66,7 +66,7 @@ if (!$sortorder) { $object = new BonPrelevement($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals $hookmanager->initHooks(array('directdebitprevcard', 'globalcard', 'directdebitprevlist')); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 1dc1fd3d76d..855f73a7d00 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -65,7 +65,7 @@ if (!$sortorder) { $object = new BonPrelevement($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals $hookmanager->initHooks(array('directdebitprevcard', 'globalcard', 'directdebitprevlist')); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index febb51cdc1d..a8ec234b5f8 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -65,7 +65,7 @@ $pagenext = $page + 1; $object = new BonPrelevement($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // Security check if ($user->socid > 0) { diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index b0fadbafd1b..2a388467b36 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -56,7 +56,7 @@ $pagenext = $page + 1; $object = new BonPrelevement($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // Security check if ($user->socid > 0) { diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index ffd6498dbd7..bae9dceb734 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -48,7 +48,7 @@ if ($id > 0) { $object->fetch($id); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('recapcomptacard', 'globalcard')); // Load variable for pagination @@ -75,7 +75,7 @@ $arrayfields = array( //... ); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplierbalencelist', 'globalcard')); /* diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index c300817bfa4..f1e5e79d063 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -1525,7 +1525,7 @@ $object = array(&$total_ht, &$total_ttc); $parameters["mode"] = $modecompta; $parameters["date_start"] = $date_start; $parameters["date_end"] = $date_end; -// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks print $hookmanager->resPrint; diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index a2b35d82de3..dd06e2e285b 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -983,7 +983,7 @@ if (isModEnabled('accounting') && ($modecompta == 'BOOKKEEPING')) { $action = "balance"; $object = array(&$encaiss, &$encaiss_ttc, &$decaiss, &$decaiss_ttc); $parameters["mode"] = $modecompta; -// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addReportInfo', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 1c503429393..bfe0fb7d5a2 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -65,10 +65,10 @@ $label = GETPOST('label', 'alpha'); $actioncode = GETPOST('actioncode'); $fk_user = GETPOSTINT('userid') > 0 ? GETPOSTINT('userid') : 0; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('taxcard', 'globalcard')); -// Initialize technical objects +// Initialize a technical objects $object = new ChargeSociales($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->tax->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index d7ac5034db2..2c1288ac2cc 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -117,7 +117,7 @@ if (isModEnabled("bank")) { $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('sclist')); $object = new ChargeSociales($db); diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php index 53c6fe187e6..c1c4947b2e2 100644 --- a/htdocs/compta/sociales/note.php +++ b/htdocs/compta/sociales/note.php @@ -68,7 +68,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php index e5e7bd78391..c758a83261e 100644 --- a/htdocs/compta/sociales/payments.php +++ b/htdocs/compta/sociales/payments.php @@ -45,7 +45,7 @@ if (isModEnabled('accounting')) { $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('specialexpensesindex')); // Load translation files required by the page diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 59560c1373d..04e831dcf96 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -66,7 +66,7 @@ if (empty($refund)) { $datev = dol_mktime(12, 0, 0, GETPOSTINT("datevmonth"), GETPOSTINT("datevday"), GETPOSTINT("datevyear")); $datep = dol_mktime(12, 0, 0, GETPOSTINT("datepmonth"), GETPOSTINT("datepday"), GETPOSTINT("datepyear")); -// Initialize technical objects +// Initialize a technical objects $object = new Tva($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->tax->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('tax', 'charges', 'lire'); $permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 060072bdb95..1f57326572b 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -413,7 +413,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) { $parameters["type"] = 'vat'; $object = array(&$x_coll, &$x_paye, &$x_both); - // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array + // Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 994123bc0db..1d19bed301e 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -391,7 +391,7 @@ if ($refresh === true) { $parameters["month"] = $m; $parameters["type"] = 'vat'; - // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array + // Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php index 4dbc0a50dcf..576d7db852a 100644 --- a/htdocs/compta/tva/list.php +++ b/htdocs/compta/tva/list.php @@ -99,7 +99,7 @@ if (isModEnabled("bank")) { $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('salestaxeslist')); $object = new Tva($db); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 441c6bee6cd..25ed645538a 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -404,7 +404,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) { $parameters["type"] = 'vat'; $object = array(&$x_coll, &$x_paye, &$x_both); - // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array + // Initialize a technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index 5ef2652268c..db3fc45d2b4 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -109,7 +109,7 @@ if (!$sortorder) { $sortorder = 'DESC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contactagenda', 'globalcard')); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 8417091ddd1..b8aa8fe81e8 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -64,7 +64,7 @@ $cancel = GETPOST('cancel', 'alpha'); $id = GETPOSTINT('id'); $socid = GETPOSTINT('socid'); -// Initialize technical object +// Initialize a technical object $object = new Contact($db); $extrafields = new ExtraFields($db); @@ -83,7 +83,7 @@ if (!empty($canvas)) { $objcanvas->getCanvas('contact', 'contactcard', $canvas); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contactcard', 'globalcard')); if ($id > 0) { diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 158229e620a..888f90822ab 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -86,7 +86,7 @@ $type_element = GETPOSTISSET('type_element') ? GETPOST('type_element') : ''; // Load translation files required by the page $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('consumptioncontact')); $result = restrictedArea($user, 'contact', $object->id, 'socpeople&societe'); diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index efc55ac0e5b..f4e2d3d6b03 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -85,7 +85,7 @@ if ($id > 0) { $upload_dir = $conf->societe->multidir_output[$object->entity].'/contact/'.dol_sanitizeFileName($object->ref); $modulepart = 'contact'; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contactdocument')); // Security check diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 6f5796526df..f50e643a843 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -184,7 +184,7 @@ if ($type == "c") { $urlfiche = ""; } -// Initialize technical object +// Initialize a technical object $object = new Contact($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array($contextpage)); diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 1f956e94821..e979fa93103 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -53,7 +53,7 @@ $result = restrictedArea($user, 'contact', $id, 'socpeople&societe'); $permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context // $hookmanager->initHooks(array('contactcard')); -> Name conflict with product/card.php $hookmanager->initHooks(array('contactnote')); @@ -68,7 +68,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php index 7fe377f1a96..2112b4aa9f5 100644 --- a/htdocs/contact/project.php +++ b/htdocs/contact/project.php @@ -32,7 +32,7 @@ $langs->loadLangs(array("contacts", "companies", "projects")); $id = GETPOSTINT('id'); $result = restrictedArea($user, 'contact', $id, 'socpeople&societe'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projectcontact')); /* diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php index 4a14558c0e9..dbdb930bb6a 100644 --- a/htdocs/contrat/agenda.php +++ b/htdocs/contrat/agenda.php @@ -88,7 +88,7 @@ if ($id > 0 || !empty($ref)) { $result = $object->fetch($id, $ref); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendacontract', 'globalcard')); $permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d3fb03dffa4..3cdbac83901 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -82,7 +82,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contractcard', 'globalcard')); $object = new Contrat($db); @@ -151,9 +151,9 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) { $date_start = ''; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 2af94f7654c..d9310761e02 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -51,7 +51,7 @@ if ($user->socid) { $object = new Contrat($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contractcontactcard', 'globalcard')); $permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 28a1c9455e2..180c7bd8913 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -79,7 +79,7 @@ if ($object->id > 0) { $upload_dir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref); $modulepart = 'contract'; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contractcard', 'globalcard')); $permissiontoadd = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index e304f8833c7..5a83982ed4f 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('contractindex')); // Load translation files required by the page diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 0ee1f2ae461..10d5c288a3b 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -146,7 +146,7 @@ if ($search_status == '') { $search_status = 1; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Contrat($db); $hookmanager->initHooks(array('contractlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/contrat/messaging.php b/htdocs/contrat/messaging.php index 335146bfce3..285ad325c28 100644 --- a/htdocs/contrat/messaging.php +++ b/htdocs/contrat/messaging.php @@ -73,10 +73,10 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Contrat($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendacontract', 'globalcard')); // Security check diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 996eace982f..7a7f441375f 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -45,7 +45,7 @@ $ref = GETPOST('ref', 'alpha'); if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context //$hookmanager->initHooks(array('contractcard', 'globalcard')); -> Conflict with contrat\card.php $hookmanager->initHooks(array('contractnote')); @@ -67,7 +67,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index 9dc62e8728a..56bacf7159d 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -108,7 +108,7 @@ $opclotureyear = GETPOSTINT('opclotureyear'); $filter_opcloture = GETPOST('filter_opcloture', 'alpha'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new ContratLigne($db); $hookmanager->initHooks(array('contractservicelist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php index 08a9ad5c05e..6520b4639fe 100644 --- a/htdocs/core/ajax/onlineSign.php +++ b/htdocs/core/ajax/onlineSign.php @@ -84,7 +84,7 @@ if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed . $type . $ref . (!isMod httponly_accessforbidden('Bad value for securitykey. Value provided ' . dol_escape_htmltag($SECUREKEY) . ' does not match expected value for ref=' . dol_escape_htmltag($ref), 403); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ajaxonlinesign')); diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index b0b89cc5605..afb5d48ba2c 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1798,7 +1798,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr $sql = ''; if (isModEnabled('agenda')) { - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendadao')); // Recherche histo sur actioncomm diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 10485e8cb69..39fa548bce6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -14451,7 +14451,7 @@ function recordNotFound($message = '', $printheader = 1, $printfooter = 1, $show if (empty($hookmanager)) { include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager = new HookManager($db); - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('main')); } diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 5ff5b4968b5..17b06e5cdb9 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -1234,7 +1234,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho if (empty($hookmanager)) { include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager = new HookManager($db); - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('main')); } diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index 1c5e913a9aa..a6631f0f470 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -363,7 +363,7 @@ class ImportCsv extends ModeleImports //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]); } - // Define array to convert fields ('c.ref', ...) into column index (1, ...) + // Define an array to convert fields ('c.ref', ...) into column index (1, ...) $arrayfield = array(); foreach ($sort_array_match_file_to_database as $key => $val) { $arrayfield[$val] = ($key - 1); diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 8702997ecfb..5ff8636bae3 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -408,7 +408,7 @@ class ImportXlsx extends ModeleImports //dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]); } - // Define array to convert fields ('c.ref', ...) into column index (1, ...) + // Define an array to convert fields ('c.ref', ...) into column index (1, ...) $arrayfield = array(); foreach ($sort_array_match_file_to_database as $key => $val) { $arrayfield[$val] = ($key); diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php index 9f12209a783..319f8f39c3d 100644 --- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php @@ -196,7 +196,7 @@ class pdf_standard extends ModelePDFMovement $pdluoid = GETPOSTINT('pdluoid'); - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('movementlist')); $extrafields = new ExtraFields($this->db); diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php index 3ab7e76f353..cbfee031cb3 100644 --- a/htdocs/core/tpl/commonfields_add.tpl.php +++ b/htdocs/core/tpl/commonfields_add.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php index fea9afd80dc..39a029f1480 100644 --- a/htdocs/core/tpl/commonfields_edit.tpl.php +++ b/htdocs/core/tpl/commonfields_edit.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php index 6065f64e189..4c26b90462e 100644 --- a/htdocs/core/tpl/commonfields_view.tpl.php +++ b/htdocs/core/tpl/commonfields_view.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php index e9a5d283807..dc28a6f2f48 100644 --- a/htdocs/core/tpl/extrafields_add.tpl.php +++ b/htdocs/core/tpl/extrafields_add.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php index e778f59919e..17ceda033d3 100644 --- a/htdocs/core/tpl/extrafields_edit.tpl.php +++ b/htdocs/core/tpl/extrafields_edit.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index ac3fea2ca4a..c67230b4fdb 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Show extrafields. It also show fields from hook formObjectOptions. Need to have following variables defined: + * Show extrafields. It also shows fields from hook formObjectOptions. Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php index d6a8a143eb0..1aac2783a92 100644 --- a/htdocs/core/tpl/formlayoutai.tpl.php +++ b/htdocs/core/tpl/formlayoutai.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $conf * $formmail * $formwebsite (optional) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index ca5de5c0ef9..8cd60aa4b77 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -26,7 +26,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index fa58c7124e8..42f7f17a77e 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index 6863dd024e5..bfbd31f2136 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 29663b5e755..31885a26d60 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 824e987cfc4..21e5d86d104 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -77,7 +77,7 @@ $diroutputmassaction = $outputdir.'/temp/massgeneration/'.$user->id; $object = new Cronjob($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('cronjoblist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php index 4ad6eb69478..24c47fd1f51 100644 --- a/htdocs/delivery/card.php +++ b/htdocs/delivery/card.php @@ -77,9 +77,9 @@ $extrafields->fetch_name_optionals_label($object->table_element); $extrafields->fetch_name_optionals_label($object->table_element_line); // Load object. Make an object->fetch -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('deliverycard', 'globalcard')); $error = 0; @@ -93,7 +93,7 @@ $parameters = array(); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks // Delete Link $permissiondellink = $user->hasRight('expedition', 'delivery', 'supprimer'); // Used by the include of actions_dellink.inc.php -include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' if ($action == 'add') { $db->begin(); diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 49097ebbdc8..61d3370f30c 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -78,7 +78,7 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array($object->element.'card', 'globalcard')); $upload_dir = $conf->don->dir_output; diff --git a/htdocs/don/index.php b/htdocs/don/index.php index 57cf398b2a8..223f7bc487b 100644 --- a/htdocs/don/index.php +++ b/htdocs/don/index.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('donationindex')); $langs->load("donations"); diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 2d9767d1263..d016871b06a 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -68,7 +68,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Don($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->don->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/don/note.php b/htdocs/don/note.php index 6a74d2c9e05..e22537e7dad 100644 --- a/htdocs/don/note.php +++ b/htdocs/don/note.php @@ -69,7 +69,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } if ($action == 'classin' && $user->hasRight('don', 'creer')) { diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php index 140eb4671d5..81668de176d 100644 --- a/htdocs/don/paiement/list.php +++ b/htdocs/don/paiement/list.php @@ -102,7 +102,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position'); $optioncss = GETPOST('optioncss', 'alpha'); $moreforfilter = GETPOST('moreforfilter', 'alpha'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('donationlist')); // Security check diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php index 580f8ab03dd..1406164aec7 100644 --- a/htdocs/ecm/file_note.php +++ b/htdocs/ecm/file_note.php @@ -119,7 +119,7 @@ if (!$permissiontoread) { * Actions */ -include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' /* diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index e0c191e8e23..405fb76bc5d 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -89,7 +89,7 @@ $permissiontocreatedir = $user->hasRight('ecm', 'setup'); $permissiontodelete = $user->hasRight('ecm', 'upload'); $permissiontodeletedir = $user->hasRight('ecm', 'setup'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ecmindexcard', 'globalcard')); /* diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index a46470e9d7a..8c54ffad45f 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -93,7 +93,7 @@ $result = restrictedArea($user, 'ecm', 0); * Actions */ -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ecmautocard', 'globalcard')); // Purge search criteria diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php index c59cab0c059..b435cc77e47 100644 --- a/htdocs/ecm/index_medias.php +++ b/htdocs/ecm/index_medias.php @@ -103,7 +103,7 @@ $websitekey = ''; $permissiontoadd = $permissiontouploadfile; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ecmmediascard', 'globalcard')); /* diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php index 5f00a49e9d6..5c00c56499d 100644 --- a/htdocs/eventorganization/conferenceorbooth_card.php +++ b/htdocs/eventorganization/conferenceorbooth_card.php @@ -53,7 +53,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $withproject = GETPOSTINT('withproject'); -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBooth($db); $extrafields = new ExtraFields($db); $projectstatic = new Project($db); @@ -83,7 +83,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('eventorganization', 'read'); diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php index b2ae4685c89..bd7e7c087a5 100644 --- a/htdocs/eventorganization/conferenceorbooth_contact.php +++ b/htdocs/eventorganization/conferenceorbooth_contact.php @@ -54,7 +54,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $withproject = GETPOSTINT('withproject'); -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBooth($db); $extrafields = new ExtraFields($db); $projectstatic = new Project($db); @@ -67,7 +67,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check if ($user->socid > 0) { diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php index da8471988d9..ab8cb6a96b8 100644 --- a/htdocs/eventorganization/conferenceorbooth_document.php +++ b/htdocs/eventorganization/conferenceorbooth_document.php @@ -71,7 +71,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBooth($db); $extrafields = new ExtraFields($db); $projectstatic = new Project($db); @@ -84,7 +84,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. if ($id > 0 || !empty($ref)) { $upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php index 43a6d1be07e..4211eba558a 100644 --- a/htdocs/eventorganization/conferenceorbooth_list.php +++ b/htdocs/eventorganization/conferenceorbooth_list.php @@ -70,7 +70,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBooth($db); $project = new Project($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php index 4e6074703a6..f400e55e38a 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_card.php +++ b/htdocs/eventorganization/conferenceorboothattendee_card.php @@ -54,7 +54,7 @@ $conf_or_booth_id = GETPOSTINT('conforboothid'); $fk_project = GETPOSTINT('fk_project'); $withproject = 1; -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBoothAttendee($db); $extrafields = new ExtraFields($db); $projectstatic = new Project($db); @@ -105,7 +105,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Now we have loaded the attendee, we can force the project (in case value provided as parameter is wrong or value not provided) if ($object->fk_project > 0) { diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php index 04d491ef5da..262b1df7b51 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_list.php +++ b/htdocs/eventorganization/conferenceorboothattendee_list.php @@ -78,7 +78,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBoothAttendee($db); $project = new Project($db); $projectstatic = new Project($db); diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php index 66caf29a247..12cd4852d27 100644 --- a/htdocs/eventorganization/conferenceorboothattendee_note.php +++ b/htdocs/eventorganization/conferenceorboothattendee_note.php @@ -40,7 +40,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new ConferenceOrBoothAttendee($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id; @@ -54,7 +54,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); //$result = restrictedArea($user, 'eventorganization', $id); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->eventorganization->multidir_output[$object->entity]."/".$object->id; } @@ -74,7 +74,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } /* diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index a388a57cc63..d7ed5a2c5e7 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -105,9 +105,9 @@ $extrafields->fetch_name_optionals_label($object->table_element_line); $extrafields->fetch_name_optionals_label($objectorder->table_element_line); // Load object. Make an object->fetch -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('expeditioncard', 'globalcard')); $date_delivery = dol_mktime(GETPOSTINT('date_deliveryhour'), GETPOSTINT('date_deliverymin'), 0, GETPOSTINT('date_deliverymonth'), GETPOSTINT('date_deliveryday'), GETPOSTINT('date_deliveryyear')); @@ -152,7 +152,7 @@ if (empty($reshook)) { } } - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' // Actions to build doc $upload_dir = $conf->expedition->dir_output.'/sending'; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index e8adbfe755d..7ad70bc9359 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -34,7 +34,7 @@ $hookmanager = new HookManager($db); $socid = GETPOSTINT('socid'); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('sendingindex')); // Load translation files required by the page diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index e9569c98b46..e1616338c6c 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -101,7 +101,7 @@ $diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgenerati $object = new Expedition($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('shipmentlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php index 1128bc9dbb6..11fabc52245 100644 --- a/htdocs/expedition/note.php +++ b/htdocs/expedition/note.php @@ -84,7 +84,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 717f7f36d21..c7580698fd0 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -73,7 +73,7 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' // Security check if ($user->socid) { diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 6079b8d3b2a..d08d44b2875 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -110,9 +110,9 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('expensereportcard', 'globalcard')); $permissionnote = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_setnotes.inc.php @@ -213,11 +213,11 @@ if (empty($reshook)) { } } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $user->hasRight('expensereport', 'creer')) { diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index c28c5251dc1..9ce6c27a8a1 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -73,7 +73,7 @@ $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object- $modulepart = 'trip'; // Load object -//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // Security check if ($user->socid) { diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index 9e24d253e58..b9c0298cc2a 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('expensereportindex')); // Load translation files required by the page diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 59f03517777..e6e1e44ba78 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -136,7 +136,7 @@ if ($search_user == '') { $search_user = -1; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new ExpenseReport($db); $hookmanager->initHooks(array('expensereportlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php index 157403f4873..8096e685d9c 100644 --- a/htdocs/expensereport/note.php +++ b/htdocs/expensereport/note.php @@ -80,7 +80,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php index 5efef914f43..e064cbb3508 100644 --- a/htdocs/expensereport/payment/list.php +++ b/htdocs/expensereport/payment/list.php @@ -114,7 +114,7 @@ $arrayfields = array( $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('paymentexpensereportlist')); $object = new PaymentExpenseReport($db); diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php index e348b888d55..9e08562164a 100644 --- a/htdocs/fichinter/agenda.php +++ b/htdocs/fichinter/agenda.php @@ -68,7 +68,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Fichinter($db); $extrafields = new ExtraFields($db); @@ -77,7 +77,7 @@ $hookmanager->initHooks(array('myobjectagenda', 'globalcard')); // Note that con $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals $permissiontoread = $user->hasRight("fichinter", "lire"); $permissiontoadd = $user->hasRight("fichinter", "creer"); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index dba6a24c4d7..42c4cc18672 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -81,7 +81,7 @@ $hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolG $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0)); $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0)); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('interventioncard', 'globalcard')); $object = new Fichinter($db); @@ -148,9 +148,9 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $user->hasRight('ficheinter', 'creer')) { diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index ca8b9349c9e..d35cc71b350 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -37,7 +37,7 @@ if (!$user->hasRight('ficheinter', 'lire')) { $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('interventionindex')); // Load translation files required by the page diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 22fbbb86979..58aae628c25 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -102,7 +102,7 @@ if (!$sortfield) { $sortfield = "f.ref"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Fichinter($db); $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 1bae3398b59..98ec1fdb7fc 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -60,7 +60,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 78404298d50..a77a665440a 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -73,7 +73,7 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartysupplier', 'globalcard')); // Security check diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 1235ee651fb..29185532aac 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -103,7 +103,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ordersuppliercard', 'globalcard')); $object = new CommandeFournisseur($db); @@ -205,11 +205,11 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' if ($action == 'setref_supplier' && $usercancreate) { $result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'ORDER_SUPPLIER_MODIFY'); diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index da489614f4c..ee6ca36224a 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -39,7 +39,7 @@ $langs->loadLangs(array("suppliers", "orders")); $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('orderssuppliersindex')); $max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5); diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index bee99153ffe..dd0559a162c 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -152,7 +152,7 @@ if (!$sortorder) { $sortorder = 'DESC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new CommandeFournisseur($db); $hookmanager->initHooks(array('supplierorderlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index e6f5c92e182..bc6bd489411 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -69,7 +69,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php index 9043bafe6d0..f957c21f940 100644 --- a/htdocs/fourn/facture/card-rec.php +++ b/htdocs/fourn/facture/card-rec.php @@ -102,7 +102,7 @@ if (($id > 0 || $title) && $action != 'create' && $action != 'add') { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplierinvoicereccard', 'globalcard')); $extrafields = new ExtraFields($db); @@ -160,11 +160,11 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; // Set note - include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Create predefined invoice if ($action == 'add') { diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index a5ccd9c19e4..d8c13446421 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -91,7 +91,7 @@ $hidedetails = (GETPOSTINT('hidedetails') ? GETPOSTINT('hidedetails') : (getDolG $hidedesc = (GETPOSTINT('hidedesc') ? GETPOSTINT('hidedesc') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0)); $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0)); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('invoicesuppliercard', 'globalcard')); $object = new FactureFournisseur($db); @@ -174,11 +174,11 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Link invoice to order if (GETPOST('linkedOrder') && empty($cancel) && $id > 0) { diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php index 5412be295ea..a086d06e212 100644 --- a/htdocs/fourn/facture/list-rec.php +++ b/htdocs/fourn/facture/list-rec.php @@ -110,7 +110,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new FactureFournisseurRec($db); $extrafields = new ExtraFields($db); @@ -121,7 +121,7 @@ if (($id > 0 || $ref) && $action != 'create' && $action != 'add') { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplierinvoicereclist')); // Fetch optionals attributes and labels diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 43d8d30a00b..457e7cae391 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -144,7 +144,7 @@ $diroutputmassaction = $conf->fournisseur->facture->dir_output.'/temp/massgenera $now = dol_now(); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new FactureFournisseur($db); $hookmanager->initHooks(array('supplierinvoicelist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 41b2b1f4d34..36f26c68c2a 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09'); if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('invoicesuppliernote')); $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); @@ -67,7 +67,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } // Set label diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index e2f2a99836d..cbcfa796f6a 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -99,7 +99,7 @@ if ($user->socid > 0) { $object = new PaiementFourn($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('paymentsupplierlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index b846a944f2b..12cf826ad8a 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -50,11 +50,11 @@ $socid = 0; // Initialize objects $object = new PaiementFourn($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplierpaymentcard', 'globalcard')); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // This also test permission on read invoice diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 42e1a641e07..c61cae31575 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -41,7 +41,7 @@ $id = GETPOSTINT('id'); $object = new PaiementFourn($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php index 2ceae859c94..b8be196ef95 100644 --- a/htdocs/fourn/paiement/list.php +++ b/htdocs/fourn/paiement/list.php @@ -110,7 +110,7 @@ $arrayfields = array( $arrayfields = dol_sort_array($arrayfields, 'position'); '@phan-var-force array,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('paymentsupplierlist')); $object = new PaiementFourn($db); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 6ed8503fc00..556241e456e 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -74,7 +74,7 @@ if ($user->socid) { $catid = GETPOST('catid', 'intcomma'); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('supplierpricelist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 02419cea24c..f13edd0853e 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -39,7 +39,7 @@ if ($user->socid > 0) { } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplierbalencelist', 'globalcard')); /* diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index ca5c3e631bc..688adfc8e85 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -92,7 +92,7 @@ if (($id > 0) || $ref) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('holidaycard', 'globalcard')); $cancreate = 0; diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php index 9060ba7e1f8..7dfa390008f 100644 --- a/htdocs/holiday/card_group.php +++ b/htdocs/holiday/card_group.php @@ -92,7 +92,7 @@ if (($id > 0) || $ref) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('holidaycard', 'globalcard')); $cancreate = 0; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 94b8c2a3164..8e0d49af542 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -66,7 +66,7 @@ if (!$sortorder) { } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('defineholidaylist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 218fe17870d..2938bf26101 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -99,7 +99,7 @@ $search_valideur = GETPOST('search_valideur', 'intcomma'); $search_status = GETPOST('search_status', 'intcomma'); $search_type = GETPOST('search_type', 'intcomma'); -// Initialize technical objects +// Initialize a technical objects $object = new Holiday($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('holidaylist')); // Note that conf->hooks_modules contains array diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 2187692b95a..4deca221612 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -80,7 +80,7 @@ if (!$sortorder) { // Load translation files required by the page $langs->loadLangs(array('users', 'other', 'holiday')); -// Initialize technical objects +// Initialize a technical objects $object = new Holiday($db); $extrafields = new ExtraFields($db); //$diroutputmassaction = $conf->mymodule->dir_output . '/temp/massgeneration/'.$user->id; diff --git a/htdocs/hrm/core/tpl/objectline_title.tpl.php b/htdocs/hrm/core/tpl/objectline_title.tpl.php index f96fd3a72f8..1e2d2810f09 100644 --- a/htdocs/hrm/core/tpl/objectline_title.tpl.php +++ b/htdocs/hrm/core/tpl/objectline_title.tpl.php @@ -24,7 +24,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php index a325e303a10..f1873e5ce68 100644 --- a/htdocs/hrm/core/tpl/objectline_view.tpl.php +++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php @@ -24,7 +24,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index c2168814a8d..018ee9229f1 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -50,7 +50,7 @@ foreach ($tmpstatus2label as $key => $val) { $object = new Establishment($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' $permissiontoread = $user->admin; $permissiontoadd = $user->admin; // Used by the include of actions_addupdatedelete.inc.php diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 95773416675..c74f10234a8 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -63,7 +63,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Establishment($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -72,7 +72,7 @@ $hookmanager->initHooks(array('hrmagenda', 'globalcard')); // Note that conf->ho $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php index 93a699e2545..1392da90834 100644 --- a/htdocs/hrm/evaluation_agenda.php +++ b/htdocs/hrm/evaluation_agenda.php @@ -75,7 +75,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -84,7 +84,7 @@ $hookmanager->initHooks(array('evaluationagenda', 'globalcard')); // Note that c $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php index 5cddbd523be..2d09c8cb05e 100644 --- a/htdocs/hrm/evaluation_card.php +++ b/htdocs/hrm/evaluation_card.php @@ -53,7 +53,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -78,7 +78,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('hrm', 'evaluation', 'read'); diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php index c3a53411b34..4f32b57c99d 100644 --- a/htdocs/hrm/evaluation_contact.php +++ b/htdocs/hrm/evaluation_contact.php @@ -45,7 +45,7 @@ $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -54,7 +54,7 @@ $hookmanager->initHooks(array('evaluationcontact', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // Permissions $permission = $user->hasRight('hrm', 'evaluation', 'write'); diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php index a83905abff9..bd9ea7c653c 100644 --- a/htdocs/hrm/evaluation_document.php +++ b/htdocs/hrm/evaluation_document.php @@ -65,7 +65,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -74,7 +74,7 @@ $hookmanager->initHooks(array('evaluationdocument', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/evaluation/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php index 4f1bb1de9f8..b73e82956f9 100644 --- a/htdocs/hrm/evaluation_list.php +++ b/htdocs/hrm/evaluation_list.php @@ -70,7 +70,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/hrm/evaluation_note.php b/htdocs/hrm/evaluation_note.php index 1e078be00d9..297f99b87eb 100644 --- a/htdocs/hrm/evaluation_note.php +++ b/htdocs/hrm/evaluation_note.php @@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Evaluation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -54,7 +54,7 @@ $hookmanager->initHooks(array('evaluationnote', 'globalcard')); // Note that con $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -81,7 +81,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 5045bc0bf02..c3d40aee823 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -52,7 +52,7 @@ if (isModEnabled('holiday')) { } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager = new HookManager($db); $hookmanager->initHooks('hrmindex'); @@ -445,7 +445,7 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo print ''; -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $parameters = array('user' => $user); $reshook = $hookmanager->executeHooks('dashboardHRM', $parameters, $object); // Note that $action and $object may have been modified by hook diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php index ffd2887b667..10be7bc94c5 100644 --- a/htdocs/hrm/job_agenda.php +++ b/htdocs/hrm/job_agenda.php @@ -73,7 +73,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -82,7 +82,7 @@ $hookmanager->initHooks(array('jobagenda', 'globalcard')); // Note that conf->ho $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php index be87900e2c0..c70f0c5305c 100644 --- a/htdocs/hrm/job_card.php +++ b/htdocs/hrm/job_card.php @@ -50,7 +50,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id; @@ -75,7 +75,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('hrm', 'all', 'read'); diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php index 2155f033088..da1f0fccdb7 100644 --- a/htdocs/hrm/job_document.php +++ b/htdocs/hrm/job_document.php @@ -63,7 +63,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -73,7 +73,7 @@ $hookmanager->initHooks(array('jobdocument', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/job/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php index eb710892a92..81f9f2b0c09 100644 --- a/htdocs/hrm/job_list.php +++ b/htdocs/hrm/job_list.php @@ -69,7 +69,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/hrm/job_note.php b/htdocs/hrm/job_note.php index ff377cdbbe9..57d945e7a89 100644 --- a/htdocs/hrm/job_note.php +++ b/htdocs/hrm/job_note.php @@ -43,7 +43,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -53,7 +53,7 @@ $hookmanager->initHooks(array('jobnote', 'globalcard')); // Note that conf->hook $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -84,7 +84,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php index 8797dd4b772..28bf2488c28 100644 --- a/htdocs/hrm/position.php +++ b/htdocs/hrm/position.php @@ -74,7 +74,7 @@ $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Job($db); $objectposition = new Position($db); $extrafields = new ExtraFields($db); @@ -143,7 +143,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position'); // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('hrm', 'all', 'read'); diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php index 57560f901f3..3098eb87e2a 100644 --- a/htdocs/hrm/position_agenda.php +++ b/htdocs/hrm/position_agenda.php @@ -75,7 +75,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Position($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -85,7 +85,7 @@ $hookmanager->initHooks(array('positionagenda', 'globalcard')); // Note that con $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php index ad28f36351a..2a667f4dad7 100644 --- a/htdocs/hrm/position_card.php +++ b/htdocs/hrm/position_card.php @@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $id = GETPOSTINT('id'); -// Initialize technical objects +// Initialize a technical objects $form = new Form($db); $object = new Position($db); $res = $object->fetch($id); @@ -87,7 +87,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // $lineid = GETPOST('lineid', 'int'); -// Initialize technical objects +// Initialize a technical objects //$object = new Position($db); //$res = $object->fetch($id); /*if ($res < 0) { @@ -118,7 +118,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. /* diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php index 539a8405f4a..b149ba212ea 100644 --- a/htdocs/hrm/position_document.php +++ b/htdocs/hrm/position_document.php @@ -64,7 +64,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Position($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -73,7 +73,7 @@ $hookmanager->initHooks(array('positiondocument', 'globalcard')); // Note that c $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/position/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php index 864c14d5cba..41a72073921 100644 --- a/htdocs/hrm/position_list.php +++ b/htdocs/hrm/position_list.php @@ -69,7 +69,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Position($db); $extrafields = new ExtraFields($db); $userstatic = new User($db); diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php index d3e8121b893..ec56ce7d407 100644 --- a/htdocs/hrm/position_note.php +++ b/htdocs/hrm/position_note.php @@ -42,7 +42,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Position($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -51,7 +51,7 @@ $hookmanager->initHooks(array('positionnote', 'globalcard')); // Note that conf- $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -82,7 +82,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php index 97a7a9ba97f..0940e223cce 100644 --- a/htdocs/hrm/skill_agenda.php +++ b/htdocs/hrm/skill_agenda.php @@ -75,7 +75,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Skill($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -84,7 +84,7 @@ $hookmanager->initHooks(array('skillagenda', 'globalcard')); // Note that conf-> $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php index d7b8e3d49ea..587a3bb1337 100644 --- a/htdocs/hrm/skill_card.php +++ b/htdocs/hrm/skill_card.php @@ -50,7 +50,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new Skill($db); $extrafields = new ExtraFields($db); //$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -76,7 +76,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('hrm', 'all', 'read'); @@ -526,7 +526,7 @@ if ($action != "create" && $action != "edit") { $pageprev = $page - 1; $pagenext = $page + 1; - // Initialize technical objects + // Initialize a technical objects $objectline = new Skilldet($db); // $diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id; // $hookmanager->initHooks(array('skilldetlist')); // Note that conf->hooks_modules contains array diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php index 418208e0465..7e907414fb3 100644 --- a/htdocs/hrm/skill_document.php +++ b/htdocs/hrm/skill_document.php @@ -64,7 +64,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Skill($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -73,7 +73,7 @@ $hookmanager->initHooks(array('skilldocument', 'globalcard')); // Note that conf $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/skill/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php index 8d73bb14783..164f5be221b 100644 --- a/htdocs/hrm/skill_list.php +++ b/htdocs/hrm/skill_list.php @@ -70,7 +70,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Skill($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/hrm/skill_note.php b/htdocs/hrm/skill_note.php index 4b2b4bfe427..2888f12a798 100644 --- a/htdocs/hrm/skill_note.php +++ b/htdocs/hrm/skill_note.php @@ -42,7 +42,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Skill($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id; @@ -51,7 +51,7 @@ $hookmanager->initHooks(array('skillnote', 'globalcard')); // Note that conf->ho $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->hrm->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -82,7 +82,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php index ea6715d7734..e9dc791e376 100644 --- a/htdocs/hrm/skill_tab.php +++ b/htdocs/hrm/skill_tab.php @@ -66,7 +66,7 @@ if (empty($objecttype)) { $TAuthorizedObjects = array('job', 'user'); $skill = new SkillRank($db); -// Initialize technical objects +// Initialize a technical objects if (in_array($objecttype, $TAuthorizedObjects)) { if ($objecttype == 'job') { $object = new Job($db); @@ -80,7 +80,7 @@ if (in_array($objecttype, $TAuthorizedObjects)) { $hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hooks_modules contains array // Load object -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. if (method_exists($object, 'loadPersonalConf')) { $object->loadPersonalConf(); } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 00d059bc504..4e9b3f5b783 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -148,7 +148,7 @@ $charset = GETPOST('charset', 'aZ09'); $separator_used = str_replace('\t', "\t", $separator); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('imports')); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 46111f46912..27a08a6f4ce 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -295,7 +295,7 @@ if (empty($conf->db->user)) { $conf->db->user = ''; } -// Define array of document root directories +// Define an array of document root directories $conf->file->dol_document_root = array(DOL_DOCUMENT_ROOT); if (!empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt contains several directories diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php index 8557b019fa6..edd0dd5ab9e 100644 --- a/htdocs/intracommreport/card.php +++ b/htdocs/intracommreport/card.php @@ -65,7 +65,7 @@ $typeOfDeclaration = array( "expedition" => $langs->trans("Expedition"), ); -// Initialize technical objects +// Initialize a technical objects $object = new IntracommReport($db); if ($id > 0) { $object->fetch($id); @@ -73,7 +73,7 @@ if ($id > 0) { $form = new Form($db); $formother = new FormOther($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('intracommcard', 'globalcard')); $error = 0; diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php index 9c5741ac040..aef3a5fbbea 100644 --- a/htdocs/intracommreport/list.php +++ b/htdocs/intracommreport/list.php @@ -82,7 +82,7 @@ if ((string) $type == '0') { } } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $object = new IntracommReport($db); $hookmanager->initHooks(array('intracommreportlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php index c0617a8d80b..9e880510f65 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php +++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php @@ -71,7 +71,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('knowledgerecordagenda', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = (!empty($conf->knowledgemanagement->multidir_output[$object->entity]) ? $conf->knowledgemanagement->multidir_output[$object->entity] : $conf->knowledgemanagement->dir_output)."/".$object->id; } diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php index 045a60a49dc..5b55a29cb5f 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_card.php +++ b/htdocs/knowledgemanagement/knowledgerecord_card.php @@ -46,7 +46,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; @@ -71,7 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read'); diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php index 461d88e13fc..26bf15731ab 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_contact.php +++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php @@ -39,7 +39,7 @@ $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; @@ -48,7 +48,7 @@ $hookmanager->initHooks(array('knowledgerecordcontact', 'globalcard')); // Note $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php index 135ef010842..8bc6eb40cef 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_document.php +++ b/htdocs/knowledgemanagement/knowledgerecord_document.php @@ -60,7 +60,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; @@ -69,7 +69,7 @@ $hookmanager->initHooks(array('knowledgerecorddocument', 'globalcard')); // Note $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->knowledgemanagement->multidir_output[$object->entity ? $object->entity : $conf->entity]."/knowledgerecord/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php index 043ab6327b7..adffaf0b8a3 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_list.php +++ b/htdocs/knowledgemanagement/knowledgerecord_list.php @@ -69,7 +69,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php index 490b3ce5f34..a0773071f84 100644 --- a/htdocs/knowledgemanagement/knowledgerecord_note.php +++ b/htdocs/knowledgemanagement/knowledgerecord_note.php @@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new KnowledgeRecord($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->knowledgemanagement->dir_output.'/temp/massgeneration/'.$user->id; @@ -47,7 +47,7 @@ $hookmanager->initHooks(array('knowledgerecordnote', 'globalcard')); // Note tha $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->knowledgemanagement->multidir_output[$object->entity]."/".$object->id; } @@ -71,7 +71,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang index 3c881e75557..f3d54d824f3 100644 --- a/htdocs/langs/en_US/eventorganization.lang +++ b/htdocs/langs/en_US/eventorganization.lang @@ -41,7 +41,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, # Object OrganizedEvent=Organized event EventOrganizationConfOrBooth= Conference Or Booth -EventOrganizationConfOrBoothes=Conferences or Boothes +EventOrganizationConfOrBoothes=Conferences or Booths ManageOrganizeEvent = Manage the organization of an event ConferenceOrBooth = Conference Or Booth ConferenceOrBoothTab = Conference Or Booth @@ -78,7 +78,7 @@ ConferenceOrBoothFormatCode=Code of conference or booth mode ConferenceOrBoothFormatLabel=Label of conference or booth mode Attendees=Attendees ListOfAttendeesOfEvent=List of attendees of event projects -ListOfConfOrBoothOfEvent=List of conferences or boothes of event projects +ListOfConfOrBoothOfEvent=List of conferences or booths of event projects DownloadICSLink = Download ICS link EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php index 8271a8869f9..51cf078a4f8 100644 --- a/htdocs/loan/list.php +++ b/htdocs/loan/list.php @@ -55,7 +55,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Loan($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->loan->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index 62d84a1adbc..a8c6cf0c37d 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -65,7 +65,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3e318452045..250c39f5f31 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1160,7 +1160,7 @@ if (!defined('NOLOGIN')) { header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : '')); exit; } else { - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('main')); // Code for search criteria persistence. diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 33a6b0e72ce..c484f01495e 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -81,7 +81,7 @@ if (!empty($enddatemonth)) { // Security check $result = restrictedArea($user, 'margins'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new User($db); $hookmanager->initHooks(array('marginagentlist')); diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 1504b68dea8..d2f327724f6 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -58,7 +58,7 @@ if (GETPOST('enddatemonth')) { $enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear')); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Societe($db); $hookmanager->initHooks(array('margincustomerlist')); diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index ed286d71f22..562540187cc 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -71,7 +71,7 @@ if (GETPOST('enddatemonth')) { $enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear')); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Product($db); $hookmanager->initHooks(array('marginproductlist')); diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 1232867ed3b..5efcde97c71 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -58,7 +58,7 @@ if ($socid > 0) { $object->fetch($socid); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartymargins', 'globalcard')); $result = restrictedArea($user, 'societe', $object->id, ''); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 2539d9748c1..0a03587ebb6 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -85,8 +85,8 @@ $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $doliba $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug) $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance $conf->file->dol_main_url_root = $dolibarr_main_url_root; // Define url inside the config file -$conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs') -$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr') +$conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define an array of document root directories ('/home/htdocs') +$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define an array of url root path ('' or '/dolibarr') if (!empty($dolibarr_main_document_root_alt)) { // dolibarr_main_document_root_alt can contains several directories $values = preg_split('/[;,]/', $dolibarr_main_document_root_alt); diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index eaaf8206e87..abfb0f90d6b 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -61,7 +61,7 @@ require_once '../lib/mymodule.lib.php'; // Translations $langs->loadLangs(array("admin", "mymodule@mymodule")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('mymodulesetup', 'globalsetup')); // Parameters diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php index cd6bc38701e..baf04bf9c70 100644 --- a/htdocs/modulebuilder/template/myobject_agenda.php +++ b/htdocs/modulebuilder/template/myobject_agenda.php @@ -118,7 +118,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; @@ -127,7 +127,7 @@ $hookmanager->initHooks(array($object->element.'agenda', 'globalcard')); // Note $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mymodule->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 037d3abc38c..71192032e8c 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -105,7 +105,7 @@ if (!empty($backtopagejsfields)) { $dol_openinpopup = $tmpbacktopagejsfields[0]; } -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; @@ -130,7 +130,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // There is several ways to check permission. // Set $enablepermissioncheck to 1 to enable a minimum low level of checks diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php index f7669ae118d..6f1e63f280b 100644 --- a/htdocs/modulebuilder/template/myobject_contact.php +++ b/htdocs/modulebuilder/template/myobject_contact.php @@ -68,7 +68,7 @@ $lineid = GETPOST('lineid', 'int'); $socid = GETPOST('socid', 'int'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; @@ -77,7 +77,7 @@ $hookmanager->initHooks(array($object->element.'contact', 'globalcard')); // Not $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals // There is several ways to check permission. // Set $enablepermissioncheck to 1 to enable a minimum low level of checks diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index 5c36a559723..85bebb0e658 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -109,7 +109,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; @@ -119,7 +119,7 @@ $hookmanager->initHooks(array($object->element.'document', 'globalcard')); // No $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 31bd7f40717..9ba9924f6b6 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -116,7 +116,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php index c0edbbeffae..283bf743067 100644 --- a/htdocs/modulebuilder/template/myobject_note.php +++ b/htdocs/modulebuilder/template/myobject_note.php @@ -89,7 +89,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new MyObject($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; @@ -98,7 +98,7 @@ $hookmanager->initHooks(array($object->element.'note', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mymodule->multidir_output[empty($object->entity) ? $conf->entity : $object->entity]."/".$object->id; } @@ -140,7 +140,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php index aa1b37d12eb..6028ceb5266 100644 --- a/htdocs/mrp/index.php +++ b/htdocs/mrp/index.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('mrpindex')); // Load translation files required by the page diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php index 5067cd662f0..8284c12ae21 100644 --- a/htdocs/mrp/mo_agenda.php +++ b/htdocs/mrp/mo_agenda.php @@ -72,7 +72,7 @@ if (!$sortorder) { $sortorder = 'DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; @@ -82,7 +82,7 @@ $hookmanager->initHooks(array('moagenda', 'globalcard')); // Note that conf->hoo $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mrp->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php index df1f9e64683..306ba0edcb7 100644 --- a/htdocs/mrp/mo_card.php +++ b/htdocs/mrp/mo_card.php @@ -56,7 +56,7 @@ $TBomLineId = GETPOST('bomlineid', 'array'); $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT("socid"); -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $objectbom = new BOM($db); @@ -83,7 +83,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. if (GETPOSTINT('fk_bom') > 0) { $objectbom->fetch(GETPOSTINT('fk_bom')); @@ -282,7 +282,7 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; // Action to move up and down lines of object - //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action close produced if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd) { diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php index 6afe0f35686..31487c38a1f 100644 --- a/htdocs/mrp/mo_document.php +++ b/htdocs/mrp/mo_document.php @@ -62,7 +62,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; @@ -72,7 +72,7 @@ $hookmanager->initHooks(array('modocument', 'globalcard')); // Note that conf->h $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mrp->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php index 76caec517df..d46925f0055 100644 --- a/htdocs/mrp/mo_list.php +++ b/htdocs/mrp/mo_list.php @@ -68,7 +68,7 @@ $pagenext = $page + 1; //if (! $sortfield) $sortfield="p.date_fin"; //if (! $sortorder) $sortorder="DESC"; -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php index 81319482351..4eca847ceac 100644 --- a/htdocs/mrp/mo_movements.php +++ b/htdocs/mrp/mo_movements.php @@ -83,7 +83,7 @@ if (!$sortorder) { $sortorder = "DESC"; } -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; @@ -108,7 +108,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); @@ -235,7 +235,7 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; // Action to move up and down lines of object - //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' if ($action == 'set_thirdparty' && $permissiontoadd) { $object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname); diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php index 9d24201da2e..40d590c6ff9 100644 --- a/htdocs/mrp/mo_note.php +++ b/htdocs/mrp/mo_note.php @@ -40,7 +40,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; @@ -50,7 +50,7 @@ $hookmanager->initHooks(array('monote', 'globalcard')); // Note that conf->hooks $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->mrp->multidir_output[empty($object->entity) ? $conf->entity : $object->entity]."/".$object->id; } @@ -75,7 +75,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 789dfe604cc..e01db20309c 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -59,7 +59,7 @@ $fk_default_warehouse = GETPOSTINT('fk_default_warehouse'); $collapse = GETPOST('collapse', 'aZ09comma'); -// Initialize technical objects +// Initialize a technical objects $object = new Mo($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id; @@ -86,7 +86,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); @@ -169,7 +169,7 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; // Action to move up and down lines of object - //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' if ($action == 'set_thirdparty' && $permissiontoadd) { $object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname); diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php index 22791f2cb55..984d9ae5594 100644 --- a/htdocs/multicurrency/multicurrency_rate.php +++ b/htdocs/multicurrency/multicurrency_rate.php @@ -81,13 +81,13 @@ $type = ''; $texte = ''; $newcardbutton = ''; -// Initialize technical objects +// Initialize a technical objects $object = new CurrencyRate($db); $form = new Form($db); $extrafields = new ExtraFields($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('EditorRatelist', 'globallist')); if (empty($action)) { diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index cc359726513..b0e5f407dd9 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -56,7 +56,7 @@ if ($result <= 0) { exit; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('surveycard', 'globalcard')); $expiredate = dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear')); diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index 0bbbbf88799..b8cba8a84db 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -38,7 +38,7 @@ if (!$user->hasRight('opensurvey', 'read')) { $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('opensurveyindex')); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index e1cb682ea33..6b5f0e277a0 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -59,7 +59,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Opensurveysondage($db); $opensurvey_static = new Opensurveysondage($db); diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php index f625010635e..b56ca45d814 100644 --- a/htdocs/partnership/partnership_agenda.php +++ b/htdocs/partnership/partnership_agenda.php @@ -71,7 +71,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('partnershipagenda', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->partnership->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php index f0cf3eb8634..d8ff622ae65 100644 --- a/htdocs/partnership/partnership_card.php +++ b/htdocs/partnership/partnership_card.php @@ -45,7 +45,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; @@ -71,7 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('partnership', 'read'); diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php index 1f8c46b8083..ba58fa6e5f5 100644 --- a/htdocs/partnership/partnership_contact.php +++ b/htdocs/partnership/partnership_contact.php @@ -40,7 +40,7 @@ $lineid = GETPOSTINT('lineid'); $socid = GETPOSTINT('socid'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; @@ -49,7 +49,7 @@ $hookmanager->initHooks(array('partnershipcontact', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals $permissiontoread = $user->hasRight('partnership', 'read'); $permission = $user->hasRight('partnership', 'write'); diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php index 8dcfd23b294..ce96c4f50bb 100644 --- a/htdocs/partnership/partnership_document.php +++ b/htdocs/partnership/partnership_document.php @@ -60,7 +60,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; @@ -69,7 +69,7 @@ $hookmanager->initHooks(array('partnershipdocument', 'globalcard')); // Note tha $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->partnership->multidir_output[$object->entity ? $object->entity : $conf->entity]."/partnership/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php index 09dd60c7d29..78454290d65 100644 --- a/htdocs/partnership/partnership_list.php +++ b/htdocs/partnership/partnership_list.php @@ -67,7 +67,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $adherent = new Adherent($db); diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php index bfb9c735bb2..2753a8a4593 100644 --- a/htdocs/partnership/partnership_note.php +++ b/htdocs/partnership/partnership_note.php @@ -38,7 +38,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; @@ -52,7 +52,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); //$result = restrictedArea($user, 'partnership', $id); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->partnership->multidir_output[$object->entity]."/".$object->id; } @@ -90,7 +90,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php index cacbe90dd32..2ba9198484d 100644 --- a/htdocs/product/agenda.php +++ b/htdocs/product/agenda.php @@ -73,7 +73,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productagenda')); $object = new Product($db); diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f362e851eb4..89370e2abc3 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -197,7 +197,7 @@ if ($object->id > 0) { restrictedArea($user, 'produit|service', 0, 'product&product', '', '', $fieldtype); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productcard', 'globalcard')); // Permissions diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 8d3d1987c8a..dd7b728cb77 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -53,7 +53,7 @@ if (!empty($user->socid)) { $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); $fieldtype = (!empty($ref) ? 'ref' : 'rowid'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productcompositioncard', 'globalcard')); $object = new Product($db); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 4749ea17b47..3caedef6f8f 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -58,7 +58,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productdocuments')); // Get parameters diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 277ccb97875..45af0f4bffc 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -47,7 +47,7 @@ if ($type == '' && !$user->hasRight('service', 'lire') && $user->hasRight('produ // Load translation files required by the page $langs->loadLangs(array('products', 'stocks')); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('productindex')); // Initialize objects diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index 7b9071f6fa6..2fc3e789ac5 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -48,7 +48,7 @@ if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) { $result = restrictedArea($user, 'stock', $id, '', 'inventory_advance'); } -// Initialize technical objects +// Initialize a technical objects $object = new Inventory($db); $extrafields = new ExtraFields($db); // no inventory docs yet @@ -76,7 +76,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index c5f36f8cc21..08ec41b6b46 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -64,7 +64,7 @@ if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) { $result = restrictedArea($user, 'stock', $id, '', 'inventory_advance'); } -// Initialize technical objects +// Initialize a technical objects $object = new Inventory($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id; @@ -89,7 +89,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check - Protection if external user //if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 6335bf3c68e..5d7258f7c76 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -58,7 +58,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Inventory($db); $extrafields = new ExtraFields($db); // no inventory docs yet diff --git a/htdocs/product/list.php b/htdocs/product/list.php index fceb1781b51..6132e5460d7 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -154,7 +154,7 @@ if ((string) $type == '0') { } } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $object = new Product($db); $hookmanager->initHooks(array('productservicelist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/product/messaging.php b/htdocs/product/messaging.php index fc9d8b66e79..73470d4801c 100644 --- a/htdocs/product/messaging.php +++ b/htdocs/product/messaging.php @@ -72,13 +72,13 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Product($db); if ($id > 0 || !empty($ref)) { $object->fetch($id, $ref); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendathirdparty', 'globalcard')); // Security check diff --git a/htdocs/product/note.php b/htdocs/product/note.php index 623c88114ca..b718f9894ec 100644 --- a/htdocs/product/note.php +++ b/htdocs/product/note.php @@ -77,7 +77,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 6be4f7efa86..23203912b0e 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -80,7 +80,7 @@ if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CU $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productpricecard', 'globalcard')); if ($object->id > 0) { diff --git a/htdocs/product/price_suppliers.php b/htdocs/product/price_suppliers.php index 897e1ee83a1..72f255afdcd 100644 --- a/htdocs/product/price_suppliers.php +++ b/htdocs/product/price_suppliers.php @@ -98,7 +98,7 @@ if (!$sortorder) { $sortorder = "ASC"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('pricesuppliercard', 'globalcard')); $object = new ProductFournisseur($db); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index e471426e52d..3558da35647 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -96,7 +96,7 @@ if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs. } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productreassortlist')); if ($user->socid) { diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 1472dafe6ce..f43993f4e19 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -128,7 +128,7 @@ if (!empty($canvas)) { $objcanvas->getCanvas('product', 'list', $canvas); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('reassortlotlist')); // Definition of array of fields for columns diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php index fe6efca508f..97a7928280e 100644 --- a/htdocs/product/stats/bom.php +++ b/htdocs/product/stats/bom.php @@ -44,7 +44,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsbom')); $option = ''; diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 8a6eca21ac8..bae4dde9757 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -66,7 +66,7 @@ if ($socid < 0) { $fieldvalue = ($id > 0 ? $id : $ref); $fieldtype = (!empty($ref) ? 'ref' : 'rowid'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatscard', 'globalcard')); $tmp = dol_getdate(dol_now()); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 78854c359bc..3938a12ac32 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -46,7 +46,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsorder')); // Load variable for pagination diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index fd0b1f092bf..6aae0d6e78b 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -44,7 +44,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatssupplierorder')); $mesg = ''; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 71c3bc007ac..ad2f9d22996 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -42,7 +42,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatscontract')); // Load variable for pagination diff --git a/htdocs/product/stats/expedition.php b/htdocs/product/stats/expedition.php index 457c35a6111..4ea3eb5e000 100644 --- a/htdocs/product/stats/expedition.php +++ b/htdocs/product/stats/expedition.php @@ -47,7 +47,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsexpedition')); // Load variable for pagination diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 8a584b73276..7c6570dbe23 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -46,7 +46,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsinvoice')); $extrafields = new ExtraFields($db); diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index cbb1ad84c12..69d7f088513 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -46,7 +46,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatssupplierinvoice')); $option = ''; diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php index 52bb03e7f9a..69c1905031d 100644 --- a/htdocs/product/stats/facturerec.php +++ b/htdocs/product/stats/facturerec.php @@ -47,7 +47,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsinvoice')); $showmessage = GETPOST('showmessage'); diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php index 1ae40f71f57..53ccc1dc88a 100644 --- a/htdocs/product/stats/mo.php +++ b/htdocs/product/stats/mo.php @@ -44,7 +44,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsmo')); // Load variable for pagination diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 87d171e704e..abfe0c64614 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -46,7 +46,7 @@ if (!empty($user->socid)) { } $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatspropal')); // Load variable for pagination diff --git a/htdocs/product/stats/reception.php b/htdocs/product/stats/reception.php index 4648f93f5b4..61b0bcfc910 100644 --- a/htdocs/product/stats/reception.php +++ b/htdocs/product/stats/reception.php @@ -46,7 +46,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatsreception')); // Load variable for pagination diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php index f40e03d7642..3a1106b0e9c 100644 --- a/htdocs/product/stats/supplier_proposal.php +++ b/htdocs/product/stats/supplier_proposal.php @@ -45,7 +45,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productstatssupplierpropal')); // Load variable for pagination diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 339469e0012..b89e5f16929 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -76,7 +76,7 @@ if (!$sortorder) { //$result=restrictedArea($user,'stock', $id, 'entrepot&stock'); $result = restrictedArea($user, 'stock'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('warehousecard', 'stocklist', 'globalcard')); $object = new Entrepot($db); diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 0329bbe0b95..1c40346aa76 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('stockindex')); // Load translation files required by the page diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php index 9373a6d7014..931d53e18b2 100644 --- a/htdocs/product/stock/list.php +++ b/htdocs/product/stock/list.php @@ -68,7 +68,7 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b // If $page is not defined, or '' or -1 or if we click on clear filters $page = 0; } -// Initialize technical objects +// Initialize a technical objects $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; @@ -79,7 +79,7 @@ if (!$sortorder) { $sortorder = "ASC"; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Entrepot($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index b5642d3870f..df89401e1c8 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -92,7 +92,7 @@ if (!$sortorder) { $pdluoid = GETPOSTINT('pdluoid'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new MouvementStock($db); $hookmanager->initHooks(array('movementlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 4e4c4500dc7..cf3158d86c5 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -114,7 +114,7 @@ if (!$sortorder) { $pdluoid = GETPOSTINT('pdluoid'); -// Initialize technical objects +// Initialize a technical objects $object = new MouvementStock($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index d641db57999..43d34310aaf 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -110,7 +110,7 @@ if (!empty($canvas)) { $objcanvas->getCanvas('stockproduct', 'card', $canvas); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('stockproductcard', 'globalcard')); $error = 0; diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php index e842d88db52..a904c7df52b 100644 --- a/htdocs/product/stock/productlot_card.php +++ b/htdocs/product/stock/productlot_card.php @@ -53,7 +53,7 @@ $batch = GETPOST('batch', 'alpha'); $productid = GETPOSTINT('productid'); $ref = GETPOST('ref', 'alpha'); // ref is productid_batch -// Initialize technical objects +// Initialize a technical objects $object = new Productlot($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('productlotcard', 'globalcard')); // Note that conf->hooks_modules contains array @@ -88,7 +88,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id || $ref) { if ($ref) { $tmp = explode('_', $ref); @@ -105,7 +105,7 @@ if ($id || $ref) { } } -// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks of modules. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('productlotcard', 'globalcard')); diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php index 08dc3b1b6a8..e594d612f73 100644 --- a/htdocs/product/stock/productlot_document.php +++ b/htdocs/product/stock/productlot_document.php @@ -56,7 +56,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'produit|service'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productlotdocuments')); // Get parameters diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php index 79e89258c99..3b96ffe2483 100644 --- a/htdocs/product/stock/productlot_list.php +++ b/htdocs/product/stock/productlot_list.php @@ -65,7 +65,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $object = new Productlot($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->productbatch->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/product/stock/productlot_note.php b/htdocs/product/stock/productlot_note.php index 74c94602185..f0975155480 100644 --- a/htdocs/product/stock/productlot_note.php +++ b/htdocs/product/stock/productlot_note.php @@ -36,7 +36,7 @@ $id = GETPOSTINT('id'); $ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); -// Initialize technical objects +// Initialize a technical objects $object = new Productlot($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->productlot->dir_output.'/temp/massgeneration/'.$user->id; @@ -45,7 +45,7 @@ $hookmanager->initHooks(array('productlotnote')); // Note that conf->hooks_modul $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->productlot->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -70,7 +70,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 7dd8856a436..2335f4d3913 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -46,7 +46,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'produit|service'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('stockreplenishlist')); //checks if a product has been ordered diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php index f09dfa47de6..52680fe20af 100644 --- a/htdocs/product/stock/stats/commande_fournisseur.php +++ b/htdocs/product/stock/stats/commande_fournisseur.php @@ -50,7 +50,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('batchproductstatssupplierorder')); $showmessage = GETPOST('showmessage'); diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php index b084b4bd222..31d1ee17f46 100644 --- a/htdocs/product/stock/stats/expedition.php +++ b/htdocs/product/stock/stats/expedition.php @@ -50,7 +50,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('batchproductstatsexpedition')); $showmessage = GETPOST('showmessage'); diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php index 1fb6eaf7a94..5e26155ea57 100644 --- a/htdocs/product/stock/stats/mo.php +++ b/htdocs/product/stock/stats/mo.php @@ -45,7 +45,7 @@ if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('batchproductstatsmo')); // Load variable for pagination diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php index 33f993d2f55..2d1f23edc7c 100644 --- a/htdocs/product/stock/stats/reception.php +++ b/htdocs/product/stock/stats/reception.php @@ -50,7 +50,7 @@ if (!empty($user->socid)) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('batchproductstatsreception')); $showmessage = GETPOST('showmessage'); diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index 0c16e56a898..4475f326832 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -39,7 +39,7 @@ require_once './lib/replenishment.lib.php'; // Load translation files required by the page $langs->loadLangs(array('products', 'stocks', 'orders')); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('stockatdate')); // Security check diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php index bf0f3152d5a..9f9ce23f608 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php @@ -69,7 +69,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new StockTransfer($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id; @@ -78,7 +78,7 @@ $hookmanager->initHooks(array('stocktransferagenda', 'globalcard')); // Note tha $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id; } diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php index 40d143ac4d7..837e8bc5eed 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php @@ -61,7 +61,7 @@ $label = GETPOST('label', 'alpha'); $batch = GETPOST('batch', 'alpha'); $code_inv = GETPOST('inventorycode', 'alphanohtml'); -// Initialize technical objects +// Initialize a technical objects $object = new StockTransfer($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id; @@ -86,7 +86,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('stocktransfer', 'stocktransfer', 'read'); diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php index 70150bdc028..7d6a138fea6 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php @@ -59,7 +59,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new StockTransfer($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id; @@ -68,7 +68,7 @@ $hookmanager->initHooks(array('stocktransferdocument', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals //if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity?$object->entity:$conf->entity] . "/stocktransfer/" . dol_sanitizeFileName($object->id); if ($id > 0 || !empty($ref)) { diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php index da87eb71191..7364c1e0c28 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php @@ -61,7 +61,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new StockTransfer($db); $extrafields = new ExtraFields($db); $diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id; diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php index ccbfa8cfe9e..7f85f805c27 100644 --- a/htdocs/product/stock/stocktransfer/stocktransfer_note.php +++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'alpha'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new StockTransfer($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id; @@ -51,7 +51,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); //$result = restrictedArea($user, 'stocktransfer', $id); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id; } @@ -65,7 +65,7 @@ $permissiontoadd = $user->hasRight('stocktransfer', 'stocktransfer', 'write'); / * Actions */ -include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' /* diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php index d880e516500..757805e0130 100644 --- a/htdocs/product/stock/tpl/extrafields_add.tpl.php +++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $action * $conf diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 899e0d0dbb4..ca9529267b4 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -64,7 +64,7 @@ if ($object->id > 0) { restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('producttranslationcard', 'globalcard')); diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 2e257cf79bd..8b375007646 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -39,7 +39,7 @@ if ($search_project_user == $user->id) { $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('activityindex')); // Security check diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 6b1edad2c23..42ce3bd1748 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -78,7 +78,7 @@ $fk_project = GETPOSTINT('fk_project'); $mine = GETPOST('mode') == 'mine' ? 1 : 0; //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projectcard', 'globalcard')); $object = new Project($db); @@ -162,7 +162,7 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' // Action setdraft object if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) { diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php index cceb564e7e0..c4e98fb0ebf 100644 --- a/htdocs/projet/comment.php +++ b/htdocs/projet/comment.php @@ -54,7 +54,7 @@ if (!$user->hasRight('projet', 'lire')) { accessforbidden(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projectcard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index db8b06f371c..51c0113904b 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -54,7 +54,7 @@ $mine = GETPOST('mode') == 'mine' ? 1 : 0; $object = new Project($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index c9190870ff1..577999144ac 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -45,7 +45,7 @@ $mine = (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0); $object = new Project($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index f4a20b60201..9ff27e0afcf 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -180,7 +180,7 @@ $mine = GETPOST('mode') == 'mine' ? 1 : 0; $object = new Project($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index b88e9a899f7..64db1dd61a6 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -43,7 +43,7 @@ $mine = ($mode == 'mine' ? 1 : 0); $object = new Project($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 0a1d665780f..38e00706267 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('projectsindex')); // Load translation files required by the page diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 4a51e6f1316..2ae144d002b 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -190,7 +190,7 @@ if (GETPOSTISARRAY('search_status') || GETPOST('search_status_multiselect')) { $search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : '0,1'); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Project($db); $hookmanager->initHooks(array('projectlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index c01c81de525..83f259d1287 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -40,7 +40,7 @@ $mine = (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mine') ? 1 : 0; $object = new Project($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } @@ -64,7 +64,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index d770f23f4f5..cd51707d7ba 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -113,7 +113,7 @@ $object = new Project($db); $taskstatic = new Task($db); $extrafields = new ExtraFields($db); -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) { $object->fetchComments(); } @@ -142,7 +142,7 @@ $result = restrictedArea($user, 'projet', $id, 'projet&project'); $diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projecttaskscard', 'globalcard')); $progress = GETPOSTINT('progress'); diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index 10750562add..6251418aef5 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -48,7 +48,7 @@ $withproject = GETPOSTINT('withproject'); $project_ref = GETPOST('project_ref', 'alpha'); $planned_workload = ((GETPOSTINT('planned_workloadhour') != '' || GETPOSTINT('planned_workloadmin') != '') ? (GETPOSTINT('planned_workloadhour') > 0 ? GETPOSTINT('planned_workloadhour') * 3600 : 0) + (GETPOSTINT('planned_workloadmin') > 0 ? GETPOSTINT('planned_workloadmin') * 60 : 0) : ''); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projecttaskcommentcard', 'globalcard')); $object = new Task($db); diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 85b6c5a03a7..e13ba57f2e5 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -108,7 +108,7 @@ $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $sear // Initialize context for list $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'tasklist'; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Task($db); $hookmanager->initHooks(array('tasklist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index dfd36d12df7..92538636bc3 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -104,7 +104,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index fbf8fdc1e45..fd8585c588d 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -55,7 +55,7 @@ $project_ref = GETPOST('project_ref', 'alpha'); $planned_workload = ((GETPOST('planned_workloadhour') != '' || GETPOST('planned_workloadmin') != '') ? (GETPOSTINT('planned_workloadhour') > 0 ? GETPOSTINT('planned_workloadhour') * 3600 : 0) + (GETPOSTINT('planned_workloadmin') > 0 ? GETPOSTINT('planned_workloadmin') * 60 : 0) : ''); $mode = GETPOST('mode', 'alpha'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projecttaskcard', 'globalcard')); $object = new Task($db); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index ff04c97ef49..4d020e03ac0 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -111,7 +111,7 @@ if (!$sortorder) { $childids = $user->getAllChildIds(1); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context //$object = new TaskTime($db); $hookmanager->initHooks(array('projecttasktime', 'globalcard')); @@ -1241,7 +1241,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser if ($projectstatic->id > 0 || $allprojectforuser > 0) { - // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array + // Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('tasktimelist')); $formconfirm = ''; diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index 23a7673def2..284dfd6091e 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -172,7 +172,7 @@ if (!getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) { exit; } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('agendaexport')); $reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $action and $object may have been modified by some diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php index b6e84d2437b..15808c7681c 100644 --- a/htdocs/public/company/new.php +++ b/htdocs/public/company/new.php @@ -87,7 +87,7 @@ if (!getDolGlobalString('SOCIETE_ENABLE_PUBLIC')) { $permissiontoadd = $user->hasRight('societe', 'creer'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 011f594a8c4..c4f4d32041c 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -53,7 +53,7 @@ if (empty($dolibarr_main_demo)) { httponly_accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page'); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $res = $hookmanager->initHooks(array('demo')); $demoprofiles = array(); diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php index f8bacc3d940..2eede71a814 100644 --- a/htdocs/public/eventorganization/attendee_new.php +++ b/htdocs/public/eventorganization/attendee_new.php @@ -139,7 +139,7 @@ if ($securekeytocompare != $securekeyreceived) { // Load translation files $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 8fc8e514578..a94c09cf119 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -91,7 +91,7 @@ if (!getDolGlobalString('MEMBER_ENABLE_PUBLIC')) { httponly_accessforbidden("Auto subscription form for public visitors has not been enabled"); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index d97cae4ef8e..b38b1140896 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -168,7 +168,7 @@ if ($source == 'proposal') { httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source. Value not supported.", 400, 1); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('onlinesign')); $error = 0; diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php index 9a1db3d88cc..26500400ebc 100644 --- a/htdocs/public/partnership/new.php +++ b/htdocs/public/partnership/new.php @@ -79,7 +79,7 @@ if (!getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC')) { httponly_accessforbidden("Auto subscription form for public visitors has not been enabled"); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewpartnershipcard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php index 0b41a315145..3fea349ceae 100644 --- a/htdocs/public/project/new.php +++ b/htdocs/public/project/new.php @@ -73,7 +73,7 @@ if (!getDolGlobalString('PROJECT_ENABLE_PUBLIC')) { exit; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewleadcard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index d5abd931716..160ae7da02f 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -94,7 +94,7 @@ if ($securekeytocompare != $securekeyreceived) { // Load translation files $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 063c0508d20..70a87215f22 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -95,7 +95,7 @@ if ($securekeytocompare != $securekeyreceived) { // Load translation files $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); $extrafields = new ExtraFields($db); diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php index e4401520ca0..10b0cf496b1 100644 --- a/htdocs/public/ticket/create_ticket.php +++ b/htdocs/public/ticket/create_ticket.php @@ -79,7 +79,7 @@ $cancel = GETPOST('cancel', 'aZ09'); $backtopage = ''; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('publicnewticketcard', 'globalcard')); $object = new Ticket($db); diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php index db7a20b4f01..6413bb102d3 100644 --- a/htdocs/public/ticket/list.php +++ b/htdocs/public/ticket/list.php @@ -79,7 +79,7 @@ if (isset($_SESSION['email_customer'])) { $object = new Ticket($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ticketpubliclist', 'globalcard')); if (!isModEnabled('ticket')) { diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php index 7be70ec70ee..ff1da7c898b 100644 --- a/htdocs/public/ticket/view.php +++ b/htdocs/public/ticket/view.php @@ -227,7 +227,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; $form = new Form($db); $formticket = new FormTicket($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('ticketpublicview', 'globalcard')); if (!getDolGlobalString('TICKET_ENABLE_PUBLIC_INTERFACE')) { diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 6b28afe31de..4c06be7396b 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -112,9 +112,9 @@ $extrafields->fetch_name_optionals_label($object->table_element_line); $extrafields->fetch_name_optionals_label($objectorder->table_element_line); // Load object. Make an object->fetch -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('receptioncard', 'globalcard')); $date_delivery = dol_mktime(GETPOSTINT('date_deliveryhour'), GETPOSTINT('date_deliverymin'), 0, GETPOSTINT('date_deliverymonth'), GETPOSTINT('date_deliveryday'), GETPOSTINT('date_deliveryyear')); @@ -208,7 +208,7 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' // Reopen if ($action == 'reopen' && $permissiontoadd) { diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php index e9a0ffa6738..a41a6ec838f 100644 --- a/htdocs/reception/document.php +++ b/htdocs/reception/document.php @@ -88,7 +88,7 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->reception->dir_output."/".dol_sanitizeFileName($object->ref); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('receptiondocument')); // Security check diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php index 3665ae8d27f..dc960e9d256 100644 --- a/htdocs/reception/index.php +++ b/htdocs/reception/index.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('receptionindex')); $langs->loadLangs(array("orders", "receptions")); diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index c7b9f2f615f..236f49c9987 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -101,7 +101,7 @@ $pagenext = $page + 1; $diroutputmassaction = $conf->reception->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id; $object = new Reception($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('receptionlist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php index d726fa6f813..f80f3375ae5 100644 --- a/htdocs/reception/note.php +++ b/htdocs/reception/note.php @@ -61,7 +61,7 @@ if ($id > 0 || !empty($ref)) { } } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('receptionnote')); // Security check @@ -106,7 +106,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php index 8f685bb1b14..b3f3a36de15 100644 --- a/htdocs/recruitment/recruitmentcandidature_agenda.php +++ b/htdocs/recruitment/recruitmentcandidature_agenda.php @@ -71,7 +71,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentCandidature($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('recruitmentcandidatureagenda', 'globalcard')); // $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php index 813f0b74677..5e24742cd0c 100644 --- a/htdocs/recruitment/recruitmentcandidature_card.php +++ b/htdocs/recruitment/recruitmentcandidature_card.php @@ -45,7 +45,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentCandidature($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -70,7 +70,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('recruitment', 'recruitmentjobposition', 'read'); diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php index 741e0107a45..19aaae140d2 100644 --- a/htdocs/recruitment/recruitmentcandidature_document.php +++ b/htdocs/recruitment/recruitmentcandidature_document.php @@ -59,7 +59,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentCandidature($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -68,7 +68,7 @@ $hookmanager->initHooks(array('recruitmentcandidaturedocument', 'globalcard')); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentcandidature/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php index 2a31b345c4a..41aa72806fb 100644 --- a/htdocs/recruitment/recruitmentcandidature_list.php +++ b/htdocs/recruitment/recruitmentcandidature_list.php @@ -62,7 +62,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentCandidature($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php index ba6660db5c4..33958bd0b3f 100644 --- a/htdocs/recruitment/recruitmentcandidature_note.php +++ b/htdocs/recruitment/recruitmentcandidature_note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentCandidature($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -46,7 +46,7 @@ $hookmanager->initHooks(array('recruitmentjobpositionnote', 'globalcard')); // N $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -70,7 +70,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php index e433b72ba2b..05e5bf29db7 100644 --- a/htdocs/recruitment/recruitmentjobposition_agenda.php +++ b/htdocs/recruitment/recruitmentjobposition_agenda.php @@ -70,7 +70,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -79,7 +79,7 @@ $hookmanager->initHooks(array('recruitmentjobpositionagenda', 'globalcard')); // $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php index 3abda72c4eb..9fda96d6a95 100644 --- a/htdocs/recruitment/recruitmentjobposition_applications.php +++ b/htdocs/recruitment/recruitmentjobposition_applications.php @@ -44,7 +44,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); //$lineid = GETPOST('lineid', 'int'); -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -69,7 +69,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('recruitment', 'recruitmentjobposition', 'read'); diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php index b8010fade97..416520f0ef2 100644 --- a/htdocs/recruitment/recruitmentjobposition_card.php +++ b/htdocs/recruitment/recruitmentjobposition_card.php @@ -44,7 +44,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -69,7 +69,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $permissiontoread = $user->hasRight('recruitment', 'recruitmentjobposition', 'read'); diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php index 11e4fe7bb62..5947bf30469 100644 --- a/htdocs/recruitment/recruitmentjobposition_document.php +++ b/htdocs/recruitment/recruitmentjobposition_document.php @@ -59,7 +59,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -68,7 +68,7 @@ $hookmanager->initHooks(array('recruitmentjobpositiondocument', 'globalcard')); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentjobposition/".get_exdir(0, 0, 0, 1, $object); diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php index 761483aaa92..3138dabfd29 100644 --- a/htdocs/recruitment/recruitmentjobposition_list.php +++ b/htdocs/recruitment/recruitmentjobposition_list.php @@ -58,7 +58,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -118,7 +118,7 @@ foreach ($object->fields as $key => $val) { include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields['nbapplications'] = array('type'=>'integer', 'label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right'); diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php index fec6fdd4b97..4e19ed85910 100644 --- a/htdocs/recruitment/recruitmentjobposition_note.php +++ b/htdocs/recruitment/recruitmentjobposition_note.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new RecruitmentJobPosition($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id; @@ -51,7 +51,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); //$result = restrictedArea($user, 'recruitment', $id); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = $conf->recruitment->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id; } @@ -75,7 +75,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php index 176f8afa851..14bc13a2f4f 100644 --- a/htdocs/resource/agenda.php +++ b/htdocs/resource/agenda.php @@ -75,7 +75,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $extrafields = new ExtraFields($db); $hookmanager->initHooks(array('agendaresource')); @@ -83,7 +83,7 @@ $hookmanager->initHooks(array('agendaresource')); $object = new Dolresource($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, 'resource', $object->id, 'resource'); diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 9a8d99b2033..56c5706bc09 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -66,7 +66,7 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, 'resource', $object->id, 'resource'); diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php index a3feb378b44..b6c674df6d3 100644 --- a/htdocs/resource/contact.php +++ b/htdocs/resource/contact.php @@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09'); $object = new Dolresource($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' // Security check if ($user->socid) { diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php index 4172ed23178..dfec333399e 100644 --- a/htdocs/resource/document.php +++ b/htdocs/resource/document.php @@ -73,7 +73,7 @@ if (!$sortfield) { $object = new Dolresource($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $upload_dir = $conf->resource->dir_output.'/'.dol_sanitizeFileName($object->ref); $modulepart = 'resource'; diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index e9f25d47d57..df356f69b61 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -326,7 +326,7 @@ if (!$ret) { if (($element_id || $element_ref) && $element == 'action') { require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('actioncard', 'globalcard')); $act = fetchObjectByElement($element_id, $element, $element_ref); diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 236383bbed5..7d0d4c506ba 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -52,7 +52,7 @@ $optioncss = GETPOST('optioncss', 'alpha'); // Initialize context for list $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'resourcelist'; -// Initialize technical objects +// Initialize a technical objects $object = new Dolresource($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php index 141a61d47b2..0808f5b4225 100644 --- a/htdocs/resource/note.php +++ b/htdocs/resource/note.php @@ -41,13 +41,13 @@ $action = GETPOST('action', 'aZ09'); if ($user->socid) { $socid = $user->socid; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('resourcenote')); $object = new Dolresource($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $result = restrictedArea($user, 'resource', $object->id, 'resource'); @@ -64,7 +64,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index bbfacb08097..6ab849a5b41 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -82,7 +82,7 @@ $childids = $user->getAllChildIds(1); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('salarycard', 'globalcard')); if ($id > 0 || !empty($ref)) { diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php index 297da859f33..4739a324289 100644 --- a/htdocs/salaries/document.php +++ b/htdocs/salaries/document.php @@ -79,7 +79,7 @@ $childids = $user->getAllChildIds(1); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('salarydoc', 'globalcard')); if ($id > 0 || !empty($ref)) { diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php index 41842b9d1d9..7fef435dff7 100644 --- a/htdocs/salaries/info.php +++ b/htdocs/salaries/info.php @@ -58,7 +58,7 @@ $childids = $user->getAllChildIds(1); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('salaryinfo', 'globalcard')); $object = new Salary($db); diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index df3717dabdb..01370e984d8 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -66,7 +66,7 @@ if (!$sortorder) { $sortorder = "DESC,DESC"; } -// Initialize technical objects +// Initialize a technical objects $object = new PaymentSalary($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php index 195494fe945..744b0b1af73 100644 --- a/htdocs/salaries/payments.php +++ b/htdocs/salaries/payments.php @@ -67,7 +67,7 @@ if (!$sortorder) { $sortorder = "DESC,DESC"; } -// Initialize technical objects +// Initialize a technical objects $object = new PaymentSalary($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php index e4aeb57fd4f..8ceca2cf153 100644 --- a/htdocs/salaries/virement_request.php +++ b/htdocs/salaries/virement_request.php @@ -83,7 +83,7 @@ $childids = $user->getAllChildIds(1); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('salaryinfo', 'globalcard')); $object = new Salary($db); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index bc37aa42750..8ecf987e4a2 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -69,10 +69,10 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Societe($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendathirdparty', 'globalcard')); // Security check diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index ab5bf5d89c5..075670f105b 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -134,7 +134,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $socialnetworks = getArrayOfSocialNetworks(); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartycard', 'globalcard')); if ($socid > 0) { diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 8a2afb5b05a..27db52ca016 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -91,7 +91,7 @@ $thirdTypeSelect = GETPOST("third_select_id", 'aZ09'); $type_element = GETPOST('type_element') ? GETPOST('type_element') : ''; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('consumptionthirdparty', 'globalcard')); diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php index 21f2105d94a..1ef8690e8a7 100644 --- a/htdocs/societe/contact.php +++ b/htdocs/societe/contact.php @@ -87,7 +87,7 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartycontact', 'globalcard')); if ($object->fetch($socid) <= 0 && $action == 'view') { diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index abfa6495892..edfc829ccda 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -80,7 +80,7 @@ if ($id > 0 || !empty($ref)) { $courrier_dir = $conf->societe->multidir_output[$object->entity]."/courrier/".get_exdir($object->id, 0, 0, 0, $object, 'thirdparty'); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartydocument', 'globalcard')); $permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 83089a617ff..42d43966999 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("companies"); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager = new HookManager($db); $hookmanager->initHooks(array('thirdpartiesindex')); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index e31dd7ffa61..91e3887a7de 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -203,7 +203,7 @@ if ($type == 'f') { $search_type = '4'; } } -// Initialize technical objects to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical objects to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new Societe($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array($contextpage)); diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php index f67ff9bd96f..e88d3214805 100644 --- a/htdocs/societe/messaging.php +++ b/htdocs/societe/messaging.php @@ -69,10 +69,10 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Societe($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendathirdparty', 'globalcard')); // Security check diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php index 84ed41d2731..ac7848bdf86 100644 --- a/htdocs/societe/note.php +++ b/htdocs/societe/note.php @@ -50,7 +50,7 @@ if ($id > 0) { // Permissions $permissionnote = $user->hasRight('societe', 'creer'); // Used by the include of actions_setnotes.inc.php -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartynote', 'globalcard')); // Security check @@ -72,7 +72,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 4bb53e3ea32..720b03549f6 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -67,7 +67,7 @@ $now = dol_now(); $object = new Societe($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartynotification', 'globalcard')); diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index abf841b3260..1c2702a0d04 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -77,7 +77,7 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartybancard', 'globalcard')); // Permissions diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index 55d0091a80b..3aef346ed25 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -64,7 +64,7 @@ $result = restrictedArea($user, 'societe', $socid, '&societe'); // Initialize objects $object = new Societe($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('thirdpartycustomerprice', 'globalcard')); $error = 0; diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php index bad74c4d944..2e3c84654bc 100644 --- a/htdocs/societe/project.php +++ b/htdocs/societe/project.php @@ -55,7 +55,7 @@ if ($user->socid) { } $result = restrictedArea($user, 'societe', $socid, '&societe'); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('projectthirdparty')); $object = new Societe($db); diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index 6e6c37de5ec..227de670c38 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -71,7 +71,7 @@ $result = restrictedArea($user, 'societe', $id, ''); // Initialize objects $object = new Societe($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('contactthirdparty', 'globalcard')); diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 21bdeab9e85..ade8c4f3dca 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -72,7 +72,7 @@ if (!$sortorder) { } -// Initialize technical objects +// Initialize a technical objects $object = new Societe($db); $objectwebsiteaccount = new SocieteAccount($db); $extrafields = new ExtraFields($db); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 69d0853fbc8..a60bac93e12 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -82,7 +82,7 @@ $hideref = (GETPOSTINT('hideref') ? GETPOSTINT('hideref') : (getDolGlobalString( // Nombre de ligne pour choix de produit/service predefinis $NBLINES = 4; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplier_proposalcard', 'globalcard')); $object = new SupplierProposal($db); @@ -163,11 +163,11 @@ if (empty($reshook)) { $action = ''; } - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' - include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once' // Action clone object if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) { diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php index 6bfc7547d72..9ed352658f2 100644 --- a/htdocs/supplier_proposal/index.php +++ b/htdocs/supplier_proposal/index.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('suppliersproposalsindex')); // Load translation files required by the page diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 0f9e90cd605..5d39c3f3840 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -144,7 +144,7 @@ if (!empty($socid)) { $diroutputmassaction = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new SupplierProposal($db); $hookmanager->initHooks(array('supplier_proposallist')); $extrafields = new ExtraFields($db); diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php index 0a02922330e..452e76c0d34 100644 --- a/htdocs/supplier_proposal/note.php +++ b/htdocs/supplier_proposal/note.php @@ -46,7 +46,7 @@ if ($user->socid) { } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('supplier_proposalnote')); $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal'); @@ -69,7 +69,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php index cb4b489206c..eb2782f7be9 100644 --- a/htdocs/takepos/ajax/ajax.php +++ b/htdocs/takepos/ajax/ajax.php @@ -54,7 +54,7 @@ if (!$user->hasRight('takepos', 'run')) { accessforbidden(); } -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array of hooks $hookmanager->initHooks(array('takeposproductsearch')); // new context for product search hooks $pricelevel = 1; // default price level if PRODUIT_MULTIPRICES. TODO Get price level from thirdparty. diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 318dc8f3ba9..85e83794115 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -84,7 +84,7 @@ if (GETPOST('actioncode', 'array')) { } -// Initialize technical object to manage hooks of ticket. Note that conf->hooks_modules contains array array +// Initialize a technical object to manage hooks of ticket. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('ticketcard', 'globalcard')); $object = new Ticket($db); @@ -114,7 +114,7 @@ if (GETPOST('modelselected', 'alpha')) { } // Load object -//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id || $track_id || $ref) { $res = $object->fetch($id, $ref, $track_id); if ($res >= 0) { @@ -656,7 +656,7 @@ if (empty($reshook)) { $permissiondellink = $user->hasRight('ticket', 'write'); - include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once' // Actions to build doc include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php'; diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php index 064e9add630..f9410e9a237 100644 --- a/htdocs/ticket/index.php +++ b/htdocs/ticket/index.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php'; $hookmanager = new HookManager($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('ticketsindex')); // Load translation files required by the page diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index d7ccf72867c..78355ae9d8a 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -85,7 +85,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Ticket($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->ticket->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 90c23716b33..c3fc53bea3f 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -75,7 +75,7 @@ if (($object->id != $user->id) && (!$user->hasRight('user', 'user', 'lire'))) { accessforbidden(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'useragenda', 'globalcard')); /* diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index c7dcfc05cc3..1a667909ad5 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -58,7 +58,7 @@ $bankid = GETPOSTINT('bankid'); $action = GETPOST("action", 'alpha'); $cancel = GETPOST('cancel', 'alpha'); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('usercardBank', 'globalcard')); // Security check diff --git a/htdocs/user/card.php b/htdocs/user/card.php index fbec74cf25a..631681d9a46 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -95,7 +95,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); $socialnetworks = getArrayOfSocialNetworks(); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('usercard', 'globalcard')); $error = 0; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 993472a16e2..0b67de7d197 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -41,7 +41,7 @@ $feature2 = (($socid && $user->hasRight('user', 'self', 'creer')) ? '' : 'user') $result = restrictedArea($user, 'user', $id, 'user&user', $feature2); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'globalcard')); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 0e1da051cb4..668890e0c91 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -108,7 +108,7 @@ if ($id > 0 || !empty($ref)) { $upload_dir = $conf->user->dir_output."/".$object->id; } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'userdoc', 'globalcard')); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 098648b6ba5..51386fc3a07 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -67,10 +67,10 @@ $extrafields = new ExtraFields($db); $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. $object->getrights(); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('groupcard', 'globalcard')); // Security check diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php index 774657348c1..98e79785fce 100644 --- a/htdocs/user/group/list.php +++ b/htdocs/user/group/list.php @@ -60,7 +60,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new UserGroup($db); $extrafields = new ExtraFields($db); //$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 02c28510688..58c254d2717 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -78,7 +78,7 @@ $object->getrights(); $entity = $conf->entity; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('groupperms', 'globalcard')); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 3db495eb657..e14c062d085 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -52,7 +52,7 @@ if ($user->socid > 0) { $companystatic = new Societe($db); $fuserstatic = new User($db); -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('userhome')); if (!isset($form) || !is_object($form)) { $form = new Form($db); @@ -323,7 +323,7 @@ print $boxlist; print ''; -// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +// Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $parameters = array('user' => $user); $reshook = $hookmanager->executeHooks('dashboardUsersGroups', $parameters, $object); // Note that $action and $object may have been modified by hook diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 4b957549df8..45549a29248 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -49,7 +49,7 @@ $object = new User($db); $object->fetch($id, '', '', 1); $object->getrights(); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'userldap', 'globalcard')); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index bcd8b1ffa9f..355265e10cc 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -67,7 +67,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $object = new User($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php index 1bfd7af9359..eabf89a25b3 100644 --- a/htdocs/user/messaging.php +++ b/htdocs/user/messaging.php @@ -73,7 +73,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new User($db); if ($id > 0 || !empty($ref)) { $result = $object->fetch($id, $ref, '', 1); @@ -83,7 +83,7 @@ if ($id > 0 || !empty($ref)) { $object->getrights(); } -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('agendathirdparty', 'globalcard')); // Security check diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 08f55c75b51..4fe5dd7e8de 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -61,7 +61,7 @@ $feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user') $result = restrictedArea($user, 'user', $id, 'user&user', $feature2); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'usernote', 'globalcard')); @@ -74,7 +74,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 2b422ddd1fd..c0f7af5f520 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -80,7 +80,7 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan $form = new Form($db); $formadmin = new FormAdmin($db); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'userihm', 'globalcard')); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 36ed4646d16..d553851236a 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -85,7 +85,7 @@ $object->getrights(); $entity = $conf->entity; -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('usercard', 'userperms', 'globalcard')); diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index fd58ad0b2c1..67afacc7de6 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -54,9 +54,9 @@ $result = restrictedArea($user, 'variants'); $object = new ProductAttribute($db); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once' -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('productattributecard', 'globalcard')); $permissiontoread = $user->hasRight('variants', 'read'); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index a627c998cfc..4893f798bfe 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -58,7 +58,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new ProductAttribute($db); //$extrafields = new ExtraFields($db); $diroutputmassaction = $conf->variants->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php index 92bfc8c3b88..0d5ee24fc84 100644 --- a/htdocs/variants/tpl/productattributevalueline_create.tpl.php +++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php index ec99925f320..21b87469577 100644 --- a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php +++ b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/variants/tpl/productattributevalueline_title.tpl.php b/htdocs/variants/tpl/productattributevalueline_title.tpl.php index b455c347bf9..3561cda1552 100644 --- a/htdocs/variants/tpl/productattributevalueline_title.tpl.php +++ b/htdocs/variants/tpl/productattributevalueline_title.tpl.php @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php index 825c3639a3f..c8203f211da 100644 --- a/htdocs/variants/tpl/productattributevalueline_view.tpl.php +++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Need to have following variables defined: + * Need to have the following variables defined: * $object (invoice, order, ...) * $conf * $langs diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php index d868de4f716..c57e201af07 100644 --- a/htdocs/webhook/target_card.php +++ b/htdocs/webhook/target_card.php @@ -47,7 +47,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); $lineid = GETPOSTINT('lineid'); -// Initialize technical objects +// Initialize a technical objects $object = new Target($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id; @@ -72,7 +72,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions // There is several ways to check permission. diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php index 63591826abc..1dd9d3fdd5c 100644 --- a/htdocs/webhook/target_list.php +++ b/htdocs/webhook/target_list.php @@ -66,7 +66,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Target($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/webportal/admin/configcss.php b/htdocs/webportal/admin/configcss.php index 8f68e8e81c8..9d8becba7e6 100644 --- a/htdocs/webportal/admin/configcss.php +++ b/htdocs/webportal/admin/configcss.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php"; // Translations $langs->loadLangs(array("admin", "hrm", "other", "website")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('webportalsetup', 'globalsetup')); // Parameters diff --git a/htdocs/webportal/admin/setup.php b/htdocs/webportal/admin/setup.php index b5d02d8065d..1b6554be7e5 100644 --- a/htdocs/webportal/admin/setup.php +++ b/htdocs/webportal/admin/setup.php @@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php"; // Translations $langs->loadLangs(array("admin", "webportal", "website")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('webportalsetup', 'globalsetup')); // Parameters diff --git a/htdocs/webportal/admin/setup_theme.php b/htdocs/webportal/admin/setup_theme.php index d8816aafb54..c7e62a6101a 100644 --- a/htdocs/webportal/admin/setup_theme.php +++ b/htdocs/webportal/admin/setup_theme.php @@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . "/webportal/lib/webportal.lib.php"; // Translations $langs->loadLangs(array("admin", "webportal", "website")); -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +// Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('webportalthemesetup', 'globalsetup')); // Parameters diff --git a/htdocs/webportal/class/controller.class.php b/htdocs/webportal/class/controller.class.php index ddc3ae103df..61cab0ccecc 100644 --- a/htdocs/webportal/class/controller.class.php +++ b/htdocs/webportal/class/controller.class.php @@ -68,7 +68,7 @@ class Controller $this->db = $db; - // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context + // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context $hookmanager->initHooks(array('webportalpage', 'webportal')); } diff --git a/htdocs/webportal/class/html.formcardwebportal.class.php b/htdocs/webportal/class/html.formcardwebportal.class.php index b167cfda4e0..506202cde61 100644 --- a/htdocs/webportal/class/html.formcardwebportal.class.php +++ b/htdocs/webportal/class/html.formcardwebportal.class.php @@ -176,7 +176,7 @@ class FormCardWebPortal $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha'); - // Initialize technical objects + // Initialize a technical objects $object = new $objectclass($this->db); //$extrafields = new ExtraFields($db); $hookmanager->initHooks(array('webportal' . $elementEn . 'card', 'globalcard')); // Note that conf->hooks_modules contains array @@ -190,7 +190,7 @@ class FormCardWebPortal } // Load object - include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. + include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check (enable the most restrictive one) if (!isModEnabled('webportal')) { diff --git a/htdocs/webportal/class/html.formlistwebportal.class.php b/htdocs/webportal/class/html.formlistwebportal.class.php index 043aac2df82..b90cc4fbef1 100644 --- a/htdocs/webportal/class/html.formlistwebportal.class.php +++ b/htdocs/webportal/class/html.formlistwebportal.class.php @@ -137,7 +137,7 @@ class FormListWebPortal // load module libraries dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php'); - // Initialize technical objects + // Initialize a technical objects $objectclass = 'WebPortal' . ucfirst($elementEn); $object = new $objectclass($this->db); diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php index 399bbb983b5..729901f81f3 100644 --- a/htdocs/website/websiteaccount_card.php +++ b/htdocs/website/websiteaccount_card.php @@ -40,7 +40,7 @@ $confirm = GETPOST('confirm', 'alpha'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new SocieteAccount($db); $extrafields = new ExtraFields($db); $hookmanager->initHooks(array($object->element.'card', 'globalcard')); // Note that conf->hooks_modules contains array @@ -64,7 +64,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Security check //if ($user->socid > 0) accessforbidden(); diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php index ed9d863cdae..d3f54e28c43 100644 --- a/htdocs/workstation/workstation_agenda.php +++ b/htdocs/workstation/workstation_agenda.php @@ -74,7 +74,7 @@ if (!$sortorder) { $sortorder = 'DESC,DESC'; } -// Initialize technical objects +// Initialize a technical objects $object = new Workstation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id; @@ -84,7 +84,7 @@ $hookmanager->initHooks(array('workstationagenda', 'globalcard')); // Note that $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = rtrim(getMultidirOutput($object, '', 1), '/'); } diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php index 9ad7fd7154b..3dbe5b841e7 100644 --- a/htdocs/workstation/workstation_card.php +++ b/htdocs/workstation/workstation_card.php @@ -59,7 +59,7 @@ $groups = GETPOST('groups', 'array:int'); $resources = GETPOST('resources', 'array:int'); //$lineid = GETPOST('lineid', 'int'); -// Initialize technical objects +// Initialize a technical objects $object = new Workstation($db); //$extrafields = new ExtraFields($db); @@ -85,7 +85,7 @@ if (empty($action) && empty($id) && empty($ref)) { } // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. // Permissions $permissiontoread = $user->hasRight('workstation', 'workstation', 'read'); diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php index 5037da70832..bb27fbda10d 100644 --- a/htdocs/workstation/workstation_document.php +++ b/htdocs/workstation/workstation_document.php @@ -63,7 +63,7 @@ if (!$sortfield) { } //if (! $sortfield) $sortfield="position_name"; -// Initialize technical objects +// Initialize a technical objects $object = new Workstation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id; @@ -73,7 +73,7 @@ $hookmanager->initHooks(array('workstationdocument', 'globalcard')); // Note tha $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = rtrim(getMultidirOutput($object, '', 1), '/'); diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php index 67e4ba8d2c2..11ad744f2ac 100644 --- a/htdocs/workstation/workstation_list.php +++ b/htdocs/workstation/workstation_list.php @@ -64,7 +64,7 @@ $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -// Initialize technical objects +// Initialize a technical objects $object = new Workstation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id; diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php index a822c458f67..9f2d8d67b9a 100644 --- a/htdocs/workstation/workstation_note.php +++ b/htdocs/workstation/workstation_note.php @@ -42,7 +42,7 @@ $action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'aZ09'); $backtopage = GETPOST('backtopage', 'alpha'); -// Initialize technical objects +// Initialize a technical objects $object = new Workstation($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id; @@ -52,7 +52,7 @@ $hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note t $extrafields->fetch_name_optionals_label($object->table_element); // Load object -include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'. Include fetch and fetch_thirdparty but not fetch_optionals if ($id > 0 || !empty($ref)) { $upload_dir = rtrim(getMultidirOutput($object, '', 1), '/'); } @@ -74,7 +74,7 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } if (empty($reshook)) { - include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be 'include', not 'include_once' }