diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 9d13914ef33c0cf1ce1bf1468ae446844ffcd107..a2f0078a71c43d81e75671b4ea530117e87de73d 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); 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"); -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"); +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'; /* diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 5a35a3b116a4a0d86ff01247e7d1adb6f803fc70..ba19e621b4f9de252d329a015afd3c4587f33c65 100644 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); 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"); -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"); +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'; /* diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index 3f265f2a181c4afaee1387934af3df15129b6da6..4c0c04df0ab162e84d548301c0dddaa4ac02f92c 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); 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"); -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"); +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'; $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono"); $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie"); diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 71401511e7a8b1d5ba25de4057700481fd83b1b0..416b65150cb11d2ccc604419aaab44188a0300a3 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -25,7 +25,7 @@ * \ingroup mymodule * \brief Description and activation file for module MyModule */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index f5de8e82f8c6e58ff79d4bce2d4173e496a0d2b2..3c8db50ee2920109e2cf2a54f5d77d7210a5a88b 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -105,7 +105,7 @@ class Skeleton_Class // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -216,7 +216,7 @@ class Skeleton_Class // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -265,7 +265,7 @@ class Skeleton_Class // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index 82d6f74497c71ef73305aded70015d09dd8cbba1..13878312fce84a7262a065722e8fdd3a922484e0 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -36,15 +36,15 @@ // Change this following line to use the correct relative path (../, ../../, etc) $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("../../../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 && 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"); // Change this following line to use the correct relative path from htdocs -dol_include_once("/module/class/skeleton_class.class.php"); +dol_include_once('/module/class/skeleton_class.class.php'); // Load traductions files requiredby by page $langs->load("companies"); diff --git a/htdocs/adherents/admin/mailman.php b/htdocs/adherents/admin/mailman.php index ce407584391f71cba373c6f0a31d06fd6d6e3800..5e7aa08f547f0a29ed4501342265c122cb7bff97 100644 --- a/htdocs/adherents/admin/mailman.php +++ b/htdocs/adherents/admin/mailman.php @@ -99,7 +99,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con } else { - include_once(DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'; $mailmanspip=new MailmanSpip($db); $object=new stdClass(); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 99bf68174ae26242de07cdd392e6b2cc9fac769c..ece8bcf5cd740e948d1f816bee21d355c5f57ab0 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -722,7 +722,7 @@ if ($rowid) // Link for paypal payment if ($conf->paypal->enabled) { - include_once(DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; print showPaypalPaymentUrl('membersubscription',$object->ref); } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 7e7f73971a76b65afa840517a2d358568801561b..3c0290b4eeb44931f277fcc267b2916df802f9b1 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -162,7 +162,7 @@ class Adherent extends CommonObject $from=$conf->email_from; if ($conf->global->ADHERENT_MAIL_FROM) $from=$conf->global->ADHERENT_MAIL_FROM; - include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subjecttosend, $this->email, $from, $texttosend, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml); if ($mailfile->sendfile()) { @@ -345,7 +345,7 @@ class Adherent extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('MEMBER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -462,7 +462,7 @@ class Adherent extends CommonObject $nbrowsaffected+=$this->db->affected_rows($resql); // Actions on extra fields (by external module) - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('memberdao')); $parameters=array('id'=>$this->id); @@ -596,7 +596,7 @@ class Adherent extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('MEMBER_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -729,7 +729,7 @@ class Adherent extends CommonObject if ($this->db->affected_rows($resql)) { // 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($this->db); $result=$interface->run_triggers('MEMBER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -852,7 +852,7 @@ class Adherent extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('MEMBER_NEW_PASSWORD',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1227,7 +1227,7 @@ class Adherent extends CommonObject $this->last_subscription_date_end=$datefin; // 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($this->db); $result=$interface->run_triggers('MEMBER_SUBSCRIPTION',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1288,7 +1288,7 @@ class Adherent extends CommonObject $this->statut=1; // 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($this->db); $result=$interface->run_triggers('MEMBER_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1338,7 +1338,7 @@ class Adherent extends CommonObject $this->statut=0; // 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($this->db); $result=$interface->run_triggers('MEMBER_RESILIATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1366,7 +1366,7 @@ class Adherent extends CommonObject { global $conf; - include_once(DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'; $mailmanspip=new MailmanSpip($db); $err=0; @@ -1412,7 +1412,7 @@ class Adherent extends CommonObject { global $conf; - include_once(DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'; $mailmanspip=new MailmanSpip($db); $err=0; diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index 4db3884cdad6538353741c9477cbbf12a1aa6778..52d73691cb8890706e954bee1758cfaa507b10ef 100755 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -23,8 +23,8 @@ * \brief Fichier de la classe de gestion des stats des adhérents */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/adherents/class/cotisation.class.php"; +include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +include_once DOL_DOCUMENT_ROOT . '/adherents/class/cotisation.class.php'; /** diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 4abaa9b822e3c36c51223c89c29bfa76a83aa6dd..75a9c9a60cf5dfd7cd9dc26b253a75e3d13cd7b1 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -85,7 +85,7 @@ if ($rowid) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('membercard')); @@ -1128,7 +1128,7 @@ if ($rowid && $action != 'edit') if (empty($login)) { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $login=dol_buildlogin($object->lastname,$object->firstname); } if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4)); @@ -1564,7 +1564,7 @@ if ($rowid && $action != 'edit') // Action SPIP if ($conf->mailmanspip->enabled && $conf->global->ADHERENT_USE_SPIP) { - include_once(DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php'; $mailmanspip=new MailmanSpip($db); $isinspip=$mailmanspip->is_in_spip($object); diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index fc45ac75dd6d2336338fbf39a6d0b3b880f2d7c9..b97133c4606c716931c830d9a13e3e75816a1b3f 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -198,7 +198,7 @@ else if ($mode == 'memberbycountry') { $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php'; - if (is_readable($color_file)) include_once($color_file); + if (is_readable($color_file)) include_once $color_file; // Assume we've already included the proper headers so just call our script inline // More doc: https://developers.google.com/chart/interactive/docs/gallery/geomap?hl=fr-FR diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index c9de48afb9551df36e019f671992936f3e518ef1..b1112017b80ab9e3418cf9e8c67d91681bb48cb9 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -207,7 +207,7 @@ if ($resql) // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php) if (! is_dir($newdir)) continue; - $result=@include_once($newdir.$obj->coder.".modules.php"); + $result=@include_once $newdir.$obj->coder.'.modules.php'; if ($result) break; } if ($result) diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index d454fe4b95abad26cd742560322e867c49c60332..e1ca04bb00ee9a8b613f93fe194131895e030c8d 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -23,9 +23,9 @@ */ require '../main.inc.php'; -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'; -include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index b6bca0eefebb1ebe9a4d5147825f9707c9918c8d..80f6d04921abc89384cd093874f09da9de0697dd 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -62,7 +62,7 @@ $pageprev = $page - 1; $pagenext = $page + 1; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('admin')); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 98b91883366168bf24d3813758caaa4f4f3943fd..e3e822577ee5580a78a3c67b23db8b0b865e5536 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -117,7 +117,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml'])) { setEventMessage($langs->trans("FileWasRemoved"), $filetodelete); - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->remove_attached_files($keytodelete); } @@ -154,7 +154,7 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE $deliveryreceipt= $_POST["deliveryreceipt"]; // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -644,7 +644,7 @@ else // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; - include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mail = new CMailFile('','','',''); $result=$mail->check_server_port($server,$port); if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>'; @@ -664,7 +664,7 @@ else print_titre($langs->trans("DoTestSend")); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM); @@ -709,7 +709,7 @@ else print_titre($langs->trans("DoTestSendHTML")); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index fd459051604cfe3e7aba545b198d3bb0abf1b9c8..c142bcde3eaf35c903a499ffa5a356d6b54f0034 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -133,7 +133,7 @@ foreach ($modulesdir as $dir) try { - $res=include_once($dir.$file); + $res=include_once $dir.$file; $objMod = new $modName($db); $modNameLoaded[$modName]=$dir; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 8c9178e895aaef09a29b017d1c174c58fbcdeade..be361ec177e372355b1694d3bd4b4c0d6ae71fd1 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -256,7 +256,7 @@ else // Show $pdfformatlabel=''; if (empty($conf->global->MAIN_PDF_FORMAT)) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $pdfformatlabel=dol_getDefaultFormat(); } else $pdfformatlabel=$conf->global->MAIN_PDF_FORMAT; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 52482b071587009c87fe051bbe25d63008bc42be..04cb8e6a569e00ea18b3d5c90c9a9b7ffca36448 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -99,7 +99,7 @@ foreach ($modulesdir as $dir) if ($modName) { - include_once($dir.$file); + include_once $dir.$file; $objMod = new $modName($db); // Load all lang files of module diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 0406e99d9715a323d211e8afb51c5d37c0eb245e..34c74319b4fa18f60cc3e08d0ac76d7790e1453c 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -82,7 +82,7 @@ if ($action == 'send' && ! $_POST['cancel']) $errors_to = GETPOST("errorstosms"); // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php'; $formsms = new FormSms($db); if (! empty($formsms->error)) @@ -295,7 +295,7 @@ else // If we use SSL/TLS if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; - include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mail = new CSMSFile('','','',''); $result=$mail->check_server_port($server,$port); if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>'; @@ -315,7 +315,7 @@ else print_titre($langs->trans("DoTestSend")); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT."/core/class/html.formsms.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php'; $formsms = new FormSms($db); $formsms->fromtype='user'; $formsms->fromid=$user->id; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 44cf3fb67612df28582c3b81a6dc3c3e7797fd45..312a99649c2ef0790e679f5939fd55c1a2be5681 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -193,7 +193,7 @@ print '</td></tr>'; try { set_include_path('/usr/share/php/'); - $res=@include_once('FirePHPCore/FirePHP.class.php'); + $res=@include_once 'FirePHPCore/FirePHP.class.php'; restore_include_path(); if ($res) { diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 2802818b0389336dadf8d1948e55241393cee152..0c038dfd4f7720f9aa048930d3ad214b66344005 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -63,7 +63,7 @@ foreach($modulesdir as $dir) if ($modName) { - include_once($dir.$file); + include_once $dir.$file; $objMod = new $modName($db); $modules[$objMod->numero]=$objMod; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index c4d9c721f6e867fdb7027be252e0fc24ea1022c2..b835b4a5953a21956f080d6df5453d172557096b 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -22,7 +22,7 @@ */ require '../../main.inc.php'; -include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 04c5fb12d6cadcf938e292cc593ebf31405425c8..1487cddbe33ad3eac9bff3d7bd4f62f4c5c60974 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -23,7 +23,7 @@ */ require '../../main.inc.php'; -include_once $dolibarr_main_document_root."/core/lib/files.lib.php"; +include_once $dolibarr_main_document_root.'/core/lib/files.lib.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index a9c42e0bdd65c361bbdf0be3f844bc1e7122c242..d46631fdbf519283667696ddf0d59ca101087535 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -52,7 +52,7 @@ $template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/'; $interfaces = new Interfaces($db); $triggers = $interfaces->getTriggersList(0,'priority'); -include($template_dir.'triggers.tpl.php'); +include $template_dir.'triggers.tpl.php'; llxFooter(); diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php index 34ee081b5b30c223beff74f3162ac225e14d7bb1..d907bab6e59f403cdbfb23128074fe12acbc766d 100644 --- a/htdocs/asterisk/cidlookup.php +++ b/htdocs/asterisk/cidlookup.php @@ -30,7 +30,7 @@ $phone = $_GET['phone']; -include("../master.inc.php"); +include '../master.inc.php'; // Check parameters diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index 6da095e5ce1ff592426f952ad4b43799b313c8a9..3e67a6a772f72e70a568fb9c8f65df21b2576896 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -26,7 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once(DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php'); +include_once DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php'; /* diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index d0d2f2a008f0ef3c3808c40ad613c4a19dc8b8af..8bed790691eb2e2b65bf2f859dc9bb0ac21777ce 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -23,7 +23,7 @@ */ require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php'; -include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'); +include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; /** diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index aa58deac4fc687d10e4e2f6ef8b68020e60b1bdb..5753aba61872682ac6cc4b3f0d039db60bfd30ae 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -26,7 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; -include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'); +include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'; $langs->load("products"); diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index 47c6fa51a3728d1f996d1cea689a6a306b298fc0..a4d01739861938585b2afa73b29b150c4b66049b 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -56,11 +56,11 @@ print '<div class="principal">'; if ( $_GET['menu'] ) { - include($_GET['menu'].'.php'); + include $_GET['menu'].'.php'; } else { - include('facturation.php'); + include 'facturation.php'; } print '</div>'; diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 0b5e0b2b2f910b50bbe86516d392ea0ff80f0b20..be86b0179a15be0c74caea2823cab564d081881e 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -64,14 +64,14 @@ print '<div class="conteneur_img_droite">'."\n"; print '<h1 class="entete"><span>POINT OF SALE</span></h1>'."\n"; print '<div class="menu_principal">'."\n"; -include_once('tpl/menu.tpl.php'); +include_once 'tpl/menu.tpl.php'; print '</div>'."\n"; print '<div class="contenu">'."\n"; -include_once('affContenu.php'); +include_once 'affContenu.php'; print '</div>'."\n"; -include_once('affPied.php'); +include_once 'affPied.php'; print '</div></div></div>'."\n"; print '</body></html>'."\n"; diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index b625eccd28e19b504421f53c8d903db3441f301b..28e7bf25fb7f9c166f184e4fd4dae9c4f4ea4952 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -122,7 +122,7 @@ class Auth if ($test && $goontestloop) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode); if ($login) { diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 19d7bba39145cf83395f6155fa18b42efff0abbc..fb072f27d332189ee136929b20eb321bdf39aadf 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); +include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; /** diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index c3dcf63b9aa4def6a97e75727d7927fa4f8a4cf3..4fe0a225e3f4464a9f71ceb67dd8e6a3b68bb11e 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -146,7 +146,7 @@ else </div> </div> -<?php include('affPied.php'); ?></div> +<?php include 'affPied.php'; ?></div> </div> </div> </body> diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php index 62cf2024dd62d4b21657443175d32873f04b5f2f..d71b2cb866f61ca9a2d50f27894dce3366ef88c9 100644 --- a/htdocs/cashdesk/index_verif.php +++ b/htdocs/cashdesk/index_verif.php @@ -20,7 +20,7 @@ * We set here login choices into session. */ -include('../main.inc.php'); +include '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php'; diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 78fbc8a4f7466290c8d122716f5261a85e83e69f..ba9767e5983f35c00d3510f2c8bc91d4ddc3326e 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -19,9 +19,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); -include_once(DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'); +include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; if (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"])) { diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index 49e99bd0d9c8624aded68187c99501a0982a4d2a..d9767cdb83464daf0898ebcef128ef2c3620e97d 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); +include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("main"); $langs->load('cashdesk'); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 07e4396c7b52b8d66a82fb80fd202f575b1556dd..34adae9b9d0b310866aa3cdec1d206be52501d11 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -185,7 +185,7 @@ class Categorie } // 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($this->db); $result=$interface->run_triggers('CATEGORY_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -283,7 +283,7 @@ class Categorie $this->db->commit(); // 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($this->db); $result=$interface->run_triggers('CATEGORY_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -388,7 +388,7 @@ class Categorie else { // 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($this->db); $result=$interface->run_triggers('CATEGORY_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; $this->error=join(',',$this->errors); } @@ -1295,7 +1295,7 @@ class Categorie */ function liste_photos($dir,$nbmax=0) { - include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); + include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; $nbphoto=0; $tabobj=array(); diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 66c2b7ab4de7df5f50d0050adda787001e3b1fd3..caab3dcc3a6e8114a17a23541896a163768d192e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -211,7 +211,7 @@ class ActionComm extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ACTION_CREATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -347,7 +347,7 @@ class ActionComm extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ACTION_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -439,7 +439,7 @@ class ActionComm extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ACTION_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { @@ -778,7 +778,7 @@ class ActionComm extends CommonObject if ($cachedelay) { $nowgmt = dol_now(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) { dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 632f6f0cfa9dbea0632aa3909278c4de7213961a..1a04f8f86a35430127daa5fad322f5bf69368de9 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -63,7 +63,7 @@ $contact = new Contact($db); //var_dump($_POST); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('actioncard')); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 70f300028528fa7283e963c8a1db8c7d405cb952..bf0f58e5843d4aade77170b5564ff5d3c7fe2270 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -738,7 +738,7 @@ $cachecontacts=array(); $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php"; if (is_readable($color_file)) { - include_once($color_file); + include_once $color_file; } if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220)); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index fa62f75163244446bdf87f2c7751a7a2597060ab..69adcb1bd9e9d2d925db92ba09ccedf17e69ee93 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -46,7 +46,7 @@ $origin=GETPOST('origin','alpha'); $originid=GETPOST('originid','int'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('propalcard')); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 04b7976957922129d52b6cc3ca251ae3f2158580..f5b3b5a611b1d44f693fc1aeda3a17e84cc51490 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -361,7 +361,7 @@ if ($id > 0) } // Sales representative - include(DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'); + include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'; // Module Adherent if ($conf->adherent->enabled) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index a5954c479d7a864271a47b80fd5068e5ad35675c..da9f1b6e3f825f3fe3541cd25c26b53d697293b0 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -464,21 +464,21 @@ if ($object->fetch($id) >= 0) { if ($obj->source_type == 'member') { - include_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $m=new Adherent($db); $m->id=$obj->source_id; print $m->getNomUrl(2); } else if ($obj->source_type == 'user') { - include_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); + include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $m=new User($db); $m->id=$obj->source_id; print $m->getNomUrl(2); } else if ($obj->source_type == 'thirdparty') { - include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $m=new Societe($db); $m->id=$obj->source_id; print $m->getNomUrl(2); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 6257754d4a1cc2137e94f3bfc9e6ccc5547d544e..96b21b1a192e458a2074cfb44155e80e9f3032ce 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -47,7 +47,7 @@ $result=$object->fetch($id); $extrafields = new ExtraFields($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('mailingcard')); @@ -929,7 +929,7 @@ else print_titre($langs->trans("TestMailing")); // Create l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromname = $object->email_from; $formmail->frommail = $object->email_from; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index a26164ebfdc70dcd46aa5ec071c9203f94fba463..5840e6614422f8a1986365c6684e5a262a390077 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -100,7 +100,7 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('propalcard')); @@ -514,7 +514,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $actionmsg2=$langs->transnoentities('Action'.$actiontypecode); // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -543,7 +543,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $object->elementtype = $object->element; // 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('PROPAL_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { @@ -1509,14 +1509,14 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } /* @@ -1525,7 +1525,7 @@ if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print '<table id="tablelines" class="noborder" width="100%">'; @@ -1710,7 +1710,7 @@ if ($action != 'presend') print '</td><td valign="top" width="50%">'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'propal',$socid); @@ -1725,7 +1725,7 @@ if ($action != 'presend') if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -1757,7 +1757,7 @@ if ($action == 'presend') print_titre($langs->trans('SendPropalByMail')); // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 5a545224cc998006a863db23273c1259f95db1f8..e8d2332a40dd2ab03289684fe23d2c80d63f34cd 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -214,8 +214,8 @@ class Propal extends CommonObject { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $this->db->begin(); @@ -314,7 +314,7 @@ class Propal extends CommonObject global $conf; dol_syslog("Propal::Addline propalid=$propalid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -467,7 +467,7 @@ class Propal extends CommonObject global $conf,$user,$langs; dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters $remise_percent=price2num($remise_percent); @@ -799,7 +799,7 @@ class Propal extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PROPAL_CREATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -936,7 +936,7 @@ class Propal extends CommonObject } // 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($this->db); $result=$interface->run_triggers('PROPAL_CLONE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1187,7 +1187,7 @@ class Propal extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PROPAL_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1544,7 +1544,7 @@ class Propal extends CommonObject } // 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($this->db); $result=$interface->run_triggers('PROPAL_CLOSE_SIGNED',$this,$user,$langs,$conf); if ($result < 0) { @@ -1555,7 +1555,7 @@ class Propal extends CommonObject else { // 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($this->db); $result=$interface->run_triggers('PROPAL_CLOSE_REFUSED',$this,$user,$langs,$conf); if ($result < 0) { @@ -1806,7 +1806,7 @@ class Propal extends CommonObject if (! $error && ! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2659,7 +2659,7 @@ class PropaleLigne if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('LINEPROPAL_INSERT',$this,$user,$langs,$conf); if ($result < 0) { @@ -2697,7 +2697,7 @@ class PropaleLigne if ($this->db->query($sql) ) { // 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($this->db); $result = $interface->run_triggers('LINEPROPAL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2787,7 +2787,7 @@ class PropaleLigne if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('LINEPROPAL_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index 7c3b0c27eb05349896776cb534a95dc6d70748c4..f588ada366f976a7211f816f051c4407a37b3493 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -24,8 +24,8 @@ * \brief Fichier de la classe de gestion des stats des propales */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php"; +include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; /** diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 6264810c37dea4cf6763768b88e4ed761e5bbe52..c2b2a74f66c02f2f09b6ac3ff6950f66c1a40d49 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -208,7 +208,7 @@ if ($id > 0 || ! empty($ref)) $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/contacts.tpl.php')); + $res=@include dol_buildpath($reldir.'/contacts.tpl.php'); if ($res) break; } diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index a8bb8278e3abacc6aa941ffdcaa39afcb98e26ba..cfa4b625f5db7dd8887da17fb05dea432e0a92a6 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('propalcard')); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index fec1a0d193e353999f8af3bef3d4ddddbbefbd59..e285d9e3ac28d280b4b0026e4edc24b389082e18 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php index b6ce9b07032c13f8cd349c3635c06ca45330cf99..884317265a1f66a0956bbea45f567eccdc99ef13 100644 --- a/htdocs/comm/prospect/class/prospect.class.php +++ b/htdocs/comm/prospect/class/prospect.class.php @@ -22,7 +22,7 @@ * \ingroup societe * \brief Fichier de la classe des prospects */ -include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; /** diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 707fc3b12ff25ae72082a8ba9c83d4fab2f9b75e..3a16307a7606d742a745008293f6922dff956259 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -178,7 +178,7 @@ if ($socid > 0) print '</td></tr>'; // Sales representative - include(DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'); + include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'; // Module Adherent if ($conf->adherent->enabled) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 316ebc0900ef08e690f965c1eabeccabb786a99e..ff2a070d08a4d0b6618fb11950fd21fd90d3d445 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -26,7 +26,7 @@ * \ingroup commande * \brief Fichier des classes de commandes */ -include_once(DOL_DOCUMENT_ROOT."/core/class/commonorder.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; @@ -137,7 +137,7 @@ class Commande extends CommonOrder // Chargement de la classe de numerotation $classname = $conf->global->COMMANDE_ADDON; - $result=include_once($dir.'/'.$file); + $result=include_once $dir.'/'.$file; if ($result) { $obj = new $classname(); @@ -296,7 +296,7 @@ class Commande extends CommonOrder if (! $error) { // 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($this->db); $result=$interface->run_triggers('ORDER_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -424,7 +424,7 @@ class Commande extends CommonOrder if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_REOPEN',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -480,7 +480,7 @@ class Commande extends CommonOrder if ($this->db->query($sql)) { // 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($this->db); $result=$interface->run_triggers('ORDER_CLOSE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -557,7 +557,7 @@ class Commande extends CommonOrder if (! $error) { // 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($this->db); $result=$interface->run_triggers('ORDER_CANCEL',$this,$user,$langs,$conf); if ($result < 0) { @@ -763,7 +763,7 @@ class Commande extends CommonOrder if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ORDER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -850,7 +850,7 @@ class Commande extends CommonOrder } // 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($this->db); $result=$interface->run_triggers('ORDER_CLONE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -945,7 +945,7 @@ class Commande extends CommonOrder // Actions hooked (by external module) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('orderdao')); @@ -1010,7 +1010,7 @@ class Commande extends CommonOrder { dol_syslog(get_class($this)."::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1349,8 +1349,8 @@ class Commande extends CommonOrder { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $this->db->begin(); @@ -2090,7 +2090,7 @@ class Commande extends CommonOrder if ($this->db->query($sql)) { // 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($this->db); $result=$interface->run_triggers('ORDER_CLASSIFY_BILLED',$this,$user,$langs,$conf); if ($result < 0) { @@ -2161,7 +2161,7 @@ class Commande extends CommonOrder global $conf; dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; if ($this->brouillon) { @@ -2296,7 +2296,7 @@ class Commande extends CommonOrder if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ORDER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2957,7 +2957,7 @@ class OrderLine if ($resql) { // 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($this->db); $result=$interface->run_triggers('LINEORDER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3056,7 +3056,7 @@ class OrderLine if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('LINEORDER_INSERT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3147,7 +3147,7 @@ class OrderLine if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('LINEORDER_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php index 88875f1d08f7adb422447d0dc5bc10471c0b5b86..cee15c0645f04107edcd2b366db4039ab0fa27db 100644 --- a/htdocs/commande/class/commandestats.class.php +++ b/htdocs/commande/class/commandestats.class.php @@ -23,9 +23,9 @@ * \ingroup commandes * \brief Fichier de la classe de gestion des stats des commandes */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php"; -include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php"; +include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; +include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php'; /** diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index 3516e8b0833232afb3c026dea64f412858c25218..0d8ec10ea73f0b96f9f76402b0884ce55420e9e3 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -210,7 +210,7 @@ if ($id > 0 || ! empty($ref)) $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/contacts.tpl.php')); + $res=@include dol_buildpath($reldir.'/contacts.tpl.php'); if ($res) break; } } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 235b5680c25d41b4b4c8c5a0a4e70cc2b4b43ceb..23f2f1334b6fb19be0b713921ace12309129d294 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -83,7 +83,7 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('ordercard')); @@ -1120,7 +1120,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -1153,7 +1153,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $object->elementtype = $object->element; // 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('ORDER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { @@ -1480,7 +1480,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G // Template to use by default print '<tr><td>'.$langs->trans('Model').'</td>'; print '<td colspan="2">'; - include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; $liste=ModelePDFCommandes::liste_modeles($db); print $form->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF); print "</td></tr>"; @@ -2060,14 +2060,14 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } /* @@ -2079,7 +2079,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print '<table id="tablelines" class="noborder" width="100%">'; @@ -2256,7 +2256,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G print '</td><td valign="top" width="50%">'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'order',$socid); @@ -2271,7 +2271,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -2303,7 +2303,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G print_titre($langs->trans('SendOrderByMail')); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 9ecc195d794e7e09ec78cda6b10e13f1db69496d..dab125c5c61ace09604e329b9d08d403ec100da2 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; print '</div>'; } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 83f31fe7598246021e31c28cb0ec65ba0e9ee176..87dfe7193982fec5158393dd4fd47c011e292d8a 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -426,7 +426,7 @@ if ($action == 'create') // Modele PDF print '<tr><td>'.$langs->trans('Model').'</td>'; print '<td>'; - include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; $liste=ModelePDFFactures::liste_modeles($db); print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print "</td></tr>"; diff --git a/htdocs/commissions/admin/commissions.php b/htdocs/commissions/admin/commissions.php index 038d7fbe30498b94978a262aea5047fdb64edd64..66911efc9244c4c1b21edb4b9c9e531ca72eb90e 100644 --- a/htdocs/commissions/admin/commissions.php +++ b/htdocs/commissions/admin/commissions.php @@ -21,7 +21,7 @@ * \brief Page to setup advanced commissions module */ -include("../../main.inc.php"); +include '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/commissions/lib/commissions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 096b33563e48d1791b0659c97cd25efcdfe0668d..3442f476b3aec1f2696c34ffa303b3a61b1b316b 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -98,7 +98,7 @@ class BankCateg // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -204,7 +204,7 @@ class BankCateg // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -261,7 +261,7 @@ class BankCateg // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 32be2e05211cf6e3ccb084d15a94a2405d19edb1..7d18abb7de4f0c50ad140316d96d72526598280c 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -378,7 +378,7 @@ if ($result) print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">'; if ($objp->receiptid) { - include_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; $receipt=new RemiseCheque($db); $receipt->fetch($objp->receiptid); print ' '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2); diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 05617fe00485a3d9b9600f7845f29dbbb2abee59..8d4abc4807551ec8e104e3a551c327f8c0c2df25 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -124,7 +124,7 @@ class Deplacement extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement"); // 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($this->db); $result=$interface->run_triggers('DEPLACEMENT_CREATE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php index f41a8c663cf0d9d355eaca46e22358588a5ba608..60bd8e531e7d42fd755b2a09ddf86c8c09057f97 100644 --- a/htdocs/compta/deplacement/class/deplacementstats.class.php +++ b/htdocs/compta/deplacement/class/deplacementstats.class.php @@ -22,8 +22,8 @@ * \ingroup factures * \brief Fichier de la classe de gestion des stats des deplacement et notes de frais */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/compta/deplacement/class/deplacement.class.php"; +include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +include_once DOL_DOCUMENT_ROOT . '/compta/deplacement/class/deplacement.class.php'; /** * \class DeplacementStats diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index cd66af34cc3d5f9ccde1cf0074786370dff6af74..8de8ae479709381e46d1d1ec507b5702375179cd 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -49,7 +49,7 @@ $mesg = ''; $object = new Deplacement($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('tripsandexpensescard')); @@ -530,7 +530,7 @@ else if ($id) // Notes $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; print '</div>'; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index e64e340c5189c05d01354d70690b701893b1062a..591df7333a5aba3821a2efc368936bae5298e78f 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -355,7 +355,7 @@ class Don extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don"); // 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($this->db); $result=$interface->run_triggers('DON_CREATE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index bc49df3ff4d80ef5db61d1812cf31629362e6b81..2ac166d5558a5644bf2ebc354bb9a77f1be59963 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -50,7 +50,7 @@ $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOS $result = restrictedArea($user, 'don', $id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('doncard')); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 28112caf00e4f697d5886c6fce40a2fa145a599a..bb78087c5076a34981784bcf9ee5997eab1bc25b 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('invoicecard')); @@ -1422,7 +1422,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -1453,7 +1453,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $object->elementtype = $object->element; // 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('BILL_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1948,7 +1948,7 @@ if ($action == 'create') // Modele PDF print '<tr><td>'.$langs->trans('Model').'</td>'; print '<td>'; - include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; $liste=ModelePDFFactures::liste_modeles($db); print $form->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF); print "</td></tr>"; @@ -2922,14 +2922,14 @@ else if ($id > 0 || ! empty($ref)) $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } /* @@ -2939,7 +2939,7 @@ else if ($id > 0 || ! empty($ref)) if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print '<table id="tablelines" class="noborder noshadow" width="100%">'; @@ -3210,7 +3210,7 @@ else if ($id > 0 || ! empty($ref)) // Link for paypal payment if ($conf->paypal->enabled && $object->statut != 0) { - include_once(DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; print showPaypalPaymentUrl('invoice',$object->ref); } @@ -3219,7 +3219,7 @@ else if ($id > 0 || ! empty($ref)) print '<br>'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'invoice',$socid); @@ -3246,7 +3246,7 @@ else if ($id > 0 || ! empty($ref)) } $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -3278,7 +3278,7 @@ else if ($id > 0 || ! empty($ref)) print_titre($langs->trans($titreform)); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 6d05ebaf9c661986dfb1e1a11f4650f210466776..7eef830a887ac3ee8906fe69e4bf2f9a68cebe89 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -433,7 +433,7 @@ class FactureRec extends Facture function addline($facid, $desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0) { dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Check parameters if ($type < 0) return -1; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 8b3b7c93bd63d2e89f501778f53a7d353cd7c660..6674996a83a19106e8e03ebc6611ff43d8c3ea4a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -31,7 +31,7 @@ * \brief File of class to manage invoices */ -include_once(DOL_DOCUMENT_ROOT."/core/class/commoninvoice.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT .'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; @@ -428,7 +428,7 @@ class Facture extends CommonInvoice if ($result > 0) { // 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($this->db); $result=$interface->run_triggers('BILL_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -601,7 +601,7 @@ class Facture extends CommonInvoice } // 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($this->db); $result=$interface->run_triggers('BILL_CLONE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -693,7 +693,7 @@ class Facture extends CommonInvoice if ($ret > 0) { // Actions hooked (by external module) - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('invoicedao')); @@ -1036,7 +1036,7 @@ class Facture extends CommonInvoice if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1073,8 +1073,8 @@ class Facture extends CommonInvoice { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $this->db->begin(); @@ -1195,7 +1195,7 @@ class Facture extends CommonInvoice if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('BILL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1404,7 +1404,7 @@ class Facture extends CommonInvoice if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_PAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1459,7 +1459,7 @@ class Facture extends CommonInvoice if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_UNPAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1524,7 +1524,7 @@ class Facture extends CommonInvoice if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_CANCEL',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1745,7 +1745,7 @@ class Facture extends CommonInvoice if (! $error) { // 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($this->db); $result=$interface->run_triggers('BILL_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1874,7 +1874,7 @@ class Facture extends CommonInvoice function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0) { dol_syslog(get_class($this)."::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -2027,7 +2027,7 @@ class Facture extends CommonInvoice */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line", LOG_DEBUG); @@ -2400,7 +2400,7 @@ class Facture extends CommonInvoice { $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) - $mybool|=@include_once($dir.$file); + $mybool|=@include_once $dir.$file; } // For compatibility @@ -2413,7 +2413,7 @@ class Facture extends CommonInvoice { $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) - $mybool|=@include_once($dir.$file); + $mybool|=@include_once $dir.$file; } } //print "xx".$mybool.$dir.$file."-".$classname; @@ -3358,7 +3358,7 @@ class FactureLigne if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('LINEBILL_INSERT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3455,7 +3455,7 @@ class FactureLigne if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('LINEBILL_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3491,7 +3491,7 @@ class FactureLigne if ($this->db->query($sql) ) { // 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($this->db); $result = $interface->run_triggers('LINEBILL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c56183ca777ce612b58b3242b79a373f9ff69542..fd42cb19b76a4950fed6bbe6d0d1f683559755dc 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -22,10 +22,10 @@ * \ingroup factures * \brief Fichier de la classe de gestion des stats des factures */ -include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php"; -include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php"; -include_once DOL_DOCUMENT_ROOT . "/core/lib/date.lib.php"; +include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; +include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; +include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; +include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; /** * \class FactureStats diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index ba5dc74c734737c48f7fd324db6521b10f78dbe5..4357ac46731f12a83b02aaf3034633624a6d7347 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -135,7 +135,7 @@ class PaymentTerm // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -315,7 +315,7 @@ class PaymentTerm // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -371,7 +371,7 @@ class PaymentTerm // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 43f6225396e702e34828cbebdc649155f2167add..d3625faf622d01a1e1f6d90073ebe24485821f65 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -187,7 +187,7 @@ if ($id > 0 || ! empty($ref)) $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/contacts.tpl.php')); + $res=@include dol_buildpath($reldir.'/contacts.tpl.php'); if ($res) break; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 2ce49772a1df21f315942a977e01963ddaf99257..8a19de20180178345b2de9a5eeed4bcb0e170566 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -97,7 +97,7 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA $object=new Facture($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('invoicecard')); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index e37bd7ef4d7d5fcf5757f631cadad6fd0df7f1e5..45cfad096ec9bdcb435170c29a25df2af09526a9 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -124,7 +124,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 54354da48858c4f64530a03fb285f87055b2f496..8bcdf9c72ef1207baf34c35a1e9abdf20982f4ea 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -500,7 +500,7 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) // Last donations if ($conf->don->enabled && $user->rights->societe->lire) { - include_once(DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; $langs->load("boxes"); $donationstatic=new Don($db); @@ -565,7 +565,7 @@ if ($conf->don->enabled && $user->rights->societe->lire) // Last trips and expenses if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) { - include_once(DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; $langs->load("boxes"); diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 8522ed50cc645aa89213af9074e3a2ad2191a317..6f0c46b813bc98b4fc19bb6a93edb68d15762539 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -103,7 +103,7 @@ class localtax extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // 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($this->db); $result=$interface->run_triggers('LOCALTAX_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -165,7 +165,7 @@ class localtax extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('LOCALTAX_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -264,7 +264,7 @@ class localtax extends CommonObject } // 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($this->db); $result=$interface->run_triggers('LOCALTAX_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 701a69ff6b627ddf4987f05620f490ee46a25482..74d891a7764f1853cc2299eb2dec989780062337 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -222,7 +222,7 @@ class Paiement extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('PAYMENT_CUSTOMER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -337,7 +337,7 @@ class Paiement extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PAYMENT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -480,7 +480,7 @@ class Paiement extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PAYMENT_ADD_TO_BANK',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index ef0e7663a43f4bd1b15689cbaa7b1ed241b7bac9..a397ca5c29ca9721bb3da44f044cbbae3097aaf4 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -165,7 +165,7 @@ class ChargeSociales extends CommonObject $this->db->begin(); // Get bank transaction lines for this social contributions - include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $account=new Account($this->db); $lines_url=$account->get_url('',$this->id,'sc'); diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 7c91b4c8b9788327d2840bd39d923ab740a7d45e..7bff88b37a4c505a8333909d17c7a36d3e69ebd1 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -275,7 +275,7 @@ class PaymentSocialContribution extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -344,7 +344,7 @@ class PaymentSocialContribution extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index d139e0e99dd40833adafa6d816ca6a1042ec6bde..23d01de6631e3267a26e6e655dff439beff3869e 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -122,7 +122,7 @@ class Tva extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // 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($this->db); $result=$interface->run_triggers('TVA_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -189,7 +189,7 @@ class Tva extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('TVA_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -289,7 +289,7 @@ class Tva extends CommonObject } // 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($this->db); $result=$interface->run_triggers('TVA_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -516,7 +516,7 @@ class Tva extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO devrait s'appeler paiementtva // 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($this->db); $result=$interface->run_triggers('TVA_ADDPAYMENT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index a73584903bf98b716d3efeb9e8dec35f60c4fb31..90a0acff0d295bfe60cc6e4a35040147009a641b 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -41,7 +41,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'tax', '', '', 'charges'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('taxvatcard')); diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 688db644b969d61a5835058d46aeb0f944957849..6d37292f62fcb926fa930064c2075244124af03c 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -396,7 +396,7 @@ abstract class ActionsContactCardCommon if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $login=dol_buildlogin($this->object->nom, $this->object->prenom); diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index 1cb87732ddc0d3201ffd0b30651aa7ebd4581d90..485de6470e5ee18b4d9ccd20b95dccf7ca6537a6 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -21,7 +21,7 @@ * \ingroup thirdparty * \brief Fichier de la classe Thirdparty contact card controller (default canvas) */ -include_once(DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php'); +include_once DOL_DOCUMENT_ROOT.'/contact/canvas/actions_contactcard_common.class.php'; /** * \class ActionsContactCardDefault diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 17aa7745a866fc266d10ff979b9b5a867bf53eb3..fc3a386af0228c203f4b1296b08f53c3b78ab47c 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -168,7 +168,7 @@ class Contact extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('CONTACT_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -264,7 +264,7 @@ class Contact extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('CONTACT_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -725,7 +725,7 @@ class Contact extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('CONTACT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 6bd01d3ad337630a1f14abd4497cce15e920e456..96c8073946172a878e3ebac1135ebba69230aec1 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -63,7 +63,7 @@ if (! empty($canvas)) $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', '', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('contactcard')); @@ -706,7 +706,7 @@ else if ($action == 'create_user') { // Full firstname and name separated with a dot : firstname.name - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $login=dol_buildlogin($object->nom,$object->prenom); $generated_password=''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index f76acf85f24e19b870d7741556fbd849ef1a6439..5cdd2c1568a126d37783a6d88adab4927dd9f308 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -197,7 +197,7 @@ else print '<tr>'; if (! empty($object->birthday)) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.dol_print_date($object->birthday,"day"); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 07a98907d0331bbd2697f8f1af48246f3c65e1c9..c51c3f1a85f10c7a17b814d6af03f33fbdf27940 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -100,7 +100,7 @@ class Contrat extends CommonObject // Chargement de la classe de numerotation $classname = $conf->global->CONTRACT_ADDON; - $result=include_once($dir.'/'.$file); + $result=include_once $dir.'/'.$file; if ($result) { $obj = new $classname(); @@ -156,7 +156,7 @@ class Contrat extends CommonObject if ($resql) { // 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($this->db); $result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -204,7 +204,7 @@ class Contrat extends CommonObject if ($resql) { // 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($this->db); $result=$interface->run_triggers('CONTRACT_SERVICE_CLOSE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -290,7 +290,7 @@ class Contrat extends CommonObject if ($resql) { // 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($this->db); $result=$interface->run_triggers('CONTRACT_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -654,7 +654,7 @@ class Contrat extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('CONTRACT_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -795,7 +795,7 @@ class Contrat extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1109,7 +1109,7 @@ class Contrat extends CommonObject } // 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($this->db); $result=$interface->run_triggers('CONTRACTLINE_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1937,7 +1937,7 @@ class ContratLigne if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index af4622c8d1d111c2fd7105e4d51f499976470f40..d68c87aaba5f81858d4d24d139ed8de968a29275 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -173,7 +173,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; // Contacts lines - include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } else diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 57bda230349214598b729e6ca645fbe9a2382db5..081b38c8ee9f03374c64150e989321431bc19e81 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -59,7 +59,7 @@ $result=restrictedArea($user,'contrat',$id); $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('contractcard')); @@ -808,14 +808,14 @@ else $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 8936bc90f2ad5b4f6b78d3ed4b719f4eba2cdb11..21f1f41c4e49d692bea90749f41a49ec16e0926b 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -109,7 +109,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php index d24a241eee5cec980e241bfb28e71c6189474374..9de59a527d1f15c8632eb578cfdf839e271f1533 100644 --- a/htdocs/core/ajax/ajaxdirtree.php +++ b/htdocs/core/ajax/ajaxdirtree.php @@ -31,12 +31,12 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); -$res=@include("../../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'); -include_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'); -include_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); +$res=@include '../../main.inc.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; +include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; +include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; $openeddir = GETPOST('openeddir'); $modulepart= GETPOST('modulepart'); diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php index 7dd1ce0474374376c2cfefe07717f2bdb20f1c1b..0f81b28aae15b0fc3357c413d56594c8b9c34505 100644 --- a/htdocs/core/ajax/extraparams.php +++ b/htdocs/core/ajax/extraparams.php @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -include("../../main.inc.php"); +include '../../main.inc.php'; $id = GETPOST('id','int'); $element = GETPOST('element','alpha'); diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 41d74fdebee6bf287612b4d3f095afa05cc59188..9145cd1a2a9cb5e37c4ce1374ca472c0e6734d32 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -23,7 +23,7 @@ * \brief Module to build boxe for events */ -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 events @@ -65,7 +65,7 @@ class box_actions extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); + include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $actionstatic=new ActionComm($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo",$max)); diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index 9166267ccbc411d05772c8d01a75eaeafd126239..762d79bda2576d948594a1d110eebd1d943f3863 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -20,7 +20,7 @@ * \brief Module to show box of bills, orders & propal 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 of customer activity (invoice, order, proposal) @@ -66,9 +66,9 @@ class box_activity extends ModeleBoxes $totalMnt = 0; $totalnb = 0; - include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); - include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); - include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $facturestatic=new Facture($db); $propalstatic=new Propal($db); $commandestatic=new Commande($db); diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php index 0be97f83a4cfe41ccb5e27204209a7dc2ca69a3b..291c7f52596604bb2e68610ac985d1accc0f1d2f 100644 --- a/htdocs/core/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -20,7 +20,7 @@ * \ingroup bookmark * \brief Module to generate box of bookmarks list */ -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 bookmarks diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index a0ab16baf0e5b32b2a3cb63443ecdb5341fa66ef..87d42a42ad57254994f3539c747427b806ad82c7 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -23,7 +23,7 @@ * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -66,7 +66,7 @@ class box_clients extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdpartystatic=new Societe($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers",$max)); diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index f89e37f191ec61d3da20a3275b1e2bdf89c02954..1e76c3d4d0b3459c75568775127547578ba9d0e5 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -23,7 +23,7 @@ * \brief Module de generation de l'affichage de la box commandes */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -65,7 +65,7 @@ class box_commandes extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $commandestatic=new Commande($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerOrders",$max)); diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index 390dbe52ac2bfb2a8cabaa6736b2065f0e015a59..09f84afca7801cd657a5dea156c9f4f7b177603a 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -22,8 +22,8 @@ * \ingroup banque * \brief Module to generate box for bank accounts */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; +include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; /** diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index 577ef3262ff1017d1abcaa94c684e74773e25f7a..a1ee44fe161ef17b7da7d0d794e5ece7658ab72d 100755 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -23,8 +23,8 @@ * \brief Module to show box of contacts */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; +include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; /** diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 57cc7eafaa129b88edd73bd62ccf66e23332597b..9f0448f0534e65527d6a942e95906b048449d730 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -21,7 +21,7 @@ * \brief Module de generation de l'affichage de la box contracts */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -65,7 +65,7 @@ class box_contracts extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $contractstatic=new Contrat($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts",$max)); diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index cceaafa5985402667e2c034dbb772500c722f7c3..78b241154b8341903387eed21ffdb58191950304 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -24,8 +24,8 @@ * \brief Fichier de gestion d'une box pour le module external_rss */ -include_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/rssparser.class.php'; +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index ee8e01a24f8318700baf191ce9deb302b2deb394..2feadec09c64acb6288c3de7670daa7b26bfd9c4 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -22,7 +22,7 @@ * \ingroup factures * \brief Module de generation de l'affichage de la box factures */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -64,7 +64,7 @@ class box_factures extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $facturestatic=new Facture($db); $text = $langs->trans("BoxTitleLastCustomerBills",$max); diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index eb3cf5e67c98414660999670cbb663ca55d1af92..a8f66935a48d5bc36f0861b14d242ba8325bc7df 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -22,7 +22,7 @@ * \ingroup supplier * \brief Fichier de gestion d'une box des factures fournisseurs */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -64,7 +64,7 @@ class box_factures_fourn extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $facturestatic=new FactureFournisseur($db); $this->info_box_head = array( diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index fc167601cc68ad1e0a5aa42587e604618b5a2731..1920af9ebc8ca3808dee699dc1de9b5e1f6110fd 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -21,7 +21,7 @@ * \ingroup fournisseur * \brief Fichier de gestion d'une box des factures fournisseurs impayees */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -64,7 +64,7 @@ class box_factures_fourn_imp extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $facturestatic=new FactureFournisseur($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills",$max)); diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index f71420ba2a4f7f936c5070585a55eb1c88825882..fdc81cff8182812df44f4101b0e0d2fb2853d831 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -67,7 +67,7 @@ class box_factures_imp extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $facturestatic=new Facture($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills",$max)); diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index bb9a4adbfa63a17f62009319765a869db579d1b1..38ffa7dbe7b3c486a5fc3d9bd7d58178e930caf7 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -22,7 +22,7 @@ * \brief Module to generate box of suppliers */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -65,7 +65,7 @@ class box_fournisseurs extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdpartystatic=new Societe($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers",$max)); diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index e64649ec1fdeabce57f7ad698775aea024fca91e..67e44abebbb704ad30928c2bcd58d1191e397d58 100755 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -23,7 +23,7 @@ * \brief Module de generation de l'affichage de la box clients */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -66,7 +66,7 @@ class box_members extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $memberstatic=new Adherent($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max)); diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php index e19ef1c0169879db2b7b337cc377f91dd249857b..dab5d325d765ee156ec9be1f29ee26c23e1d4e4d 100644 --- a/htdocs/core/boxes/box_osc_client.php +++ b/htdocs/core/boxes/box_osc_client.php @@ -22,7 +22,7 @@ * \brief Module to generate box of shop customers */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index fe12c196138eb1e3d7e02824dda9c4d3437bc22a..f0645659062a559c9fd6e129fb597ee3d662e885 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -67,7 +67,7 @@ class box_produits extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $productstatic=new Product($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max)); diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 9f9bd706ac008b61a82a2737011de1006801b107..f36205a9616bf73e9116b82fbe0b8959cf2fd3e9 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -23,7 +23,7 @@ * \brief Module de generation de l'affichage de la box propales */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -66,7 +66,7 @@ class box_propales extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $propalstatic=new Propal($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max)); diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 4251b9f19530465046d447b6a8487f4242065a8d..c50272baee8a3ed9c0547b65f994ddc2d8f37036 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -24,8 +24,8 @@ */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); -include_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; +include_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php'; /** @@ -71,7 +71,7 @@ class box_prospect extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdpartystatic=new Societe($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects",$max)); diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index bd1686da45ae65a526f875cf8a38d9b6042ee8eb..d4a701ca5ef5780ed9b4abbbdc0cdccc8fd5d067 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -23,7 +23,7 @@ * \brief Module de generation de l'affichage de la box services_vendus */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** @@ -65,7 +65,7 @@ class box_services_contracts extends ModeleBoxes $this->max=$max; - include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $contratlignestatic=new ContratLigne($db); $this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract",$max)); diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index bcb31e96464f7ca09c724bde183bb93cd624259e..86b50c45951d9ee48b5c17d5b65481eeb4d1c679 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -21,7 +21,7 @@ * \brief Module to show the box of last expired services */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 6577cb432cf61600a71418555b98c039bf3b375a..355d53198557ceafec01fb0c550b4a85f58db87e 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -23,7 +23,7 @@ * \ingroup fournisseurs * \brief Module that generates the latest supplier orders box */ -include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** * Class that manages the box showing latest supplier orders @@ -64,7 +64,7 @@ class box_supplier_orders extends ModeleBoxes $this->max = $max; - include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $supplierorderstatic=new CommandeFournisseur($db); $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestSupplierOrders", $max)); diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 3bd6afce64e019debf5bb33ead2d9d29f265f9cf..d93bb51eb846419998e4a46b77ca7519bdfaef07 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -161,7 +161,7 @@ class Canvas global $db, $conf, $langs, $user, $canvas; global $form, $formfile; - include($this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'); // Include native PHP template + include $this->template_dir.($this->card?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 61674e5e9050710b1559b9354e216a5010a70250..b3b80b8b4590d5450857cb73e487ec9a6cf6ee97 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -187,7 +187,7 @@ abstract class CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers(strtoupper($this->element).'_ADD_CONTACT',$this,$user,$langs,$conf); if ($result < 0) { @@ -263,7 +263,7 @@ abstract class CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers(strtoupper($this->element).'_DELETE_CONTACT',$this,$user,$langs,$conf); if ($result < 0) { @@ -1454,7 +1454,7 @@ abstract class CommonObject */ function update_price($exclspec=0,$roundingadjust=-1,$nodatabaseupdate=0) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; if ($roundingadjust < 0 && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $roundingadjust=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND; if ($roundingadjust < 0) $roundingadjust=0; @@ -2380,7 +2380,7 @@ abstract class CommonObject // Bypass the default method if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('commonobject')); @@ -2432,7 +2432,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/'.$tplpath.'/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/linkedobjectblock.tpl.php')); + $res=@include dol_buildpath($reldir.'/linkedobjectblock.tpl.php'); if ($res) break; } } @@ -2466,7 +2466,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/predefinedproductline_create.tpl.php')); + $res=@include dol_buildpath($reldir.'/predefinedproductline_create.tpl.php'); if ($res) break; } } @@ -2492,7 +2492,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_create.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_create.tpl.php'); if ($res) break; } } @@ -2647,7 +2647,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/predefinedproductline_view.tpl.php')); + $res=@include dol_buildpath($reldir.'/predefinedproductline_view.tpl.php'); if ($res) break; } } @@ -2658,7 +2658,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_view.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_view.tpl.php'); if ($res) break; } } @@ -2674,7 +2674,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/predefinedproductline_edit.tpl.php')); + $res=@include dol_buildpath($reldir.'/predefinedproductline_edit.tpl.php'); if ($res) break; } } @@ -2685,7 +2685,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_edit.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_edit.tpl.php'); if ($res) break; } } @@ -2832,7 +2832,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/originproductline.tpl.php')); + $res=@include dol_buildpath($reldir.'/originproductline.tpl.php'); if ($res) break; } } diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php index ec315f1cb9e286ccb215ac01391a2b2f5dbe0d52..ec5129a0dd88830a5b7a4fad10122fb673586fa4 100644 --- a/htdocs/core/class/cpays.class.php +++ b/htdocs/core/class/cpays.class.php @@ -113,7 +113,7 @@ class Cpays // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -231,7 +231,7 @@ class Cpays // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -287,7 +287,7 @@ class Cpays // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index b91943d146f2daa40ae212e738dd32ecf07731df..f979ef45551e0372876c4abcada9af64b33acc00 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -118,7 +118,7 @@ class Ctypent // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -236,7 +236,7 @@ class Ctypent // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -292,7 +292,7 @@ class Ctypent // extends CommonObject // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php index 2fb677aeffe769e08c1b3d94ddc16107c4fc46ba..3eeb0cb9255d40e680a803111faa9695658eca94 100644 --- a/htdocs/core/class/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -47,12 +47,12 @@ class DolGeoIP if ($type == 'country') { // geoip may have been already included with PEAR - if (! function_exists('geoip_country_code_by_name')) $res=include_once(GEOIP_PATH."geoip.inc"); + if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc'; } else if ($type == 'city') { // geoip may have been already included with PEAR - if (! function_exists('geoip_country_code_by_name')) $res=include_once(GEOIP_PATH."geoipcity.inc"); + if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc'; } else { print 'ErrorBadParameterInConstructor'; return 0; } diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index cd82c00e0e613e35bdc4bc0ff95e3d8754350a1d..a3bbb7d4e14534d6d7a51059599565f7d6b021ca 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -113,7 +113,7 @@ class DolGraph $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php'; if (is_readable($color_file)) { - include_once($color_file); + include_once $color_file; if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor; if (isset($theme_datacolor)) $this->datacolor = $theme_datacolor; if (isset($theme_bgcolor)) $this->bgcolor = $theme_bgcolor; @@ -568,7 +568,7 @@ class DolGraph $classname=''; if ($this->type[0] == 'bars') $classname='BarPlot'; // Only first type of type is supported by artichow if ($this->type[0] == 'lines') $classname='LinePlot'; - include_once(ARTICHOW_PATH.$classname.".class.php"); + include_once ARTICHOW_PATH.$classname.'.class.php'; // Definition de couleurs $bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b827ff362dd64524cb046bc06ff776854fc4c77d..57c4308fb80203401843db129b33099d16ceb3dd 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -866,7 +866,7 @@ class Form $i = 0; if ($num) { - include_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'); + include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $contactstatic=new Contact($this->db); while ($i < $num) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 1597a92e0d6703845114afe7e34d9b78e38020ba..34b6a9448d77a566991d0bb3ff5048e3c5eaec84 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -195,7 +195,7 @@ class FormFile function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false) { // filedir = conf->...dir_ouput."/".get_exdir(id) - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; global $langs,$bc,$conf; @@ -233,7 +233,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; $modellist=ModeleThirdPartyDoc::liste_modeles($this->db); } } @@ -242,7 +242,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; $modellist=ModelePDFPropales::liste_modeles($this->db); } } @@ -251,7 +251,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; $modellist=ModelePDFCommandes::liste_modeles($this->db); } } @@ -260,7 +260,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; $modellist=ModelePDFExpedition::liste_modeles($this->db); } } @@ -269,7 +269,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db); } } @@ -278,7 +278,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'; $modellist=ModelePDFFicheinter::liste_modeles($this->db); } } @@ -287,7 +287,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; $modellist=ModelePDFFactures::liste_modeles($this->db); } } @@ -296,7 +296,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'; $modellist=ModelePDFProjects::liste_modeles($this->db); } } @@ -305,7 +305,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; $modellist=ModeleExports::liste_modeles($this->db); } } @@ -314,7 +314,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'; $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db); } } @@ -323,7 +323,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'; $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db); } } @@ -332,7 +332,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'; $modellist=ModeleChequeReceipts::liste_modeles($this->db); } } @@ -341,7 +341,7 @@ class FormFile if (is_array($genallowed)) $modellist=$genallowed; else { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; $modellist=ModeleDon::liste_modeles($this->db); } } @@ -355,7 +355,7 @@ class FormFile $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0); if (file_exists($file)) { - $res=include_once($file); + $res=include_once $file; } $class='Modele'.ucfirst($modulepart); if (class_exists($class)) @@ -408,7 +408,7 @@ class FormFile $out.= '<th align="center" class="formdoc liste_titre">'; if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $formadmin=new FormAdmin($this->db); $defaultlang=$codelang?$codelang:$langs->getDefaultLang(); $out.= $formadmin->select_language($defaultlang); @@ -570,7 +570,7 @@ class FormFile $nboffiles=count($filearray); - if ($nboffiles > 0) include_once(DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'); + if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; $var=true; foreach($filearray as $key => $file) // filearray must be only files here @@ -671,42 +671,42 @@ class FormFile // To show ref or specific information according to view to show (defined by $module) if ($modulepart == 'company') { - include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $object_instance=new Societe($this->db); } else if ($modulepart == 'invoice') { - include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $object_instance=new Facture($this->db); } else if ($modulepart == 'invoice_supplier') { - include_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $object_instance=new FactureFournisseur($this->db); } else if ($modulepart == 'propal') { - include_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $object_instance=new Propal($this->db); } else if ($modulepart == 'order') { - include_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $object_instance=new Commande($this->db); } else if ($modulepart == 'order_supplier') { - include_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $object_instance=new CommandeFournisseur($this->db); } else if ($modulepart == 'contract') { - include_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $object_instance=new Contrat($this->db); } else if ($modulepart == 'tax') { - include_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; $object_instance=new ChargeSociales($this->db); } @@ -815,10 +815,10 @@ class FormFile $max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize); // Include main - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php'; // Include template - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php'; } diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index d950ab04e0128e7af31f55fe151ffd63a9517f58..2371d07bbae18bcf5ec0225a9b589d86b56a7435 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -806,7 +806,7 @@ class FormOther { global $conf,$langs,$db; - include_once(DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'; //$infobox=new InfoBox($db); $boxactivated=InfoBox::listboxes($db,'activated',$areacode,$user); diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index f6892455301ccb30c3c4603a502b1c16f8c41e1b..d3466e5268c178db6c2868dacf3275ac89a74dba 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -107,7 +107,7 @@ class Interfaces } else { - include_once($newdir.'/'.$file); + include_once $newdir.'/'.$file; } // Check if trigger file is disabled by name @@ -233,7 +233,7 @@ class Interfaces } else { - include_once($newdir.'/'.$file); + include_once $newdir.'/'.$file; } $files[$i] = $file; diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 1d7f443f739208153bc682593773bb504aa75049..1474cb7686ac2f35380790cbaa00c115b0a095ba 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -162,7 +162,7 @@ class Notify if (dol_strlen($sendto)) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM'); $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index c3af2d046b4adf4944ed42629d7be884267f36cc..f86c40b087929232ef7bc951727ae3b65507fbba 100755 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -165,7 +165,7 @@ class RssParser { global $conf; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $str=''; // This will contain content of feed diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index 7dee233f436f9c1ce5194226a0d21f650314e0fe..51bb466486182545e77dab52c41aa3323adcaa0c 100755 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -318,7 +318,7 @@ class SMTPs $host=preg_replace('@ssl://@i','',$host); // Remove prefix // DOL_CHANGE LDR - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if ( (! is_ip($host)) && ((gethostbyname($host)) == $host)) { diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index c40ca2a2386f343ee03307b4170554f7e2f91603..88837c2a91221d2a60b7f5cd5853befdef6c1e25 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -603,7 +603,7 @@ class Translate $fonc='numberwords'; if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) { - include_once($newdir.'/functions_'.$fonc.'.lib.php'); + include_once $newdir.'/functions_'.$fonc.'.lib.php'; $newnumber=numberwords_getLabelFromNumber($this,$number,$isamount); break; } diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index fa3d69cb4fbe8944cddd732d460b95c14a354485..ef73cf5be70c593511d2d64ce6982964d58891f4 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -684,7 +684,7 @@ function activateModule($value,$withdeps=1) { if (file_exists($dir.$modFile)) { - $found=@include_once($dir.$modFile); + $found=@include_once $dir.$modFile; if ($found) break; } } @@ -803,7 +803,7 @@ function unActivateModule($value, $requiredby=1) { if (file_exists($dir.$modFile)) { - $found=@include_once($dir.$modFile); + $found=@include_once $dir.$modFile; if ($found) break; } } @@ -907,7 +907,7 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq if ($modName) { - include_once($dir.$file); + include_once $dir.$file; $objMod = new $modName($db); if ($objMod->numero > 0) diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index c12074faea7f4ec83708fd41e71d8d318fae6dd8..30989a272e7a4b0952741a657696e4761a7a0f1e 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -87,7 +87,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt print $form->select_dolusers($filterd,'userdone',1,'',!$canedit); print '</td></tr>'; - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); print '<tr>'; print '<td nowrap="nowrap">'; @@ -175,8 +175,8 @@ function show_array_actions_to_do($max=5) $now=dol_now(); - include_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); - include_once(DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'); + include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; + include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; $sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,"; $sql.= " c.code, c.libelle,"; diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index a8d032a72e28e535a19e2d4060cd08c380cb0c48..3685169446069b1b329742db07b992809f4cd87b 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -634,7 +634,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable $object->src_file=$dest_file; // 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('FILE_UPLOAD',$object,$user,$langs,$conf); if ($result < 0) { @@ -695,7 +695,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$objec // TODO Replace trigger by a hook. Triggers must be used for business events only. // 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('FILE_DELETE',$object,$user,$langs,$conf); if ($result < 0) { $error++; $errors=$interface->errors; } @@ -945,7 +945,7 @@ function dol_add_file_process($upload_dir,$allowoverwrite=0,$donotupdatesession= { if (empty($donotupdatesession)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->add_attached_files($upload_dir . "/" . $_FILES[$varfiles]['name'],$_FILES[$varfiles]['name'],$_FILES[$varfiles]['type']); } @@ -1025,7 +1025,7 @@ function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile= } if (empty($donotupdatesession)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->remove_attached_files($keytodelete); } @@ -1092,7 +1092,7 @@ function dol_compress_file($inputfile, $outputfile, $mode="gz") { $foundhandler=1; - include_once(ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php'); + include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php'; $archive = new PclZip($outputfile); $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile)); //$archive->add($inputfile); @@ -1136,7 +1136,7 @@ function dol_uncompress($inputfile,$outputdir) if (defined('ODTPHP_PATHTOPCLZIP')) { - include_once(ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php'); + include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php'; $archive = new PclZip($inputfile); if ($archive->extract(PCLZIP_OPT_PATH, $outputdir) == 0) return array('error'=>$archive->errorInfo(true)); else return array(); diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php index 7f66a6ac09067336eed74ece0fa37c4f35bbb62f..887cae3115d098a6f626a6958910d5a21eff2b72 100644 --- a/htdocs/core/lib/fourn.lib.php +++ b/htdocs/core/lib/fourn.lib.php @@ -65,7 +65,7 @@ function facturefourn_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id; /*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); @@ -131,7 +131,7 @@ function ordersupplier_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id; /*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index aec66e15cbe6fa4aa5d573a941eee07ad20170e4..878cee4812fcdbb144fdf19f1ece2b0c29266885 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -33,7 +33,7 @@ if (! function_exists('json_encode')) { - include_once(DOL_DOCUMENT_ROOT ."/core/lib/json.lib.php"); + include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php'; } /** @@ -222,7 +222,7 @@ function dol_getprefix() * Make an include_once using default root and alternate root if it fails. * WARNING: In most cases, you should not use this function: * To link to a core file, use include(DOL_DOCUMENT_ROOT.'/pathtofile') - * To link to a module file from a module file, use include('./mymodulefile'); + * To link to a module file from a module file, use include './mymodulefile'; * To link to a module file from a core file, then this function can be used * * @param string $relpath Relative path to file (Ie: mydir/myfile, ../myfile, ...) @@ -568,7 +568,7 @@ function dol_syslog($message, $level=LOG_INFO) // 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('/usr/share/php/'); - include_once('FirePHPCore/FirePHP.class.php'); + include_once 'FirePHPCore/FirePHP.class.php'; set_include_path($oldinclude); ob_start(); $firephp = FirePHP::getInstance(true); @@ -1239,7 +1239,7 @@ function dol_print_ip($ip,$mode=0) //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages) - include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'; $geoip=new DolGeoIP('country',$datafile); //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n"; //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n"; @@ -1275,7 +1275,7 @@ function dol_user_country() $datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE; //$ip='24.24.24.24'; //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat'; - include_once(DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'; $geoip=new DolGeoIP('country',$datafile); $countrycode=$geoip->getCountryCodeFromIP($ip); $ret=$countrycode; @@ -1425,7 +1425,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie', $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php"; if (is_readable($color_file)) { - include_once($color_file); + include_once $color_file; if (isset($theme_datacolor)) { $datacolor=array(); diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index c0640900d8118808edc0f1322013d2ae4a484923..c63360a07ad670c3691360ecde444061707f1452 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -179,7 +179,7 @@ function dol_print_object_info($object) $langs->load("other"); $langs->load("admin"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $deltadateforserver=getServerTimeZoneInt('now'); $deltadateforclient=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']); @@ -1214,7 +1214,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0) // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). if (! empty($obj->description)) // List of directories to scan is defined { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $const=$obj->description; $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php index 50753fc2818bfd0edf47c012ff868c795e3d80bc..07e7550994bacc96abc318e928771f613dfd76e8 100644 --- a/htdocs/core/lib/invoice.lib.php +++ b/htdocs/core/lib/invoice.lib.php @@ -81,7 +81,7 @@ function facture_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id; /*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php index 0ba1d9451dc339514bf1176e6c442f4c98c079cf..2bd4fd8779bf1bd538d1f45d284532e5bf2ac054 100644 --- a/htdocs/core/lib/order.lib.php +++ b/htdocs/core/lib/order.lib.php @@ -84,7 +84,7 @@ function commande_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id; /*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index a66ddba0189b93b4a4fa8f641841fa428a0de6cb..c98c2be380cf8556277e330d5b02dac4a2dca4d3 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -42,7 +42,7 @@ function pdf_getFormat() if (empty($conf->global->MAIN_PDF_FORMAT)) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $pdfformat=dol_getDefaultFormat(); } else $pdfformat=$conf->global->MAIN_PDF_FORMAT; @@ -177,7 +177,7 @@ function pdf_getPDFFontSize($outputlangs) function pdf_getHeightForLogo($logo) { $height=22; $maxwidth=130; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; $tmp=dol_getImageSize($logo); if ($tmp['height']) { @@ -1216,7 +1216,7 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm */ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false) { - include_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if ($object->lines[$i]->special_code != 3) { diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 774084a78240174cd31c125bd89c963be25db929..d7a4f21ee00dd66ccc1f06f8a4787f5bf3754257 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -65,7 +65,7 @@ function project_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); @@ -134,7 +134,7 @@ function task_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');; /*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php index 23439d25806a5d1fea452d3fb00d16ace865d88e..ca30e8631f1eb452cce7424b8060d47af6179c77 100644 --- a/htdocs/core/lib/propal.lib.php +++ b/htdocs/core/lib/propal.lib.php @@ -87,7 +87,7 @@ function propal_prepare_head($object) $head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id; /*$filesdir = $conf->propal->dir_output . "/" . dol_sanitizeFileName($propal->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $listoffiles=dol_dir_list($filesdir,'files',1); $head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/ $head[$h][1] = $langs->trans('Documents'); diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 23617b7208bb6f1789abe2fb3c68bbebc1a2fe9b..5460f0f3771c99c7aa77af091d4e0401e7007b70 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -373,7 +373,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature { if (! empty($conf->projet->enabled) && ! $user->rights->projet->all->lire) { - include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $projectstatic=new Project($db); $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0); $tmparray=explode(',',$tmps); @@ -456,7 +456,7 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess global $conf, $db, $user, $langs; if (! is_object($langs)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; $langs=new Translate('',$conf); } diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index 40fb341d2292282397af38061e769e51bf8dfc79..7c2c1d897e88be69c73493cd46e0e72dca4a7ff8 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -84,7 +84,7 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod } $result=false; - if ($fullauthfile) $result=include_once($fullauthfile); + if ($fullauthfile) $result=include_once $fullauthfile; if ($fullauthfile && $result) { // Call function to check user/password @@ -133,7 +133,7 @@ function dol_loginfunction($langs,$conf,$mysoc) // Instantiate hooks of thirdparty module only if not already define if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); } $hookmanager->initHooks(array('mainloginpage')); @@ -282,7 +282,7 @@ function dol_loginfunction($langs,$conf,$mysoc) if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; - include($template_dir.'login.tpl.php'); // To use native PHP + include $template_dir.'login.tpl.php'; // To use native PHP $_SESSION["dol_loginmesg"] = ''; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index cd0004321849e35c74278c1eeee59352c07a5d66..f4f65b1be0413d24d4fe3111770b9ec3b77b898e 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -260,7 +260,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') // Informations on receipt if ($conf->livraison_bon->enabled) { - include_once(DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'); + include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; $expedition->id=$objp->sendingid; $expedition->fetchObjectLinked($expedition->id,$expedition->element); //var_dump($expedition->linkedObjects); diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php index 9e1d0fd129235f10309baccebafb2c33a24e6be6..ed4ce476c8ce66b087a9172b4ff806b2d993f190 100755 --- a/htdocs/core/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -83,7 +83,7 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) // Set authmode $authmode=explode(',',$dolibarr_main_authentication); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode); if (empty($login)) { diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php index 2f1b6e04a2600cdde2262a3aa980b1c6cb1c3341..277dca6cc3784b3df81d04a6e091c6a1cee64a25 100644 --- a/htdocs/core/lib/xcal.lib.php +++ b/htdocs/core/lib/xcal.lib.php @@ -44,7 +44,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile) $calfileh=fopen($outputfile,'w'); if ($calfileh) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $now=dol_now(); $encoding=''; diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index fed225a4263c0dcdb6ff4d0e2143c0f834fb6aed..ab33d464c8d41a619c0e44a6463b9da05db06e64 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -485,7 +485,7 @@ abstract class DolibarrModules $error=0; - include_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); + include_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php'; $ok = 1; foreach($conf->file->dol_document_root as $dirroot) @@ -961,7 +961,7 @@ abstract class DolibarrModules // If we want to init permissions on admin users if ($reinitadminperms) { - include_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); + include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1"; dol_syslog(get_class($this)."::insert_permissions Search all admin users sql=".$sql); $resqlseladmin=$this->db->query($sql,1); diff --git a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php index 531928e3283a6f341bb7862b6e6d5918ff378354..f031ea2d4aa85ab65d137129a12c86b6b0d3a42a 100644 --- a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php @@ -52,7 +52,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator $type='chequereceipt'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); // TODO Remove this to use getListOfModels only $liste = array('blochet'=>'blochet'); diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index df8287086c94ae24f432d6f43875a14f6c7aa852..7ea8c0fed0a480c1be311cd7d583b7334d9f5a07 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -321,7 +321,7 @@ class pdf_edison extends ModelePDFCommandes // Actions on extra fields (by external module or standard code) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 04a6cd9d10026014e5ab9ba75ae52c5d04d2bd4b..59077af73cc8efaa8d878f529fe1d40f019e4d40 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -399,7 +399,7 @@ class pdf_einstein extends ModelePDFCommandes // Add pdfgeneration hook if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 047aa5c823ebdf285993edf70513cf8beaef40de..27eeb60fdaae1f3788f1545bd06a0211344b17f6 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -54,7 +54,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator $type='order'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -235,7 +235,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 dol_meta_create($object); // 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('ORDER_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php index a07061e05c099fbe50d52b74df0f9413955dabd2..73f6bdf2052089cd08d222c2b792c2655f65bf3d 100644 --- a/htdocs/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -50,7 +50,7 @@ abstract class ModeleDon extends CommonDocGenerator $type='donation'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; diff --git a/htdocs/core/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php index d8dc976faf9d9c634c745a5cc5c548816eb4e561..564adf19a29e846d03cdc122858d9b0eff276235 100644 --- a/htdocs/core/modules/expedition/methode_expedition.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition.modules.php @@ -58,7 +58,7 @@ class ModeleShippingMethod $type='???'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; diff --git a/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php index 1117165e11273fc150f36fd29d0bcc6c4448e043..6d3b300b4b889486ff95290def623e26bb7ff8cb 100644 --- a/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php @@ -20,7 +20,7 @@ * \file htdocs/core/modules/expedition/methode_expedition_colsui.modules.php * \ingroup expedition */ -include_once "methode_expedition.modules.php"; +include_once 'methode_expedition.modules.php'; /** * Class to manage shipment Colsui diff --git a/htdocs/core/modules/expedition/methode_expedition_enl.modules.php b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php index 3da4913b7d95713a0b2edc5f52b0c54114dfc5e9..0087018cc6f87de37ad462d7e0f88cb6a5ef607e 100644 --- a/htdocs/core/modules/expedition/methode_expedition_enl.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php @@ -19,7 +19,7 @@ * \file htdocs/core/modules/expedition/methode_expedition_enl.modules.php * \ingroup expedition */ -include_once "methode_expedition.modules.php"; +include_once 'methode_expedition.modules.php'; /** diff --git a/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php index df15cbcd72c390fee484402f9738b5a5758e676d..cadd71d15bae027e2ced2b4570468f74f3e099a9 100644 --- a/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php @@ -20,7 +20,7 @@ * \ingroup expedition */ -include_once "methode_expedition.modules.php"; +include_once 'methode_expedition.modules.php'; /** diff --git a/htdocs/core/modules/expedition/methode_expedition_trans.modules.php b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php index 20ae00da1f7acfa953de95e6d38729eb2be08a5b..24895ccd3f8eedd35f395c274af92435a5073d5c 100644 --- a/htdocs/core/modules/expedition/methode_expedition_trans.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php @@ -19,7 +19,7 @@ * \file htdocs/core/modules/expedition/methode_expedition_trans.modules.php * \ingroup expedition */ -include_once "methode_expedition.modules.php"; +include_once 'methode_expedition.modules.php'; /** diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index 5d198dd0cc5884211b1df9c8f0aca6dffa7e1275..a40fddc9ef624567ec022ec39bc89a96c5770840 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -51,7 +51,7 @@ abstract class ModelePdfExpedition extends CommonDocGenerator $type='shipping'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -222,7 +222,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) //dol_delete_preview($object); // 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('SHIPPING_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index cd182248128842f8ce5b06f5219faf3294f59a7f..24fe33b632f031db48e37ac3f04bed4ab31456fb 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -402,7 +402,7 @@ class pdf_crabe extends ModelePDFFactures // Add pdfgeneration hook if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index 7f2f008e75a6c801a10e2c6ac3ef7899dd3337db..b2b3254ab3aa4edf020ff6e0803033f3eb98ed88 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -357,7 +357,7 @@ class pdf_oursin extends ModelePDFFactures // Actions on extra fields (by external module or standard code) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 88912a3c59a09d14d2f1917b1bbe3292345b5a10..66f02307d176f4aacfe2ffe37f8ba37d64bf54b6 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -52,7 +52,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator $type='invoice'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -236,7 +236,7 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, dol_meta_create($object); // 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('BILL_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index eeb46ed4fb9125cee55adbeceb34c6a80558717e..0cda5ac63b7e096fa8363a7483a02fb5af9ac244 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -51,7 +51,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator $type='ficheinter'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -225,7 +225,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $ dol_delete_preview($object); // 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('FICHEINTER_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index e65aea510809678cb28df21959aa5153d91fb939..663c71987559e780c5efd29534b258abf6c130dc 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -51,7 +51,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator $type='delivery'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -226,7 +226,7 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='') dol_delete_preview($object); // 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('DELIVERY_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index de9ea9fb5fa16fc62d781b7ac986008dd78f138c..32df2f5d0e86dadf70c008e3fd6f6a2d8def2135 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -51,7 +51,7 @@ class ModelePDFCards $type='members_card'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index f04c436b2a17988aa82216a6954149790e2b7a7c..65e9373477780a2794553b18c884b8803d7a9e9f 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -26,7 +26,7 @@ * \brief Fichier de description et activation du module Comptabilite Expert */ -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/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index d0356dafdef454a5bb7ae6c94f96f957eedfb53f..1f8aeae62093958440c2b1a2e640884619f2f2a0 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -27,7 +27,7 @@ * \brief File descriptor or module Member */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * Classe de description et activation du module Adherent diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index ad4b032a6f69ca42322b8d19caf4b42ed1ec3e7a..7292503e31dfc68b7bb7c9120e85fb5fdd750d16 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -27,7 +27,7 @@ * \ingroup agenda * \brief Fichier de description et activation du module agenda */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modAgenda diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 3303c3bcb7a7a3c18732b7828089d0e59d5272d4..f5cc0ac06836ddf2206ca4d308a7aee08c42f8d0 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -27,7 +27,7 @@ * \brief Fichier de description et activation du module Banque */ -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/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php index aef4e0426d401ab7709cc5b700042e042080687b..1fa133e0a9f1c24e3cbdc77c6b3b666c50973c09 100644 --- a/htdocs/core/modules/modBarcode.class.php +++ b/htdocs/core/modules/modBarcode.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Barcode */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modBarcode diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php index 91a51dd00c64796c1a58a7ea5bfd427bb3538d0b..c8cda2c14c93a2f1469009269203664485ff8da9 100644 --- a/htdocs/core/modules/modBookmark.class.php +++ b/htdocs/core/modules/modBookmark.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module Bookmarks */ -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/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php index 0aa50d7c5781b6b58189dced773af7332b42e21b..5538a9a63c9f366fdd2ae573cc9820143fc41ae2 100644 --- a/htdocs/core/modules/modBoutique.class.php +++ b/htdocs/core/modules/modBoutique.class.php @@ -26,7 +26,7 @@ * \brief Fichier de description et activation du module OSCommerce */ -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/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php index a7a6fa134788953ced624d1fcbe27538900efe7f..30a538dd3fa7163d14ff3a4de9177a394fb8c5cc 100644 --- a/htdocs/core/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -22,7 +22,7 @@ * \ingroup pos * \brief File to enable/disable module Point Of Sales */ -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/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index cb0e349f70bea71b059bbaab7dcde8a9d0001c59..bc18fa78ecbbbab7761a59ba7e77be93831666dd 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -23,7 +23,7 @@ * \ingroup category * \brief Fichier de description et activation du module Categorie */ -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/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php index 0f673696d268350bf3b71229b46a63efb3f74d79..47cbbfde2a0d40110a8bc85bb0555ff41c5bb2d3 100644 --- a/htdocs/core/modules/modClickToDial.class.php +++ b/htdocs/core/modules/modClickToDial.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module de click to Dial */ -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/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 7c23cd1f80ec50084d781bb4bdd92dfc1fc45904..ed9640a7790a81580474e052072512c5f0159a7d 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -29,7 +29,7 @@ * \brief Fichier de description et activation du module Commande */ -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/modCommissions.class.php b/htdocs/core/modules/modCommissions.class.php index 8335ffe7b2be88e0cf1dd986c4371a7f38999957..7aaa29f606388c447724178de86dc97572442c11 100644 --- a/htdocs/core/modules/modCommissions.class.php +++ b/htdocs/core/modules/modCommissions.class.php @@ -23,7 +23,7 @@ * \ingroup commissions * \brief Description and activation file for module Commissions */ -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/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php index e6a5b6d31821809758a2c63d4ebb223470a2eea5..a8fe798cd37c323b4d75d9205a93d570a5f5d5e0 100644 --- a/htdocs/core/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -26,7 +26,7 @@ * \brief Fichier de description et activation du module Comptabilite */ -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/modContrat.class.php b/htdocs/core/modules/modContrat.class.php index 4466efffdcd07c5568ebf2e2177fd8381420c329..e7317dc99d05d7cf3be075bc8ba5cc396508504f 100644 --- a/htdocs/core/modules/modContrat.class.php +++ b/htdocs/core/modules/modContrat.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Contrat */ -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/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php index 7c3f60abe4dd50f23b442bece8bb676bcccb608b..f42b6b20c8021c8c8647ca1a24359f54ae123536 100644 --- a/htdocs/core/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -23,7 +23,7 @@ * \ingroup deplacement * \brief Fichier de description et activation du module Deplacement et notes de frais */ -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/modDocument.class.php b/htdocs/core/modules/modDocument.class.php index d0d31cb3e6710546a433476b8982ff9bb908431e..70058b77b1a72e44fb2b53a7ff676a680b58e175 100644 --- a/htdocs/core/modules/modDocument.class.php +++ b/htdocs/core/modules/modDocument.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Generation document */ -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/modDon.class.php b/htdocs/core/modules/modDon.class.php index e9acf254562f4ff61fc27b03c99f8a9cc1075a28..e1a39c42d13fbfd6937e13dff75488e03cac4a44 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Don */ -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/modECM.class.php b/htdocs/core/modules/modECM.class.php index 26eae1f353e1faf40965fc0e93eb8b283cd806f8..748b121547b2d5dbd44ee59f35fd397eab0c0848 100644 --- a/htdocs/core/modules/modECM.class.php +++ b/htdocs/core/modules/modECM.class.php @@ -23,7 +23,7 @@ * \brief Description and activation file for module ECM */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modECM diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php index 6d4dd923fadef1a9d84e79f08c9800b72e68a73d..c47c9710d2710357322c1774238097aa15547f34 100644 --- a/htdocs/core/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -26,7 +26,7 @@ * \brief Fichier de description et activation du module Expedition */ -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/modExport.class.php b/htdocs/core/modules/modExport.class.php index 86659deca258ad4017043eb436277ba9b84a90ed..0c817b8488c4aae0a7c3f0dd8cad3be552430632 100644 --- a/htdocs/core/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module export */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modExport diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php index 0d946aa6dac4f32fbcb479c663f48b03fd378dc3..435a3c75714ca746de91d097dc1195e9590528bd 100644 --- a/htdocs/core/modules/modExternalRss.class.php +++ b/htdocs/core/modules/modExternalRss.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module externalrss */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modExternalRss diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php index 09311d199ba5a3a2de3d8a46c09084a0ef094836..aa0629d8ffc1a691f015c44a2bbb7a5ddb617606 100644 --- a/htdocs/core/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -25,7 +25,7 @@ * \brief Description and activation file for module ExternalSite */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modExternalSite diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php index 04a66df1bd8c86f1f05705518913d308e26593a4..590d35006275ca62d22111ae7b2e76c46b78420b 100644 --- a/htdocs/core/modules/modFTP.class.php +++ b/htdocs/core/modules/modFTP.class.php @@ -24,7 +24,7 @@ * \brief Description and activation file for module FTP */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modFTP diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index 76effd8c918a372545d5ed567adf430842ce9900..0ed7ed4485213e472aea2053a872a0d5358cf754 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -26,7 +26,7 @@ * \ingroup facture * \brief Fichier de la classe de description et activation du module Facture */ -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/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php index 9b1e0f8834da25b2ee1e61d0ce013a144d12ecbc..831a4bf679f281e9c222070180fdb365e4b68ec6 100644 --- a/htdocs/core/modules/modFckeditor.class.php +++ b/htdocs/core/modules/modFckeditor.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Fckeditor */ -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/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index f74d8d5eb32be12c4d252d49b44994f86fc2dae6..2a55a5653c0ed87ceca13d7d81ff6fc0dd0c7630 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -28,7 +28,7 @@ * \brief Fichier de description et activation du module Ficheinter */ -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/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 1257905d5672e0e7991521f9cc14a960d3856ca4..873445fd57b0a1d7a5525e09d0e99a6137854058 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -24,7 +24,7 @@ * \ingroup fournisseur * \brief Fichier de description et activation du module Fournisseur */ -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/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php index d4fe5f7bac83aa241b04e723513a13c538a3392d..be81886e51464790e7098f852746a016b31c4b51 100644 --- a/htdocs/core/modules/modGeoIPMaxmind.class.php +++ b/htdocs/core/modules/modGeoIPMaxmind.class.php @@ -23,7 +23,7 @@ * \brief File of geoipmaxmind module descriptor */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modGeoIPMaxmind diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php index 7e17060838cf1038f2a1dc67b2b9acffdd02c0c8..9fc8899a1cf083ab02f65872b0dd390da7f0b8e5 100644 --- a/htdocs/core/modules/modGravatar.class.php +++ b/htdocs/core/modules/modGravatar.class.php @@ -23,7 +23,7 @@ * \ingroup gravatar * \brief Description and activation file for module Gravatar */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modGravatar diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php index f131ee0ae72b5bab59a634a43f2aa760656aa7e7..7bc70dbe55b1262ccbf7c8ecdcefb0e6c983a4ea 100644 --- a/htdocs/core/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module Import */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modImport diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php index 864f4273981f07d92a9390655004726bf2ace79a..76a28618467038073b827840673cb13567195f02 100644 --- a/htdocs/core/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module Label */ -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/modLdap.class.php b/htdocs/core/modules/modLdap.class.php index 1d2fee931e2629e4186f2a1ee19e2068222c7e28..66066e534fd0cfb2ecd75eafa1117c1511aa4a9e 100644 --- a/htdocs/core/modules/modLdap.class.php +++ b/htdocs/core/modules/modLdap.class.php @@ -24,7 +24,7 @@ * \ingroup ldap * \brief File to describe and activate Ldap module */ -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/modMailing.class.php b/htdocs/core/modules/modMailing.class.php index 6f9a7e362e7fde862cc5fe154a866a7e0aaf816c..62bf61082c24e12cf556461f898664452fd3772f 100644 --- a/htdocs/core/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Mailing */ -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/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php index e56057bd3349e1802aa8f2f6a90ce137f84cdae7..cd55017bc3baeb93f6d4adae7db916590f9400cf 100644 --- a/htdocs/core/modules/modMailmanSpip.class.php +++ b/htdocs/core/modules/modMailmanSpip.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module de click to Dial */ -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/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index 082fd821acf795eb1cc9ac52d553b8a044c5b530..4619b765506a27e4fc097a05c937a21318cd7fd8 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -21,7 +21,7 @@ * \ingroup margin * \brief Description and activation file for module Margin */ -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/modNotification.class.php b/htdocs/core/modules/modNotification.class.php index 4f60d51ee66e4b94dc49e8460f1bf30e1b0b4758..0aedef2948e4e060d9bf719ca8d2181929e9f6bf 100644 --- a/htdocs/core/modules/modNotification.class.php +++ b/htdocs/core/modules/modNotification.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module Notification */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modNotification diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php index 3d8d92d815371e99a843bea440c7cbf5993b2f20..8d9032f11d483a8618c6b538f92da7380840bdf4 100644 --- a/htdocs/core/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -23,7 +23,7 @@ * \ingroup paybox * \brief Description and activation file for module Paybox */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modPayBox diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php index dd52eba0e093b1862fe8386990e9be0a8eabb02e..5c10fe30ee5c81d0fbc0542390eee5481c9969f4 100644 --- a/htdocs/core/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -24,7 +24,7 @@ * \ingroup paypal * \brief Description and activation file for module Paypal */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** \class modPaypal diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php index f63947bc4a6f4a175f8eaf6b7cb5dc9b7d0789ca..0a5da251e0ff4813d54b75ab14f4f99c77d64dd7 100644 --- a/htdocs/core/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -26,7 +26,7 @@ * \brief Fichier de description et activation du module Prelevement */ -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/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 191673e1df69660eca57056d83ffc9dbaa7e9c3a..c74985bca44373b40aff890f40ccdcced952fdaa 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -30,7 +30,7 @@ * \brief File to describe module to manage catalog of predefined products */ -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/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index 1c2adb531b74623af1f1772010b9417fb83971c5..3849c7df0d810fcd2473539b2df9e80f6bd3b482 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -27,7 +27,7 @@ * \brief Fichier de description et activation du module Projet */ -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/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index 63c2af92e6a04f7c2ae1f6c419e3c31fc30c661d..332096a50c5b07d71a709089a3009644ac9eb874 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -28,7 +28,7 @@ * \brief Fichier de description et activation du module Propale */ -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/modService.class.php b/htdocs/core/modules/modService.class.php index c765bf23d36b3aaef827d33be14c35a5e2e7b701..88bc0b5491e2ae74ed0247977b40ed3b883b226b 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -28,7 +28,7 @@ * \brief Fichier de description et activation du module Service */ -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/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 3d1be2568881eac46d393fef9de14f3a8018290d..603c7bb87985cdda9ca85e9c69a87af2466d6c42 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -27,7 +27,7 @@ * \brief Fichier de description et activation du module Societe */ -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/modStock.class.php b/htdocs/core/modules/modStock.class.php index 057a9fe34ac90fbbd1508aabb5124827dfe71943..5180e914ef507dd308d5551185500d8fac92c5ec 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Stock */ -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/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php index 0ce4111f6e0e2493a79a738692107c93901d999e..3147b067f355e2ae2776627138b4f3eb3175f895 100644 --- a/htdocs/core/modules/modSyslog.class.php +++ b/htdocs/core/modules/modSyslog.class.php @@ -24,7 +24,7 @@ * \brief Fichier de description et activation du module de syslog */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modSyslog diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php index 49148d049e4b476c7eb8bd8c9d1600bfb58ac39a..6342f53249d1de30fc246d163a00e5fbabf32364 100644 --- a/htdocs/core/modules/modTax.class.php +++ b/htdocs/core/modules/modTax.class.php @@ -28,7 +28,7 @@ * \brief Fichier de description et activation du module Taxe */ -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/modUser.class.php b/htdocs/core/modules/modUser.class.php index 5f98dd0b438d47df9b5d269cce1b9720c1356244..63829e38963644390f50d33d7759c2b33bbaef8b 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -25,7 +25,7 @@ * \brief Fichier de description et activation du module Utilisateur */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modUser diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php index 03dfa798babb7931426ac3af5c93615e41f42dd3..f932d017ee2d27a710175be2c8238d98cf474a0e 100644 --- a/htdocs/core/modules/modWebServices.class.php +++ b/htdocs/core/modules/modWebServices.class.php @@ -23,7 +23,7 @@ * \brief File to describe webservices module */ -include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** * \class modWebServices diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php index e1b1d128e2d33bad31d3cdc4ac5e0b9e6239b122..acaed9cbf69e399f46efee910b39373c0e214cc3 100644 --- a/htdocs/core/modules/modWorkflow.class.php +++ b/htdocs/core/modules/modWorkflow.class.php @@ -24,7 +24,7 @@ * \brief File to describe and activate module Workflow */ -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/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index 8ce7b4e3e0cbb1ffbd3dc82e9aa68205b4583f3a..96e7bbcc7c5de160827cedb361b78c0ed1624e1f 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -51,7 +51,7 @@ class ModelePDFLabels $type='members_labels'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index b76883ef5516cf27935d71892a9208189af08692..3996a255e039dd84d8e00a65c11a60d7f09d77d7 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -47,7 +47,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator $type='project'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -226,7 +226,7 @@ function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, dol_meta_create($object); // 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('PROJECT_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; }*/ diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index e0ac661f7fdfed6073a973e3c81400c42d779b99..4a24f74c2a063765bb6fee8472092d29123e9608 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -386,7 +386,7 @@ class pdf_azur extends ModelePDFPropales // Actions on extra fields (by external module or standard code) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php index 26d2ed0e77b8891ff4cf6e62724645f26020df11..9be3c094e9215a9d34496fdabbb38658aa822c31 100644 --- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php @@ -386,7 +386,7 @@ class pdf_jaune extends ModelePDFPropales // Actions on extra fields (by external module or standard code) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 40ce33ed8f3dab19a6e2ca2b2ddea7603193de78..1a1e77d9d46a4af662beb7ed407f8e61e3f2037a 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -52,7 +52,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator $type='propal'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -231,7 +231,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, dol_meta_create($object); // 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('PROPAL_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index 4ad2adaf31cbca16cf870b773eaec4c2c930b5e6..b238ee3cfe63ce9b1f0fd34ba8a72ce325419bc9 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -76,7 +76,7 @@ class pdf_paiement */ function write_file($_dir, $month, $year, $outputlangs) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; global $user,$langs,$conf; diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 3f2ae4a2f00c01c2d1d2ae6d7a91b3b986600bb2..fc96075f430d0c77c4aff25a0c5d32bb70ad616c 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -49,7 +49,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator $type='company'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -418,7 +418,7 @@ function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs) $outputlangs->charset_output=$sav_charset_output; // 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('COMPANY_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 8631aa98e51ad704664d69969ffc74bf7e37eb12..fdcddaf6df1a0523ee2d47e84f1c8e872240d0bc 100755 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -47,7 +47,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator $type='invoice_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -145,7 +145,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided dol_delete_preview($object); // 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('SUPPLIER_INVOICE_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 0e57b3073cba14560f6d85309c2bedb645dbdb01..6dd866f8887cb5a9d19413e56c3adfe7ef978296 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -386,7 +386,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices // Actions on extra fields (by external module or standard code) if (!is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index cfefba334487bf63bfff98dafd7a481cdc6f62e4..7c437a751cd9e491b90048fc66c21d2bc1272022 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -53,7 +53,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator $type='order_supplier'; $liste=array(); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $liste=getListOfModels($db,$type,$maxfilenamelength); return $liste; @@ -226,7 +226,7 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet dol_delete_preview($object); // 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('SUPPLIER_ORDER_BUILDDOC',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index d3487e01b8c565be9a9cf8eebef67e5a9cea246a..a194480e834a9a89b4b9e702e20e7d744a3cf663 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -407,7 +407,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // Add pdfgeneration hook if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php index ff90233652120009deaa4207001680334743378c..a3859ba9988821c135e3497fb4b1e6a7e2bd0a7d 100644 --- a/htdocs/core/tpl/bloc_showhide.tpl.php +++ b/htdocs/core/tpl/bloc_showhide.tpl.php @@ -54,7 +54,7 @@ $(document).ready(function() { <div id="<?php echo $blocname ?>_bloc" class="<?php echo ($hide ? 'hideobject' : 'nohideobject'); ?>"> -<?php include(DOL_DOCUMENT_ROOT.'/core/tpl/'.$blocname.'.tpl.php'); ?> +<?php include DOL_DOCUMENT_ROOT.'/core/tpl/'.$blocname.'.tpl.php'; ?> </div> <br> diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index 938a8b7c338cdb33018958bcc64e1586bcad9e63..b828e0b4ccffc609e09a1417fa2d19dc86849de8 100755 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -228,7 +228,7 @@ class InterfaceLogevents // Add entry in event table if ($this->date) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/events.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php'; $event=new Events($this->db); $event->type=$action; diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 5615ef084ad05169a962fae4ae089ad913087556..18babb8b64449d7c6a64d3ddd550999b5eeef6b0 100755 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -106,7 +106,7 @@ class InterfaceWorkflowManager dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) { - include_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $newobject = new Commande($this->db); $ret=$newobject->createFromProposal($object); @@ -121,7 +121,7 @@ class InterfaceWorkflowManager dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) { - include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $newobject = new Facture($this->db); $ret=$newobject->createFromOrder($object); diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 2124f793b9f08d3fb6c26086aef5745a50bb89c7..6a20cca94262048181d6c279c81772220511d605 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -147,7 +147,7 @@ class EcmDirectory // extends CommonObject $result=dol_mkdir($dir); // 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($this->db); $result=$interface->run_triggers('MYECMDIR_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -216,7 +216,7 @@ class EcmDirectory // extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('MYECMDIR_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -368,7 +368,7 @@ class EcmDirectory // extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('MYECMDIR_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -658,7 +658,7 @@ class EcmDirectory // extends CommonObject function refreshcachenboffile($all=0) { global $conf; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $dir=$conf->ecm->dir_output.'/'.$this->getRelativePath(); $filelist=dol_dir_list($dir,'files',0,'','\.meta$'); diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 0da4bcdff5dc0e6f37a98bc02917d36565b33976..d52e2e177d61cd62c3dcb5126d3f50af1b2c4a4b 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -801,7 +801,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti $mode='noajax'; -include_once(DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'); +include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // End right panel diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 9e03b4169d9b12570f0a74b90caad99cf5c4dd03..06d79a5cd00e721f106069dfb326eeef9db9fb8c 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -122,7 +122,7 @@ class Expedition extends CommonObject // Chargement de la classe de numerotation $classname = $conf->global->EXPEDITION_ADDON_NUMBER; - $result=include_once($dir.'/'.$file); + $result=include_once $dir.'/'.$file; if ($result) { $obj = new $classname(); @@ -251,7 +251,7 @@ class Expedition extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('SHIPPING_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -576,7 +576,7 @@ class Expedition extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('SHIPPING_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -616,7 +616,7 @@ class Expedition extends CommonObject if ($this->statut == 1) { // Expedition validee - include_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); + include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; $delivery = new Livraison($this->db); $result=$delivery->create_from_sending($user, $this->id); if ($result > 0) @@ -732,7 +732,7 @@ class Expedition extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('SHIPPING_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -814,7 +814,7 @@ class Expedition extends CommonObject } // Call triggers - include_once(DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('SHIPPING_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -869,7 +869,7 @@ class Expedition extends CommonObject $resql = $this->db->query($sql); if ($resql) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; $num = $this->db->num_rows($resql); $i = 0; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 8270f86eaff96c921aae0cc52e9ecb967c9dae01..4b34720e0430a56bedcd65f5bcc94c1466763746 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -58,7 +58,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,$origin,$origin_id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('expeditioncard')); @@ -434,7 +434,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -465,7 +465,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' $object->elementtype = $object->element; // 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('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { @@ -1378,7 +1378,7 @@ else print '</td><td valign="top" width="50%">'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'shipping',$socid); @@ -1391,7 +1391,7 @@ else if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref); $file=$fileparams['fullname']; @@ -1423,7 +1423,7 @@ else print_titre($langs->trans('SendShippingByEMail')); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index a105b317a2f1f87adaabde3f2a1cd988a475779d..2b204b2b654d1f80b505c972f7e5c49a8d8d671b 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -439,7 +439,7 @@ class Export // want this action call a trigger. //// Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index ec4753f0edd5626a4c7e301fc20a773ba36c9c7a..3317554ec1c66d43391ec7c4ac8eb42f25829046 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -63,7 +63,7 @@ print '<td>'.$langs->trans("LibraryShort").'</td>'; print '<td align="right">'.$langs->trans("LibraryVersion").'</td>'; print '</tr>'; -include_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); +include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; $model=new ModeleExports(); $liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index b99f078055fcbf7c4535c1c072c558734e4074c9..4f2cdbe06c09da7dcd860336f7437f26b13e2f94 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -160,7 +160,7 @@ class Fichinter extends CommonObject $this->db->commit(); // 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($this->db); $result=$interface->run_triggers('FICHEINTER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -204,7 +204,7 @@ class Fichinter extends CommonObject if ($this->db->query($sql)) { // 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($this->db); $result=$interface->run_triggers('FICHEINTER_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { @@ -355,7 +355,7 @@ class Fichinter extends CommonObject if ($resql) { // 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($this->db); $result=$interface->run_triggers('FICHEINTER_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -666,7 +666,7 @@ class Fichinter extends CommonObject } // 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($this->db); $result=$interface->run_triggers('FICHEINTER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 4a12c061e0258aaaeb5d2146c7d028c1da63e3ec..4969213df7807ecc1e9e6bcbcf5ff2307869fda4 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -148,7 +148,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; // Contacts lines - include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 6434a08ddf14e96b17c20060d6298b4ecb95107d..82046da91af14aaeec08a0bf6683052547751b7d 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -60,7 +60,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('interventioncard')); @@ -556,7 +556,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -589,7 +589,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $object->elementtype = $object->element; // 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('FICHEINTER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -963,14 +963,14 @@ else if ($id > 0 || ! empty($ref)) $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } /* @@ -1257,7 +1257,7 @@ else if ($id > 0 || ! empty($ref)) print '</td><td valign="top" width="50%">'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'fichinter',$socid); print "</td><td>"; @@ -1272,7 +1272,7 @@ else if ($id > 0 || ! empty($ref)) if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -1304,7 +1304,7 @@ else if ($id > 0 || ! empty($ref)) print_titre($langs->trans('SendInterventionByMail')); // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index b284da446bba74011f641a2f40044ccd9fbe7740..3026148e196b3ebbfb28b2dc9af36095eb3798e8 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 2b36ac17c800637bac6dbecc67739fc220f49c27..f068bf5d7d4142230c58c03f07f7490342234c23 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -68,7 +68,7 @@ $conffiletoshow = "htdocs/conf/conf.php"; // Include configuration -$result=@include_once($conffile); +$result=@include_once $conffile; if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { header("Location: install/index.php"); @@ -228,7 +228,7 @@ if (! defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset( * Include functions */ -if (! defined('ADODB_DATE_VERSION')) include_once(ADODB_PATH.'adodb-time.inc.php'); +if (! defined('ADODB_DATE_VERSION')) include_once ADODB_PATH.'adodb-time.inc.php'; if (! file_exists(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php")) { @@ -238,8 +238,8 @@ if (! file_exists(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php")) } // Included by default -include_once(DOL_DOCUMENT_ROOT ."/core/lib/functions.lib.php"); -include_once(DOL_DOCUMENT_ROOT ."/core/lib/security.lib.php"); +include_once DOL_DOCUMENT_ROOT .'/core/lib/functions.lib.php'; +include_once DOL_DOCUMENT_ROOT .'/core/lib/security.lib.php'; //print memory_get_usage(); // If password is encoded, we decode it diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index bb28f40fc5f1d6272d5f0ad80233366f2a194cb1..53211070923386a28101d2e42d705474726ef007 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -26,7 +26,7 @@ * \brief File of class to manage suppliers orders */ -include_once(DOL_DOCUMENT_ROOT."/core/class/commonorder.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; @@ -383,7 +383,7 @@ class CommandeFournisseur extends CommonOrder if (! $error) { // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -721,7 +721,7 @@ class CommandeFournisseur extends CommonOrder if (! $error) { // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_APPROVE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -782,7 +782,7 @@ class CommandeFournisseur extends CommonOrder if ($error == 0) { // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_REFUSE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -833,7 +833,7 @@ class CommandeFournisseur extends CommonOrder $this->log($user, $statut, time()); // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_CANCEL',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -965,7 +965,7 @@ class CommandeFournisseur extends CommonOrder if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1016,7 +1016,7 @@ class CommandeFournisseur extends CommonOrder global $langs,$mysoc; dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (! $qty) $qty=1; @@ -1145,7 +1145,7 @@ class CommandeFournisseur extends CommonOrder { global $conf, $langs, $user; // 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($this->db); $result=$interface->run_triggers('LINEORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1314,7 +1314,7 @@ class CommandeFournisseur extends CommonOrder if (! $error) { // 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($this->db); $result=$interface->run_triggers('ORDER_SUPPLIER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1600,7 +1600,7 @@ class CommandeFournisseur extends CommonOrder function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false) { dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; if ($this->brouillon) { @@ -1679,7 +1679,7 @@ class CommandeFournisseur extends CommonOrder { global $conf, $langs, $user; // 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($this->db); $result=$interface->run_triggers('LINEORDER_SUPPLIER_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index aaddc114ac2cd05b237b3d5ff4a0c4957024e794..0f6fc7ceff69ceb24fecde7ab865a96d30bdd8f8 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -26,7 +26,7 @@ * \brief File of class to manage suppliers invoices */ -include_once(DOL_DOCUMENT_ROOT."/core/class/commoninvoice.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; /** @@ -205,7 +205,7 @@ class FactureFournisseur extends CommonInvoice if ($result > 0) { // 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($this->db); $result=$interface->run_triggers('BILL_SUPPLIER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -537,7 +537,7 @@ class FactureFournisseur extends CommonInvoice if (! $notrigger) { // Call triggers - //include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; //$interface=new Interfaces($this->db); //$result=$interface->run_triggers('BILL_SUPPLIER_MODIFY',$this,$user,$langs,$conf); //if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -602,7 +602,7 @@ class FactureFournisseur extends CommonInvoice if (! $error) { // 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($this->db); $result=$interface->run_triggers('INVOICE_SUPPLIER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -709,7 +709,7 @@ class FactureFournisseur extends CommonInvoice if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_SUPPLIER_PAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -759,7 +759,7 @@ class FactureFournisseur extends CommonInvoice if ($resql) { // 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($this->db); $result=$interface->run_triggers('BILL_SUPPLIER_UNPAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -858,7 +858,7 @@ class FactureFournisseur extends CommonInvoice if (! $error) { // 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($this->db); $result=$interface->run_triggers('BILL_SUPPLIER_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -979,7 +979,7 @@ class FactureFournisseur extends CommonInvoice function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false) { dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1022,7 +1022,7 @@ class FactureFournisseur extends CommonInvoice { global $conf, $langs, $user; // 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($this->db); $result=$interface->run_triggers('LINEBILL_SUPPLIER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1067,7 +1067,7 @@ class FactureFournisseur extends CommonInvoice function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false) { dol_syslog(get_class($this)."::updateline $id,$label,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; $pu = price2num($pu); $qty = price2num($qty); @@ -1136,7 +1136,7 @@ class FactureFournisseur extends CommonInvoice { global $conf, $langs, $user; // 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($this->db); $result=$interface->run_triggers('LINEBILL_SUPPLIER_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1308,7 +1308,7 @@ class FactureFournisseur extends CommonInvoice function initAsSpecimen() { global $langs,$conf; - include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $now = dol_now(); diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 6a27a03581ea7fde01059d83816862fcd2a84e9c..7b931323a40a810bfb90f00108b757f753b1fe0d 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -202,7 +202,7 @@ class PaiementFourn extends Paiement if (! $error) { // 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($this->db); $result=$interface->run_triggers('PAYMENT_SUPPLIER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 977f520ad975758f99aca031305e2cdefa0184f1..16b68a89d7d114e51588826ce20e044375d692c1 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; // Contacts lines - include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } else diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index e9f2b2f14a34f322402085fe2b26001e6f051063..dad9cbd659365badeefa830ec0b6f1d79d092c6d 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -67,7 +67,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'commande_fournisseur', $id,''); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('ordersuppliercard')); @@ -783,7 +783,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -816,7 +816,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $object->elementtype = $object->element; // 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('ORDER_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { $error++; $errors=$interface->errors; } @@ -1257,14 +1257,14 @@ if ($id > 0 || ! empty($ref)) $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } dol_htmloutput_mesg($mesg); @@ -1738,7 +1738,7 @@ if ($id > 0 || ! empty($ref)) // List of actions on element /* Hidden because" available into "Log" tab print '<br>'; - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'order_supplier',$socid); */ @@ -1755,7 +1755,7 @@ if ($id > 0 || ! empty($ref)) if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -1787,7 +1787,7 @@ if ($id > 0 || ! empty($ref)) print_titre($langs->trans('SendOrderByMail')); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index b1c2244869a41e175a7a3ceda550e48a48af2c9e..d3e61d40999053c3a523630a497a0768ae78631e 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; $colwidth=20; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index e5ed32723630fcad38f937ee118913bdd557423a..4ef956255537f73237399ab529ec6b8820277c85 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -163,7 +163,7 @@ if ($id > 0 || ! empty($ref)) print '<br>'; // Contacts lines - include(DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php'; } else diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 513a820cafc038a49afc801a2532ee0f1d8b33a7..0782199e2c1fd492960d8d4194842eac441db531 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -58,7 +58,7 @@ if (! empty($user->societe_id)) $socid=$user->societe_id; $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('invoicesuppliercard')); @@ -699,7 +699,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -732,7 +732,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $object->elementtype = $object->element; // 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('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { @@ -1529,7 +1529,7 @@ else $blocname = 'contacts'; $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) @@ -1537,7 +1537,7 @@ else $colwidth=20; $blocname = 'notes'; $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } @@ -1949,7 +1949,7 @@ else print '<br>'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid); @@ -1962,7 +1962,7 @@ else if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref); $file=$fileparams['fullname']; @@ -1994,7 +1994,7 @@ else print_titre($langs->trans('SendBillByMail')); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 5cdecfeeab021805e76857883621296ed4bb2829..802875dda75dbd3b0fd18550332bd04edf6f172d 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -151,7 +151,7 @@ if ($id) print '<br>'; $colwidth=20; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 89c50b6a9a30a489335d9f36481ab7571ce7658b..40ec8d6a2740b513660c7a792f0827c4fab47311 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -315,7 +315,7 @@ class Import if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('IMPORT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 45435239336b3218fbc0b8ae5dc20c9e8ae31539..3682a8c59475061bb8e4ef37b17fddf847cb2829 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -61,7 +61,7 @@ print '<td>'.$langs->trans("LibraryShort").'</td>'; print '<td align="right">'.$langs->trans("LibraryVersion").'</td>'; print '</tr>'; -include_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); +include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'; $model=new ModeleImports(); $liste=$model->liste_modeles($db); diff --git a/htdocs/index.php b/htdocs/index.php index 9c01b4f1fc5b5124431754d15ef5368c1b7d747f..e356d9433a401dffc8e90623228cc10d7bd93546 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -34,7 +34,7 @@ if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home"; $action=GETPOST('action'); -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('index')); @@ -63,16 +63,16 @@ if (preg_match('/^smartphone/',$conf->smart_menu) && ! empty($conf->browser->pho $limitmenuto=1; // A virer // Load the smartphone menu manager - $result=@include_once(DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu); + $result=@include_once DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu; if (! $result) // If failed to include, we try with standard { $conf->smart_menu='smartphone_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu); + include_once DOL_DOCUMENT_ROOT ."/core/menus/smartphone/".$conf->smart_menu; } $menusmart = new MenuSmart($db); - include_once(DOL_DOCUMENT_ROOT.'/theme/phones/smartphone/tpl/menu.tpl.php'); + include_once DOL_DOCUMENT_ROOT.'/theme/phones/smartphone/tpl/menu.tpl.php'; exit; } @@ -234,7 +234,7 @@ if ($user->societe_id == 0) // Search in cache if load_state_board is already realized if (! isset($boardloaded[$classe]) || ! is_object($boardloaded[$classe])) { - include_once($includes[$key]); + include_once $includes[$key]; $board=new $classe($db); $board->load_state_board($user); @@ -289,7 +289,7 @@ print '</tr>'; // Number of actions to do (late) if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) { - include_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); + include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $board=new ActionComm($db); $board->load_board($user); $board->warning_delay=$conf->actions->warning_delay/60/60/24; @@ -303,7 +303,7 @@ if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) // Number of customer orders a deal if ($conf->commande->enabled && $user->rights->commande->lire) { - include_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $board=new Commande($db); $board->load_board($user); $board->warning_delay=$conf->commande->client->warning_delay/60/60/24; @@ -317,7 +317,7 @@ if ($conf->commande->enabled && $user->rights->commande->lire) // Number of suppliers orders a deal if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) { - include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $board=new CommandeFournisseur($db); $board->load_board($user); $board->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24; @@ -333,7 +333,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $langs->load("propal"); - include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $board=new Propal($db); $board->load_board($user,"opened"); $board->warning_delay=$conf->propal->cloture->warning_delay/60/60/24; @@ -349,7 +349,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) { $langs->load("propal"); - include_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $board=new Propal($db); $board->load_board($user,"signed"); $board->warning_delay=$conf->propal->facturation->warning_delay/60/60/24; @@ -365,7 +365,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) { $langs->load("contracts"); - include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $board=new Contrat($db); $board->load_board($user,"inactives"); $board->warning_delay=$conf->contrat->services->inactifs->warning_delay/60/60/24; @@ -381,7 +381,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) { $langs->load("contracts"); - include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $board=new Contrat($db); $board->load_board($user,"expired"); $board->warning_delay=$conf->contrat->services->expires->warning_delay/60/60/24; @@ -396,7 +396,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) { $langs->load("bills"); - include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $board=new Facture($db); $board->load_board($user); $board->warning_delay=$conf->facture->client->warning_delay/60/60/24; @@ -412,7 +412,7 @@ if ($conf->fournisseur->enabled && $conf->facture->enabled && $user->rights->fac { $langs->load("bills"); - include_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $board=new FactureFournisseur($db); $board->load_board($user); $board->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24; @@ -428,7 +428,7 @@ if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id { $langs->load("banks"); - include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $board=new Account($db); $found=$board->load_board($user); if ($found > 0) @@ -447,7 +447,7 @@ if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id { $langs->load("banks"); - include_once(DOL_DOCUMENT_ROOT."/compta/paiement/cheque/class/remisecheque.class.php"); + include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; $board=new RemiseCheque($db); $board->load_board($user); $board->warning_delay=$conf->bank->cheque->warning_delay/60/60/24; @@ -463,7 +463,7 @@ if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societ { $langs->load("members"); - include_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $board=new Adherent($db); $board->load_board($user); $board->warning_delay=$conf->adherent->cotisation->warning_delay/60/60/24; diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 77b5750e78d3a1f709253e4c80c997cf30293db7..38ab53a8aa9283af3d30b3c8fc77084b86249c69 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it */ -include_once("./inc.php"); +include_once './inc.php'; $err = 0; $allowinstall = 0; @@ -39,7 +39,7 @@ $langs->load("install"); $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("Dolibarr install/upgrade process started"); @@ -187,7 +187,7 @@ if (is_readable($conffile) && filesize($conffile) > 8) { dolibarr_install_syslog("conf file '$conffile' already defined"); $confexists=1; - include_once($conffile); + include_once $conffile; $databaseok=1; if ($databaseok) @@ -291,7 +291,7 @@ else // Try to create db connexion if (file_exists($conffile)) { - include_once($conffile); + include_once $conffile; if (! empty($dolibarr_main_db_type) && ! empty($dolibarr_main_document_root)) { if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php")) diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 4aa97569c7eff4308ae60123a399633c8d9dc07c..331f81853717b6a9d1dfec2c55b2258ab77a88f2 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -27,7 +27,7 @@ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php -include("./inc.php"); +include './inc.php'; $action=GETPOST('action'); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); @@ -47,7 +47,7 @@ $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("--- etape1: Entering etape1.php page"); @@ -123,7 +123,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; } // Test database connexion if (! $error) { - $result=@include_once($main_dir."/core/db/".$_POST["db_type"].".class.php"); + $result=@include_once $main_dir."/core/db/".$_POST["db_type"].'.class.php'; if ($result) { // If we ask database or user creation we need to connect as root, so we need root login @@ -724,7 +724,7 @@ function write_main_file($mainfile,$main_dir) clearstatcache(); fputs($fp, '<?php'."\n"); fputs($fp, "// Wrapper to include main into htdocs\n"); - fputs($fp, "include_once('".$main_dir."/main.inc.php');\n"); + fputs($fp, "include_once '".$main_dir.'/main.inc.php');\n'; fputs($fp, '?>'); fclose($fp); } @@ -746,7 +746,7 @@ function write_master_file($masterfile,$main_dir) clearstatcache(); fputs($fp, '<?php'."\n"); fputs($fp, "// Wrapper to include master into htdocs\n"); - fputs($fp, "include_once('".$main_dir."/master.inc.php');\n"); + fputs($fp, "include_once '".$main_dir.'/master.inc.php');\n'; fputs($fp, '?>'); fclose($fp); } @@ -907,7 +907,7 @@ function write_conf_file($conffile) if (file_exists("$conffile")) { - include("$conffile"); // On force rechargement. Ne pas mettre include_once ! + include $conffile; // On force rechargement. Ne pas mettre include_once ! conf($dolibarr_main_document_root); print "<tr><td>"; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index ae2767987814eff50626667673c181195a507ded..d5d2be5bf92e431b8b84c81c3e83d8233504a25c 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -22,7 +22,7 @@ * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data */ -include("./inc.php"); +include './inc.php'; require_once $dolibarr_main_document_root.'/core/class/conf.class.php'; require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; @@ -56,7 +56,7 @@ if ($dolibarr_main_db_type == "mssql") $choix=3; $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("--- etape2: Entering etape2.php page"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 29deeda71c55614ef779a7ebbfcd98d0982ee755..458f42c8370d5a2375841a8872ea2db4d905fa37 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -25,7 +25,7 @@ */ -include_once("./inc.php"); +include_once './inc.php'; require_once $dolibarr_main_document_root.'/core/class/conf.class.php'; require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; @@ -40,7 +40,7 @@ $langs->load("install"); $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("--- etape4: Entering etape4.php page"); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 50cd59f7cdb20f993779274316979d0bb6ea5b8f..43acb1ee768409d5e991e2cd1829c22ceaa47eb5 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -25,8 +25,8 @@ * \brief Last page of upgrade or install process */ -include_once("./inc.php"); -if (file_exists($conffile)) include_once($conffile); +include_once './inc.php'; +if (file_exists($conffile)) include_once $conffile; require_once $dolibarr_main_document_root . '/core/lib/admin.lib.php'; require_once $dolibarr_main_document_root . '/core/lib/security.lib.php'; // for dol_hash @@ -65,7 +65,7 @@ if (! isset($force_install_lockinstall)) $force_install_lockinstall=''; $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO); @@ -150,7 +150,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) $modName='modUser'; $file = $modName . ".class.php"; dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO); - include_once(DOL_DOCUMENT_ROOT ."/core/modules/".$file); + include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file; $objMod = new $modName($db); $result=$objMod->init(); if (! $result) print 'ERROR in activating module file='.$file; @@ -160,7 +160,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) $conf->setValues($db); // Create user - include_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php"); + include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php'; $createuser=new User($db); $createuser->id=0; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 1d691e9b21e84f1d0930519c2b6e4231f1db0c7b..ebf7bf7879b4337cab1c6ac09b16b6247583a5aa 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -25,7 +25,7 @@ * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) */ -include_once("./inc.php"); +include_once './inc.php'; $err=0; @@ -55,7 +55,7 @@ if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='' $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; -if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once($forcedfile); } +if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; } dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); @@ -281,7 +281,7 @@ if (! empty($force_install_message)) { $type=$reg[1]; $class='DoliDB'.ucfirst($type); - include_once($dir."/".$file); + include_once $dir."/".$file; if ($type == 'sqlite') continue; // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e51a6b34eb58f9a32bf85a9432d5885b6cc0dfca..780b159d2f866b186bddfd06849731bf7d164baf 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -76,7 +76,7 @@ $conffiletoshow = "htdocs/conf/conf.php"; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { - $result=include_once($conffile); // Load conf file + $result=include_once $conffile; // Load conf file if ($result) { if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility @@ -105,7 +105,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php"); + $result=include_once $dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.'.class.php'; if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; @@ -256,7 +256,7 @@ function conf($dolibarr_main_document_root) global $dolibarr_main_db_pass; global $character_set_client; - $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php"); + $return=include_once $dolibarr_main_document_root.'/core/class/conf.class.php'; if (! $return) return -1; $conf=new Conf(); diff --git a/htdocs/install/index.php b/htdocs/install/index.php index 8acab820eae2170f2eec784fc8d51fd8c6dba4f3..efa0eb438b454b425f7b5be66ee0a435b4eab6a6 100644 --- a/htdocs/install/index.php +++ b/htdocs/install/index.php @@ -22,9 +22,9 @@ * \brief Show page to select language. This is done only for a first installation. * For a reinstall this page redirect to page check.php */ -include_once("./inc.php"); -include_once("../core/class/html.form.class.php"); -include_once("../core/class/html.formadmin.class.php"); +include_once './inc.php'; +include_once '../core/class/html.form.class.php'; +include_once '../core/class/html.formadmin.class.php'; $err = 0; diff --git a/htdocs/install/phpinfo.php b/htdocs/install/phpinfo.php index 98872238d04afe5a32f10a57aa63198255decda6..f91d61395a48966b0575674495a3fa4c5ab4fb02 100644 --- a/htdocs/install/phpinfo.php +++ b/htdocs/install/phpinfo.php @@ -21,7 +21,7 @@ * \brief Show page phpinfo */ -include_once("./inc.php"); +include_once './inc.php'; phpinfo(); diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 9136a2a9187bdfd09862d9019b18de53db47a434..a18dce9921d1eaf0c54fb5e33fed6d21029d3149 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -22,8 +22,8 @@ * \brief Run repair script */ -include_once("./inc.php"); -if (file_exists($conffile)) include_once($conffile); +include_once './inc.php'; +if (file_exists($conffile)) include_once $conffile; require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php'; require_once 'lib/repair.lib.php'; @@ -315,37 +315,37 @@ if (GETPOST('purge')) // To show ref or specific information according to view to show (defined by $module) if ($modulepart == 'invoice') { - include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $object_instance=new Facture($db); } else if ($modulepart == 'invoice_supplier') { - include_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $object_instance=new FactureFournisseur($db); } else if ($modulepart == 'propal') { - include_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); + include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $object_instance=new Propal($db); } else if ($modulepart == 'order') { - include_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $object_instance=new Commande($db); } else if ($modulepart == 'order_supplier') { - include_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $object_instance=new CommandeFournisseur($db); } else if ($modulepart == 'contract') { - include_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); + include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $object_instance=new Contrat($db); } else if ($modulepart == 'tax') { - include_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'); + include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; $object_instance=new ChargeSociales($db); } diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index fb1f3631376a395d07538157bdf9d5b4380b379a..31063479e20f915f63e4d9543264c4e515eaab6d 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -22,7 +22,7 @@ * \brief Run migration script */ -include_once("./inc.php"); +include_once './inc.php'; if (! file_exists($conffile)) { print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index a477e9f41926de9968a2b888626641b0309ad1c7..9387a32957a43ece1c818d0f24719b5fe7a4f546 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -23,7 +23,7 @@ * \brief Upgrade some data */ -include_once('./inc.php'); +include_once './inc.php'; if (! file_exists($conffile)) { print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; @@ -1754,7 +1754,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->facture->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; $modellist=ModelePDFFactures::liste_modeles($db); if (count($modellist)==0) { @@ -1767,7 +1767,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->commande->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; $modellist=ModelePDFCommandes::liste_modeles($db); if (count($modellist)==0) { @@ -1780,7 +1780,7 @@ function migrate_modeles($db,$langs,$conf) if (! empty($conf->expedition->enabled)) { - include_once(DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'); + include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; $modellist=ModelePDFExpedition::liste_modeles($db); if (count($modellist)==0) { @@ -3490,7 +3490,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_AGENDA)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'; if ($res) { $mod=new modAgenda($db); $mod->remove('noboxes'); @@ -3500,7 +3500,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_SOCIETE)) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'; if ($res) { $mod=new modSociete($db); $mod->remove('noboxes'); @@ -3510,7 +3510,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_PRODUIT)) // Permission has changed into 2.7 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php'; if ($res) { $mod=new modProduct($db); //$mod->remove('noboxes'); @@ -3521,7 +3521,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'; $mod=new modService($db); //$mod->remove('noboxes'); $mod->init('noboxes'); @@ -3531,7 +3531,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'; $mod=new modCommande($db); //$mod->remove('noboxes'); $mod->init('noboxes'); @@ -3541,7 +3541,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'; $mod=new modFacture($db); //$mod->remove('noboxes'); $mod->init('noboxes'); @@ -3550,7 +3550,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; if ($res) { $mod=new modFournisseur($db); //$mod->remove('noboxes'); @@ -3561,7 +3561,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_USER)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'; if ($res) { $mod=new modUser($db); //$mod->remove('noboxes'); // We need to remove because id of module has changed @@ -3571,7 +3571,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'; if ($res) { $mod=new modDeplacement($db); //$mod->remove('noboxes'); // We need to remove because a permission id has been removed @@ -3581,7 +3581,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'; if ($res) { $mod=new modDon($db); //$mod->remove('noboxes'); // We need to remove because a permission id has been removed @@ -3592,7 +3592,7 @@ function migrate_reload_modules($db,$langs,$conf) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); if ($res) { - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; $mod=new modECM($db); $mod->remove('noboxes'); // We need to remove because a permission id has been removed $mod->init('noboxes'); @@ -3601,7 +3601,7 @@ function migrate_reload_modules($db,$langs,$conf) if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0 { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); - $res=@include_once(DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'); + $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'; if ($res) { $mod=new modPaybox($db); $mod->remove('noboxes'); // We need to remove because id of module has changed diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 09c0190e1409d869443d40b658ba052f027c4a36..085ea745d0a1ec3238e86cc9a0564be337f309ae 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -440,7 +440,7 @@ class Livraison extends CommonObject } // 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($this->db); $result = $interface->run_triggers('DELIVERY_VALIDATE', $this, $user, $langs, $conf); // Fin appel triggers @@ -597,7 +597,7 @@ class Livraison extends CommonObject } // Call triggers - include_once(DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('DELIVERY_DELETE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 98a82d2511aa5295a5e177dd62ff984e0e6b6347..a60133ba526680ee424f94aa54db5f713a1875c0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -325,7 +325,7 @@ if (! defined('NOLOGIN')) if (! isset($_SESSION["dol_login"])) { // It is not already authenticated and it requests the login / password - include_once(DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; // If in demo mode, we check we go to home page through the public/demo/index.php page if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') // We ask index page @@ -356,7 +356,7 @@ if (! defined('NOLOGIN')) $test=false; // 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('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST('entity','int')); if ($result < 0) { @@ -388,7 +388,7 @@ if (! defined('NOLOGIN')) $dol_dst=0; if (isset($_POST["dst_first"]) && isset($_POST["dst_second"])) { - include_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); + include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $datenow=dol_now(); $datefirst=dol_stringtotime($_POST["dst_first"]); $datesecond=dol_stringtotime($_POST["dst_second"]); @@ -413,7 +413,7 @@ if (! defined('NOLOGIN')) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword"); // 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('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2)); if ($result < 0) { @@ -429,7 +429,7 @@ if (! defined('NOLOGIN')) // We show login page if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined { - include_once(DOL_DOCUMENT_ROOT."/core/class/translate.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; $langs=new Translate("",$conf); } dol_loginfunction($langs,$conf,$mysoc); @@ -459,7 +459,7 @@ if (! defined('NOLOGIN')) } // Call 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('USER_LOGIN_FAILED',$user,$user,$langs,$conf,$_POST["entity"]); if ($result < 0) { @@ -501,7 +501,7 @@ if (! defined('NOLOGIN')) } // Call 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('USER_LOGIN_FAILED',$user,$user,$langs,$conf,(isset($_POST["entity"])?$_POST["entity"]:0)); if ($result < 0) { @@ -517,7 +517,7 @@ if (! defined('NOLOGIN')) if (! empty($conf->global->MAIN_ACTIVATE_UPDATESESSIONTRIGGER)) // We do not execute such trigger at each page load by default { // Call 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('USER_UPDATE_SESSION',$user,$user,$langs,$conf,$conf->entity); if ($result < 0) { @@ -556,7 +556,7 @@ if (! defined('NOLOGIN')) $user->update_last_login_date(); // Call 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('USER_LOGIN',$user,$user,$langs,$conf,GETPOST('entity','int')); if ($result < 0) { @@ -579,7 +579,7 @@ if (! defined('NOLOGIN')) // Create entity cookie, just used for login page if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"])) { - include_once(DOL_DOCUMENT_ROOT."/core/class/cookie.class.php"); + include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php'; $entity = $_SESSION["dol_login"].'|'.$_POST["entity"]; @@ -596,7 +596,7 @@ if (! defined('NOLOGIN')) // Hooks on successfull login $action=''; - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('login')); $parameters=array('dol_authmode'=>$dol_authmode); @@ -1111,7 +1111,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // Instantiate hooks of thirdparty module only if not already define if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); } $hookmanager->initHooks(array('toprightmenu')); @@ -1225,7 +1225,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if (! $menufound) // If failed to include, we try with standard { $top_menu='eldy_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT."/core/menus/standard/".$top_menu); + include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$top_menu; } } @@ -1364,7 +1364,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Instantiate hooks of thirdparty module if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); } $hookmanager->initHooks(array('searchform','leftblock')); @@ -1431,7 +1431,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if (! $menufound) // If failed to include, we try with standard { $top_menu='eldy_backoffice.php'; - include_once(DOL_DOCUMENT_ROOT."/core/menus/standard/".$top_menu); + include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$top_menu; } } diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index fcdba42f253185212f17f08d4329332136aa5b52..4736957c83018ad25722b2ed54b6a7da633572d4 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -21,7 +21,7 @@ * \brief Page to setup margin module */ -include("../../main.inc.php"); +include '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 9357408d1453b79ff49d60e3594eaa15c3441040..3815b33e02de84cea53ce1d082f311f641b3f40b 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -214,7 +214,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) else // For backward compatibility { dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $country_code=getCountry($country_id,2,$db); // This need a SQL request, but it's the old feature $country_label=getCountry($country_id,0,$db); // This need a SQL request, but it's the old feature } diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 4c6282709a78f0b983662756a5c3899413dd543b..664866030dd402a8ae3bdaa5c47bd0043522c2f1 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -210,7 +210,7 @@ foreach ($dirproduct as $dirroot) $file = substr($file, 0, dol_strlen($file)-4); try { - dol_include_once($dirroot.$file.".php"); + dol_include_once($dirroot.$file.'.php'); } catch(Exception $e) { diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 37b48c7be00a61bc263730f4b2b846315fbc0d07..c9a55a6ee231a1cb243803554e43a253460a3219 100755 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -20,7 +20,7 @@ * \ingroup produit * \brief File with class of actions for canvas product */ -include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 3e27cd968dc77c561e888478886c5dd9b38deee8..113e77ebe1d353e04af26a0744f43442b7c0b192 100755 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -20,7 +20,7 @@ * \ingroup service * \brief File with class of actions for canvas service */ -include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 8ab14b0afe64831a38e09d593f15324a10b342c2..9129c111248c599f860951a9d97342491d09fbd8 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -375,7 +375,7 @@ class Product extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -486,7 +486,7 @@ class Product extends CommonObject } // Actions on extra fields (by external module or standard code) - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('productdao')); $parameters=array('id'=>$this->id); @@ -504,7 +504,7 @@ class Product extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('PRODUCT_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -578,7 +578,7 @@ class Product extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('PRODUCT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1035,7 +1035,7 @@ class Product extends CommonObject */ function fetch($id='',$ref='',$ref_ext='') { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; global $langs, $conf; @@ -2542,7 +2542,7 @@ class Product extends CommonObject */ function is_photo_available($sdir) { - include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); + include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $dir = $sdir . '/'. $pdir; @@ -2584,8 +2584,8 @@ class Product extends CommonObject { global $conf,$user,$langs; - include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php"); - include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); + include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; + include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; $pdir = get_exdir($this->id,2) . $this->id ."/photos/"; $dir = $sdir . '/'. $pdir; @@ -2727,7 +2727,7 @@ class Product extends CommonObject */ function liste_photos($dir,$nbmax=0) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $nbphoto=0; $tabobj=array(); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 212d10c5c70fe30d06afb83a82d44550f53db14d..20ef3342e98578642759792803513719ce209293 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -73,7 +73,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid'); $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('productcard')); @@ -703,7 +703,7 @@ else { $module = substr($module, 0, dol_strlen($module)-4); } - dol_include_once('/core/modules/product/'.$module.".php"); + dol_include_once('/core/modules/product/'.$module.'.php'); $modCodeProduct = new $module; print '<form action="fiche.php" method="post">'; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index b97d43dba107d9234b77521f7edc3521aa427ba1..259d25c901c0bc6b5a426859f327c95031e82e0d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -57,7 +57,7 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('pricesuppliercard')); diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 1f0c7ebaf97b2ff3970700dffc358c77d61dab0e..cc3540f48958fe09c12c87032329135cf2f72aa7 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -218,7 +218,7 @@ else $template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/'; } - include($template_dir.'list.tpl.php'); // Include native PHP templates + include $template_dir.'list.tpl.php'; // Include native PHP templates } else { diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 4a181fab2ff2f95358b4cba036ee1f76efa9f564..cb3e891ff9d243fdd789fc6647ab3f71530ac0a9 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -261,7 +261,7 @@ class Entrepot extends CommonObject $this->town = $obj->town; $this->country_id = $obj->country_id; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $tmp=getCountry($this->country_id,'all'); $this->pays=$tmp['label']; // deprecated $this->pays_code=$tmp['code']; // deprecated diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 6321813fdb924eae385f11e95181edc55601d096..85662fd1a30706600573abc42a977c687a084c57 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -223,7 +223,7 @@ class MouvementStock if ($movestock && ! $error) { // 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($this->db); $this->product_id = $fk_product; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 613a07214905a76bbf295e7df4d15d90d0157961..55c30ec4220c6368c3202a8601456dd230350ca1 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -124,7 +124,7 @@ class Project extends CommonObject if (!$notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface = new Interfaces($this->db); $result = $interface->run_triggers('PROJECT_CREATE', $this, $user, $langs, $conf); if ($result < 0) @@ -198,7 +198,7 @@ class Project extends CommonObject if (!$notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface = new Interfaces($this->db); $result = $interface->run_triggers('PROJECT_MODIFY', $this, $user, $langs, $conf); if ($result < 0) @@ -479,7 +479,7 @@ class Project extends CommonObject if (!$notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface = new Interfaces($this->db); $result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf); if ($result < 0) @@ -529,7 +529,7 @@ class Project extends CommonObject if ($resql) { // 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($this->db); $result = $interface->run_triggers('PROJECT_VALIDATE', $this, $user, $langs, $conf); if ($result < 0) @@ -590,7 +590,7 @@ class Project extends CommonObject if ($resql) { // 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($this->db); $result = $interface->run_triggers('PROJECT_CLOSE', $this, $user, $langs, $conf); if ($result < 0) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 9a49d8d55b916296427bdbd1073022e7da0168bb..40601aeef08b03161b715981f156385f3117f609 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -128,7 +128,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -269,7 +269,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -348,7 +348,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -720,7 +720,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_TIMESPENT_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -830,7 +830,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_TIMESPENT_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -892,7 +892,7 @@ class Task extends CommonObject if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('TASK_TIMESPENT_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 4c183a409c5d45ec6a0e89ef794841540a21d99f..34c736a09d481b679734e3d3a6448761fa7ac6ce 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -50,7 +50,7 @@ if ($user->societe_id > 0) $socid=$user->societe_id; $result = restrictedArea($user, 'projet', $id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('projectcard')); @@ -718,7 +718,7 @@ else print '</td><td valign="top" width="50%">'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'project',$socid); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 687c1a1aaf700ec67e5f8d9ac475fc260824882a..7619bc732eb7f6eb63e7f52a3935a31dc94d8a80 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -239,7 +239,7 @@ if (count($tasksarray)>0) { //var_dump($_SESSION); print '<div id="tabs" class="ganttcontainer" style="border: 1px solid #ACACAC;">'."\n"; - include_once(DOL_DOCUMENT_ROOT.'/projet/ganttchart.php'); + include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.php'; print '</div>'."\n"; } else diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 526b57898108f702ca5408fb8d09a99aa894680f..523afef075084ec1e2c8ea34d712b01fc3546d57 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -55,7 +55,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id; $result = restrictedArea($user, 'projet', $id); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('projecttaskcard')); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index bd1706f27252e4eaa5d96db8bb554f8c993fe79b..fdac534b81b192d2c3fedd9994464359b3bf22b7 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -206,7 +206,7 @@ if ($object->id > 0) $colwidth=30; $moreparam=$param; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index bd73f8d3b770d6b17a535c9e22b1a06f812326b8..66ddbc09da2487bc2024d16d83fd8d365780951e 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -42,7 +42,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id; if (! $user->rights->projet->lire) accessforbidden(); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('projecttaskcard')); diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 485d2d032916a6e924164f3608cb26de11a60eaa..d244baa0ba99122fa29affcb8b978c6e9b0615c4 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -38,7 +38,7 @@ global $dolibarr_main_demo; if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',1,1,1); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('demo')); @@ -140,7 +140,7 @@ foreach ($modulesdir as $dir) { try { - include_once($dir.$file); + include_once $dir.$file; $objMod = new $modName($db); if ($objMod->numero > 0) diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index 768bc4f25785941d00250078ed6d2281747e735d..5c24d29041dcf8dd8b9493e3fdbdc3cbe4e5d542 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -154,7 +154,7 @@ if ($PAYPALTOKEN) if (! empty($conf->global->PAYPAL_MESSAGE_OK)) print $conf->global->PAYPAL_MESSAGE_OK; // 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('PAYPAL_PAYMENT_OK',$object,$user,$langs,$conf); if ($result < 0) { $error++; $errors=$interface->errors; } diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 6b7b4fdb09d2f523c8664cddaf2b7f36e8668dfc..97e33167d228f8aaf7462bd6637d1b8f6650b725 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -250,7 +250,7 @@ foreach ($dirsociete as $dirroot) $file = substr($file, 0, dol_strlen($file)-4); try { - dol_include_once($dirroot.$file.".php"); + dol_include_once($dirroot.$file.'.php'); } catch(Exception $e) { @@ -330,7 +330,7 @@ foreach ($dirsociete as $dirroot) $file = substr($file, 0, dol_strlen($file)-4); try { - dol_include_once($dirroot.$file.".php"); + dol_include_once($dirroot.$file.'.php'); } catch(Exception $e) { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 67cedc6235076d789a8b19cbf9bcdd02b593b92f..870ec8b67ccc368164e7807596d490cfba5fa591 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -433,7 +433,7 @@ abstract class ActionsCardCommon $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeClient = new $module; @@ -470,7 +470,7 @@ abstract class ActionsCardCommon $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeFournisseur = new $module; diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index b4e55b9e6576443154be3df054d9966ae7c4889a..409230d6fbad99a41000bfb238b2177042a3ac14 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -21,7 +21,7 @@ * \ingroup thirdparty * \brief File of Thirdparty card controller (default canvas) */ -include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'); +include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'; /** * \class ActionsCardCompany diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index 74f64e07a1e679c44a2d604ce1abff852d6aa383..7d10a2a52cfc6341b9af2bb041f09a6e09767e01 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -20,7 +20,7 @@ * \ingroup thirdparty * \brief Fichier de la classe Thirdparty card controller (individual canvas) */ -include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'); +include_once DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'; /** * \class ActionsCardIndividual diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index f88eefcfd4add8deb4362caea885cd61a1338fe0..5bedda46099c09135672ffca4838cff90189391d 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -21,7 +21,7 @@ * \ingroup societe * \brief File for class of customers */ -include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; /** diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 9365c8b5fa3fb6d0c31ccd8e63d794c51385009b..6ad2bde8468d6cde6f9c9fe11d5ab6b849ea5e6c 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -244,7 +244,7 @@ class Societe extends CommonObject if ($ret >= 0) { // 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($this->db); $result=$interface->run_triggers('COMPANY_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -571,7 +571,7 @@ class Societe extends CommonObject $this->AddFournisseurInCategory($this->fournisseur_categorie); // Actions on extra fields (by external module or standard code) - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('thirdpartydao')); $parameters=array('socid'=>$this->id); @@ -589,7 +589,7 @@ class Societe extends CommonObject if (! $error && $call_trigger) { // 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($this->db); $result=$interface->run_triggers('COMPANY_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -925,7 +925,7 @@ class Societe extends CommonObject if (! $error) { // Additionnal action by hooks - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('thirdpartydao')); $parameters=array(); $action='delete'; @@ -954,7 +954,7 @@ class Societe extends CommonObject if (! $error) { // 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($this->db); $result=$interface->run_triggers('COMPANY_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1629,7 +1629,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'); if ($res) break; } $var = $conf->global->SOCIETE_CODECLIENT_ADDON; @@ -1658,7 +1658,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_FOURNISSEUR_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_FOURNISSEUR_ADDON.'.php'); if ($res) break; } $var = $conf->global->SOCIETE_CODEFOURNISSEUR_ADDON; @@ -1684,7 +1684,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'); if ($res) break; } @@ -1718,7 +1718,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'); if ($res) break; } @@ -1756,7 +1756,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php'); if ($res) break; } @@ -1791,7 +1791,7 @@ class Societe extends CommonObject $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.".php"); + $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php'); if ($res) break; } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index d9dc12faf5a4ec6938f5fa0239ee022b9e3a2ea5..513e5c5554de8797773c8f6039017e86bda5be45 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -70,7 +70,7 @@ if (! empty($canvas)) $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); +include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($db); $hookmanager->initHooks(array('thirdpartycard')); @@ -522,7 +522,7 @@ else $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeClient = new $module; @@ -535,7 +535,7 @@ else $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeFournisseur = new $module; @@ -1010,7 +1010,7 @@ else $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeClient = new $module; @@ -1028,7 +1028,7 @@ else $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules); foreach ($dirsociete as $dirroot) { - $res=dol_include_once($dirroot.$module.".php"); + $res=dol_include_once($dirroot.$module.'.php'); if ($res) break; } $modCodeFournisseur = new $module; @@ -1749,7 +1749,7 @@ else } // Sales representative - include(DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'); + include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'; // Module Adherent if ($conf->adherent->enabled) diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index c97a9291a765db1e922bc0c48a0c9854a4842122..06c5ad9793d8c711240a8dd4b1a557bb2616bec0 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -24,7 +24,7 @@ */ require_once '../main.inc.php'; -include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("companies"); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 2e009b3fd18caeaf0dc787ba9411c08b6913bb2a..f27546d25289a7f3a4fcbb688742523778ecf9d9 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -74,7 +74,7 @@ $conffiletoshow = "htdocs/conf/conf.php"; if (! defined('DONOTLOADCONF') && file_exists($conffile)) { - $result=include_once($conffile); // Load conf file + $result=include_once $conffile; // Load conf file if ($result) { @@ -104,7 +104,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php"); + $result=include_once $dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.'.class.php'; if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; @@ -179,7 +179,7 @@ function conf($dolibarr_main_document_root) global $dolibarr_main_db_pass; global $character_set_client; - $return=include_once($dolibarr_main_document_root."/core/class/conf.class.php"); + $return=include_once $dolibarr_main_document_root.'/core/class/conf.class.php'; if (! $return) return -1; $conf=new Conf(); diff --git a/htdocs/support/index.php b/htdocs/support/index.php index 8fb68eaf672556b2bdcf6b0a56175c029357f23f..c5b214eb9a1deacb098c82176baebb7d7c198b1d 100644 --- a/htdocs/support/index.php +++ b/htdocs/support/index.php @@ -26,7 +26,7 @@ // Use its own include to not share the include of Dolibarr // This is a standalone feature with no information from Dolibarr to show // and no database access to do. -include_once("./inc.php"); +include_once './inc.php'; $uri=preg_replace('/^http(s?):\/\//i','',$dolibarr_main_url_root); $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' diff --git a/htdocs/support/online.php b/htdocs/support/online.php index 07cffbc7d26b6475fbd2771dd63c54ca4c7c5485..d7095181acd5c3f1465c84fb4e35bf1bd5a4d594 100644 --- a/htdocs/support/online.php +++ b/htdocs/support/online.php @@ -23,7 +23,7 @@ error_reporting(0); -include_once("./inc.php"); +include_once './inc.php'; $uri=preg_replace('/^http(s?):\/\//i','',$dolibarr_main_url_root); $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a '' diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php index fb6a0075f83a3fa64b6356d3178ee1ee57ce5a95..0071dd17edb557e5c714cee57e3d04a502563f21 100644 --- a/htdocs/theme/eldy/graph-color.php +++ b/htdocs/theme/eldy/graph-color.php @@ -23,7 +23,7 @@ * * To include file, do this: * $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php'; - * if (is_readable($color_file)) include_once($color_file); + * if (is_readable($color_file)) include_once $color_file; */ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; diff --git a/htdocs/theme/phones/smartphone/tpl/login.tpl.php b/htdocs/theme/phones/smartphone/tpl/login.tpl.php index 5ab6bc6663463663aca84b5b08d18ea490538004..de239e3d05096d5b3650513d2fdd4a6402f5e208 100644 --- a/htdocs/theme/phones/smartphone/tpl/login.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/login.tpl.php @@ -20,7 +20,7 @@ top_httphead(); <!DOCTYPE html> <html> <?php -include('header.tpl.php'); +include 'header.tpl.php'; ?> <body> <script type="text/javascript"> diff --git a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php index d815521bd670a76d7c6bebb41a554a3b7972d326..1151aee7243905be20eeb0c9d68da8c3848e69a9 100644 --- a/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/passwordforgotten.tpl.php @@ -20,7 +20,7 @@ top_httphead(); <!DOCTYPE html> <html> <?php -include('header.tpl.php'); +include 'header.tpl.php'; ?> <body> <!-- BEGIN SMARTPHONE TEMPLATE --> diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index aa7312773020984ea81bfd4f8e5ef79ac3145601..087b9fbc1b49fa986265dec4760149f513aea5b7 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -643,7 +643,7 @@ class User extends CommonObject if ($result) { // 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($this->db); $result=$interface->run_triggers('USER_ENABLEDISABLE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -709,7 +709,7 @@ class User extends CommonObject if ($result) { // 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($this->db); $result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -816,7 +816,7 @@ class User extends CommonObject if (! $notrigger) { // 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($this->db); $result = $interface->run_triggers('USER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -899,7 +899,7 @@ class User extends CommonObject if ($resql) { // 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($this->db); $result = $interface->run_triggers('USER_CREATE_FROM_CONTACT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1181,7 +1181,7 @@ class User extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('USER_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1330,7 +1330,7 @@ class User extends CommonObject if (! $error && ! $notrigger) { // 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($this->db); $result=$interface->run_triggers('USER_NEW_PASSWORD',$this,$user,$langs,$conf); if ($result < 0) $this->errors=$interface->errors; @@ -1585,7 +1585,7 @@ class User extends CommonObject $this->newgroupid=$group; // 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($this->db); $result=$interface->run_triggers('USER_SETINGROUP',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1643,7 +1643,7 @@ class User extends CommonObject $this->oldgroupid=$group; // 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($this->db); $result=$interface->run_triggers('USER_REMOVEFROMGROUP',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 573575652a01af1d010f72bbe7c442086d643799..487557b939dd3115a6e9d508ef6c52fb74845081 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -530,7 +530,7 @@ class UserGroup extends CommonObject if ($result) { // 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($this->db); $result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -587,7 +587,7 @@ class UserGroup extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('GROUP_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -635,7 +635,7 @@ class UserGroup extends CommonObject if (! $notrigger) { // 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($this->db); $result=$interface->run_triggers('GROUP_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 150c37b1975a94440af14833beeaea7a721a8814..059136e1757644a6f73cc22513590a27a42eec49 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; -if (! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 48466bc66497f5b541217646b3eb8ab316d114b1..7d29918ae10c61e051944582aa359c19f6e4851e 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -26,7 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; -if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); // Defini si peux lire/modifier utilisateurs et permisssions $canreadperms=($user->admin || $user->rights->user->user->lire); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index dd52a6b517a7d92fce49da53878be0de9da2425b..6caf070d6752c9bd76a952911c11460b1a2ff963 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -113,7 +113,7 @@ if ($id) if ($modName) { - include_once($dir."/".$file); + include_once $dir."/".$file; $objMod = new $modName($db); // Load all lang files of module if (isset($objMod->langfiles) && is_array($objMod->langfiles)) diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 5aae43c145cefff44d2a74d6c9226ab99b953f80..4d85ff977b1fbde183b7351348272d9fdac060d5 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -24,7 +24,7 @@ */ require '../main.inc.php'; -if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php index 00721d20f5d1d5354fb06628d48d28c1326e7dfb..4ec89e0bad03e7be3d7ee1cba7aa1acf0ece41e6 100644 --- a/htdocs/user/logout.php +++ b/htdocs/user/logout.php @@ -40,7 +40,7 @@ if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuse } // 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('USER_LOGOUT',$user,$user,$langs,$conf,$conf->entity); if ($result < 0) { $error++; } diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 630e89febe58d8f2d00454f352da15b13664cce7..2b7cc2c66b1eb25a44cc0ec0ebd8ee87394df84b 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -218,7 +218,7 @@ if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_ $entityCookieName = 'DOLENTITYID_'.$prefix; if (isset($_COOKIE[$entityCookieName])) { - include_once(DOL_DOCUMENT_ROOT . "/core/class/cookie.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/cookie.class.php'; $lastuser = ''; $lastentity = ''; $entityCookie = new DolCookie($conf->file->cookie_cryptkey); $cookieValue = $entityCookie->_getCookie($entityCookieName); @@ -236,6 +236,6 @@ if (function_exists("imagecreatefrompng") && ! $disabled) $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"'); } -include($template_dir.'passwordforgotten.tpl.php'); // To use native PHP +include $template_dir.'passwordforgotten.tpl.php'; // To use native PHP ?> \ No newline at end of file diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index af407a4f55566325257b60fe8a9927c113c04913..e32bfa59620eef4447c436c7ed3cf7145338684c 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -134,7 +134,7 @@ foreach($modulesdir as $dir) if ($modName) { - include_once($dir.$file); + include_once $dir.$file; $objMod = new $modName($db); // Load all lang files of module diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index 5c5ec93bc85d4d47a2bfd94a29969abeb671592b..c8957633290981fd91ec827ec72f55475fecb33a 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -366,7 +366,7 @@ if ($modulepart == 'barcode') // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php) if (! is_dir($newdir)) continue; - $result=@include_once($newdir.$generator.".modules.php"); + $result=@include_once $newdir.$generator.'.modules.php'; if ($result) break; } diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 084ccba9c3d9e7018011e540539df04cb01de6d7..d1fb254c46baaa7abb48275f7479bdffd00ffe89 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -342,7 +342,7 @@ function createProductOrService($authentication,$product) if (! $error) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $newobject=new Product($db); $newobject->ref=$product['ref']; diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index 1755b6ae0c68ee69cc84e97e284ba6e3b6d06dee..f23bee5f631de77e430f5cf6e0526168f2131da1 100755 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -345,7 +345,7 @@ function createThirdParty($authentication,$thirdparty) if (! $error) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $newobject=new Societe($db); $newobject->ref=$thirdparty['ref'];