From a0a5d33641ddd0f2f3511a56c737219d2087467f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 26 Jul 2018 11:57:25 +0200 Subject: [PATCH] test include --- build/generate_filelist_xml.php | 4 +- dev/examples/code/create_invoice.php | 4 +- dev/examples/code/create_order.php | 4 +- dev/examples/code/create_product.php | 4 +- dev/examples/code/create_user.php | 4 +- dev/examples/code/get_contracts.php | 4 +- dev/initdata/generate-invoice.php | 6 +-- dev/initdata/generate-order.php | 4 +- dev/initdata/generate-product.php | 2 +- dev/initdata/generate-proposal.php | 12 +++--- dev/initdata/generate-thirdparty.php | 2 +- dev/initdata/import-products.php | 2 +- dev/initdata/import-thirdparties.php | 2 +- dev/initdata/import-users.php | 2 +- dev/initdata/purge-data.php | 2 +- dev/initdemo/sftpget_and_loaddump.php | 16 +++---- dev/initdemo/updatedemo.php | 16 +++---- dev/setup/codesniffer/ruleset.xml | 13 ++++++ dev/tools/test/testtcpdf.php | 4 +- dev/tools/test/testutf.php | 4 +- dev/translation/autotranslator.php | 6 +-- htdocs/admin/dolistore/ajax/image.php | 25 ++++------- .../class/PSWebServiceLibrary.class.php | 4 +- htdocs/admin/mails_senderprofile_list.php | 4 +- htdocs/admin/modules.php | 2 +- htdocs/asset/card.php | 4 +- htdocs/cashdesk/affContenu.php | 2 +- htdocs/cashdesk/facturation.php | 2 +- htdocs/cashdesk/validation.php | 2 +- htdocs/cashdesk/validation_ok.php | 2 +- htdocs/cashdesk/validation_ticket.php | 4 +- htdocs/comm/action/class/actioncomm.class.php | 6 +-- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- htdocs/compta/bank/bilan.php | 2 +- htdocs/compta/bank/budget.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/info.php | 2 +- htdocs/compta/bank/ligne.php | 6 +-- htdocs/compta/bank/list.php | 2 +- htdocs/compta/bank/releve.php | 2 +- htdocs/compta/bank/transfer.php | 2 +- htdocs/compta/facture/card.php | 4 +- .../facture/class/facture-rec.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/compta/facture/document.php | 4 +- htdocs/compta/facture/fiche-rec.php | 6 +-- htdocs/compta/facture/info.php | 2 +- htdocs/compta/paiement/cheque/card.php | 2 +- .../cheque/class/remisecheque.class.php | 4 +- htdocs/compta/paiement/cheque/index.php | 2 +- htdocs/compta/paiement/cheque/list.php | 2 +- .../compta/paiement/class/paiement.class.php | 6 +-- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/prelevement/card.php | 2 +- .../class/bonprelevement.class.php | 8 ++-- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/prelevement/demandes.php | 2 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/index.php | 2 +- htdocs/compta/prelevement/ligne.php | 2 +- htdocs/compta/prelevement/list.php | 2 +- htdocs/compta/prelevement/rejets.php | 2 +- htdocs/compta/prelevement/stats.php | 2 +- htdocs/compta/sociales/card.php | 6 +-- .../class/paymentsocialcontribution.class.php | 2 +- htdocs/compta/sociales/document.php | 6 +-- htdocs/compta/sociales/info.php | 4 +- htdocs/conf/conf.php.example | 14 +++---- htdocs/contrat/card.php | 2 +- htdocs/contrat/contact.php | 2 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/index.php | 6 +-- htdocs/contrat/info.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/contrat/note.php | 2 +- htdocs/contrat/services_list.php | 8 ++-- htdocs/core/actions_massactions.inc.php | 4 +- htdocs/core/ajax/price.php | 2 +- htdocs/core/boxes/box_project.php | 4 +- htdocs/core/boxes/box_task.php | 6 +-- htdocs/core/class/smtps.class.php | 2 +- htdocs/core/lib/invoice2.lib.php | 4 +- .../core/modules/modExpenseReport.class.php | 2 +- htdocs/core/modules/modHRM.class.php | 2 +- htdocs/core/modules/modHoliday.class.php | 2 +- htdocs/core/modules/modOpenSurvey.class.php | 2 +- .../doc/doc_generic_project_odt.modules.php | 2 +- .../modules/syslog/mod_syslog_chromephp.php | 10 ++--- .../modules/syslog/mod_syslog_firephp.php | 2 +- htdocs/core/tpl/resource_add.tpl.php | 2 +- htdocs/cron/admin/cron.php | 2 +- htdocs/cron/class/cronjob.class.php | 2 +- htdocs/dav/fileserver.php | 2 +- htdocs/expedition/card.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/expensereport/card.php | 6 +-- .../class/expensereport.class.php | 2 +- .../class/expensereportstats.class.php | 4 +- .../class/paymentexpensereport.class.php | 2 +- htdocs/expensereport/document.php | 2 +- htdocs/expensereport/list.php | 8 ++-- htdocs/expensereport/note.php | 2 +- htdocs/externalsite/frametop.php | 2 +- htdocs/fichinter/card-rec.php | 7 +--- .../fournisseur.commande.dispatch.class.php | 6 +-- htdocs/ftp/index.php | 42 +++++++++---------- htdocs/holiday/card.php | 2 +- htdocs/holiday/define_holiday.php | 2 +- htdocs/holiday/list.php | 2 +- htdocs/holiday/month_report.php | 2 +- htdocs/holiday/view_log.php | 2 +- htdocs/hrm/admin/admin_establishment.php | 2 +- htdocs/hrm/admin/admin_hrm.php | 2 +- htdocs/hrm/establishment/card.php | 2 +- htdocs/hrm/establishment/info.php | 2 +- htdocs/hrm/index.php | 2 +- .../mailmanspip/class/mailmanspip.class.php | 2 +- htdocs/main.inc.php | 2 +- htdocs/margin/admin/margin.php | 4 +- htdocs/modulebuilder/index.php | 2 +- htdocs/modulebuilder/template/admin/about.php | 10 ++--- htdocs/modulebuilder/template/admin/setup.php | 10 ++--- .../template/css/mymodule.css.php | 10 ++--- .../modulebuilder/template/js/mymodule.js.php | 10 ++--- .../template/myobject_document.php | 2 +- .../modulebuilder/template/myobject_list.php | 2 +- .../modulebuilder/template/myobject_note.php | 2 +- .../template/scripts/myobject.php | 10 ++--- htdocs/opensurvey/card.php | 12 +++--- .../class/opensurveysondage.class.php | 6 +-- htdocs/opensurvey/exportcsv.php | 8 ++-- htdocs/opensurvey/index.php | 6 +-- htdocs/opensurvey/list.php | 8 ++-- htdocs/opensurvey/results.php | 11 +++-- htdocs/opensurvey/wizard/choix_autre.php | 8 ++-- htdocs/opensurvey/wizard/choix_date.php | 8 ++-- htdocs/opensurvey/wizard/create_survey.php | 10 ++--- htdocs/product/class/productbatch.class.php | 2 +- .../class/propalmergepdfproduct.class.php | 2 +- htdocs/product/inventory/list.php | 2 +- htdocs/projet/activity/index.php | 2 +- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/activity/perweek.php | 2 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/tasks.php | 2 +- htdocs/projet/tasks/comment.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/projet/tasks/list.php | 2 +- htdocs/projet/tasks/note.php | 2 +- htdocs/projet/tasks/task.php | 2 +- htdocs/public/cron/cron_run_jobs.php | 10 +---- htdocs/public/opensurvey/studs.php | 10 ++--- htdocs/public/stripe/ipn.php | 6 +-- htdocs/resource/card.php | 7 +--- htdocs/resource/class/dolresource.class.php | 2 +- .../class/html.formresource.class.php | 4 +- htdocs/resource/element_resource.php | 6 +-- htdocs/societe/checkvat/checkVatPopup.php | 2 +- htdocs/societe/consumption.php | 2 +- htdocs/societe/website.php | 2 +- htdocs/stripe/payment.php | 3 +- htdocs/ticket/class/ticket.class.php | 4 +- htdocs/ticket/class/ticketlogs.class.php | 4 +- htdocs/ticket/list.php | 2 +- htdocs/user/class/usergroup.class.php | 2 +- htdocs/webservices/server_order.php | 4 +- .../webservices/server_productorservice.php | 4 +- htdocs/website/websiteaccount_card.php | 23 +++------- .../accountancy/export-thirdpartyaccount.php | 2 +- scripts/bank/export-bank-receipts.php | 2 +- .../company/export-contacts-xls-example.php | 12 +++--- .../company/sync_contacts_dolibarr2ldap.php | 8 ++-- .../email_expire_services_to_customers.php | 4 +- ...ail_expire_services_to_representatives.php | 4 +- scripts/cron/cron_run_jobs.php | 6 +-- scripts/emailings/mailing-send.php | 6 +-- .../email_unpaid_invoices_to_customers.php | 4 +- ...ail_unpaid_invoices_to_representatives.php | 4 +- scripts/invoices/rebuild_merge_pdf.php | 10 ++--- .../members/sync_members_dolibarr2ldap.php | 6 +-- .../members/sync_members_ldap2dolibarr.php | 10 ++--- .../sync_members_types_dolibarr2ldap.php | 6 +-- .../sync_members_types_ldap2dolibarr.php | 8 ++-- scripts/modulebuilder/builddoc.php | 2 +- scripts/modulebuilder/initmodule.php | 2 +- scripts/product/migrate_picture_path.php | 6 +-- scripts/product/regenerate_thumbs.php | 8 ++-- scripts/user/sync_groups_dolibarr2ldap.php | 6 +-- scripts/user/sync_groups_ldap2dolibarr.php | 10 ++--- scripts/user/sync_users_dolibarr2ldap.php | 6 +-- scripts/user/sync_users_ldap2dolibarr.php | 8 ++-- scripts/withdrawals/build_withdrawal_file.php | 10 ++--- test/phpunit/ModulesTest.php | 2 +- test/phpunit/WebservicesInvoicesTest.php | 2 +- test/phpunit/WebservicesOrdersTest.php | 2 +- test/phpunit/WebservicesOtherTest.php | 2 +- test/phpunit/WebservicesProductsTest.php | 2 +- test/phpunit/WebservicesThirdpartyTest.php | 2 +- test/phpunit/WebservicesUserTest.php | 2 +- 205 files changed, 442 insertions(+), 477 deletions(-) diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php index 0764d64b491..ec9ded557ff 100755 --- a/build/generate_filelist_xml.php +++ b/build/generate_filelist_xml.php @@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit; } -require_once($path."../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once $path."../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; /* diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php index bd82d38d306..e519c62a436 100755 --- a/dev/examples/code/create_invoice.php +++ b/dev/examples/code/create_invoice.php @@ -40,7 +40,7 @@ $error=0; // -------------------- START OF YOUR CODE HERE -------------------- // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file. //$langs->setDefaultLang('en_US'); // To change default language of $langs @@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; // Create invoice object $obj = new Facture($db); diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php index 4575e9e28f3..95b047705fa 100755 --- a/dev/examples/code/create_order.php +++ b/dev/examples/code/create_order.php @@ -40,7 +40,7 @@ $error=0; // -------------------- START OF YOUR CODE HERE -------------------- // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file. //$langs->setDefaultLang('en_US'); // To change default language of $langs @@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"; // Create order object $com = new Commande($db); diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php index 61598ff59d9..8cbc07a1b63 100755 --- a/dev/examples/code/create_product.php +++ b/dev/examples/code/create_product.php @@ -40,7 +40,7 @@ $error=0; // -------------------- START OF YOUR CODE HERE -------------------- // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file. //$langs->setDefaultLang('en_US'); // To change default language of $langs @@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; // Create instance of object $myproduct=new Product($db); diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php index 20173eb914a..f8e0ba23011 100755 --- a/dev/examples/code/create_user.php +++ b/dev/examples/code/create_user.php @@ -40,7 +40,7 @@ $error=0; // -------------------- START OF YOUR CODE HERE -------------------- // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file. //$langs->setDefaultLang('en_US'); // To change default language of $langs @@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; // Create user object $obj = new User($db); diff --git a/dev/examples/code/get_contracts.php b/dev/examples/code/get_contracts.php index fbe512300e8..daff0e43e6f 100755 --- a/dev/examples/code/get_contracts.php +++ b/dev/examples/code/get_contracts.php @@ -40,7 +40,7 @@ $error=0; // -------------------- START OF YOUR CODE HERE -------------------- // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file. //$langs->setDefaultLang('en_US'); // To change default language of $langs @@ -65,7 +65,7 @@ print 'Argument id_thirdparty='.$argv[1]."\n"; // Start of transaction $db->begin(); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); +require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"; // Create contract object $obj = new Contrat($db); diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php index e313aa44d1f..4064336cbab 100755 --- a/dev/initdata/generate-invoice.php +++ b/dev/initdata/generate-invoice.php @@ -32,9 +32,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); -require (__DIR__. '/../../htdocs/master.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +require __DIR__. '/../../htdocs/master.inc.php'; +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; /* diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php index c73b15b620d..5e53fa752a2 100755 --- a/dev/initdata/generate-order.php +++ b/dev/initdata/generate-order.php @@ -33,14 +33,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr //$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); -require (__DIR__. '/../../htdocs/master.inc.php'); +require __DIR__. '/../../htdocs/master.inc.php'; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"; /* diff --git a/dev/initdata/generate-product.php b/dev/initdata/generate-product.php index 3ae44b00b3a..393d5c5ce3d 100755 --- a/dev/initdata/generate-product.php +++ b/dev/initdata/generate-product.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr //$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); -require (__DIR__. '/../../htdocs/master.inc.php'); +require __DIR__. '/../../htdocs/master.inc.php'; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php index 6f1dc293a68..631b734fc9e 100755 --- a/dev/initdata/generate-proposal.php +++ b/dev/initdata/generate-proposal.php @@ -33,11 +33,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr //$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); -require (__DIR__. '/../../htdocs/master.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +require __DIR__. '/../../htdocs/master.inc.php'; +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"; +require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"; +require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; /* * Parameters @@ -157,7 +157,7 @@ $user->rights->propal->propal_advance->validate=1; if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"; } $i=0; diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php index 992ab61f4ef..7f2c3e2055d 100755 --- a/dev/initdata/generate-thirdparty.php +++ b/dev/initdata/generate-thirdparty.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr //$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); -require (__DIR__. '/../../htdocs/master.inc.php'); +require __DIR__. '/../../htdocs/master.inc.php'; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php index a08e3b6066e..942e6f8f5d7 100755 --- a/dev/initdata/import-products.php +++ b/dev/initdata/import-products.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +require $path."../../htdocs/master.inc.php"; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php index 0c32c7ea6a3..63c6856e5ec 100755 --- a/dev/initdata/import-thirdparties.php +++ b/dev/initdata/import-thirdparties.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +require $path."../../htdocs/master.inc.php"; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php index 3aaa9c11a4a..72a006bbe29 100755 --- a/dev/initdata/import-users.php +++ b/dev/initdata/import-users.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +require $path."../../htdocs/master.inc.php"; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php index f992dcb2dc6..5a1e7b3afc3 100755 --- a/dev/initdata/purge-data.php +++ b/dev/initdata/purge-data.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]); -require ($path."../../htdocs/master.inc.php"); +require $path."../../htdocs/master.inc.php"; include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php index 981ff964b8e..98cb6189935 100755 --- a/dev/initdemo/sftpget_and_loaddump.php +++ b/dev/initdemo/sftpget_and_loaddump.php @@ -41,15 +41,15 @@ $passwordbase=isset($argv[6])?$argv[6]:''; // Include Dolibarr environment $res=0; -if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php"); -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php"); -if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php"); -if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php"); -if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php"); -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only +if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; +if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; +if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; +if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; +if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only if (! $res) die ("Failed to include master.inc.php file\n"); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; /* diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php index 9c453096904..ef37e25c04f 100755 --- a/dev/initdemo/updatedemo.php +++ b/dev/initdemo/updatedemo.php @@ -36,15 +36,15 @@ $confirm=isset($argv[1])?$argv[1]:''; // Include Dolibarr environment $res=0; -if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php"); -if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php"); -if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php"); -if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php"); -if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php"); -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only -if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only +if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php"; +if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php"; +if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; +if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; +if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only +if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only if (! $res) die ("Failed to include master.inc.php file\n"); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; /* diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index 5c4175d1f11..6619cf83754 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -286,6 +286,19 @@ + + + 0 + + + 0 + + + 0 + + + 0 + diff --git a/dev/tools/test/testtcpdf.php b/dev/tools/test/testtcpdf.php index e14dae9c2a3..ce962dce3d9 100755 --- a/dev/tools/test/testtcpdf.php +++ b/dev/tools/test/testtcpdf.php @@ -27,8 +27,8 @@ * @since 2008-03-04 */ -require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'); -require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'); +require_once '../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'; +require_once '../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'; // create new PDF document $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); diff --git a/dev/tools/test/testutf.php b/dev/tools/test/testutf.php index c626a92a57d..ffa746bcab5 100644 --- a/dev/tools/test/testutf.php +++ b/dev/tools/test/testutf.php @@ -47,8 +47,8 @@ print 'Files has been created. Check its name from your explorer'."\n"; * @since 2008-09-15 */ -require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'); -require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'); +require_once '../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php'; +require_once '../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php'; // create new PDF document $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php index 58314a23b9e..c7897810a72 100755 --- a/dev/translation/autotranslator.php +++ b/dev/translation/autotranslator.php @@ -37,8 +37,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Include Dolibarr environment -require_once($path.'../../htdocs/master.inc.php'); -require_once($path.'../../htdocs/core/lib/files.lib.php'); +require_once $path.'../../htdocs/master.inc.php'; +require_once $path.'../../htdocs/core/lib/files.lib.php'; // After this $db is an opened handler to database. We close it at end of file. // Load main language strings @@ -88,7 +88,7 @@ if ($argv[2] != 'all') } } -require_once(DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php"); +require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php"; $langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]); diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php index 14d05a036e8..043d24e8376 100644 --- a/htdocs/admin/dolistore/ajax/image.php +++ b/htdocs/admin/dolistore/ajax/image.php @@ -20,22 +20,11 @@ if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1); /** - * \file htdocs/commande/info.php - * \ingroup commande - * \brief Page des informations d'une commande + * \file htdocs/admin/dolistore/ajax.php + * \ingroup admin + * \brief Page des informations dolistore */ -$res = 0; -if (!$res && file_exists("../main.inc.php")) $res = @include("../main.inc.php"); -if (!$res && file_exists("../../main.inc.php")) $res = @include("../../main.inc.php"); -if (!$res && file_exists("../../../main.inc.php")) $res = @include("../../../main.inc.php"); -if (!$res && file_exists("../../../../main.inc.php")) $res = @include("../../../../main.inc.php"); -if (!$res && file_exists("../../../dolibarr/htdocs/main.inc.php")) - $res = @include("../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only -if (!$res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) - $res = @include("../../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only -if (!$res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) - $res = @include("../../../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only -if (!$res) die("Include of main fails"); +require "../../../main.inc.php"; // CORE @@ -52,8 +41,10 @@ $quality = GETPOST('quality', 'alpha'); try { $url = $conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'/api/images/products/'.$id_product.'/'.$id_image.'/'.$quality; - $api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, - $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api); + $api = new PrestaShopWebservice( + $conf->global->MAIN_MODULE_DOLISTORE_API_SRV, + $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api + ); //echo $url; $request = $api->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET')); header('Content-type:image'); diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php index de3ca683519..c6e33023e4c 100644 --- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php +++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php @@ -53,7 +53,7 @@ class PrestaShopWebservice * PrestaShopWebservice constructor. Throw an exception when CURL is not installed/activated * * * * '."\n"; if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $formfile = new FormFile($db); $hidegeneratedfilelistifempty=1; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index cb560b29d86..437a43bd05b 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -672,7 +672,7 @@ if ($mode == 'common') print ''; print $versiontrans; if(!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)){ - require_once(DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php'; if (!empty($objMod->url_last_version)) { $newversion = getURLContent($objMod->url_last_version); if(isset($newversion['content'])){ diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 1cb580c8c8d..9126f80617f 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -25,8 +25,8 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php'; require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php'; -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; // Load translation files required by the page $langs->loadLangs(array("asset")); diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index bd778f3422e..2a3c0279df8 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -87,7 +87,7 @@ print ''; print '
'; print '
'; -require ('tpl/liste_articles.tpl.php'); +require 'tpl/liste_articles.tpl.php'; print '
'; print '
'; diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php index f52890b68d2..6a2889f6e71 100644 --- a/htdocs/cashdesk/facturation.php +++ b/htdocs/cashdesk/facturation.php @@ -163,4 +163,4 @@ $obj_facturation->paiementLe('RESET'); // Affichage des templates -require ('tpl/facturation1.tpl.php'); +require 'tpl/facturation1.tpl.php'; diff --git a/htdocs/cashdesk/validation.php b/htdocs/cashdesk/validation.php index 289c864ca32..ff1219861e2 100644 --- a/htdocs/cashdesk/validation.php +++ b/htdocs/cashdesk/validation.php @@ -24,5 +24,5 @@ $form=new Form($db); // Affichage des templates -require ('tpl/validation1.tpl.php'); +require 'tpl/validation1.tpl.php'; diff --git a/htdocs/cashdesk/validation_ok.php b/htdocs/cashdesk/validation_ok.php index 70bf3d1b64f..c8c83a91f18 100644 --- a/htdocs/cashdesk/validation_ok.php +++ b/htdocs/cashdesk/validation_ok.php @@ -22,5 +22,5 @@ */ // Affichage des templates -require ('tpl/validation2.tpl.php'); +require 'tpl/validation2.tpl.php'; diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php index 577df309138..a98b50b0bc9 100644 --- a/htdocs/cashdesk/validation_ticket.php +++ b/htdocs/cashdesk/validation_ticket.php @@ -24,7 +24,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'; -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $obj_facturation = unserialize($_SESSION['serObjFacturation']); unset($_SESSION['serObjFacturation']); @@ -35,7 +35,7 @@ $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters,$obj_facturation); if (empty($reshook)) { - require ('tpl/ticket.tpl.php'); + require 'tpl/ticket.tpl.php'; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index c6ec428e68f..6c863580203 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1351,9 +1351,9 @@ class ActionComm extends CommonObject { global $conf,$langs,$dolibarr_main_url_root,$mysoc; - require_once (DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"); - require_once (DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT ."/core/lib/xcal.lib.php"; + require_once DOL_DOCUMENT_ROOT ."/core/lib/date.lib.php"; + require_once DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"; dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index a786cf5ca28..82dcfe76d60 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -24,7 +24,7 @@ * \brief Page to report input-output of a bank account */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 8ddc3de0014..b198b54dfc8 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -29,7 +29,7 @@ * \brief List of bank transactions */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index 5e5194d55c8..7c04c409bed 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -22,7 +22,7 @@ * \brief Page de bilan */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Load translation files required by the page diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 280cd9bdbc0..a319f6de6a4 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -24,7 +24,7 @@ * \brief Page de budget */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Load translation files required by the page diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index db497733863..c091d2ac298 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -27,7 +27,7 @@ * \brief Page to create/view a bank account */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php'; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index be029fcb2f5..8760852592f 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -26,7 +26,7 @@ * \brief Page ajout de categories bancaires */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php'; diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php index 33e74dc3691..314ab074c19 100644 --- a/htdocs/compta/bank/document.php +++ b/htdocs/compta/bank/document.php @@ -24,7 +24,7 @@ * \ingroup banque * \brief Page de gestion des documents attaches a un compte bancaire */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT . "/core/lib/bank.lib.php"; require_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php"; require_once DOL_DOCUMENT_ROOT . "/core/lib/images.lib.php"; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index b829002a990..c163c0e421e 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -23,7 +23,7 @@ * \brief Page graph des transactions bancaires */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index ab43b9374aa..0b622154137 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -21,7 +21,7 @@ * \brief Onglet info d'une ecriture bancaire */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 10e549dd094..78759f40cf0 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -28,7 +28,7 @@ * \brief Page to edit a bank transaction record */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; @@ -98,8 +98,8 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban { dol_print_error($db); } - } - else + } + else { setEventMessages($langs->trans("MissingIds"), null, 'errors'); } diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index e52e285742c..909785f2fba 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -27,7 +27,7 @@ use Stripe\BankAccount; * \brief Home page of bank module */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 1d9d5526700..af352035bbe 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -25,7 +25,7 @@ * \brief Page to show a bank statement report */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index 765001e75a5..0c8d3ea2b87 100644 --- a/htdocs/compta/bank/transfer.php +++ b/htdocs/compta/bank/transfer.php @@ -26,7 +26,7 @@ * \brief Page de saisie d'un virement */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 0688d8488ed..b5d04062693 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1705,8 +1705,8 @@ if (empty($reshook)) if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) { $idprod = $res->fk_product_child; - } - else + } + else { setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors'); $error ++; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index a82f06ad851..06f33f3f69a 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -443,7 +443,7 @@ class FactureRec extends CommonInvoice // Retreive all extrafield for line // fetch optionals attributes and labels - require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafieldsline=new ExtraFields($this->db); $extrafieldsline=$extrafieldsline->fetch_name_optionals_label('facturedet_rec',true); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index bb00620d056..4edce36b82f 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3027,7 +3027,7 @@ class Facture extends CommonInvoice { global $mysoc,$user; - include_once(DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; // Cap percentages to 100 if ($percent > 100) $percent = 100; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 828c77f1178..161804d8a34 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; + include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } // Load translation files required by the page @@ -78,7 +78,7 @@ if ($object->fetch($id)) * Actions */ -include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; +require_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; /* diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 6719e7091c8..35ce40a6316 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; - //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; + include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; + //include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; } require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; @@ -546,7 +546,7 @@ if (empty($reshook)) } elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { - require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; + include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; $prodcustprice = new Productcustomerprice($db); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 8964b85203b..4eba0ba65fc 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; + include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; } // Load translation files required by the page diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 69f3bd102df..428f55f9362 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -273,7 +273,7 @@ else if ($action == 'remove_file' && $user->rights->banque->cheque) { if ($object->fetch($id) > 0) { - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("other"); diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 528b01477a6..189afeda59f 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -593,8 +593,8 @@ class RemiseCheque extends CommonObject $file = "pdf_".$model.".class.php"; if (file_exists($dir.$file)) { - require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; - require_once $dir.$file; + include_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; + include_once $dir.$file; $classname='BordereauCheque'.ucfirst($model); $docmodel = new $classname($this->db); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 527bd05e3a1..b6770e62d33 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -24,7 +24,7 @@ * \brief Home page for cheque receipts */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php index 800f40b9694..44fd508dc3d 100644 --- a/htdocs/compta/paiement/cheque/list.php +++ b/htdocs/compta/paiement/cheque/list.php @@ -25,7 +25,7 @@ * \brief Page list of cheque deposits */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 539c70f591b..53a17830c09 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -545,7 +545,7 @@ class Paiement extends CommonObject $this->fk_account=$accountid; - require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; dol_syslog("$user->id,$mode,$label,$this->fk_account,$emetteur_nom,$emetteur_banque"); @@ -1064,7 +1064,7 @@ class Paiement extends CommonObject $arraybill = $this->getBillsArray(); if (is_array($arraybill) && count($arraybill) > 0) { - require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $facturestatic=new Facture($this->db); foreach ($arraybill as $billid) { @@ -1170,7 +1170,7 @@ class Paiement extends CommonObject */ function fetch_thirdparty($force_thirdparty_id=0) { - require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; + include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; if (empty($force_thirdparty_id)) { diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 0cbaa9ce55e..c7fee1f70a8 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -24,7 +24,7 @@ * \brief Page liste des bons de prelevements */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 343a45472b6..84c4087e451 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -23,7 +23,7 @@ * \brief Card of a direct debit */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index a6b0ec84317..94d5a764a38 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -762,16 +762,16 @@ class BonPrelevement extends CommonObject dol_syslog(__METHOD__."::Bank=".$banque." Office=".$agence." mode=".$mode." format=".$format, LOG_DEBUG); - require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); - require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; + require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; if (empty($format)) return 'ErrorBadParametersForDirectDebitFileCreate'; $error = 0; $datetimeprev = time(); - //Choice the date of the execution direct debit - if(!empty($executiondate)) $datetimeprev = $executiondate; + //Choice the date of the execution direct debit + if(!empty($executiondate)) $datetimeprev = $executiondate; $month = strftime("%m", $datetimeprev); $year = strftime("%Y", $datetimeprev); diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 74bd282d606..191a54b7484 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -25,7 +25,7 @@ * \brief Prelevement creation page */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index d20f92cb188..b5058b5c685 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -24,7 +24,7 @@ * \brief Page to list withdraw requests */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 2eabd64873d..d4593a3dcef 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -24,7 +24,7 @@ * \brief Page liste des factures prelevees */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 113153bc896..ebf3876406b 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -24,7 +24,7 @@ * \brief Withdraw reject */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index c126212f17c..e4371abfb5c 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -23,7 +23,7 @@ * \brief Prelevement statistics */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index de99b56eb19..83f14169d4c 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -26,7 +26,7 @@ */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 721cf62bcd7..8cad6ed70d5 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -24,7 +24,7 @@ * \brief card of withdraw line */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 8d657f00221..cac9e52b3c9 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -24,7 +24,7 @@ * \brief Page liste des prelevements */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index c8812bba1a9..2e340a2c801 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -24,7 +24,7 @@ * \brief Reject page */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 20d213e820b..7c878787e89 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -24,7 +24,7 @@ * \brief Page with statistics on withdrawals */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php index 101a934a524..697253b90eb 100644 --- a/htdocs/compta/sociales/card.php +++ b/htdocs/compta/sociales/card.php @@ -32,11 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; + include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } if (! empty($conf->accounting->enabled)) { - require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; + include_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; } // Load translation files required by the page diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index ba9c671f755..114a2e78cf1 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -518,7 +518,7 @@ class PaymentSocialContribution extends CommonObject if (! empty($conf->banque->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); $acc->fetch($accountid); diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 490dbf3a1fe..5f3fc5aa4eb 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -35,8 +35,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; + include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } // Load translation files required by the page @@ -76,7 +76,7 @@ $modulepart='tax'; * Actions */ -include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; +require_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; if ($action == 'setlib' && $user->rights->tax->charges->creer) { diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index 1827c1597f8..4e184e2099f 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -27,8 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if (! empty($conf->projet->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; + include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } // Load translation files required by the page diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 7475cf54ddb..886a6171818 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -14,7 +14,7 @@ // dolibarr_main_url_root // This parameter defines the root URL of your Dolibarr index.php page without ending "/". // It must link to the directory htdocs. -// In most cases, this is autodetected but it's still required +// In most cases, this is autodetected but it's still required // * to show full url bookmarks for some services (ie: agenda rss export url, ...) // * or when using Apache dir aliases (autodetect fails) // * or when using nginx (autodetect fails) @@ -40,7 +40,7 @@ $dolibarr_main_document_root=''; // dolibarr_main_url_root_alt // This parameter defines the relative sub URLs to add to $dolibarr_main_url_root to // forge alternative root directories (used by modules developers). -// You can put several values, separated by a coma, but number of entries must match +// You can put several values, separated by a coma, but number of entries must match // number of entries into $dolibarr_main_document_root_alt. // Examples: // $dolibarr_main_url_root_alt='/custom'; @@ -52,7 +52,7 @@ $dolibarr_main_document_root=''; // dolibarr_main_document_root_alt // This parameter contains absolute alternative root file system directories (used by // modules developers). -// You can put several values, separated by a coma, but number of entries must match +// You can put several values, separated by a coma, but number of entries must match // number of entries into $dolibarr_main_url_root_alt. // Examples: // $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/custom'; @@ -162,7 +162,7 @@ $dolibarr_main_db_collation='utf8_unicode_ci'; // Default value: dolibarr // Possible values: Any values found in files in htdocs/core/login directory after // the "function_" string and before the ".php" string. You can also separate several -// values using a ",". In this case, Dolibarr will check login/pass for each value in +// values using a ",". In this case, Dolibarr will check login/pass for each value in // order defined into value. However, note that this can't work with all values. // Examples: // $dolibarr_main_authentication='http'; @@ -207,10 +207,10 @@ $dolibarr_main_authentication='dolibarr'; // 0 = No forced redirect // 1 = Force redirect to https, until SCRIPT_URI start with https into response // 2 = Force redirect to https, until SERVER["HTTPS"] is 'on' into response -// 'https://my.domain.com' = Force reditect to https using this domain name. +// 'https://my.domain.com' = Force reditect to https using this domain name. // Warning: If you enable this parameter, your web server must be configured to -// respond URL with https protocol. -// According to your web server setup, some values may works and other not. Try +// respond URL with https protocol. +// According to your web server setup, some values may works and other not. Try // different values (1,2 or 'https://my.domain.com') if you experience problems. // Default value: 0 // Possible values: 0, 1, 2 or 'https://my.domain.com' diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d0120d130df..9c13a57112a 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -30,7 +30,7 @@ * \brief Page of a contract */ -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 4d403198eb8..063e3ecb228 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -24,7 +24,7 @@ * \brief Onglet de gestion des contacts des contrats */ -require ("../main.inc.php"); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 0208d68f80d..20a70830952 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -27,7 +27,7 @@ * \brief Page des documents joints sur les contrats */ -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index b78bf52b6be..f348cab8234 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -24,9 +24,9 @@ * \brief Home page of contract area */ -require ("../main.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require "../main.inc.php"; +require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"; +require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; // Load translation files required by the page $langs->loadLangs(array('products', 'companies', 'contracts')); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 8899351c284..c783ca4948c 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -22,7 +22,7 @@ * \brief Page des informations d'un contrat */ -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 18e78c7ff0a..e616afefd99 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -28,7 +28,7 @@ * \brief Page liste des contrats */ -require ("../main.inc.php"); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index c160201191a..a5ea40e146c 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -24,7 +24,7 @@ * \brief Fiche de notes sur un contrat */ -require ("../main.inc.php"); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; if (! empty($conf->projet->enabled)) { diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php index de44410e505..1ce48a7371d 100644 --- a/htdocs/contrat/services_list.php +++ b/htdocs/contrat/services_list.php @@ -25,10 +25,10 @@ * \brief Page to list services in contracts */ -require ("../main.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +require "../main.inc.php"; +require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"; +require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; +require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; // Load translation files required by the page $langs->loadLangs(array('products', 'contracts', 'companies')); diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php index 646be9a3f92..7d481463294 100644 --- a/htdocs/core/actions_massactions.inc.php +++ b/htdocs/core/actions_massactions.inc.php @@ -378,7 +378,7 @@ if (! $error && $massaction == 'confirm_presend') //var_dump($filepath); // Send mail (substitutionarray must be done just before this) - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1); if ($mailfile->error) { @@ -433,7 +433,7 @@ if (! $error && $massaction == 'confirm_presend') if (! empty($trigger_name)) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"; $interface=new Interfaces($db); $result=$interface->run_triggers($trigger_name, $objectobj, $user, $langs, $conf); if ($result < 0) { $error++; $errors=$interface->errors; } diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php index 577f659b2cc..453fdc7bc82 100644 --- a/htdocs/core/ajax/price.php +++ b/htdocs/core/ajax/price.php @@ -25,7 +25,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); -require('../../main.inc.php'); +require '../../main.inc.php'; $output = GETPOST('output','alpha'); $amount = price2num(GETPOST('amount','alpha')); diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 976cbf1766c..29bc4410b82 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -23,7 +23,7 @@ * \ingroup projet * \brief Module to show Projet activity of the current Year */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"; /** * Class to manage the box to show last projet @@ -80,7 +80,7 @@ class box_project extends ModeleBoxes // list the summary of the orders if ($user->rights->projet->lire) { - include_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); + include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $projectstatic = new Project($this->db); $socid=$user->societe_id; diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index 3a665243073..802195ca445 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -22,8 +22,8 @@ * \brief Module to Task activity of the current year */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; /** @@ -75,7 +75,7 @@ class box_task extends ModeleBoxes $totalMnt = 0; $totalnb = 0; $totalDuree=0; - include_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); + include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php"; $taskstatic=new Task($db); diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index ffa9dafdfbe..7f0f8143cbd 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -656,7 +656,7 @@ class SMTPs { // If the path is not valid, this will NOT generate an error, // it will simply return false. - if ( ! @include ( $_strConfigPath ) ) + if ( ! @include $_strConfigPath) { $this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.'); $_retVal = false; diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php index 866cf004ca6..f318f493417 100644 --- a/htdocs/core/lib/invoice2.lib.php +++ b/htdocs/core/lib/invoice2.lib.php @@ -23,8 +23,8 @@ * \brief Function to rebuild PDF and merge PDF files into one */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index 78f517b6768..3226745d6c0 100644 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -23,7 +23,7 @@ * \ingroup expensereport * \brief Description and activation file for module ExpenseReport */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"; /** diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php index 6b9f81a5a1f..d713b4edc4a 100644 --- a/htdocs/core/modules/modHRM.class.php +++ b/htdocs/core/modules/modHRM.class.php @@ -20,7 +20,7 @@ * \ingroup HRM * \brief Description and activation file for module HRM */ -include_once (DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php"; /** * Class to describe and activate the HRM module diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index 0ba265e6089..eb1b727ea31 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -28,7 +28,7 @@ * \ingroup holiday * \brief Description and activation file for module holiday */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"; /** diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php index 23c1b2680b8..951a8ea5d63 100644 --- a/htdocs/core/modules/modOpenSurvey.class.php +++ b/htdocs/core/modules/modOpenSurvey.class.php @@ -23,7 +23,7 @@ * \ingroup opensurvey * \brief Description and activation file for module OpenSurvey */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"; /** diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 2f393e50002..92b3ea54a48 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -206,7 +206,7 @@ class doc_generic_project_odt extends ModelePDFProjects $ret[$pc.'phone_mobile'] = $ct->phone_mobile; // fetch external user extrafields - require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafields=new ExtraFields($this->db); $extralabels=$extrafields->fetch_name_optionals_label($ct->table_element, true); $extrafields_num = $ct->fetch_optionals(); diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php index 7523588ac15..2617cdb269d 100644 --- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php @@ -66,8 +66,8 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface } set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); - $res = @include_once('ChromePhp.php'); - if (! $res) $res=@include_once('ChromePhp.class.php'); + $res = @include_once 'ChromePhp.php'; + if (! $res) $res=@include_once 'ChromePhp.class.php'; restore_include_path(); @@ -152,12 +152,12 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface try { - // Warning ChromePHP must be into PHP include path. It is not possible to use into require_once() a constant from + // Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from // database or config file because we must be able to log data before database or config file read. $oldinclude=get_include_path(); set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); - $res = @include_once('ChromePhp.php'); - if (! $res) $res=@include_once('ChromePhp.class.php'); + $res = @include_once 'ChromePhp.php'; + if (! $res) $res=@include_once 'ChromePhp.class.php'; set_include_path($oldinclude); ob_start(); // To be sure headers are not flushed until all page is completely processed diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php index f502022c4f6..98a3c7142af 100644 --- a/htdocs/core/modules/syslog/mod_syslog_firephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php @@ -153,7 +153,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface try { - // Warning FirePHPCore must be into PHP include path. It is not possible to use into require_once() a constant from + // Warning FirePHPCore must be into PHP include path. It is not possible to use into require_once a constant from // database or config file because we must be able to log data before database or config file read. $oldinclude=get_include_path(); set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH); diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php index af1d25aaee1..688d3aba221 100644 --- a/htdocs/core/tpl/resource_add.tpl.php +++ b/htdocs/core/tpl/resource_add.tpl.php @@ -9,7 +9,7 @@ if (empty($conf) || ! is_object($conf)) } -require_once(DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'); +require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; $form = new Form($db); $formresources = new FormResource($db); diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php index 729772bcf7e..647aa8b96e3 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -25,7 +25,7 @@ */ // Dolibarr environment -$res = @include("../../main.inc.php"); // From htdocs directory +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php'; diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index e3235789d66..3ccf27ee676 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -22,7 +22,7 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; /** diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php index a1d145306f5..2fc4485dc76 100644 --- a/htdocs/dav/fileserver.php +++ b/htdocs/dav/fileserver.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOLOGIN')) define("NOLOGIN",1); // This means this output page does not require to be logged. if (! defined('NOCSRFCHECK')) define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/dav/dav.class.php'; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index ab860ced2e9..eb932f76c51 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -504,7 +504,7 @@ if (empty($reshook)) // Action update else if ( - ($action == 'settracking_number' + ($action == 'settracking_number' || $action == 'settracking_url' || $action == 'settrueWeight' || $action == 'settrueWidth' diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 4042b202300..4974722166c 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1114,7 +1114,7 @@ class Expedition extends CommonObject // Stock control if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > 0) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"; $langs->load("agenda"); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 0dee88c8a4c..141260d36f3 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.clas require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; if (! empty($conf->accounting->enabled)) { - include_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; + require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; } // Load translation files required by the page @@ -95,7 +95,7 @@ $extrafields = new ExtraFields($db); $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); // Load object -require DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be require, not require_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 $hookmanager->initHooks(array('expensereportcard','globalcard')); @@ -2456,7 +2456,7 @@ $defaulttopic='SendExpenseReportRef'; $diroutput = $conf->expensereport->dir_output; $trackid = 'exp'.$object->id; -require DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; llxFooter(); diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 8300960e204..b7c81c4d33a 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1127,7 +1127,7 @@ class ExpenseReport extends CommonObject // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref) // in order not to lose the attachments diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php index 07396663f42..2c15b1ffed5 100644 --- a/htdocs/expensereport/class/expensereportstats.class.php +++ b/htdocs/expensereport/class/expensereportstats.class.php @@ -22,8 +22,8 @@ * \ingroup expensereport * \brief Fichier de la classe de gestion des stats des expensereport et notes de frais */ -include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; -include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; /** * Classe permettant la gestion des stats des expensereports et notes de frais diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 0634ca16b7a..781b22d27e7 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -505,7 +505,7 @@ class PaymentExpenseReport extends CommonObject if (! empty($conf->banque->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); $acc->fetch($accountid); diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index 2bf890e540c..f0d61d0f80d 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -73,7 +73,7 @@ $modulepart='trip'; * Actions */ -require_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; +include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; /* diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 64bffc43e3b..d3e5bc6fabd 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -26,7 +26,7 @@ * \brief list of expense reports */ -require "../main.inc.php"; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; @@ -143,7 +143,7 @@ $parameters=array('socid'=>$socid); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; +include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; if (empty($reshook)) { @@ -179,7 +179,7 @@ if (empty($reshook)) if ($action == 'update' && ! $cancel) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if ($canedituser) // Case we can edit all field { @@ -313,7 +313,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense $sql.= " AND d.fk_user_author IN (".join(',',$childids).")\n"; } // Add where from extra fields -require DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks $parameters=array(); $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php index 9bf360c9ac7..baa0c174fc1 100644 --- a/htdocs/expensereport/note.php +++ b/htdocs/expensereport/note.php @@ -56,7 +56,7 @@ $permissionnote=$user->rights->expensereport->creer; // Used by the include of a * Actions */ -require DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be require, not require_once +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once /* diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php index 5abc4e840a3..ee746d745cc 100644 --- a/htdocs/externalsite/frametop.php +++ b/htdocs/externalsite/frametop.php @@ -22,7 +22,7 @@ * \brief Top frame to show external web application */ -require ("../main.inc.php"); +require "../main.inc.php"; // Load translation files required by the page $langs->load("externalsite"); diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 96d7e106b5a..8b258ebbf6e 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -29,12 +29,7 @@ * \brief Page to show predefined fichinter */ -$res=0; -if (! $res && file_exists("../../main.inc.php")) - $res=@include("../../main.inc.php"); // For root directory -if (! $res && file_exists("../../../main.inc.php")) - $res=@include("../../../main.inc.php"); // For "custom" directory - +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinterrec.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index a72e225b535..910115d8822 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -24,9 +24,9 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; +//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; /** diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index afc7c1f0f7a..de8489ebb55 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -83,7 +83,7 @@ $mesg=''; // Submit file if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $result=$ecmdir->fetch($_REQUEST["section"]); if (! $result > 0) @@ -378,7 +378,7 @@ jQuery(document).ready(function() { $(".checkboxfordelete").prop('checked', false); jQuery("#delconst").hide(); }); - + }); @@ -408,7 +408,7 @@ else if ($action == 'delete') { print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'§ion='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1); - + } // Confirmation de la suppression d'une ligne categorie @@ -486,7 +486,7 @@ else $newsection=$section; $newsectioniso=utf8_decode($section); //$newsection='/home'; - + // List content of directory ($newsection = '/', '/home', ...) if (! empty($conf->global->FTP_CONNECT_WITH_SFTP)) { @@ -551,7 +551,7 @@ else $is_directory=ftp_isdir($conn_id, $newremotefileiso); } - + print ''; // Name print ''; @@ -615,14 +615,14 @@ else print ""; - + if (! $ok) { print $mesg.'
'."\n"; setEventMessages($mesg, null, 'errors'); } - - + + // Actions /* if ($user->rights->ftp->write && ! empty($section)) @@ -654,7 +654,7 @@ else break; } $i++; - } + } if (! $foundsetup) { print $langs->trans("SetupOfFTPClientModuleNotComplete"); @@ -669,11 +669,11 @@ else print '
'; // Close FTP connection -if ($conn_id) +if ($conn_id) { if (! empty($conf->global->FTP_CONNECT_WITH_SFTP)) { - + } else if (! empty($conf->global->FTP_CONNECT_WITH_SSL)) { @@ -684,7 +684,7 @@ if ($conn_id) ftp_close($conn_id); } } - + llxFooter(); @@ -709,7 +709,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect $ok=1; $conn_id=null; - + if (! is_numeric($ftp_port)) { $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port); @@ -719,17 +719,17 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect if ($ok) { $connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT); - if (! empty($conf->global->FTP_CONNECT_WITH_SFTP)) + if (! empty($conf->global->FTP_CONNECT_WITH_SFTP)) { dol_syslog('Try to connect with ssh2_ftp'); $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port); } - else if (! empty($conf->global->FTP_CONNECT_WITH_SSL)) + else if (! empty($conf->global->FTP_CONNECT_WITH_SSL)) { dol_syslog('Try to connect with ftp_ssl_connect'); $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout); } - else + else { dol_syslog('Try to connect with ftp_connect'); $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout); @@ -744,7 +744,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect { // Turn on passive mode transfers (must be after a successful login //if ($ftp_passive) ftp_pasv($conn_id, true); - + // Change the dir $newsectioniso=utf8_decode($section); //ftp_chdir($conn_id, $newsectioniso); @@ -756,25 +756,25 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect $error++; } } - else + else { $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials"); $ok=0; $error++; } - } + } else { if (ftp_login($conn_id, $ftp_user, $ftp_password)) { // Turn on passive mode transfers (must be after a successful login if ($ftp_passive) ftp_pasv($conn_id, true); - + // Change the dir $newsectioniso=utf8_decode($section); ftp_chdir($conn_id, $newsectioniso); } - else + else { $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials"); $ok=0; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 494c572eaad..1b6046d50f8 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -26,7 +26,7 @@ * \brief Form and file creation of paid holiday. */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 55724549360..380f609ec6d 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -26,7 +26,7 @@ * \brief File that defines the balance of paid holiday of users. */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 5df3fdb314b..86ca95580b1 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -23,7 +23,7 @@ * \brief List of holiday */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index 1e72122c2be..0faa2b56585 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -22,7 +22,7 @@ * \brief Monthly report of leave requests. */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 198b9a8854c..c36ccd1f4d7 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -23,7 +23,7 @@ * \ingroup holiday */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 996ddd58ed3..f52cb1afc61 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -20,7 +20,7 @@ * \ingroup HRM * \brief HRM Establishment module setup page */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php index a7a8b8a9352..ac47eec6292 100644 --- a/htdocs/hrm/admin/admin_hrm.php +++ b/htdocs/hrm/admin/admin_hrm.php @@ -20,7 +20,7 @@ * \ingroup HRM * \brief HRM module setup page */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index db316098003..c95e886e792 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -19,7 +19,7 @@ * \file htdocs/hrm/establishment/card.php * \brief Page to show an establishment */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php index 76eb236d1a1..6cd44861ad5 100644 --- a/htdocs/hrm/establishment/info.php +++ b/htdocs/hrm/establishment/info.php @@ -20,7 +20,7 @@ * \brief Page to show info of an establishment */ -require('../../main.inc.php'); +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php'; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 365d40cca96..b49dfd92998 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -24,7 +24,7 @@ * \brief Home page for HRM area. */ -require('../main.inc.php'); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index 240637282db..f7ae2608da5 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -181,7 +181,7 @@ class MailmanSpip if ($mydb) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $mdpass=dol_hash($object->pass); $htpass=crypt($object->pass,makesalt()); $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".dolGetFirstLastname($object->firstname,$object->lastname)."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 826f83356c4..797298c4653 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1732,7 +1732,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra // Define $bookmarks if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) { - include_once (DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php'; $langs->load("bookmarks"); $bookmarks=printBookmarksList($db, $langs); diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index eaa53aa8490..ced69451d9d 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -26,8 +26,8 @@ include '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; $langs->load("admin"); $langs->load("bills"); diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 5350fd170f1..2eb20f48fea 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1640,7 +1640,7 @@ elseif (! empty($module)) } else { - $result = @include_once($dirread.'/'.$pathtoclass); + $result = @include_once $dirread.'/'.$pathtoclass; } if (class_exists($tabobj)) { diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php index b72917daff0..e580c6c7457 100644 --- a/htdocs/modulebuilder/template/admin/about.php +++ b/htdocs/modulebuilder/template/admin/about.php @@ -25,15 +25,15 @@ // Load Dolibarr environment $res=0; // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"); +if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"; // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php"); -if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; +if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"; // Try main.inc.php using relative path -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); -if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php"); +if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php"; +if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php"; if (! $res) die("Include of main fails"); // Libraries diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index fd2c509233b..2cc6468729c 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -25,15 +25,15 @@ // Load Dolibarr environment $res=0; // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"); +if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"; // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php"); -if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; +if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"; // Try main.inc.php using relative path -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); -if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php"); +if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php"; +if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php"; if (! $res) die("Include of main fails"); global $langs, $user; diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php index 5787fa4f64c..486d860e7f5 100644 --- a/htdocs/modulebuilder/template/css/mymodule.css.php +++ b/htdocs/modulebuilder/template/css/mymodule.css.php @@ -35,15 +35,15 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Load Dolibarr environment $res=0; // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"); +if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"; // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php"); -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/../main.inc.php"; // Try main.inc.php using relative path -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); -if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php"); +if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php"; +if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php"; if (! $res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php index 07f44756615..6a3447625a5 100644 --- a/htdocs/modulebuilder/template/js/mymodule.js.php +++ b/htdocs/modulebuilder/template/js/mymodule.js.php @@ -38,15 +38,15 @@ if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Load Dolibarr environment $res=0; // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"); +if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"; // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php"); -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/../main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/../main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/../main.inc.php"; // Try main.inc.php using relative path -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); -if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php"); +if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php"; +if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php"; if (! $res) die("Include of main fails"); // Define js type diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php index 2a72464fb9d..f005fbf8354 100644 --- a/htdocs/modulebuilder/template/myobject_document.php +++ b/htdocs/modulebuilder/template/myobject_document.php @@ -29,7 +29,7 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"; // Try main.inc.php using relative path if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php"; diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 6516f7eeff9..4fe54aa63a4 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -563,7 +563,7 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb $hidegeneratedfilelistifempty=1; if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0; - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $formfile = new FormFile($db); // Show list of available documents diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php index 2574e4239fa..d240f07ef53 100644 --- a/htdocs/modulebuilder/template/myobject_note.php +++ b/htdocs/modulebuilder/template/myobject_note.php @@ -29,7 +29,7 @@ if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER // Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php"; if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"; // Try main.inc.php using relative path if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php"; diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php index 0aad12e2e35..67bcdea1d74 100755 --- a/htdocs/modulebuilder/template/scripts/myobject.php +++ b/htdocs/modulebuilder/template/scripts/myobject.php @@ -47,12 +47,12 @@ $res=0; // Try master.inc.php into web root detected using web root calculated from SCRIPT_FILENAME $tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/master.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/master.inc.php"); -if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/master.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/master.inc.php"); +if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/master.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/master.inc.php"; +if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/master.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/master.inc.php"; // Try master.inc.php using relative path -if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php"); -if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php"); -if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php"); +if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php"; +if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php"; +if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php"; if (! $res) die("Include of master fails"); // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file). // $user is created but empty. diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index fda06d67012..af75bf4783b 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -22,12 +22,12 @@ * \brief Page to edit survey */ -require_once('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Security check diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index a2b6096d77c..d80bac70b79 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -24,9 +24,9 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; +//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; /** diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php index 90fd56cd4d1..b36a5256059 100644 --- a/htdocs/opensurvey/exportcsv.php +++ b/htdocs/opensurvey/exportcsv.php @@ -23,10 +23,10 @@ */ -require_once('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"; $action=GETPOST('action','aZ09'); $numsondage = ''; diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php index 663d4ad704a..3b800b748ff 100644 --- a/htdocs/opensurvey/index.php +++ b/htdocs/opensurvey/index.php @@ -21,9 +21,9 @@ * \brief Home page of opensurvey area */ -require_once('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; // Security check if (!$user->rights->opensurvey->read) accessforbidden(); diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index 0471abcddb9..de8feaad8da 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -22,10 +22,10 @@ * \brief Page to list surveys */ -require_once('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"; // Security check if (!$user->rights->opensurvey->read) accessforbidden(); diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index cd6e6ed3225..9672e310938 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -22,12 +22,11 @@ * \brief Page to preview votes of a survey */ -$res=0; -require_once('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Security check diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php index a415d6b4987..9acf9d441e2 100644 --- a/htdocs/opensurvey/wizard/choix_autre.php +++ b/htdocs/opensurvey/wizard/choix_autre.php @@ -22,10 +22,10 @@ * \brief Page to create a new survey (choice selection) */ -require_once('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Security check if (!$user->rights->opensurvey->write) accessforbidden(); diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php index 7dd0168c77a..fb7312b891c 100644 --- a/htdocs/opensurvey/wizard/choix_date.php +++ b/htdocs/opensurvey/wizard/choix_date.php @@ -22,10 +22,10 @@ * \brief Page to create a new survey (date selection) */ -require_once('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Security check if (!$user->rights->opensurvey->write) accessforbidden(); diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index 0dfc2505ce3..2e33d377ca2 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -23,11 +23,11 @@ * \brief Page to create a new survey */ -require_once('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Security check if (!$user->rights->opensurvey->write) accessforbidden(); diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 48afbcc9dbb..b52514a4195 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -22,7 +22,7 @@ * \brief Manage record and specific data for batch number management */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; /** diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 87fdd132878..92c6ffadca4 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -22,7 +22,7 @@ * \brief This file is an CRUD class file (Create/Read/Update/Delete) */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php index 74422cc2601..a5592c87f5d 100644 --- a/htdocs/product/inventory/list.php +++ b/htdocs/product/inventory/list.php @@ -525,7 +525,7 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb $hidegeneratedfilelistifempty=1; if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0; - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $formfile = new FormFile($db); // Show list of available documents diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 92719093650..53818220081 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -23,7 +23,7 @@ * \brief Page activite perso du module projet */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 2b8996373e4..0943d8dd428 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -24,7 +24,7 @@ * \brief List activities of tasks (per day entry) */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index cf68f6ccc95..b22ed6ee71a 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -24,7 +24,7 @@ * \brief List activities of tasks (per week entry) */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 45a417a6dd2..da418680376 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -23,7 +23,7 @@ * \brief Gantt diagramm of a project */ -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 5af0d6da9e5..bf2ddf33890 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -23,7 +23,7 @@ * \brief List all tasks of a project */ -require ("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php index ac527424721..6c4b7f56d3f 100644 --- a/htdocs/projet/tasks/comment.php +++ b/htdocs/projet/tasks/comment.php @@ -23,7 +23,7 @@ * \brief Page of a project task */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 4d78aad4764..6ed9af89385 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -23,7 +23,7 @@ * \brief Actors of a task */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 14703f6d3eb..7a97de16f52 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -24,7 +24,7 @@ * \brief List all task of a project */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 9e6018ab5c5..2fd47827d6a 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -21,7 +21,7 @@ * \brief Page to show information on a task */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 4809cfe1276..ace9ab21a29 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -23,7 +23,7 @@ * \brief Page of a project task */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php index b11bf4cc42f..3bee8fd6434 100644 --- a/htdocs/public/cron/cron_run_jobs.php +++ b/htdocs/public/cron/cron_run_jobs.php @@ -36,11 +36,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity); // librarie core // Dolibarr environment -$res = @include("../../main.inc.php"); // From htdocs directory -if (! $res) { - $res = @include("../../../main.inc.php"); // From "custom" directory -} -if (! $res) die("Include of master.inc.php fails"); +require '../../main.inc.php'; // librarie jobs dol_include_once("/cron/class/cronjob.class.php"); @@ -51,10 +47,6 @@ global $langs, $conf; $langs->load("admin"); $langs->load("cron"); - - - - /* * View */ diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index 32cb5f2e1ba..a9bd8a0fb70 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -24,11 +24,11 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require_once('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"); -require_once(DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php"; +require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php"; // Init vars diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php index 748f1439687..42a732fcb21 100644 --- a/htdocs/public/stripe/ipn.php +++ b/htdocs/public/stripe/ipn.php @@ -21,9 +21,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); -$res=0; -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); // to work if your module directory is into a subdir of root htdocs directory -if (! $res) die("Include of main fails"); +require '../../main.inc.php'; if (empty($conf->stripe->enabled)) accessforbidden('',0,0,1); require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; @@ -110,7 +108,7 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabl $key=1; } $ret=$mc->switchEntity($key); - if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); + if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php"; if (! $res) die("Include of main fails"); } diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 832f70f4ea1..e4a21ae9888 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -22,12 +22,7 @@ */ -// Change this following line to use the correct relative path (../, ../../, etc) -$res=0; -$res=@include("../main.inc.php"); // For root directory -if (! $res) $res=@include("../../main.inc.php"); // For "custom" directory -if (! $res) die("Include of main fails"); - +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php'; require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 7c3999db7c9..515f08f6053 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -491,7 +491,7 @@ class Dolresource extends CommonObject $sql.= " t.fk_code_type_resource,"; $sql.= " t.tms,"; - require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafields=new ExtraFields($this->db); $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); if (is_array($extralabels) && count($extralabels)>0) { diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index 19bed957f74..ed667fad8ab 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -21,8 +21,8 @@ * \ingroup core * \brief Class file to manage forms into resource module */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/resource/class/dolresource.class.php"); +require_once DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"; +require_once DOL_DOCUMENT_ROOT ."/resource/class/dolresource.class.php"; /** diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php index 389d0236759..b844fce0f6c 100644 --- a/htdocs/resource/element_resource.php +++ b/htdocs/resource/element_resource.php @@ -23,11 +23,7 @@ */ -$res=0; -$res=@include("../main.inc.php"); // For root directory -if (! $res) $res=@include("../../main.inc.php"); // For "custom" directory -if (! $res) die("Include of main fails"); - +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index f1e56d4a359..e15c0864574 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -21,7 +21,7 @@ * \brief Popup screen to validate VAT */ -require ("../../main.inc.php"); +require "../../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once NUSOAP_PATH.'/nusoap.php'; diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 551f168ded3..947c35a2d5c 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -25,7 +25,7 @@ * \brief Add a tab on thirpdarty view to list all products/services bought or sells by thirdparty */ -require("../main.inc.php"); +require "../main.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php index 3563283ba05..d00b3144185 100644 --- a/htdocs/societe/website.php +++ b/htdocs/societe/website.php @@ -535,7 +535,7 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb $hidegeneratedfilelistifempty=1; if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0; - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $formfile = new FormFile($db); // Show list of available documents diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php index 1113d1428f5..8ad547a47ee 100644 --- a/htdocs/stripe/payment.php +++ b/htdocs/stripe/payment.php @@ -30,8 +30,7 @@ */ // Load Dolibarr environment -$res=@include("../main.inc.php"); // For root directory -if (! $res) $res=@include("../../main.inc.php"); +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 3dc0ab39756..bf561c15f83 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -25,8 +25,8 @@ // Put here all includes required by your class file require_once DOL_DOCUMENT_ROOT . "/core/class/commonobject.class.php"; require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php'; -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; /** diff --git a/htdocs/ticket/class/ticketlogs.class.php b/htdocs/ticket/class/ticketlogs.class.php index ffa6a193415..b4a464f6a17 100644 --- a/htdocs/ticket/class/ticketlogs.class.php +++ b/htdocs/ticket/class/ticketlogs.class.php @@ -23,8 +23,8 @@ // Put here all includes required by your class file require_once DOL_DOCUMENT_ROOT . "/core/class/commonobject.class.php"; -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +//require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +//require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; /** diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index c99ac7e7e3a..b23b4c5d27e 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -701,7 +701,7 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb $hidegeneratedfilelistifempty=1; if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0; - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $formfile = new FormFile($db); // Show list of available documents diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 882e9111b5d..9c2f3437fa4 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -27,7 +27,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; -if (! empty($conf->ldap->enabled)) require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); +if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; /** diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index e140550207d..8cbe54e0b29 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -22,7 +22,7 @@ * \brief File that is entry point to call Dolibarr WebServices */ -if (! defined("NOCSRFCHECK")) define("NOCSRFCHECK",'1'); +if (! defined("NOCSRFCHECK")) define("NOCSRFCHECK",'1'); require '../master.inc.php'; require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP @@ -659,7 +659,7 @@ function createOrder($authentication,$order) { global $db,$conf,$langs; - require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $now=dol_now(); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 37df126c753..f6c98599d93 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -570,7 +570,7 @@ function createProductOrService($authentication,$product) // Update stock if stock count is provided and differs from database after creation or update if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $savstockreal=$newobject->stock_reel; $newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel, surely 0 because we have just created product @@ -739,7 +739,7 @@ function updateProductOrService($authentication,$product) // Update stock if stock count is provided and differs from database after creation or update if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled)) { - require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $savstockreal=$newobject->stock_reel; $newobject->load_stock('novirtual,nobatch'); // This overwrite ->stock_reel diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php index 9a1ad910672..0bc4428deb2 100644 --- a/htdocs/website/websiteaccount_card.php +++ b/htdocs/website/websiteaccount_card.php @@ -22,24 +22,11 @@ */ // Load Dolibarr environment -$res=0; -// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined) -if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include($_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php"); -// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME -$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1; -while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; } -if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include(substr($tmp, 0, ($i+1))."/main.inc.php"); -if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php"); -// Try main.inc.php using relative path -if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php"); -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); -if (! $res && file_exists("../../../main.inc.php")) $res=@include("../../../main.inc.php"); -if (! $res) die("Include of main fails"); - -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php'; // Load translation files required by the page $langs->loadLangs(array("website","other")); diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php index 2d557768d7d..53136bf67b2 100755 --- a/scripts/accountancy/export-thirdpartyaccount.php +++ b/scripts/accountancy/export-thirdpartyaccount.php @@ -24,7 +24,7 @@ * \brief Page to detect empty accounting account */ -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php index 398ec1d7a19..1124749fcf4 100755 --- a/scripts/bank/export-bank-receipts.php +++ b/scripts/bank/export-bank-receipts.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php index 5fd7806a26c..c4887cb5ee1 100755 --- a/scripts/company/export-contacts-xls-example.php +++ b/scripts/company/export-contacts-xls-example.php @@ -41,13 +41,13 @@ if (! isset($argv[1]) || ! $argv[1]) { $now=$argv[1]; -require_once($path."../../htdocs/master.inc.php"); -//require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php"); -//require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_worksheet.inc.php"); +require_once $path."../../htdocs/master.inc.php"; +//require_once PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php"; +//require_once PHP_WRITEEXCEL_PATH."/class.writeexcel_worksheet.inc.php"; -require_once(PHPEXCEL_PATH."/PHPExcel.php"); -//require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php"); -require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php"); +require_once PHPEXCEL_PATH."/PHPExcel.php"; +//require_once PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php"; +require_once PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php"; // Global variables $version=DOL_VERSION; diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index 900cdbc35ed..32260291aa7 100755 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -35,10 +35,10 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; // Global variables $version=DOL_VERSION; diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index 0f5c91817db..4edf4fb261d 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -50,8 +50,8 @@ $mode=$argv[1]; $targettype=$argv[2]; -require($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; $langs->load('main'); $langs->load('contracts'); diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index ad7ccebcba7..7b15d52dff2 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -48,8 +48,8 @@ if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm $mode=$argv[1]; -require($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; $langs->load('main'); $langs->load('contracts'); diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index c690d7b63ef..88960766a68 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -41,9 +41,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once ($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php"); -require_once (DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php"; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // Check parameters if (! isset($argv[1]) || ! $argv[1]) { diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index ef9a35fc1ed..95b06f187e8 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -44,9 +44,9 @@ $id=$argv[1]; if (isset($argv[2]) || !empty($argv[2])) $login = $argv[2]; else $login = ''; -require_once ($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); -require_once (DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; +require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"; // Global variables diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 02e9db2e0ce..428f8932ea3 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -50,8 +50,8 @@ $mode=$argv[1]; $targettype=$argv[2]; -require($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; $langs->load('main'); diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index e134d693d74..dd92a752dc3 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -48,8 +48,8 @@ if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm $mode=$argv[1]; -require($path."../../htdocs/master.inc.php"); -require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); +require $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; $langs->load('main'); diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index 30782d3b913..2c71d9cf750 100755 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Include Dolibarr environment -require_once($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; // After this $db is an opened handler to database. We close it at end of file. -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice2.lib.php'); +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice2.lib.php'; // Load main language strings diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index a0c393d01c2..e3ca5f38e0a 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -34,9 +34,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"; $langs->load("main"); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index e7adb80e733..8cf0005800f 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -34,11 +34,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"; +require_once DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php"; $langs->load("main"); $langs->load("errors"); diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php index 939a98c8728..dac7ccfd0bc 100755 --- a/scripts/members/sync_members_types_dolibarr2ldap.php +++ b/scripts/members/sync_members_types_dolibarr2ldap.php @@ -41,9 +41,9 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"; // Global variables $version=DOL_VERSION; diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php index 55d5606cd30..1363f989e15 100755 --- a/scripts/members/sync_members_types_ldap2dolibarr.php +++ b/scripts/members/sync_members_types_ldap2dolibarr.php @@ -36,10 +36,10 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"; $langs->load("main"); $langs->load("errors"); diff --git a/scripts/modulebuilder/builddoc.php b/scripts/modulebuilder/builddoc.php index f2c0eef421f..c0b44a0bed8 100755 --- a/scripts/modulebuilder/builddoc.php +++ b/scripts/modulebuilder/builddoc.php @@ -45,7 +45,7 @@ if (! isset($argv[1]) || ! $argv[1]) { } $modulename=$argv[1]; -require_once ($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; diff --git a/scripts/modulebuilder/initmodule.php b/scripts/modulebuilder/initmodule.php index 6c9801878d3..bee931dc8fa 100755 --- a/scripts/modulebuilder/initmodule.php +++ b/scripts/modulebuilder/initmodule.php @@ -41,7 +41,7 @@ if (! isset($argv[1]) || ! $argv[1]) { } $modulename=$argv[1]; -require_once ($path."../../htdocs/master.inc.php"); +require_once $path."../../htdocs/master.inc.php"; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; diff --git a/scripts/product/migrate_picture_path.php b/scripts/product/migrate_picture_path.php index d72c60f05e5..69322b2f350 100755 --- a/scripts/product/migrate_picture_path.php +++ b/scripts/product/migrate_picture_path.php @@ -37,9 +37,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') { define('EVEN_IF_ONLY_LOGIN_ALLOWED',1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only". // Include and load Dolibarr environment variables -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file). // $user is created but empty. diff --git a/scripts/product/regenerate_thumbs.php b/scripts/product/regenerate_thumbs.php index bc3e1f53a6b..a4d114746c2 100755 --- a/scripts/product/regenerate_thumbs.php +++ b/scripts/product/regenerate_thumbs.php @@ -37,10 +37,10 @@ if (substr($sapi_type, 0, 3) == 'cgi') { define('EVEN_IF_ONLY_LOGIN_ALLOWED',1); // Set this define to 0 if you want to lock your script when dolibarr setup is "locked to admin user only". // Include and load Dolibarr environment variables -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"; // After this $db, $mysoc, $langs, $conf and $hookmanager are defined (Opened $db handler to database will be closed at end of file). // $user is created but empty. diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index e661a85beb5..ba304305696 100755 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -40,9 +40,9 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; // Global variables $version=DOL_VERSION; diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index cb745d9aff3..c78770c7a5c 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -35,11 +35,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"; $langs->load("main"); $langs->load("errors"); diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index dd5e3d18de4..fa97c871a50 100755 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -40,9 +40,9 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; // Global variables $version=DOL_VERSION; diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index 9a04f81c557..8c95bc0071f 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -34,10 +34,10 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"; +require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"; +require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php"; $langs->load("main"); $langs->load("errors"); diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index d381c32676a..2f7ad26a1fe 100755 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -34,11 +34,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit(-1); } -require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require_once $path."../../htdocs/master.inc.php"; +require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; +require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; // Global variables $version=DOL_VERSION; diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index f8816f8b570..589a9116c78 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -136,7 +136,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase 'Salaries','Service','Skype','Societe','Stock','Stripe','SupplierProposal','Syslog','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow'); foreach($modulelist as $modlabel) { - require_once(DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php'; $class='mod'.$modlabel; $mod=new $class($db); $result=$mod->remove(); diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php index fe896894d86..6f7ca3610cd 100644 --- a/test/phpunit/WebservicesInvoicesTest.php +++ b/test/phpunit/WebservicesInvoicesTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php index e81ee2d3604..7fb2d101184 100644 --- a/test/phpunit/WebservicesOrdersTest.php +++ b/test/phpunit/WebservicesOrdersTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) { diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php index e3725c8609c..45b01aa77d3 100644 --- a/test/phpunit/WebservicesOtherTest.php +++ b/test/phpunit/WebservicesOtherTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) { diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php index e3500a68f5b..bcbb37b0419 100644 --- a/test/phpunit/WebservicesProductsTest.php +++ b/test/phpunit/WebservicesProductsTest.php @@ -30,7 +30,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) { diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php index 90698407527..e1c2249b62a 100644 --- a/test/phpunit/WebservicesThirdpartyTest.php +++ b/test/phpunit/WebservicesThirdpartyTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) { diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php index 5098da22e6e..bfcdb400cc6 100644 --- a/test/phpunit/WebservicesUserTest.php +++ b/test/phpunit/WebservicesUserTest.php @@ -28,7 +28,7 @@ global $conf,$user,$langs,$db; //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php'; -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP if (empty($user->id)) {