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/README b/dev/skeletons/README index 32924a36ac640feee0791a85fac3c4ce7420ff08..02a760a53dcd5b4b7e5d8a66d554463287474dcc 100644 --- a/dev/skeletons/README +++ b/dev/skeletons/README @@ -9,7 +9,7 @@ skeleton_*.php to build its generated code. modMyModule.class.php: -Is a sample of module descriptor you can use if you want to build a new module/plugin for +Is a sample of module descriptor that you can use if you want to build a new module/plugin for Dolibarr. @@ -20,11 +20,7 @@ skeleton_page.php: Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI. skeleton_class.class.php: -Is a sample you can use as an example if you need to build a class file to access a new table -required by a Dolibarr development. -However it is better to run the script build_class_from_table.php that accept a table name as a -parameter and will used table description in database and the skeleton_class.class.php file to -generate full code for your class file. -After running this script, the class to access your table (insert a record, update, delete and select) -is directly finished and can be used by your business code. No more coding for accesser on table -is needed with this script as the file is completely generated once. +Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development. +However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file. +After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code. +No more coding is needed to get access to table with this script because the file is completely generated once. 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..de8ca3d11b42c1d2e3151e9c353112e3f85be4b4 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -61,7 +61,7 @@ class Skeleton_Class // extends CommonObject /** * Create object into database * - * @param User $user User that create + * @param User $user User that creates * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, Id of created object if OK */ @@ -102,10 +102,10 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls 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; } @@ -133,7 +133,7 @@ class Skeleton_Class // extends CommonObject /** - * Load object in memory from database + * Load object in memory from the database * * @param int $id Id object * @return int <0 if KO, >0 if OK @@ -178,7 +178,7 @@ class Skeleton_Class // extends CommonObject /** * Update object into database * - * @param User $user User that modify + * @param User $user User that modifies * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -193,7 +193,7 @@ class Skeleton_Class // extends CommonObject //... // Check parameters - // Put here code to add control on parameters values + // Put here code to add a control on parameters values // Update request $sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET"; @@ -213,10 +213,10 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls 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; } @@ -246,7 +246,7 @@ class Skeleton_Class // extends CommonObject /** * Delete object in database * - * @param User $user User that delete + * @param User $user User that deletes * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ @@ -262,10 +262,10 @@ class Skeleton_Class // extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. + // want this action calls 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/adherent.php b/htdocs/adherents/admin/adherent.php index 885e5ebd37c2acfd5e389357363e3f3a98e6ead7..6cea7ce93899598406952fe35dfc0827538ab8b9 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -27,9 +27,9 @@ * \brief Page to setup the module Foundation */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php index 7f9d3fe1ca5ab9fc4efc971df6a1e09966bf5647..b14042a141e2f8524e34414c657117e228c880ce 100755 --- a/htdocs/adherents/admin/adherent_extrafields.php +++ b/htdocs/adherents/admin/adherent_extrafields.php @@ -23,9 +23,9 @@ * \brief Page to setup extra fields of members */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("members"); $langs->load("admin"); @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); +require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php'; diff --git a/htdocs/adherents/admin/mailman.php b/htdocs/adherents/admin/mailman.php index ce69c6a984d5c45a8a127e42be6494faecea03e8..5e7aa08f547f0a29ed4501342265c122cb7bff97 100644 --- a/htdocs/adherents/admin/mailman.php +++ b/htdocs/adherents/admin/mailman.php @@ -27,9 +27,9 @@ * \brief Page to setup the module MailmanSpip (Mailman) */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/mailmanspip.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php'; $langs->load("admin"); $langs->load("members"); @@ -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/admin/public.php b/htdocs/adherents/admin/public.php index a716b92ba6278e8080c6dda0de3c62e41ce02e5d..911b1e13f7fba5c91f80516c0344d3f3d2ad95ef 100755 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -24,10 +24,10 @@ * \author Laurent Destailleur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; $langs->load("members"); $langs->load("admin"); diff --git a/htdocs/adherents/admin/spip.php b/htdocs/adherents/admin/spip.php index c6b3d282ab80950e36a7953698f394bf60d9f433..2d571d2c615687c5c53bcbc8e99f0c8886d9a95d 100644 --- a/htdocs/adherents/admin/spip.php +++ b/htdocs/adherents/admin/spip.php @@ -27,9 +27,9 @@ * \brief Page to setup the module MailmanSpip (SPIP) */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/mailmanspip.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php'; $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 360413b32f90a3df26b2e81905012d854a373318..db8a055e32f7d252aaf7d74359728826e358f4d4 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -26,11 +26,11 @@ * \brief Page of members events */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("companies"); $langs->load("members"); @@ -72,8 +72,8 @@ $form = new Form($db); */ if ($id) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("companies"); diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index deda22920dfe3b03e4beda9497cb3a6c714fd7f1..ece8bcf5cd740e948d1f816bee21d355c5f57ab0 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -23,14 +23,14 @@ * \brief Onglet d'ajout, edition, suppression des adhesions d'un adherent */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); $langs->load("bills"); @@ -281,7 +281,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ // Insert into bank account directlty (if option choosed for) + link to llx_cotisation if option is 'bankdirect' if ($option == 'bankdirect' && $accountid) { - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acct=new Account($db); $result=$acct->fetch($accountid); @@ -322,8 +322,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ // If option choosed, we create invoice if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly') { - require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); - require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/paymentterm.class.php"); + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php'; $invoice=new Facture($db); $customer=new Societe($db); @@ -374,9 +374,9 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $ // Add payment onto invoice if ($option == 'bankviainvoice' && $accountid) { - require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; // Creation de la ligne paiement $amounts[$invoice->id] = price2num($cotisation); @@ -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/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 28475d0357118e661488711dbb58c2372754fedd..276d0d5111630a6e7016dee29b8ba3116645af9b 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -22,12 +22,12 @@ * \ingroup member * \brief Page to output members business cards */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/member/modules_cards.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/printsheet/modules_labels.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/printsheet/modules_labels.php'; $langs->load("members"); $langs->load("errors"); diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 1566b934afe8c908aeb9ddb26edaed346fdccf82..3c0290b4eeb44931f277fcc267b2916df802f9b1 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -26,10 +26,10 @@ * \brief File of class to manage members of a foundation */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.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); @@ -513,7 +513,7 @@ class Adherent extends CommonObject // Update information on linked user if it is an update if ($this->user_id > 0 && ! $nosyncuser) { - require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); + require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; dol_syslog(get_class($this)."::update update linked user"); @@ -557,7 +557,7 @@ class Adherent extends CommonObject // Update information on linked thirdparty if it is an update if ($this->fk_soc > 0 && ! $nosyncthirdparty) { - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; dol_syslog(get_class($this)."::update update linked thirdparty"); @@ -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; } @@ -721,37 +721,37 @@ class Adherent extends CommonObject $ret=$this->setUserId(0); if ($ret > 0) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid; - dol_syslog(get_class($this)."::delete sql=".$sql); - $resql=$this->db->query($sql); - if ($resql) - { - if ($this->db->affected_rows($resql)) - { - // Appel des triggers - 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) { - $error++; $this->errors=$interface->errors; - } - // Fin appel triggers - - $this->db->commit(); - return 1; - } - else - { - // Rien a effacer - $this->db->rollback(); - return 0; - } - } - else + $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid; + dol_syslog(get_class($this)."::delete sql=".$sql); + $resql=$this->db->query($sql); + if ($resql) + { + if ($this->db->affected_rows($resql)) + { + // Appel des triggers + 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) { + $error++; $this->errors=$interface->errors; + } + // Fin appel triggers + + $this->db->commit(); + return 1; + } + else + { + // Rien a effacer + $this->db->rollback(); + return 0; + } + } + else { $this->error=$this->db->error(); - $this->db->rollback(); - return -3; + $this->db->rollback(); + return -3; } } } @@ -792,7 +792,7 @@ class Adherent extends CommonObject // If new password not provided, we generate one if (! $password) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $password=getRandomPassword(''); } @@ -825,7 +825,7 @@ class Adherent extends CommonObject if ($this->user_id && ! $nosyncuser) { - require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); + require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // This member is linked with a user, so we also update users informations // if this is an update. @@ -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; @@ -1510,7 +1510,7 @@ class Adherent extends CommonObject $ret=''; if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) { - require_once(DOL_DOCUMENT_ROOT ."/core/lib/company.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php'; $tmparray=getCountry($this->country_id,'all'); $this->country_code=$tmparray['code']; $this->country =$tmparray['label']; diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index ea2a6489f5b0d996d009c2537ea7e9f3e08cb2d0..d6a0ed1ce9118bf4726605fdddf44eb80b96f9ce 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -24,7 +24,7 @@ * \author Rodolphe Quiedeville */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** 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/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index eb4624a4c40e543bff1186e81072dfb3c0b80bb1..75d2ffe272239edc457ddc662babd7076a7dc119 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -22,7 +22,7 @@ * \brief File of class to manage subscriptions of foundation members */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** @@ -198,7 +198,7 @@ class Cotisation extends CommonObject // It subscription is linked to a bank transaction, we get it if ($this->fk_bank) { - require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $accountline=new AccountLine($this->db); $result=$accountline->fetch($this->fk_bank); } @@ -213,7 +213,7 @@ class Cotisation extends CommonObject $num=$this->db->affected_rows($resql); if ($num) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $member=new Adherent($this->db); $result=$member->fetch($this->fk_adherent); $result=$member->update_end_date($user); diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index ee05be2e5ba0125a3744a55987984dce067f35f1..b0a75427697ace62980c9b70988d5e3c161252cc 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -23,10 +23,10 @@ * \brief Page de consultation et insertion d'une cotisation */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("members"); diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 37bdd7c150b534f0b912de66d2513d1b558a8147..17b653d6a5566b4cc6a18701d0eb152a7c500cd0 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -24,13 +24,13 @@ * \ingroup societe */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("members"); $langs->load("companies"); @@ -70,7 +70,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $ // Envoie fichier if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_add_file_process($upload_dir,0,1,'userfile'); } diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 77421bdf6c41b3fd124d0375b7f2c539b306df73..75a9c9a60cf5dfd7cd9dc26b253a75e3d13cd7b1 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -24,17 +24,17 @@ * \brief Page of member */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("companies"); $langs->load("bills"); @@ -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')); @@ -213,7 +213,7 @@ if ($action == 'confirm_sendinfo' && $confirm == 'yes') if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $datenaiss=''; if (isset($_POST["naissday"]) && $_POST["naissday"] @@ -755,7 +755,7 @@ if ($action == 'create') // Password if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $generated_password=getRandomPassword(''); print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>'; print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">'; @@ -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/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 861e28086f2be4bdd3605f84b85393418ab0fc1c..b870ed6037aebea64b4c06f1acb08ae3db88543d 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -21,11 +21,11 @@ * \brief Page to add/edit/remove a member subscription */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php index 02c505ebfb0d95cf96fcefe004345f24f2a1733c..607b41040180c55e163947a9233072606b702be7 100644 --- a/htdocs/adherents/htpasswd.php +++ b/htdocs/adherents/htpasswd.php @@ -24,8 +24,8 @@ * \author Rodolphe Quiedeville */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; // Security check if (! $user->rights->adherent->export) accessforbidden(); diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 9b0d1895e1b4faee081241b90a632460f76f3bbc..fff160275bb9bb51436cf1b790f6e42b7c51f1db 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -24,9 +24,9 @@ * \brief Page accueil module adherents */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("companies"); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 067ce7fcf2723b0a00737ddf58ceaaab747a8775..bfa4f885a6a3839001d95783c6ae2470a40dc9aa 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -22,10 +22,10 @@ * \brief Page des informations d'un adherent */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index 4634bc4a7d0eae7ef2fed970ff1a7f7e0b3acf2d..b900abf6867b43f34c0160532bd334d081ee6aa5 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -22,11 +22,11 @@ * \brief Page with information of subscriptions of a member */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 304e06642250667197a00942364ec5ad292edd4b..a97c729a908dd8542b283eaadc7e4d0ad4ca6509 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -22,12 +22,12 @@ * \brief Page fiche LDAP adherent */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("companies"); $langs->load("members"); diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 657e0cd17af2d947e2a1641d098e6a9ee77bbf99..93549d1c51630e8c24f97f4284737bf1dd91c568 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -23,10 +23,10 @@ * \brief Page to list all members of foundation */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("members"); $langs->load("companies"); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 69a9a0f613a1e61a623d93e9c289b6f7337da6c2..1870683a02e4505af9fd02161fc88c2a072d426a 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -22,10 +22,10 @@ * \brief Fiche de notes sur un adherent */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("companies"); $langs->load("members"); @@ -138,7 +138,7 @@ if ($id) { print "<input type=\"hidden\" name=\"action\" value=\"update\">"; print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">"; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$object->note,'',280,'dolibarr_notes','',true,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80); $doleditor->Create(); } diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index 1c5c0c998bd3070bace4942bb81e6f54358fa922..b97133c4606c716931c830d9a13e3e75816a1b3f 100755 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -21,8 +21,8 @@ * \brief Page with geographical statistics on members */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; $graphwidth = 700; $mapratio = 0.5; @@ -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/adherents/stats/index.php b/htdocs/adherents/stats/index.php index 515df6c5a740db7f89df4d6dc033c6caa4da709e..9ce039b23750e806797a5755a3fd6d906bc2eb3a 100644 --- a/htdocs/adherents/stats/index.php +++ b/htdocs/adherents/stats/index.php @@ -23,10 +23,10 @@ * \brief Page of subscription members statistics */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 995c0b18ae770894cb9ebace6b246b3c7dc23890..3c5150fa7f51e4eeb47eef1dff8f997b7fe0b695 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -24,9 +24,9 @@ * \brief Member's type setup */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("members"); @@ -244,7 +244,7 @@ if ($action == 'create') print '<textarea name="comment" wrap="soft" cols="60" rows="3"></textarea></td></tr>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print '</td></tr>'; @@ -626,7 +626,7 @@ if ($rowid > 0) print '<textarea name="comment" wrap="soft" cols="90" rows="3">'.$adht->note.'</textarea></td></tr>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print "</td></tr>"; diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index 5fdfc965143f0d73b192a5f671bff9d408e36462..4928aa2a17224ed4e0874bd7d1c667ebc005f5dd 100644 --- a/htdocs/admin/accounting.php +++ b/htdocs/admin/accounting.php @@ -22,8 +22,8 @@ * \brief Page de configuration du module comptabilite expert */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 969cd1fb2ced56807d8f67eb634306490c231861..c0d9d38962786259de169d019a0cd8c18ec105d3 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -23,9 +23,9 @@ * \brief Autocreate actions for agenda module setup page */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index b9309c2abb3fda8c8edf0e110bfd358963834571..41ac8727563804e47288f3b571fdebecd1920c8a 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -22,12 +22,12 @@ * \brief Page to setup external calendars for agenda module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 530715576204765bc4cb9a6bbf5899ed7f5c7632..5a1ccc3c6dfc846be805e9e063b4dd88c17adb80 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -22,9 +22,9 @@ * \brief Page to setup miscellaneous options of agenda module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; if (!$user->admin) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 3670f766b6865bfd04fa394f0d0f246711ccd116..b1112017b80ab9e3418cf9e8c67d91681bb48cb9 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -24,9 +24,9 @@ * \brief Page to setup barcode module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formbarcode.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php'; $langs->load("admin"); @@ -132,7 +132,7 @@ foreach($dirbarcode as $reldir) $filebis=$reg[1]; // Chargement de la classe de codage - require_once($newdir.$file); + require_once $newdir.$file; $classname = "mod".ucfirst($filebis); $module = new $classname($db); @@ -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 36bdb3f5d5959c1d2f232e29612816243f86349d..e1ca04bb00ee9a8b613f93fe194131895e030c8d 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -22,10 +22,10 @@ * \brief Page to setup boxes */ -require("../main.inc.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"); +require '../main.inc.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'; $langs->load("admin"); diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index c2d5590413b3c09e9a0f6c0d1a70172c6a0114a3..3cb34186bd66e926308303df9c4d833132287166 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -23,8 +23,8 @@ * \brief Page to setup module clicktodial */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 638064fd1dd74fb6c79f5e117c98ff4cdbbd437d..36c57926c4d0ee6223036c153bbbb995600eee54 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -29,9 +29,9 @@ * \brief Setup page of module Order */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -89,7 +89,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -272,7 +272,7 @@ foreach ($dirmodels as $reldir) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/commande/".$file.'.php'; $module = new $file; @@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $module = new $classname($db); $modulequalified=1; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index c0c1fcba460a3c60285ce901a6a2f7ee10416c18..03309c31c3be57ada748a03fcd185f777c8c698c 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -25,14 +25,14 @@ * \brief Setup page to configure company/foundation */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $action=GETPOST('action'); @@ -51,7 +51,7 @@ $message=''; if ( ($action == 'update' && empty($_POST["cancel"])) || ($action == 'updateedit') ) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0); if (! empty($tmparray['id'])) @@ -211,7 +211,7 @@ if ($action == 'addthumb') if ($action == 'removelogo') { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; dol_delete_file($logofile); diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 0ffd319cf13ad6b1adab4f4fd220902dbc946b3e..86d87117ac1a3eada8be517982c89814dca9393e 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -24,8 +24,8 @@ * \brief Page to setup accountancy module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load('admin'); $langs->load('compta'); diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 3e04767c840e5daa762fea32e6888c3b51789be0..f2cdf0bd22eb1ad77db559c1fd683e1deb2049bd 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -24,8 +24,8 @@ * \brief Page to setup sending module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("sendings"); diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index ccd5a72c0dba8571c058e05f2c732a5ca880097e..a10738939e67ee0e9a3c9cc6eabc2a456c8f1be9 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -23,8 +23,8 @@ * \brief Admin page to define miscellaneous constants */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index aed99fdae8e51a5fcd8fbc716cc667ac3cfffaf2..4678accc1ab31e070e85d49999170885bb48e4ee 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -21,9 +21,9 @@ * \brief Setup page of module Contracts */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -113,7 +113,7 @@ if (is_resource($handle)) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.'.php'; $module = new $file; diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 0acfed506b269fa0e9fc8d4aaa0128d6afc74626..fe4edb90e2a527b1f669a3b0c0917022f054258e 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -23,8 +23,8 @@ * \brief Page to setup late delays */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_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 5b0ee0d78242574c33696e4cbfa83727f4d109b1..80f6d04921abc89384cd093874f09da9de0697dd 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -28,10 +28,10 @@ * \brief Page to administer data tables */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("errors"); $langs->load("admin"); @@ -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/dons.php b/htdocs/admin/dons.php index 789884702c6bf7d2bb7bb3889f5d6fb09d672638..f04e7d897de44cd2379e01d1d1d885cb76dabea6 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -21,9 +21,9 @@ * \ingroup dons * \brief Page d'administration/configuration du module Dons */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; $langs->load("admin"); $langs->load("donations"); @@ -53,7 +53,7 @@ if ($action == 'specimen') if (file_exists($dir.$file)) { $classname = $modele; - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname($db); @@ -200,7 +200,7 @@ if (is_resource($handle)) $name = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12); - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $module=new $classname($db); // Show modules according to features level diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index df875865a85f7dd2d01549c1d0f44cb39bab0f63..b06df9e432e4bd8aff92ed385334538e31ca2253 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -21,10 +21,10 @@ * \brief Log event setup page */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php'; if (!$user->admin) diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 1adc2ecc6602c19829752a9df6c76cae70a1bbed..d13378000c35bf9c3c39ba02232c2c82c06f4bec 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -28,9 +28,9 @@ * \brief Page d'administration/configuration du module Expedition */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("admin"); $langs->load("sendings"); @@ -130,7 +130,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -192,7 +192,7 @@ if ($action == 'setmethod' || $action== 'setmod') $moduleid=GETPOST('moduleid','alpha'); $statut=GETPOST('statut','alpha'); - require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php"); + require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php"; $classname = "methode_expedition_$module"; $expem = new $classname($db); @@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.'.php'; $module = new $file; @@ -480,7 +480,7 @@ foreach ($dirmodels as $reldir) print '<tr '.$bc[$var].'><td>'; print $name; print "</td><td>\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname(); print $module->description; diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 004c04bb12f28810c8d2d2aa9d0b875b2589b818..da5f2c36a659fb1d07024081537850c2a310c9ae 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -27,9 +27,9 @@ * \brief Page to setupe module ExternalRss */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/rssparser.class.php'; $langs->load("admin"); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index eb88d57be98cf4046f78cefed607bdd3a551fad6..6e54456f59e9e69093753a7f8cb9f8ab9a7c6806 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -26,9 +26,9 @@ * \brief Page to setup invoice module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -88,7 +88,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -347,7 +347,7 @@ foreach ($dirmodels as $reldir) if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php') { // Chargement de la classe de numerotation - require_once($dir.$filebis); + require_once $dir.$filebis; $module = new $classname($db); @@ -515,7 +515,7 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $module = new $classname($db); $modulequalified=1; diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 497bed1c02ad3e323c241bbf69d5ffc3c82556a8..7b978bb5c8da0695cf1dfffef0806fffb4febae2 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -24,9 +24,9 @@ * \brief Page d'activation du module FCKeditor dans les autres modules */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("admin"); $langs->load("fckeditor"); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 4aac5a88fedbd65bf2f45c8022656e569fd2fe99..7a800152c6541352e955b3f71e852b2f3c341565 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -28,9 +28,9 @@ * \brief Setup page of module Interventions */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -125,7 +125,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -234,7 +234,7 @@ foreach ($dirmodels as $reldir) $file = $reg[1]; $classname = substr($file,4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/".$file.'.php'; $module = new $file; @@ -356,7 +356,7 @@ foreach ($dirmodels as $reldir) print '<tr '.$bc[$var].'><td>'; echo "$name"; print "</td><td>\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db); print $module->description; print '</td>'; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 4c6c3fa533d56893c19d788eed835eddbb9713dd..d2f5ef39512e867c7f46f858e666ffa9dd41f643 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -27,11 +27,11 @@ * \brief Page d'administration-configuration du module Fournisseur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $langs->load("admin"); $langs->load('other'); @@ -94,7 +94,7 @@ if ($action == 'specimen') // For orders if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db,$commande); @@ -140,7 +140,7 @@ if ($action == 'specimenfacture') // For invoices if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db,$facture); @@ -314,7 +314,7 @@ foreach ($dirmodels as $reldir) { $file = substr($file, 0, dol_strlen($file)-4); - require_once($dir.$file.".php"); + require_once $dir.$file.'.php'; $module = new $file; @@ -455,7 +455,7 @@ foreach ($dirmodels as $reldir) print "<tr ".$bc[$var].">\n"; print "<td>".$name."</td>\n"; print "<td>\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); print $module->description; print "</td>\n"; @@ -587,7 +587,7 @@ foreach ($dirmodels as $reldir) print "<tr ".$bc[$var].">\n"; print "<td>".$name."</td>\n"; print "<td>"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); print $module->description; print "</td>\n"; diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 3d384a4b832426ba8ebf30e802c33a29bbb753dd..14a8553959dd0eef04b20902ffc4b2baad120f9f 100644 --- a/htdocs/admin/geoipmaxmind.php +++ b/htdocs/admin/geoipmaxmind.php @@ -22,9 +22,9 @@ * \brief Setup page for geoipmaxmind module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgeoip.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php'; // Security check if (!$user->admin) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 6e4f965bd27d1e08d3bf195550f9fbc1ba721a9c..6227aa5fb7280d2c28b4bf7e131fdd8ab4a5472e 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -22,12 +22,12 @@ * \brief Page to setup GUI display options */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $langs->load("admin"); $langs->load("languages"); @@ -103,7 +103,7 @@ print "<br>\n"; if ($action == 'edit') // Edit { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index c7f9e2efa2c3595d9d33d0c0e4a409d9aa929d26..de1a4faab8fbe1c4f5720043c968134caee24af7 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -21,7 +21,7 @@ * \brief Page d'accueil de l'espace administration/configuration */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("admin"); $langs->load("companies"); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index 30932ecadd05d6210d9842c90b607983eb3ca136..ba4b76a7e2a6e72e162990f3531be12c3333cb28 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -26,10 +26,10 @@ * \brief Page d'administration/configuration du module Ldap */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index d7dc1ffc9e5847579eef4af9486375702c5fdffa..d1dd88c67a1b1fde6c8d21ee7a54d9a0dd3cbb52 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -26,11 +26,11 @@ * \brief Page d'administration/configuration du module Ldap */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 5b4eded2f990a4a3c62be69db6e41e0743bca927..141de8a7d31234348b2098c237ec7b34bb01cf2f 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -26,12 +26,12 @@ * \brief Page to setup LDAP synchronization for groups */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index cca1d5fbdcb979a92db07ed1a511e12daf626d1a..83dcb2c50c461ab5626444de0beebe415ebe8b2f 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -26,12 +26,12 @@ * \brief Page d'administration/configuration du module Ldap adherent */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 5f528bc5a5f38b0b5d98e43bca17be72981d9d7b..909364fb00e2eefa0bdf9c9466309ce715068b38 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -26,12 +26,12 @@ * \brief Page d'administration/configuration du module Ldap */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index cc5ac952972e208f8ebb98a6ae450a5cdb50e03c..6fbb135955b2b8943c9d947310697ac44134d331 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -22,9 +22,9 @@ * \brief Page to setup limits */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index f23b73a766d7edbf94a781a37039bffabc0cbd66..9a23e3f968d2fbfd3875e82d3df22d49117cb4ad 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -27,9 +27,9 @@ * \ingroup livraison * \brief Page d'administration/configuration du module Livraison */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; $langs->load("admin"); $langs->load("sendings"); @@ -106,7 +106,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -236,7 +236,7 @@ foreach ($dirmodels as $reldir) { $file = substr($file, 0, dol_strlen($file)-4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php'; $module = new $file; @@ -371,7 +371,7 @@ foreach ($dirmodels as $reldir) print '<tr '.$bc[$var].'><td>'; print $name; print "</td><td>\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db); print $module->description; diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index c423645d5c81b59365010abed36d94b0c6e56171..ccded6ec1c74cf984048c03f3b3e0ba08c297a40 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -23,9 +23,9 @@ * \brief Page to setup emailing module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $langs->load("admin"); $langs->load("mails"); diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 75bf3c41e7643ba9f310c0e16390488b9ba021a6..e3e822577ee5580a78a3c67b23db8b0b865e5536 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -21,9 +21,9 @@ * \brief Page to setup emails sending */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("companies"); $langs->load("products"); @@ -78,7 +78,7 @@ if ($action == 'update' && empty($_POST["cancel"])) */ if (GETPOST('addfile') || GETPOST('addfilehtml')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -184,7 +184,7 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE $subject=make_substitutions($subject,$substitutionarrayfortest); $body=make_substitutions($body,$substitutionarrayfortest); - require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile( $subject, $sendto, @@ -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/menus.php b/htdocs/admin/menus.php index bfc9a74ac97723f8a9a6fd21279e675dc218c932..c5b3e3781644a15b69cadfd41c4be99fd5da9938 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -23,10 +23,10 @@ * \brief Page to setup menu manager to use */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $action=GETPOST('action'); diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 003dfb0c2bd2781dc8ef10171c648bd211acf58d..1dd106a1204a28ca96c51de65a15a3799645cf68 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -23,9 +23,9 @@ * \brief Tool to edit menus */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $langs->load("admin"); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index 7dd3a5e805d36fdc2f08882bf87ec2350d944506..800f10a15d71ba1ee435121515bfc70a26a2b201 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -23,9 +23,9 @@ * \brief Index page for menu editor */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; $langs->load("other"); $langs->load("admin"); diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php index 0401e57186d2b6b3df6fc5646ec8fdbb86ed788d..529f411cefcc7f7855e4b3cfb0a9721fa06d7533 100644 --- a/htdocs/admin/menus/menu.js.php +++ b/htdocs/admin/menus/menu.js.php @@ -34,8 +34,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); +require_once '../../master.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; // Define css type header('Content-type: application/javascript'); diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 41168160d31e6587719f083ef7078e09b18f01f7..d9e6a2d8bafeaab5a33a4f176cb312c03da0f68a 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -21,8 +21,8 @@ * \brief Menus options setup */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 5db40f5cdbd151398ac1fc948d9a1a1fd0cf04ca..c142bcde3eaf35c903a499ffa5a356d6b54f0034 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -25,8 +25,8 @@ * \brief Page to activate/disable all modules */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("errors"); $langs->load("admin"); @@ -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/notification.php b/htdocs/admin/notification.php index bc228be0711f616b4df489d11ed650ae7c985b78..821da019a73ea69640c8b57545ac3ce59056666e 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -22,9 +22,9 @@ * \brief Page to setup notification module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_50_modNotification_Notification.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php index b6e9bb5c848f2ad862e60c6dfe9faa703f3b5f78..a391f06b51e3e7ff2cbff7ddf61beedaf18dfffc 100644 --- a/htdocs/admin/osc-languages.php +++ b/htdocs/admin/osc-languages.php @@ -21,7 +21,7 @@ * \brief Page d'administration/configuration du module Boutique */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 5842587b5e89f88c434d533b67fa594e7ec90c59..be361ec177e372355b1694d3bd4b4c0d6ae71fd1 100755 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -23,12 +23,12 @@ * \brief Page to setup PDF options */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $langs->load("admin"); $langs->load("languages"); @@ -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 c7f1d417964c9dc5b3ad32876ef6b67bea6ca10c..04cb8e6a569e00ea18b3d5c90c9a9b7ffca36448 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -24,9 +24,9 @@ * \brief Page d'administration/configuration des permissions par defaut */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); $langs->load("users"); @@ -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/prelevement.php b/htdocs/admin/prelevement.php index 1b4cd867dd9e7ee96e7c9f31998d748596f51746..ab8e3b898f31b5438b3176b58d6d0b2ace4d1e16 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> @@ -24,10 +24,10 @@ * \brief Page configuration des prelevements */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("admin"); $langs->load("withdrawals"); diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 80be64c815355137fea6ed0696bd1076379cf2e2..d5da8993efc0437b22c2b987da7eece838c803e2 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -24,10 +24,10 @@ * \brief Page to setup project module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -89,7 +89,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -198,7 +198,7 @@ foreach ($dirmodels as $reldir) $file = $reg[1]; $classname = substr($file,4); - require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.'.php'; $module = new $file; @@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir) $var=!$var; print "<tr ".$bc[$var].">\n <td>$name"; print "</td>\n <td>\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db); print $module->description; print "</td>\n"; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 1d9a4e919a22b6a1f5ab73486f77bd4674d761e1..02b57e63cb2d3be05bbe982e7744cd1d2134d606 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -28,9 +28,9 @@ * \brief Setup page for commercial proposal module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $langs->load("admin"); $langs->load("errors"); @@ -89,7 +89,7 @@ if ($action == 'specimen') if ($filefound) { - require_once($file); + require_once $file; $module = new $classname($db); @@ -257,7 +257,7 @@ foreach ($dirmodels as $reldir) { $file = substr($file, 0, dol_strlen($file)-4); - require_once($dir.$file.".php"); + require_once $dir.$file.'.php'; $module = new $file; @@ -399,7 +399,7 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $module = new $classname($db); $modulequalified=1; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 2cba5ee10c2520f195baf06b169e6e5950153688..3b48bba814587ab91d7d5e106d51c84472028ad4 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -21,9 +21,9 @@ * \brief Page setup proxy to use for external web access */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 5b9622d9f49908e67c2acb6590e5742d278fb297..9acd06e091d4b71c79fce5e5b69e666740f5ade6 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -22,9 +22,9 @@ * \brief Page de configuration du module securite */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $action=GETPOST('action'); @@ -226,7 +226,7 @@ if (is_resource($handle)) { // Chargement de la classe de numerotation $classname = $reg[1]; - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $obj = new $classname($db,$conf,$langs,$user); $arrayhandler[$obj->id]=$obj; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 900cbe4234033414a51d612052c147add48315cc..22f31b3ff6772c1342520815741c9b60ec93048a 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -22,9 +22,9 @@ * \brief Security options setup */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("users"); $langs->load("admin"); @@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp; if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_add_file_process($upload_dir,0,0); } diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 68a4819d4ed531ea1647ef6646e0fb6ceee81dd7..34c74319b4fa18f60cc3e08d0ac76d7790e1453c 100755 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -21,8 +21,8 @@ * \brief Page to setup emails sending */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("companies"); $langs->load("products"); @@ -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)) @@ -115,7 +115,7 @@ if ($action == 'send' && ! $_POST['cancel']) complete_substitutions_array($substitutionarrayfortest, $langs); $body=make_substitutions($body,$substitutionarrayfortest); - require_once(DOL_DOCUMENT_ROOT."/core/class/CSMSFile.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/CSMSFile.class.php'; $smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account $result=$smsfile->sendfile(); // This send SMS @@ -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/stock.php b/htdocs/admin/stock.php index ceb137be24b23a8435bc57c9660b8cb4b9336c30..deb55ee311c31cfd39e36c19eadd41d1374046f2 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -23,8 +23,8 @@ * \ingroup stock * \brief Page d'administration/configuration du module gestion de stock */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("stocks"); diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index a24d7f38d899f5b77edb7553c5827cba276f326a..312a99649c2ef0790e679f5939fd55c1a2be5681 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -23,8 +23,8 @@ * \brief Setup page for logs module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; if (!$user->admin) accessforbidden(); @@ -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/about.php b/htdocs/admin/system/about.php index b33b20fd25839e92e44018137b7cd5b92bf36fa1..9f12412bff7eca7b18802a67f7d385f9180a8bc2 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -24,7 +24,7 @@ * \brief About Dolibarr File page */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); $langs->load("help"); diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a7c271798180ad824a412987490d9b002845892e..009156f1a5da32a2fdf2d08bbe2d6b40b6cf679c 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -22,7 +22,7 @@ * \brief Page to show all Dolibarr setup (config file and database constants) */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); $langs->load("user"); diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php index da6623d72f471f94b7651e08a3dd5ba98a19eed0..a6b8d9fb944672dba33f8208c836c9994d6a754d 100644 --- a/htdocs/admin/system/database-tables-contraintes.php +++ b/htdocs/admin/system/database-tables-contraintes.php @@ -23,7 +23,7 @@ * \brief Page d'info des contraintes de la base */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 7dfd6b9f2c8c14a7bd95896b3bde9cf6c11b0f06..c01aa0ee07ccafee7b6060c8cdfd57c7c3233db0 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -24,7 +24,7 @@ * \brief Page d'infos des tables de la base */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 5bfd44b14acd0aa22429930b34accaa05b67551e..e1db5b57d9c30764bf0db8aeed398a95a6bb386a 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -23,7 +23,7 @@ * \brief Page with system information of database */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php index bc6cc57405eadee2d02a9b986e95a98389c1bcb7..7f4bba4729e98223145d228e7ba90bd077b5c207 100644 --- a/htdocs/admin/system/dbtable.php +++ b/htdocs/admin/system/dbtable.php @@ -24,7 +24,7 @@ * \brief Page d'info des contraintes d'une table */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 5c9a262a2686f88afd134fb064879f697b5e5732..95828249c00d9b112f95b055188b1c8520454088 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -22,9 +22,9 @@ * \brief Page to show Dolibarr informations */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("admin"); $langs->load("install"); diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index dedae30cda05d8863b71092c9295327e3b529c7e..afe4bd9f2b75f853e81e453fafefa74965e2131c 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -22,8 +22,8 @@ * \brief Home page of system information */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); $langs->load("user"); diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 1a10f15ca1eabe25626607f47bf9614f8e109200..0c038dfd4f7720f9aa048930d3ad214b66344005 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -22,8 +22,8 @@ * \brief File to list all Dolibarr modules */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); $langs->load("install"); @@ -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/system/os.php b/htdocs/admin/system/os.php index 6d3366fe3665da2cea916fef6e1098d4c97b616d..be2f6151e64200d9bf5cc0278f3c5d55eaf8b27b 100644 --- a/htdocs/admin/system/os.php +++ b/htdocs/admin/system/os.php @@ -21,8 +21,8 @@ * \brief Page des infos systeme de l'OS */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 01ab2a200e36ac64e27dcdf49550a368b2d5dc5b..db4630535de00b8a0af638b53c4fc651ac716573 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -22,7 +22,7 @@ * \brief Page des infos systeme de php */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php index 6d237bdfff1a056f26dc7429a3ac9a61be1d17fd..fe8ee87a8e46875c17ac8196cb4b0fe03590533d 100644 --- a/htdocs/admin/system/web.php +++ b/htdocs/admin/system/web.php @@ -20,9 +20,9 @@ * \brief Page with web server system information */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php index 8fd23b96af0026b24a271046f265ed6b3bab35a6..f2e78363016678f4936fc90e3db33e249c377129 100755 --- a/htdocs/admin/system/xcache.php +++ b/htdocs/admin/system/xcache.php @@ -20,7 +20,7 @@ * \brief Page administration XCache */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php index 3b829d33ec86c6341bb02a2a4796a4ec08168efb..a9f7e6df158ec6ccfeac6cdac711dd9f584aedb9 100644 --- a/htdocs/admin/system/xdebug.php +++ b/htdocs/admin/system/xdebug.php @@ -20,7 +20,7 @@ * \brief Page administration XDebug */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index f161fbd39277e4c462eb29bad71b0421e46971d9..73b69c505052cb7bc63ed57c9043abab28d93115 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -24,8 +24,8 @@ * \brief Page de configuration du module tax */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load('admin'); diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 8fc78e725023aefdc4a5c02788418765c12a99d1..18dc96e652c6b799c98500efa0af61c3724c0dee 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -22,10 +22,10 @@ * \brief Page to export database */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("admin"); diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index cd2119ca4c85916d5c5597f35e370b940bb69286..9ff98757a36bfcfe3b69a68ba303be6ee7f092c2 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -22,7 +22,7 @@ * \brief Page to import database */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 421e677b3d7818d86516163e731355dba8b4c16d..52838109c4f4914c56cb873ca38ead7201da40ce 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -20,7 +20,7 @@ * \brief Page administration de eaccelerator */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 39e34e041c334cd6b31df72db3dea03d726484ea..55b9f5302cd901a394b8200bf0dbb76947ed903c 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -21,10 +21,10 @@ * \brief Page to export a database into a dump file */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("admin"); diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index c6d6e6a0aa428a53d7cd79000830287bac56d37e..dfbd00d949e284b94f9eca1972b8db05e5ad969d 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -22,7 +22,7 @@ * \brief Page d'accueil de l'espace outils admin */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("admin"); $langs->load("companies"); diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 2423438e6b414cc5bf211d772b0745010dd12016..9f44aa42400d676dd370de4542d8b88b0e683e03 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -22,8 +22,8 @@ * \brief List of security events */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/events.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php'; if (! $user->admin) accessforbidden(); diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 10b7dfe6554a64c28aa408470c64c0fe2d05a76a..0233073b7c7800de191741cefeb3ce127833887d 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -22,8 +22,8 @@ * \brief List of PHP sessions */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("install"); diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index e9465de8f739740afc093bae708af07744122ad1..b835b4a5953a21956f080d6df5453d172557096b 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -21,8 +21,8 @@ * \brief Page to purge files (temporary or not) */ -require("../../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +require '../../main.inc.php'; +include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("admin"); @@ -97,7 +97,7 @@ if ($action=='purge' && ! preg_match('/^confirm/i',$choice) && ($choice != 'allf // Update cachenbofdoc if (! empty($conf->ecm->enabled) && $choice=='allfiles') { - require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); + require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; $ecmdirstatic = new EcmDirectory($db); $result = $ecmdirstatic->refreshcachenboffile(1); } diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 567dcfc83237b5f0099c289510a7da8087cb2726..1487cddbe33ad3eac9bff3d7bd4f62f4c5c60974 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -22,8 +22,8 @@ * \brief Page to make a Dolibarr online upgrade */ -require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/core/lib/files.lib.php"; +require '../../main.inc.php'; +include_once $dolibarr_main_document_root.'/core/lib/files.lib.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index a80406f4ce0e32393ec4f25d333343a40a05d433..a62d6b808cbff6d835ee0416ddbf94030cd4c757 100755 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -21,8 +21,8 @@ * \brief Page to show translation information */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index d3860512d1e88ebf2ffef22143f98f77ed737122..d46631fdbf519283667696ddf0d59ca101087535 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -20,8 +20,8 @@ * \brief Page to view triggers */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/interfaces.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php'; $langs->load("admin"); @@ -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/admin/user.php b/htdocs/admin/user.php index aebb05abed9bbebcd368cb1a8ae2dd59f2e29161..8b002bd1409fa9bfe25fbb9439b46ad8a0f4a72f 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -26,8 +26,8 @@ * \brief Page to setup user module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("members"); diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index c9fe8782a450a0111c8dc0c70b9a512295834898..adf85c8e33ba9c9f45338c15d86dfddd2dd4bb11 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -24,8 +24,8 @@ * \brief Workflows setup page */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("workflow"); 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/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php index 80d394fa452547e43549a2325a3dd0c66221ae71..21aa75a4cae232a7a227bbf49a06a3b216e99a34 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -60,9 +60,9 @@ function llxFooter() print "\n".'</html>'."\n"; } -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; // Security check diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php index 5f056656ddcfd4cedb2be42ea1c259dd3f3765a6..a560abb35b79b465b057cc25ca5be71093b058c3 100644 --- a/htdocs/bookmarks/admin/bookmark.php +++ b/htdocs/bookmarks/admin/bookmark.php @@ -22,8 +22,8 @@ * \brief Page to setup bookmark module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index f047be2349fec5ebe412f62bfca3890ab3180282..eb403c5ed22b38c6efc6e9bc8fc5b13d27131c82 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -35,7 +35,7 @@ function printBookmarksList($aDb, $aLangs) $db = $aDb; $langs = $aLangs; - require_once(DOL_DOCUMENT_ROOT."/bookmarks/class/bookmark.class.php"); + require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5; $bookm = new Bookmark($db); diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index 808e1faf16217ebb2c6b9ea6b555f8adee32c96d..17263261056ea774fad38fce04757da844147ca0 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -23,8 +23,8 @@ */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/bookmarks/class/bookmark.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; $langs->load("other"); diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 10bbd015cf67dd3d6f6eb82c46f7adf8e71ad25f..8e3d0ea9e921d733e81704901b778158bfb05ba7 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -21,8 +21,8 @@ * \ingroup bookmark */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/bookmarks/class/bookmark.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; $sortfield = GETPOST("sortfield",'alpha'); @@ -124,7 +124,7 @@ if ($resql) if (! $obj->title) { // For compatibility with old Dolibarr bookmarks - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $societe=new Societe($db); $societe->fetch($obj->rowid); $obj->title=$societe->name; diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index ba6dc123bac1aeff391542ae3b094a7229d8a998..d08f03ee99327432f9c1ca395dea61d8a0298839 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -26,8 +26,8 @@ * \brief Page d'administration/configuration du module OsCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("oscommerce"); diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index bd6428684e49061eb79fa703b23f7871c42ae59a..3e67a6a772f72e70a568fb9c8f65df21b2576896 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -24,9 +24,9 @@ * \brief Page fiche client OSCommerce */ -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'); +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'; /* diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index c74a6d8ec03486961f6b7fcdbe43a54935a47469..cc509c2760fe32bebeb60e44b993aeea4456a5f5 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -23,8 +23,8 @@ * \brief Page gestion client OSCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; $langs->load("companies"); diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 4ed22127e3ed4d14aa3c39301f292c950c1e3d7d..9c70d97876b0023751d51ce9264f86d1bba458b2 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -23,8 +23,8 @@ * \brief Page ca commandes du module OsCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; /* diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php index cb049194fd19017afca2493b8149c7b65d892d00..8bed790691eb2e2b65bf2f859dc9bb0ac21777ce 100644 --- a/htdocs/boutique/commande/class/boutiquecommande.class.php +++ b/htdocs/boutique/commande/class/boutiquecommande.class.php @@ -22,8 +22,8 @@ * \brief Fichier de la classe des commandes de la boutique online */ -require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); -include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php'); +require_once DOL_DOCUMENT_ROOT .'/societe/class/address.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 6d18faef1916bd50b7212677f0ef7c0c7b80befe..5753aba61872682ac6cc4b3f0d039db60bfd30ae 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -24,9 +24,9 @@ * \brief Page fiche commande OSCommerce */ -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'); +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'; $langs->load("products"); diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 7a55172367d476193716796f014657fef1c9169a..0bf180ae2210daf6cc3d67751160903862d75da3 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -23,8 +23,8 @@ * \brief Page gestion commandes OSCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index e8f67b59c2e87ce75e6aac986e7c6638a6142882..b06233575bc10f1a87b4138dd00f0fd8ee6f117d 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -24,8 +24,8 @@ * \brief Page affichage meilleures critiques OS Commerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; /* diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index b66b6ffd178cf845a5e442583d70de8b446a6ccb..4b652c3ce556ca81da76c07d6bdd401bd972691b 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -23,8 +23,8 @@ * \brief Page fiche critique OS Commerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; $id=$_GET["id"]; diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index c6dbbba4b1e903f8b07db852125f469dc7a5ffd7..66db48a4aabf99ee822662b19bb78a1ef2f6d41a 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -23,8 +23,8 @@ * \brief Page gestion critiques OSCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; /* diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 9d473b2e8db3f6660a20d8b9a2c847c86a068966..09938bb5d35faec017f04b1a8be73e7b2571f977 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -22,8 +22,8 @@ * \brief Page accueil zone boutique */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; $langs->load("boutique"); $langs->load("orders"); diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 06715f51588ce271649ba1dcfa0402c73145a37e..3f53913bc8851dad904c039a5a2ad3721cac5339 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -24,8 +24,8 @@ * \brief Page gestion notification OS Commerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; $langs->load("products"); diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index 825c440c22aa822ae908009c3f0192e4cbc894bc..cfdf6fe9b8322651dffd4182a1219369bd4af629 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -24,8 +24,8 @@ * \brief Page fiche notification produits OS Commerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; /* diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index d1fa8daf12d6cd09a6d31cb3e9efc93c5a0c1dfa..b4388e04b0c14871b0a1bf570ecebd92e77773cb 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 31bc0181993ba63c9493a7254ff7835e904a3ccb..da5d7ac80c05f20d6d75b8e7ab835f3c2e936e87 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -23,8 +23,8 @@ * \brief Page gestion produits du module OsCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; $langs->load("companies"); diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 0bb08d5a95dda50801bdf603217030cb53208718..c90356dfb5841f4bad4575d1141d01051db69ac8 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -23,8 +23,8 @@ * \brief Page gestion produits du module OsCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; /* diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index 0d3fbfb10e82107fd83f431ab14d079fa7191aa0..dd06226aaac47ee389442b2cfe5e7e98af7a50f3 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -22,8 +22,8 @@ * \brief Page gestion promotions OSCommerce */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'; llxHeader(); diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index e92dd6e0f4d8061c327124050ad6455f0d0e6a0e..ddc72aa795a4a78713dc9cc8053d7b2fb9556c56 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -22,9 +22,9 @@ * \brief Setup page for cashdesk module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; // If socid provided by ajax company selector if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php index a4e3db7863b91148b44cd587f650d18d820be0de..a4d01739861938585b2afa73b29b150c4b66049b 100644 --- a/htdocs/cashdesk/affContenu.php +++ b/htdocs/cashdesk/affContenu.php @@ -22,7 +22,7 @@ * \ingroup cashdesk * \brief Include to show main page for cashdesk module */ -require_once('class/Facturation.class.php'); +require_once 'class/Facturation.class.php'; // Si nouvelle vente, reinitialisation des donnees (destruction de l'objet et vidage de la table contenant la liste des articles) if ( $_GET['id'] == 'NOUV' ) @@ -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 37f201008483f63808db091aef46ecf0c4a7f505..be86b0179a15be0c74caea2823cab564d081881e 100644 --- a/htdocs/cashdesk/affIndex.php +++ b/htdocs/cashdesk/affIndex.php @@ -23,8 +23,8 @@ * \ingroup cashdesk * \brief First page of point of sale module */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; // Test if already logged if ( $_SESSION['uid'] <= 0 ) @@ -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/deconnexion.php b/htdocs/cashdesk/deconnexion.php index 20e058d9362b0d31d5ab27551f2d19c8a6f46c97..e52eb9fe8dc5720833795242882a91ffb41e4045 100644 --- a/htdocs/cashdesk/deconnexion.php +++ b/htdocs/cashdesk/deconnexion.php @@ -21,7 +21,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); -require_once("../main.inc.php"); +require_once '../main.inc.php'; // This destroy tag that say "Point of Sale session is on". unset($_SESSION['uid']); diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php index 335925cf76483af6e077d946e09576639865ca64..d327b2af07c20fe16cc8778b9ff3ee3c9f5cb9a6 100644 --- a/htdocs/cashdesk/facturation_dhtml.php +++ b/htdocs/cashdesk/facturation_dhtml.php @@ -34,8 +34,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // Change this following line to use the correct relative path (../, ../../, etc) -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; //header("Content-type: text/html; charset=UTF-8"); header("Content-type: text/html; charset=".$conf->file->character_set_client); diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php index 408e36bc725e414261d71db5ccb2f10ae4669940..86be5906cc405222969b0ff0a78e6348fdfc37b4 100644 --- a/htdocs/cashdesk/facturation_verif.php +++ b/htdocs/cashdesk/facturation_verif.php @@ -16,11 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $obj_facturation = unserialize($_SESSION['serObjFacturation']); unset ($_SESSION['serObjFacturation']); diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index 3f5edb9e290a225c901bbf4fc7ced78406b1e955..4fe0a225e3f4464a9f71ceb67dd8e6a3b68bb11e 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -25,8 +25,8 @@ // Set and init common variables // This include will set: config file variable $dolibarr_xxx, $conf, $langs and $mysoc objects -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $langs->load("admin"); $langs->load("cashdesk"); @@ -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 50b18218902540580be05ffea797c4cd0f51c731..d71b2cb866f61ca9a2d50f27894dce3366ef88c9 100644 --- a/htdocs/cashdesk/index_verif.php +++ b/htdocs/cashdesk/index_verif.php @@ -20,9 +20,9 @@ * We set here login choices into session. */ -include('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php'); +include '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php'; $langs->load("main"); $langs->load("admin"); diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index cf9fd00cbe611cc7c949c7f83db6de98bdffd0e4..8e2bd0a985ae5f13e4484eebf0aaadf5c3d5dc17 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -17,8 +17,8 @@ * */ -require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("main"); $langs->load("bills"); 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/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php index 768458b8b16aded714b18adf5e00cf1ac799ea86..32473e765fcc134221aaa3499579a462aa5175ba 100644 --- a/htdocs/cashdesk/validation_ticket.php +++ b/htdocs/cashdesk/validation_ticket.php @@ -15,9 +15,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'; $obj_facturation = unserialize($_SESSION['serObjFacturation']); unset($_SESSION['serObjFacturation']); diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index f3772d617fae4f1b8badcf634a7fa98ae6e73fbf..fcd8eda6873bf8fe13cba78756515ebeb41ea3b4 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -17,13 +17,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'); -require_once(DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php'; +require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $obj_facturation = unserialize($_SESSION['serObjFacturation']); unset ($_SESSION['serObjFacturation']); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 99ec4c512ce504adad4f8d7993d7bc943c00f93e..48832c0eb86550818de21b94d8fac0ba6a578270 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -26,8 +26,8 @@ * \brief Page to show category tab */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("categories"); $langs->load("products"); @@ -94,7 +94,7 @@ if ($removecat > 0) { if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer)) { - require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $object = new Product($db); $result = $object->fetch($id, $ref); $elementtype = 'product'; @@ -111,7 +111,7 @@ if ($removecat > 0) } if ($type == 3 && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $object = new Adherent($db); $result = $object->fetch($objectid); } @@ -126,7 +126,7 @@ if ($catMere > 0) { if ($type==0 && ($user->rights->produit->creer || $user->rights->service->creer)) { - require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $object = new Product($db); $result = $object->fetch($id, $ref); $elementtype = 'product'; @@ -145,7 +145,7 @@ if ($catMere > 0) } if ($type==3 && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $object = new Adherent($db); $result = $object->fetch($objectid); $elementtype = 'member'; @@ -178,8 +178,8 @@ $form = new Form($db); */ if ($socid) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("companies"); if ($conf->notification->enabled) $langs->load("mails"); @@ -287,8 +287,8 @@ else if ($id || $ref) /* * Fiche categorie de produit */ - require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Produit $product = new Product($db); @@ -342,9 +342,9 @@ else if ($id || $ref) /* * Fiche categorie d'adherent */ - require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; // Produit $member = new Adherent($db); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 84c7810e2a6f3edc0709effd1980f75e01efae78..34adae9b9d0b310866aa3cdec1d206be52501d11 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -26,8 +26,8 @@ * \brief File of class to manage categories */ -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.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); } @@ -1242,7 +1242,7 @@ class Categorie */ function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/"; $dir .= "photos/"; @@ -1277,7 +1277,7 @@ class Categorie */ function add_thumb($file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; if (file_exists($file)) { @@ -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(); @@ -1349,7 +1349,7 @@ class Categorie */ function delete_photo($file) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index dc2d979239eea717e0e4395e0fcbad1207251a62..cec7444503ee12409dd154904df4302e75c12251 100644 --- a/htdocs/categories/edit.php +++ b/htdocs/categories/edit.php @@ -24,8 +24,8 @@ * \brief Page d'edition de categorie produit */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $id=GETPOST('id','int'); @@ -142,7 +142,7 @@ print '</tr>'; print '<tr>'; print '<td width="25%">'.$langs->trans("Description").'</td>'; print '<td>'; -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 39a1d7c5dcb2409d994032fb76b80e17fb83597b..987ad62e7bf255f138d4aee7c088f7f52930723b 100644 --- a/htdocs/categories/fiche.php +++ b/htdocs/categories/fiche.php @@ -24,8 +24,8 @@ * \brief Page to create a new category */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("categories"); @@ -215,7 +215,7 @@ if ($user->rights->categorie->creer) // Description print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('description',$description,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index c70c37ee270e1449ef4a404fb03fdb7fcebe8841..fcde9d3361f31ac3751435b910e1f8e2441333d7 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -25,9 +25,9 @@ * \brief Home page of category area */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; $langs->load("categories"); diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php index 143aac02eecb2ac22357d2becdd08adbe57910a5..cc642df17e5fcbcc952a1ae67bf220b0bcb46a19 100644 --- a/htdocs/categories/liste.php +++ b/htdocs/categories/liste.php @@ -22,8 +22,8 @@ * \brief Page liste des categories */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; if (!$user->rights->categorie->lire) accessforbidden(); diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index b783e77ec223724434442d2bc1c6dfb7e51c9079..36bd186c627f25ba1371379285723f74099c5e6e 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -24,10 +24,10 @@ * \brief Gestion des photos d'une categorie */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php'; $langs->load("categories"); $langs->load("bills"); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index b16c550de98b2d52632b82d8ec7b875ff879082d..8f5a3d1dd3f82c778d11b96dc5b286431834bf76 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -24,9 +24,9 @@ * \brief Page to show a category card */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/categories.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php'; $langs->load("categories"); @@ -315,7 +315,7 @@ if($object->type == 2) // List of members if ($object->type == 3) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $prods = $object->get_type("member","Adherent","","adherent"); if ($prods < 0) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 966b0f25d7ba96ab87ed5be64e83af52ca134aaf..caab3dcc3a6e8114a17a23541896a163768d192e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -23,8 +23,8 @@ * \ingroup commercial * \brief File of class to manage agenda events (actions) */ -require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'); +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** \class ActionComm @@ -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/document.php b/htdocs/comm/action/document.php index 34ad7b13af587fb52498cde3b6c76387e712fd50..bde511d28ff5b48c628f41d1dbeeee581d5eabc0 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -25,15 +25,15 @@ * \brief Page of documents linked to actions */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index aaba6d94455bedcc70261bde731818fce727b6c2..1a04f8f86a35430127daa5fad322f5bf69368de9 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -25,16 +25,16 @@ * \brief Page for event card */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formactions.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("companies"); $langs->load("commercial"); @@ -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')); @@ -571,7 +571,7 @@ if ($action == 'create') // Description print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$actioncomm->note),'',280,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90); $doleditor->Create(); print '</td></tr>'; @@ -791,7 +791,7 @@ if ($id) // Description print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$act->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 75d25216b8198bc9d9f599ab3529816750ad950f..bf0f58e5843d4aade77170b5564ff5d3c7fe2270 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -25,13 +25,13 @@ * \brief Home page of calendar events */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3; @@ -519,7 +519,7 @@ if ($showbirthday) if (count($listofextcals)) { - require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php"); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php'; foreach($listofextcals as $extcal) { $url=$extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics @@ -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/action/info.php b/htdocs/comm/action/info.php index fe2781fcdf578b1cdcf82353f7342ac3a02b165d..09f92d6ef625bf28b4bec322e16ddb391e4ac784 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -22,12 +22,12 @@ * \brief Page des informations d'une action */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $langs->load("commercial"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 812fc56743f4cb0290f2aee758e74547ad817749..1b429736f088c0b570c16a22189bdd8c5bad095a 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -24,12 +24,12 @@ * \brief Page to list actions */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -if (! empty($conf->projet->enabled)) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load("companies"); $langs->load("agenda"); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index f37cc76173617fe0086a5ff22abb02c54d42c8d5..e1154d435a1f3043c29ef5bb1389a6052201bdb9 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -24,11 +24,11 @@ * \brief Page with reports of actions */ -require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/action/rapport.pdf.php"); +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php'; $langs->load("commercial"); diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index a4bfa25786ee991403cf36be8a8d5916ee8d1eee..69adcb1bd9e9d2d925db92ba09ccedf17e69ee93 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -25,12 +25,12 @@ * \brief Page to add a new commercial proposal */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; if (! empty($conf->projet->enabled)) { - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; } $langs->load("propal"); @@ -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')); @@ -87,7 +87,7 @@ if ($action == 'create') { if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.'.php'; $modPropale = new $obj; $numpr = $modPropale->getNextValue($soc,$object); } diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index c03f87538ca8e36b24eec2ceecaadf96c6b5c5be..6c36bb917746053c2fd5057f0085dbdd5a2fff47 100644 --- a/htdocs/comm/address.php +++ b/htdocs/comm/address.php @@ -23,10 +23,10 @@ * \brief Tab address of thirdparty */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php'; $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index 3d3acc182cfaf7dec2b5fc32571ff0f47926a1bf..8e581f0cb51b8c3477b2a3b84976baa013af0738 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -21,7 +21,7 @@ */ -require("../main.inc.php"); +require '../main.inc.php'; $sortfield = GETPOST("sortfield",'alpha'); diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 4e74ec1c293af0a5ad01c39c48b542ca16f8381e..d1e29fe5a40b129950c12caa2e95c6ca4e74327a 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -24,7 +24,7 @@ * \brief Liste des contacts */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("companies"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 67b96147dbccbb57610db56c8908c78a02a1fddc..f5b3b5a611b1d44f693fc1aeda3a17e84cc51490 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -27,16 +27,16 @@ * \brief Page to show customer card of a third party */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -if ($conf->ficheinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +if ($conf->facture->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if ($conf->contrat->enabled) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +if ($conf->adherent->enabled) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +if ($conf->ficheinter->enabled) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; $langs->load("companies"); if ($conf->contrat->enabled) $langs->load("contracts"); @@ -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/index.php b/htdocs/comm/index.php index b1913cef72b93ae6ecc3c3cd2437b0cf6c88c72b..0a76606695e1ea102e8ed70b280fda735def6898 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -23,13 +23,13 @@ * \brief Home page of commercial area */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +if ($conf->contrat->enabled) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! $user->rights->societe->lire) accessforbidden(); diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index 0631a22383d1eb6fd0daf7750b6cc83c35af63ad..f7da122ad492baa69ed62c064685764d2059c325 100755 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -23,8 +23,8 @@ * \brief List of customers */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("companies"); $langs->load("customers"); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index f092d2639993f73a6b17de9fdb35a2b9b417f1f6..da9f1b6e3f825f3fe3541cd25c26b53d697293b0 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2010 Laurent Destailleur <eldy@uers.sourceforge.net> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> @@ -23,12 +23,12 @@ * \brief Page to define emailing targets */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/mailings/modules_mailings.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("mails"); @@ -85,7 +85,7 @@ if ($action == 'add') if (file_exists($file)) { - require_once($file); + require_once $file; // We fill $filtersarray. Using this variable is now deprecated. // Kept for backward compatibility. @@ -270,7 +270,7 @@ if ($object->fetch($id) >= 0) // Chargement de la classe $file = $dir.$modulename.".modules.php"; $classname = "mailing_".$modulename; - require_once($file); + require_once $file; $obj = new $classname($db); @@ -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/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 3b3b8caf5b9daf644232666497dace9db1d6cee5..950ef71a734c3651c824740e540e4e2f41e09065 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -23,7 +23,7 @@ * \brief File of class to manage emailings module */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index b95cc35a04f3eec7b9545c3d51d0fa748269d7bc..96b21b1a192e458a2074cfb44155e80e9f3032ce 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2012 Laurent Destailleur <eldy@uers.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> @@ -23,14 +23,14 @@ * \brief Fiche mailing, onglet general */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("mails"); @@ -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')); @@ -492,7 +492,7 @@ if (! empty($_POST['addfile'])) { $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1); - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory dol_add_file_process($upload_dir,0,0); @@ -505,7 +505,7 @@ if (! empty($_POST["removedfile"])) { $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1); - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_remove_file_process($_POST['removedfile'],0); @@ -515,7 +515,7 @@ if (! empty($_POST["removedfile"])) // Action update emailing if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $isupload=0; @@ -673,7 +673,7 @@ if ($action == 'create') print '</i></td>'; print '<td>'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('body',$_POST['body'],'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print '</td></tr>'; @@ -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; @@ -1119,7 +1119,7 @@ else print '</i></td>'; print '<td colspan="3">'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('body',$object->body,'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,70); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 5390fce71a5b9492577967eb7d4a9f2baa3cfe8a..15c823aba57124ebd5130ddcd06cd3909f2e1110 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -23,9 +23,9 @@ * \brief Page accueil de la zone mailing */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("commercial"); $langs->load("orders"); @@ -84,7 +84,7 @@ if (is_resource($handle)) // Chargement de la classe $file = $dir."/".$modulename.".modules.php"; $classname = "mailing_".$modulename; - require_once($file); + require_once $file; $mailmodule = new $classname($db); $qualified=1; diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 685e88a16decdd1a6c77381bb15eb0a39fae9bb7..34e987fe032a1820aedeb4b7f4c5a37f2a5716d5 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -22,10 +22,10 @@ * \brief Page with log information for emailing */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; $langs->load("mails"); diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 74cf10241e225bc35f840390d565fcf9e21cae52..d9f2cdc125696e273b63d95ef2947b8360904ccd 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -22,8 +22,8 @@ * \brief Liste des mailings */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php'; $langs->load("mails"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 7e5e00f7d8f17e35f449b7dadfc77977e221d6f7..a5e185690f567f6468ae417db1c80d148667af88 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> @@ -23,9 +23,9 @@ * \brief Onglet choix du niveau de prix */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("orders"); $langs->load("companies"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2794bffcbb36b437857f19368ee6c700cac9b7df..b74810e261493cdecfaf92a70de3e5c834bf2908 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -29,16 +29,16 @@ * \brief Page of commercial proposals card and list */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formpropal.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -if (! empty($conf->projet->enabled)) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('companies'); $langs->load('propal'); @@ -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')); @@ -435,7 +435,7 @@ else if ($action == 'setstatut' && $user->rights->propale->cloturer && ! GETPOST */ if (GETPOST('addfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -450,7 +450,7 @@ if (GETPOST('addfile')) */ if (GETPOST('removedfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -523,7 +523,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -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) { @@ -954,7 +954,7 @@ else if ($action == 'remove_file' && $user->rights->propale->creer) { if ($object->id > 0) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("other"); $upload_dir = $conf->propal->dir_output; @@ -1192,7 +1192,7 @@ else if ($action == 'validate') $text=$langs->trans('ConfirmValidateProp',$numref); if ($conf->notification->enabled) { - require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php"); + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='<br>'; $text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid); @@ -1550,19 +1550,19 @@ print '</table><br>'; if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany= new FormCompany($db); $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'; } /* @@ -1571,7 +1571,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%">'; @@ -1747,7 +1747,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); @@ -1762,7 +1762,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']; @@ -1794,7 +1794,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/apercu.php b/htdocs/comm/propal/apercu.php index a8a08f823d9c8c0e6e6895f90c652396663e975e..5b4fc238342a44566d26fbf2d48849daf895c567 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -25,11 +25,11 @@ * \brief Page de l'onglet apercu d'une propal */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('propal'); $langs->load("bills"); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b60b0bcb86bc1a790596092200bd050d8d963f9d..b4943a9068fa03807d2399575b1e5e2b5a4fcc4c 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -29,10 +29,10 @@ * \brief Fichier de la classe des propales */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; /** * \class Propal @@ -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; @@ -468,7 +468,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); @@ -802,7 +802,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) { @@ -918,7 +918,7 @@ class Propal extends CommonObject $this->ref_client = ''; // Set ref - require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.'.php'; $obj = $conf->global->PROPALE_ADDON; $modPropale = new $obj; $this->ref = $modPropale->getNextValue($objsoc,$this); @@ -939,7 +939,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) { @@ -1191,7 +1191,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) { @@ -1548,7 +1548,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) { @@ -1559,7 +1559,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) { @@ -1801,7 +1801,7 @@ class Propal extends CommonObject function delete($user, $notrigger=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -1810,7 +1810,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) { @@ -2309,7 +2309,7 @@ class Propal extends CommonObject // Chargement de la classe de numerotation $classname = $conf->global->PROPALE_ADDON; - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname(); @@ -2666,7 +2666,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) { @@ -2704,7 +2704,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) { @@ -2797,7 +2797,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 a0ee9f76a47e596a86a99ecce82898b3822490bd..c2b2a74f66c02f2f09b6ac3ff6950f66c1a40d49 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -24,12 +24,12 @@ * \brief Onglet de gestion des contacts de propal */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("facture"); $langs->load("orders"); @@ -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/document.php b/htdocs/comm/propal/document.php index 5529f2c9b9ca00487c5e8ec996e8b03f4fcf9b99..f0b78a818884b38bf10c06dc2320ebc7bdb660ba 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -24,12 +24,12 @@ * \brief Page de gestion des documents attaches a une proposition commerciale */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load('compta'); $langs->load('other'); diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 6d041e5e83e0dbc41f00bc2eb6aaf930f5ccf69c..a6c97c67babdb67bb0cff65f696277ea2c27c45d 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -23,9 +23,9 @@ * \brief Home page of proposal area */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/comm/propal/class/propal.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php'; $langs->load("propal"); $langs->load("companies"); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index eec618f987f24c9bc00a5af228828824df19a0c5..46fa8dd652bce44a4f8e794c47010dda95dc520f 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -23,10 +23,10 @@ * \brief Page d'affichage des infos d'une proposition commerciale */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 06b7320e3d332e492c3a30db189896f5c67ec4cc..cfa4b625f5db7dd8887da17fb05dea432e0a92a6 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -29,13 +29,13 @@ * \brief Page of commercial proposals card and list */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formpropal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('companies'); $langs->load('propal'); @@ -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 61a27c4aa4c1cd38c96e4852265938cc77021708..e285d9e3ac28d280b4b0026e4edc24b389082e18 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -24,9 +24,9 @@ * \brief Fiche d'information sur une proposition commerciale */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/propal.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; $langs->load('propal'); $langs->load('compta'); @@ -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/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index 91ad9cee9695b2b465676879ee595af6764a9cee..dc4d24d5dd105a19a267f19c350746189fbac5fd 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -24,9 +24,9 @@ * \brief Page des stats propositions commerciales */ -require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propalestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $WIDTH=500; $HEIGHT=200; 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 ce876da83cdfd2616206310d256c34982fd08b26..3a16307a7606d742a745008293f6922dff956259 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -23,14 +23,14 @@ * \brief Page de la fiche prospect */ -require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); +require_once '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +if ($conf->adherent->enabled) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $langs->load('companies'); $langs->load('projects'); @@ -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/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 834db5138557ef05edbac35dd94a217cdc36df70..4c598a5871f1493e74a1b8dddabd9d83e97e4e2f 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -23,8 +23,8 @@ * \brief Home page of propest area */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; $langs->load("propal"); diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index c80bb788eb306adb51b4419d4361d3f649498264..7dff9bcc60ee115e89fbf148210636381ba92fbb 100755 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -24,9 +24,9 @@ * \brief Page to list prospects */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("propal"); $langs->load("companies"); diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php index a478ce54ecd5d5da6ff27a9a4cb4d5bc6845bcc2..3640cee627905bb4c4fdfca193684c1d0a83afca 100644 --- a/htdocs/comm/prospect/recap-prospect.php +++ b/htdocs/comm/prospect/recap-prospect.php @@ -22,9 +22,9 @@ * \brief Page with prospect summary */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("companies"); $langs->load('other'); diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php index 9ef8ffceb8926f86d82c95f2c0192d59a70ea854..fe240ac2266f5fe2fcaf45d628583dcdd7373d4c 100644 --- a/htdocs/comm/recap-client.php +++ b/htdocs/comm/recap-client.php @@ -22,9 +22,9 @@ * \brief Page de fiche recap client */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index b124a83714f3a440d8ddf5d108ba863a9146a76a..3550b5b50b5b90fe73f6b23d84a39e191ec098b7 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * @@ -22,9 +22,9 @@ * \brief Page to edit relative discount of a customer */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("companies"); $langs->load("orders"); diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 828d231d3b8d9c5a6d1744a45d06d83ff4434318..7d66dfbfb659026a0d8048af43b3c1fbc53a1c01 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> @@ -23,10 +23,10 @@ * \brief Page to edit absolute discounts for a customer */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/discount.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $langs->load("orders"); $langs->load("bills"); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 0407eced627c9da272560cd67d01869b4c06b0f2..83822aa24078e3e1645e50a4ff6a9f0ebec30d1f 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -25,12 +25,12 @@ * \brief Page de l'onglet apercu d'une commande */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('orders'); $langs->load('propal'); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 15194b7738affe7a0c7fc2b42559574a8d6a3c77..d209bb4aacd6d2c637f1b4f66a8b26a79d8a7933 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -26,9 +26,9 @@ * \ingroup commande * \brief Fichier des classes de commandes */ -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"); +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'; /** * Class to manage customers orders @@ -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(); @@ -178,7 +178,7 @@ class Commande extends CommonOrder function valid($user, $idwarehouse=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -239,7 +239,7 @@ class Commande extends CommonOrder // If stock is incremented on validate order, we must increment it if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); // Loop on each line @@ -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; } @@ -353,7 +353,7 @@ class Commande extends CommonOrder // If stock is decremented on validate order, we must reincrement it if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $num=count($this->lines); @@ -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; } @@ -536,7 +536,7 @@ class Commande extends CommonOrder // If stock is decremented on validate order, we must reincrement it if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $num=count($this->lines); @@ -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) { @@ -764,7 +764,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; } @@ -851,7 +851,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; } @@ -947,7 +947,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')); @@ -1012,7 +1012,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; @@ -1353,8 +1353,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(); @@ -2095,7 +2095,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) { @@ -2166,7 +2166,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 (! empty($this->brouillon)) { @@ -2293,7 +2293,7 @@ class Commande extends CommonOrder function delete($user, $notrigger=0) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error = 0; @@ -2302,7 +2302,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) { @@ -2968,7 +2968,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; } @@ -3068,7 +3068,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; } @@ -3162,7 +3162,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 7569d449af0a9617ff56d0f5702cbf0905da2602..0d8ec10ea73f0b96f9f76402b0884ce55420e9e3 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -24,12 +24,12 @@ * \brief Onglet de gestion des contacts de commande */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("orders"); $langs->load("sendings"); @@ -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/customer.php b/htdocs/commande/customer.php index 8386f77d88a5daa933cd83b2d42b40a439b73ee5..d607879c5c03cde737c29d09bb4acb4135047892 100755 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -26,9 +26,9 @@ * \brief Show list of customers to add an new invoice from orders */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $action=GETPOST('action'); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index c01b8a98b5aedd2e5ab01b9a655cb4e5ab4e9994..aa6ff9914f73786d22af6b4f598e0e2085c77592 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -24,12 +24,12 @@ * \brief Page de gestion des documents attachees a une commande */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; $langs->load('companies'); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index a5ed509a7e60c53b537bd1984d2834c25fa9951c..3ce4092de331f5ff7b19829639e602a1afc17516 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -29,18 +29,18 @@ * \brief Page to show customer order */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if (! empty($conf->projet->enabled)) { - require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); - require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; } $langs->load('orders'); @@ -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')); @@ -1053,7 +1053,7 @@ else if ($action == 'remove_file') { if ($object->id > 0) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("other"); $upload_dir = $conf->commande->dir_output; @@ -1070,7 +1070,7 @@ else if ($action == 'remove_file') */ if (GETPOST('addfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -1085,7 +1085,7 @@ if (GETPOST('addfile')) */ if (GETPOST('removedfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1157,7 +1157,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(); @@ -1166,7 +1166,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -1190,7 +1190,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) { @@ -1328,7 +1328,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($action == 'create' && $user->rights->commande->creer) { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print_fiche_titre($langs->trans('CreateOrder')); @@ -1517,7 +1517,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>"; @@ -1693,7 +1693,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $text=$langs->trans('ConfirmValidateOrder',$numref); if ($conf->notification->enabled) { - require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php"); + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='<br>'; $text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$object->socid); @@ -1702,7 +1702,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $formquestion=array( //'text' => $langs->trans("ConfirmClone"), @@ -1722,7 +1722,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $formquestion=array( //'text' => $langs->trans("ConfirmClone"), @@ -1753,7 +1753,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $formquestion=array( //'text' => $langs->trans("ConfirmClone"), @@ -2092,19 +2092,19 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany= new FormCompany($db); $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'; } /* @@ -2116,7 +2116,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%">'; @@ -2286,7 +2286,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); @@ -2301,7 +2301,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']; @@ -2333,7 +2333,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; @@ -2379,4 +2379,4 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G llxFooter(); $db->close(); -?> \ No newline at end of file +?> diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 283eea505eb04d54d741559bf0a38cb0802d0597..a6000d2a44e9dc027799219ef7bd0a00ae2b7b66 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -23,10 +23,10 @@ * \brief Home page of customer order module */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; +require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index cad4ee3e70c1ddb05bd55c863a7a968ef444d8d4..bd31c21b3377930f42883602444ea7eecd58a67b 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -22,10 +22,10 @@ * \brief Page des informations d'une commande */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 9416732af77d81e3bd6f1474151df18afc5b24c3..08c68939903af033d006dd7b9a9c839a065cf345 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -25,10 +25,10 @@ */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $langs->load('orders'); $langs->load('deliveries'); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 5e2c8b45f1464bb8def1e3074b4ad382f7148969..dab125c5c61ace09604e329b9d08d403ec100da2 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -23,9 +23,9 @@ * \brief Fiche de notes sur une commande */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; $langs->load("companies"); @@ -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 b99b92391a99fd10c91643e9f0e16e127d864c3b..87dfe7193982fec5158393dd4fd47c011e292d8a 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -27,14 +27,14 @@ * \brief Page to invoice multiple orders */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load('orders'); $langs->load('deliveries'); @@ -76,7 +76,7 @@ if ($action == 'create') } $now=dol_now(); -$viewstatut=GETPOST('viewstatut'); +$viewstatut=GETPOST('viewstatut'); /* @@ -85,17 +85,17 @@ $viewstatut=GETPOST('viewstatut'); if (($action == 'create' || $action == 'add') && empty($mesgs)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); - require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); - require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); - require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (! empty($conf->projet->enabled)) { - require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; } $langs->load('bills'); $langs->load('products'); @@ -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>"; @@ -504,26 +504,26 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ' WHERE c.fk_soc = s.rowid'; // Which invoice to show - if ($viewstatut <> '') - { - if ($viewstatut < 4 && $viewstatut > -2) - { - $sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee - if ($viewstatut == 3) - { - $sql.= ' AND c.facture = 0'; // need to create invoice - } - } - if ($viewstatut == 4) - { - $sql.= ' AND c.facture = 1'; // invoice created - } - if ($viewstatut == -2) // To process - { - //$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0'; - $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected - } - } + if ($viewstatut <> '') + { + if ($viewstatut < 4 && $viewstatut > -2) + { + $sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee + if ($viewstatut == 3) + { + $sql.= ' AND c.facture = 0'; // need to create invoice + } + } + if ($viewstatut == 4) + { + $sql.= ' AND c.facture = 1'; // invoice created + } + if ($viewstatut == -2) // To process + { + //$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0'; + $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected + } + } $sql.= ' AND s.entity = '.$conf->entity; if ($socid) $sql.= ' AND s.rowid = '.$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index dff729f34e954014bf01ca8bc7476674fb3dfd6f..a92dd6cb2f3753c140f15608d10870f07b69dd0b 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -24,10 +24,10 @@ * \brief Page with customers or suppliers orders statistics */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commandestats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/commissions/admin/commissions.php b/htdocs/commissions/admin/commissions.php index cbbd486e2d4b90dc6faae1422900f2a4b3a17d74..66911efc9244c4c1b21edb4b9c9e531ca72eb90e 100644 --- a/htdocs/commissions/admin/commissions.php +++ b/htdocs/commissions/admin/commissions.php @@ -21,9 +21,9 @@ * \brief Page to setup advanced commissions module */ -include("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/commissions/lib/commissions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.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'; $langs->load("admin"); $langs->load("commissions"); diff --git a/htdocs/commissions/index.php b/htdocs/commissions/index.php index d36a075bcc26907cbdc8b325a3dbf498d5409f8c..c2ec0e4ef88ddfd47cf134767a62bb4116dd31db 100644 --- a/htdocs/commissions/index.php +++ b/htdocs/commissions/index.php @@ -21,12 +21,12 @@ * \brief Page des commissions par agent commercial */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (! empty($conf->margin->enabled)) - require_once(DOL_DOCUMENT_ROOT."/margin/lib/margins.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php index d1dce30d06929d4b8c62d8e947c0bdcd830a1868..e9ceafdaf52115a6a84b7a30a53941d8f904a639 100644 --- a/htdocs/compta/ajaxpayment.php +++ b/htdocs/compta/ajaxpayment.php @@ -32,7 +32,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee //if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) -require('../main.inc.php'); +require '../main.inc.php'; $langs->Load('compta'); diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index fc293e3813068915d0ea716ef001e78f5c0a42b9..18c6b530b98473ad85e092445d71fd2ebb6e72a9 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -26,14 +26,14 @@ * \brief List of details of bank transactions for an account */ -require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); +require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php index ffe87be45cee2b5ed31ffdb61f338663ced75528..99ac5b91834958a66846edb0425b74ae76194444 100644 --- a/htdocs/compta/bank/admin/bank.php +++ b/htdocs/compta/bank/admin/bank.php @@ -23,9 +23,9 @@ * \brief Page to setup the bank module */ -require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("admin"); $langs->load("companies"); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 2dd36be46fe7c7727b1377cc21d5bf5980e23b84..21a41b848d736c28c19129d8ca2cc5dae28eed34 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -23,9 +23,9 @@ * \brief Page reporting mensuel Entrees/Sorties d'un compte bancaire */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Security check if (isset($_GET["account"]) || isset($_GET["ref"])) diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index c7f693e04e6d2f95c77055fe2b4bbe33d756af15..10c76e97fd0125f2a66c8470237063d22ba67aa5 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -24,9 +24,9 @@ * \brief Fiche creation compte bancaire */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index d12b2560f97336452de0468a19be68ee4fee2fca..6baac904c165ff3fc1939097449de51aa9426701 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -22,7 +22,7 @@ * \brief Page de bilan */ -require("./pre.inc.php"); +require 'pre.inc.php'; if (!$user->rights->banque->lire) accessforbidden(); diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 4b540a51b2b27656bea2680bd66c0f3745ba500d..2fc7e3a2125928be58b63e5c76ef2ffdaeaf9c43 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -23,7 +23,7 @@ * \brief Page de budget */ -require("./pre.inc.php"); +require 'pre.inc.php'; $langs->load("categories"); diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index be5365ccfef66dc37c11da7c44b51fb62957008e..7b527926a3d14c30511be1055dab11f07b106167 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -23,7 +23,7 @@ * \brief Page ajout de categories bancaires */ -require("./pre.inc.php"); +require 'pre.inc.php'; if (!$user->rights->banque->configurer) accessforbidden(); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 2ca362f4696a48da6cb08457dd10672817588a46..43a21712b981caa8fa72bfb8b5ad8b1dfdc75a1e 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -24,7 +24,7 @@ * \ingroup banque * \brief File of class to manage bank accounts */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** @@ -549,7 +549,7 @@ class Account extends CommonObject $this->country_id = ($this->country_id?$this->country_id:$this->fk_pays); // Chargement librairie pour acces fonction controle RIB - require_once(DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; dol_syslog(get_class($this)."::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban"); @@ -962,7 +962,7 @@ class Account extends CommonObject // If this class is linked to a third party if (! empty($this->socid)) { - require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; $company=new Societe($this->db); $result=$company->fetch($this->socid); if (! empty($company->country_code)) return $company->country_code; diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index c8efd9c883ee49bd36bfc3733eb12dbd57296c41..3442f476b3aec1f2696c34ffa303b3a61b1b316b 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -24,9 +24,9 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** @@ -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/fiche.php b/htdocs/compta/bank/fiche.php index 2bfb23e59ae1eba6723808af8d899b2e8ef38b1f..65abe9ccb5f3d9af5a292559a723a442c031cd6e 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -24,11 +24,11 @@ * \brief Page to create/view a bank account */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formbank.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php'; $langs->load("banks"); $langs->load("companies"); @@ -300,7 +300,7 @@ if ($action == 'create') print '<tr><td valign="top">'.$langs->trans("Comment").'</td>'; print '<td colspan="3">'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '</td></tr>'; @@ -590,7 +590,7 @@ else print '<tr><td valign="top">'.$langs->trans("Comment").'</td>'; print '<td colspan="3">'; // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 8d95f2789aa04149d550f288075f47b7a39a520d..04199d68a84740ba5e2bcf73439717d151997422 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -23,10 +23,10 @@ * \brief Page graph des transactions bancaires */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $langs->load("banks"); diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index f4ca4a278e71a0cb7d850341c899c7ec7cb4934d..61e73c4a9a39d919ce76ee316aa7dbad0e3cb1a7 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -23,10 +23,10 @@ * \brief Home page of bank module */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; $langs->load("banks"); $langs->load("categories"); diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index 4e01b6fcee0a592a54d9e00d9ecd9ffdb96db814..26a8d93b847704f7dd6420b8d4b7cb57b1574678 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -21,9 +21,9 @@ * \brief Onglet info d'une ecriture bancaire */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("banks"); $langs->load("companies"); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 1275cd176dbd22a3c9283393fd4b242881dc2d53..7d18abb7de4f0c50ad140316d96d72526598280c 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -25,8 +25,8 @@ * \brief Page to edit a bank transaction record */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("banks"); $langs->load("compta"); @@ -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/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 9fcd7646e8bc7cd2621a86ae4e1ba527352ce9c4..cd1147ec608d788efc94fa47bc6de59b74170c1c 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -24,8 +24,8 @@ * \brief Fichier gestionnaire du menu compta banque */ -require_once(realpath(dirname(__FILE__)) . "/../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require_once realpath(dirname(__FILE__)) . '/../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("banks"); $langs->load("categories"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index bd7926bfeac1ce710650f93503b49247ac4cb1c0..f738934472155e6b43a6f9bfb7618216a0048c4f 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -23,14 +23,14 @@ * \brief Page to reconciliate bank transactions */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 64fd20ca008c62cb545a659c31a30259574f3261..f69cf6344e5092999492dc2e7c5433f50ada1e7f 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -23,8 +23,8 @@ * \brief Page d'affichage d'un releve */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; $action=GETPOST('action'); diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 8d40350f21e68018e1722662f47b516d9fa78ecc..868420a5a6c961eebb7feb5416316070e95572fd 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -24,11 +24,11 @@ * \brief List of bank transactions */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php'; // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 90f4598f94a882a57b252cc266506b2e579ac452..389e60a5ad40f0308012917d5891d1805f6e1a02 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -23,12 +23,12 @@ * \brief Page de detail du budget de tresorerie */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; $langs->load("banks"); $langs->load("bills"); diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 20c5acab754db411d55fef24102a1721093bdb6d..eec442017e75d45c2f16a42ade62f35cfe7ed2e5 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -24,8 +24,8 @@ * \brief Page de saisie d'un virement */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; $langs->load("banks"); @@ -69,7 +69,7 @@ if ($action == 'add') } if (! $error) { - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $accountfrom=new Account($db); $accountfrom->fetch(GETPOST('account_from','int')); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 1d016e626b64981f7755502f827112bc6b365ec9..73e79864a6aaca8eb46f4c9abb008b1ffc4a4341 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -23,11 +23,11 @@ * \brief Page to list payments of social contributions and vat */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index c6a41159583f6335ce77b0a1b6b5bce10c7eccd6..05a45243d80f8c55fbbc0f0b61d36577c0fc1e48 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -23,9 +23,9 @@ * \brief Show list of customers to add an new invoice */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $action=GETPOST('action'); diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 0d3d6e09b31f2049b632c9f65cdc33e1cb9aa5bb..8d4abc4807551ec8e104e3a551c327f8c0c2df25 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -23,7 +23,7 @@ * \brief File of class to manage trips */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** * \class Deplacement @@ -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 2c99bb9078ca18af5365bd02925c4fcc828928a7..8de8ae479709381e46d1d1ec507b5702375179cd 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -23,14 +23,14 @@ * \brief Page to show a trip card */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } $langs->load("trips"); @@ -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')); @@ -261,7 +261,7 @@ $form = new Form($db); if ($action == 'create') { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print_fiche_titre($langs->trans("NewTrip")); @@ -347,7 +347,7 @@ else if ($id) if ($action == 'edit' && $user->rights->deplacement->creer) { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $soc = new Societe($db); if ($object->socid) @@ -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/deplacement/index.php b/htdocs/compta/deplacement/index.php index 7c828beffb34e399e8b8d4ad60d99a6a6a25a8f7..a5188e38f04bc91b5c90f3a1d72e330e6090b74f 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -23,9 +23,9 @@ * \brief Page list of expenses */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; $langs->load("companies"); $langs->load("users"); diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php index 1d0874af388d91558e006392308014e3a25b6d46..61c70855f549dcff09faf4c8eb984a48e14f7b05 100644 --- a/htdocs/compta/deplacement/info.php +++ b/htdocs/compta/deplacement/info.php @@ -22,10 +22,10 @@ * \brief Page to show a trip information */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; $langs->load("trips"); diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index ae672f499c36aa4a5847448d66a09e7f6d210665..2002a0e0f0a2ff05f033d00ebd5aab4e3b7835a6 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -24,9 +24,9 @@ * \brief Page to list trips and expenses */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; $langs->load("companies"); $langs->load("users"); diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index a5aa5ccf86455f076bec5f4aff385d3e956d0ad0..2ca118c47cf4e47f6c3d7f29f1cecce11720ca79 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -23,9 +23,9 @@ * \brief Page des stats deplacement et notes de frais */ -require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacementstats.class.php"); +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacementstats.class.php'; $langs->load("trips"); diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 4efe9a39e020a4c9d0b70ae65cc1d6079fbf5111..591df7333a5aba3821a2efc368936bae5298e78f 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -23,7 +23,7 @@ * \brief Fichier de la classe des dons */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.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 e779308164edaff14d38d4df4337ecf4a2316f7a..2ac166d5558a5644bf2ebc354bb9a77f1be59963 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -23,13 +23,13 @@ * \brief Page of donation card */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load("companies"); $langs->load("donations"); @@ -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/dons/index.php b/htdocs/compta/dons/index.php index 40bd2e1e84376aac58436711d6125f9db0e77b0b..6c0f789b9b8a319118217a0a06b1b73e6813d2fd 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -23,8 +23,8 @@ * \brief Home page of donation module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 8c733a150a4523ef49ebb23aa4b1c5515ef380ac..ced00f94c50d01ddaf3088df806b05f60b104e82 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -23,9 +23,9 @@ * \brief Page de liste des dons */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -if (! empty($conf->projet->enabled)) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("companies"); $langs->load("donations"); diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 08fc93a686b3341a74a95110f6c9bcf8c618386c..8ccdfde750e62876f04cce48cb4cf9a8bd886440 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -22,7 +22,7 @@ * \brief Page des statistiques de dons */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("donations"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 44c1ee105d5c32161ac668eca183ed5e6fa4b48b..b24cdfa6deeafcac253883cfd0dafc33b592807c 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')); @@ -311,7 +311,7 @@ else if ($action == "setabsolutediscount" && $user->rights->facture->creer) } if (! empty($_POST["remise_id_for_payment"])) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discount = new DiscountAbsolute($db); $discount->fetch($_POST["remise_id_for_payment"]); @@ -1350,7 +1350,7 @@ else if ($action == 'down' && $user->rights->facture->creer) */ if (GETPOST('addfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1365,7 +1365,7 @@ if (GETPOST('addfile')) */ if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -1455,7 +1455,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(); @@ -1464,7 +1464,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1); if ($mailfile->error) { @@ -1486,7 +1486,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; } @@ -1589,7 +1589,7 @@ else if ($action == 'remove_file') { if ($object->fetch($id)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $object->fetch_thirdparty(); @@ -1981,7 +1981,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>"; @@ -2228,7 +2228,7 @@ else if ($id > 0 || ! empty($ref)) $text=$langs->trans('ConfirmValidateBill',$numref); if ($conf->notification->enabled) { - require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php"); + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='<br>'; $text.=$notify->confirmMessage('NOTIFY_VAL_FAC',$object->socid); @@ -2238,7 +2238,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $label=$object->type==2?$langs->trans("SelectWarehouseForStockIncrease"):$langs->trans("SelectWarehouseForStockDecrease"); $formquestion=array( @@ -2262,7 +2262,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->type != 3 && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $label=$object->type==2?$langs->trans("SelectWarehouseForStockDecrease"):$langs->trans("SelectWarehouseForStockIncrease"); $formquestion=array( @@ -2949,20 +2949,20 @@ else if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany= new FormCompany($db); $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'; } /* @@ -2972,7 +2972,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%">'; @@ -3236,7 +3236,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); } @@ -3245,7 +3245,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); @@ -3272,7 +3272,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']; @@ -3304,7 +3304,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; @@ -3354,4 +3354,4 @@ dol_htmloutput_mesg('',$mesgs); llxFooter(); $db->close(); -?> \ No newline at end of file +?> diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index ab65134c7dc6a3916a87f6f3d1712f68a694dee3..bac78a55c78961ff7230f72efa4f2182da336c9a 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -26,11 +26,11 @@ * \brief Page de l'onglet apercu d'une facture */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 1b19a2205f9193cdd555ade6c87e71c0e966bc09..7eef830a887ac3ee8906fe69e4bf2f9a68cebe89 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -24,9 +24,9 @@ * \brief Fichier de la classe des factures recurentes */ -require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.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 2e2760151bf328f02b3244ff23e59d5c36fa9804..baf9ee69db4b79a97cdc6344917c5e4597cf4cbc 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -31,10 +31,10 @@ * \brief File of class to manage invoices */ -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"); +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'; /** @@ -170,7 +170,7 @@ class Facture extends CommonInvoice // Create invoice from a predefined invoice if ($this->fac_rec > 0) { - require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; $_facrec = new FactureRec($this->db); $result=$_facrec->fetch($this->fac_rec); @@ -429,7 +429,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')); @@ -1037,7 +1037,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; } @@ -1074,8 +1074,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(); @@ -1182,7 +1182,7 @@ class Facture extends CommonInvoice function delete($rowid=0, $notrigger=0) { global $user,$langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if (! $rowid) $rowid=$this->id; @@ -1196,7 +1196,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) { @@ -1405,7 +1405,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; } @@ -1460,7 +1460,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; } @@ -1525,7 +1525,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; } @@ -1561,7 +1561,7 @@ class Facture extends CommonInvoice function validate($user, $force_number='', $idwarehouse=0) { global $conf,$langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $now=dol_now(); @@ -1684,7 +1684,7 @@ class Facture extends CommonInvoice // Si active on decremente le produit principal et ses composants a la validation de facture if ($this->type != 3 && $result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); // Loop on each line @@ -1746,7 +1746,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; } @@ -1803,7 +1803,7 @@ class Facture extends CommonInvoice // Si on decremente le produit principal et ses composants a la validation de facture, on réincrement if ($this->type != 3 && $result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $num=count($this->lines); @@ -1875,7 +1875,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, $label='') { 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; @@ -2029,7 +2029,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, $label='') { - 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); @@ -2339,7 +2339,7 @@ class Facture extends CommonInvoice */ function getSumCreditNotesUsed() { - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumCreditNotesUsed($this); @@ -2361,7 +2361,7 @@ class Facture extends CommonInvoice */ function getSumDepositsUsed() { - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getSumDepositsUsed($this); @@ -2403,7 +2403,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 @@ -2416,7 +2416,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; @@ -3359,7 +3359,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; } @@ -3456,7 +3456,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; } @@ -3492,7 +3492,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 dbf19328cf9fdb73e524290b1cfc8a72fff3787f..d3625faf622d01a1e1f6d90073ebe24485821f65 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -24,12 +24,12 @@ * \brief Onglet de gestion des contacts des factures */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("bills"); $langs->load("companies"); @@ -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/document.php b/htdocs/compta/facture/document.php index 55a1b536fdabfc290f2ed9a16e3c718b6ad707c1..f7394051b0d5cc016903d67a891bd589f4b28a8d 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -24,13 +24,13 @@ * \brief Page for attached files on invoices */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/invoice.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index d2ceb3f091d2607241d51f29ec07b4162575614d..9b16565678d44c0530c0f15f347c6b4c485b8f29 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -23,10 +23,10 @@ * \brief Page to show predefined invoice */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture-rec.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load('bills'); diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index ba8522ad48008c28dd2ccb9a1b9c69203907cc81..6cd4850ddd89e43be84debe18e4c75d42ede0d64 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -24,12 +24,12 @@ * \brief Page to list and build liste of unpaid invoices */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; $langs->load("bills"); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 4bcf7acea5cb167eb3c3cb34d8b39924c7da6daa..70e92d844f4817aa61584e0b1e78d7730dc423c6 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -22,11 +22,11 @@ * \brief Page des informations d'une facture */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; $langs->load("bills"); diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 1fb29318f047c2183065d919904c5ecbbdfc8b4a..8a19de20180178345b2de9a5eeed4bcb0e170566 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -28,21 +28,21 @@ * \brief Page to create/see an invoice */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -if (! empty($conf->commande->enabled)) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; if (! empty($conf->projet->enabled)) { - require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; } $langs->load('bills'); @@ -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 bc14ed5f7603b2fe5f11a3624a94749648343f81..45cfad096ec9bdcb435170c29a25df2af09526a9 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -23,10 +23,10 @@ * \brief Fiche de notes sur une facture */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; $langs->load("companies"); $langs->load("bills"); @@ -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/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index ab3b2ba3d8adfc183b243e2cbff7f6663610a29f..161a1a57705d7c6841ee2466676f2b97cba9eb12 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -25,11 +25,11 @@ * \brief Gestion des prelevement d'une facture */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; if (!$user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 9ba9672b1760600d6816068c85f68443dd74b9f0..1de79ee5600014b590e49ed673ca11221440752f 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -23,9 +23,9 @@ * \brief Page des stats factures */ -require("../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facturestats.class.php"); +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php'; $WIDTH=500; $HEIGHT=200; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 41fa2b33be0297eb1e3f6c7c837909d0affad0e8..8bcdf9c72ef1207baf34c35a1e9abdf20982f4ea 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -23,13 +23,13 @@ * \brief Main page of accountancy area */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); -if ($conf->tax->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +if ($conf->tax->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; // L'espace compta/treso doit toujours etre actif car c'est un espace partage // par de nombreux modules (banque, facture, commande a facturer, etc...) independamment @@ -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/journal/index.php b/htdocs/compta/journal/index.php index 1dcd13e30865bdd9ff05690574af7ff6f2ae5d53..4b7e347204d2d00cdab67f479352c516218f8035 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("companies"); diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 3a96441a39b9a61320ea34af83a90fa7afc54aab..07cd3d146e2bccb01fb321d889e2173a5c09636f 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -23,11 +23,11 @@ * \ingroup societe, fournisseur, facture * \brief Page with purchases journal */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; $langs->load("companies"); $langs->load("other"); diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 1e1bec80c3c726a1ef0915f9e532b62a3263e3c1..66ed316c35ebccae526cb0a89c2bd6a052894aaf 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -23,11 +23,11 @@ * \ingroup societe, facture * \brief Page with sells journal */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; $langs->load("companies"); diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 99ae27599c099a126589a7f1804ed5c0b9e770ed..6f0c46b813bc98b4fc19bb6a93edb68d15762539 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -21,7 +21,7 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.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; } @@ -500,7 +500,7 @@ class localtax extends CommonObject if ($conf->banque->enabled) { // Insertion dans llx_bank - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); $result=$acc->fetch($this->accountid); diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index bea4c61aec45841c5754d9d0b9af66ac8c715fc9..e62dc08adc9c61426df69ad42ced15211fb8c1d2 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -21,11 +21,11 @@ * \brief Third parties localtax report */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php'; $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/compta/localtax/fiche.php b/htdocs/compta/localtax/fiche.php index 3f7bf5a37fe1a9e3f50382a2170097491330182a..aa27f201a268f920938a3e72652e499fa0fea806 100644 --- a/htdocs/compta/localtax/fiche.php +++ b/htdocs/compta/localtax/fiche.php @@ -21,9 +21,9 @@ * \brief Page of IRPF payments */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("compta"); $langs->load("banks"); diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index c24638d8d72c2eeebbd8159852e6dc224151265e..0e200544a302ee0ff5462015831fc145fe106c75 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -20,10 +20,10 @@ * \ingroup tax * \brief Index page of IRPF reports */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("other"); diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php index 6b3a96a92f003f18f591ca187ed7c2e3fb758c46..6d4bf4de6dc663f0d3fa1c69848e5b05d03ec19d 100644 --- a/htdocs/compta/localtax/reglement.php +++ b/htdocs/compta/localtax/reglement.php @@ -21,8 +21,8 @@ * \brief List of IRPF payments */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/localtax/class/localtax.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php'; $langs->load("compta"); $langs->load("compta"); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 195f041b30ec177568fe340246f30905eac2c031..7e581061b8bdcc4ce4542f722278878c2ad25764 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -25,10 +25,10 @@ * \brief Page to create a payment */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load('companies'); $langs->load('bills'); @@ -227,6 +227,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Bouchon if ($facture->type == 2) { + $langs->load('other'); print $langs->trans("FeatureNotYetAvailable"); llxFooter(); exit; diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 7cfe2104b450da7311edcbfa817f409915f3c289..1cfef2ad7a85b477e2783551a72e19135280bed4 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -22,7 +22,7 @@ * \brief Page liste des paiements a valider des factures clients */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("bills"); diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 0d91e7d4edf64d146cca40d00a09bed6aee5cb80..c202c8e8b71ec59c68d6a43d7bcb810fbb022f66 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -23,7 +23,7 @@ * \ingroup compta * \brief Fichier de la classe des bordereau de remise de cheque */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** @@ -490,8 +490,8 @@ class RemiseCheque extends CommonObject $file = "pdf_".$model.".class.php"; if (file_exists($dir.$file)) { - require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); - require_once($dir.$file); + require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; + require_once $dir.$file; $classname='BordereauCheque'.ucfirst($model); $docmodel = new $classname($this->db); diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 981d2d97b66cbf9817977378ca1318a2d3fa9957..3d2729d50d77a103b9a5cb0f4693fccc239a5b09 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -24,11 +24,11 @@ * \brief Page for cheque deposits */ -require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load('bills'); $langs->load('banks'); @@ -219,7 +219,7 @@ else if ($action == 'remove_file' && $user->rights->banque->cheque) { if ($object->fetch($id) > 0) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("other"); diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 9b0168bd0c28114370bf8338ccbb977fbd5d503d..61999dfc4b5f1da35ac9e82e3b439d5c247ba4b3 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -23,9 +23,9 @@ * \brief Home page for cheque receipts */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("banks"); diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 36b3fd860bdac2e22b6d09ca3d0e64dfb06ae9eb..114d3d457b470cde3c70cb49c6ce5dd0e56d4038 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -23,9 +23,9 @@ * \brief Page liste des bordereau de remise de cheque */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require 'pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 98ed62325d69c6f3958d5bb335206ba7cc317959..c3b8ec4243b46868b7b1ec4d167f5da743b8bf8a 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -23,8 +23,8 @@ * \brief Fichier gestionnaire du menu cheques */ -require_once(realpath(dirname(__FILE__)) . "/../../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require_once realpath(dirname(__FILE__)) . '/../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("banks"); $langs->load("categories"); diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 2e2abf4c79f75b1a6aaa5ab6d96298e173984099..74d891a7764f1853cc2299eb2dec989780062337 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -22,7 +22,7 @@ * \ingroup facture * \brief File of class to manage payments of customers invoices */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** \class Paiement @@ -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; } @@ -379,7 +379,7 @@ class Paiement extends CommonObject if ($conf->banque->enabled) { - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; dol_syslog("$user->id,$mode,$label,$this->fk_account,$emetteur_nom,$emetteur_banque"); @@ -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/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index d683713f870df249863b05ccc2ac4fc1ebb3abf1..535e3a013da4f9ee5d94a4740c4bda2939f8393f 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -25,11 +25,11 @@ * \remarks Nearly same file than fournisseur/paiement/fiche.php */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); -if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; +if ($conf->banque->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index d7eebe8dd83b45a5d616a04bbd9f307750d3f013..2f2f32bcbc21b67ae883b7047f679429effaa836 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -16,7 +16,7 @@ * */ -require("../../main.inc.php"); +require '../../main.inc.php'; // Security check if (!$user->admin && $user->societe_id > 0) diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 609785976bd0c2c2aaf1ae0f271dbc88d384fefb..79bd009f0562ceb4b43797916ec84f4d527ddb6a 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -22,9 +22,9 @@ * \brief Onglet info d'un paiement */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("bills"); $langs->load("companies"); diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index e09dfbaf7be1fa0634680348ddb503dc2b47fddc..714d8a20d59379cf969d0ff7c9547edb127250bc 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -23,9 +23,9 @@ * \brief Page liste des paiements des factures clients */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 877e8121ad7b79f9a1653032eb7777e4bf697ad1..f9e6f61852fc70bae4e2033d4e392af23aa5a43e 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -22,10 +22,10 @@ * \brief Payment reports page */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/rapport/pdf_paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Security check if (! $user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 00ccd3034081007adc0f8df3ebf6848914053d4d..d10f051fba3443145b51b5892a3c5a8a0fa45765 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -21,10 +21,10 @@ * \brief Page to add payment of a tax */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index d9bee27e91a8a9b031921d6bb2dafe66f3d3791c..01b5fe1bf01f90f11582616d1527eeae372f295c 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -25,12 +25,12 @@ * \remarks Fichier presque identique a fournisseur/paiement/fiche.php */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/paymentsocialcontribution.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); -if ($conf->banque->enabled) require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +if ($conf->banque->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index c63e9521d0062957f74d73b0eab5a2c9733b856b..19ff8546b8f2ff658547190bbc9f4e8e148a0f44 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> @@ -23,10 +23,10 @@ * \brief Fiche apercu du bon de prelevement */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"; +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; $langs->load("bills"); $langs->load("categories"); diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 25387018ac0d41a4116cb65860c5c57865d4cede..2f527713c4f011a4923fd2b4fdf4e6a4239bd537 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -24,8 +24,8 @@ * \brief Page liste des bons de prelevements */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; $langs->load("widthdrawals"); $langs->load("categories"); diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index b58e072d613b88700e557d8297797dcfc1f2b359..f972779263801d806c484d3e3795d13014b463eb 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -24,10 +24,10 @@ * \brief Fichier de la classe des bons de prelevements */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; // FIXME don't include external module class if (! empty($conf->esaeb->enabled)) dol_include_once('/esaeb/class/esaeb19.class.php'); diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 07981443bbdcfea0ed2ac32711ad900faeac28f6..dfcf992f2b66ac906e7048cbf6ce334209d017df 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -232,7 +232,7 @@ class RejetPrelevement $soc = new Societe($this->db); $soc->fetch($fac->socid); - require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $subject = $langs->trans("InfoRejectSubject"); $sendto = $emuser->getFullName($langs)." <".$emuser->email.">"; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 51df78b78367bf4caa84875a58c21b9f4606b5fd..20f388c7d1df0e38c909a4882639e6d83facf745 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -24,12 +24,12 @@ * \brief Prelevement creation page */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; $langs->load("widthdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 4f6134664ed9137fbced7fc9634800dfe7934027..d6f94d15861481a2726d3236afa75fe729d7c2ac 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -24,10 +24,10 @@ * \brief Page to list withdraw requests */ -require("../bank/pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/core/modules/modPrelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"; -require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"; +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("widthdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 088afb188f87aaf756113719af5f9c633687cde0..aed9237e028da6fa6931de68fb22d9cbaa2e05bd 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -24,11 +24,11 @@ * \brief Page liste des factures prelevees */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("companies"); $langs->load("categories"); diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index 41675d1c1ec4a44f7a0155dbdfe0bbb93fa9d282..700cf00dec584787ae6cc6f30e525f5ca9ec7fdc 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * @@ -23,9 +23,9 @@ * \brief Invoice reject */ -require("../bank/pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"; -require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("categories"); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 6adf25293de6572f13238c2311296cd928885f95..2ca9479f441564a512c43c46f245578fe91349b7 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> @@ -24,11 +24,11 @@ * \brief Withdraw reject */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("categories"); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 0ef042b97052474c6558515c01a257b563927dff..5497b1acf2acb9898b8853c85e41e50c97bd7186 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> @@ -23,10 +23,10 @@ * \brief Prelevement statistics */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; // Security check if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index d01e622bb1ddae8d9128c3e28fa69e0c09f13884..3560d9ade297c35a9485399d479aae118b7ed58a 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> @@ -23,9 +23,9 @@ * \brief Fiche prelevement */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; if (!$user->rights->prelevement->bons->lire) accessforbidden(); @@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes') if ($action == 'infotrans' && $user->rights->prelevement->bons->send) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $bon = new BonPrelevement($db,""); $bon->fetch($id); diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index 414c1a388f3a768ad591a0033f9cd1c211c29f08..8dba0b37cae111a367be0fa52601cc49834d8c2a 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -24,11 +24,11 @@ * \brief Prelevement index page */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; $langs->load("withdrawals"); $langs->load("categories"); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 5013687b7296c1a7533f57230ccb6f4c3d230380..934389d9dad7a3158896d88ac9d0e2a20be95549 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -24,11 +24,11 @@ * \brief card of withdraw line */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; // Security check if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index f93e4f21e2aa42c956bbc3a97a378bab189390d2..4e9636af6a4f03fe3b9f5376aea066a982f7c490 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -24,12 +24,12 @@ * \brief Prelevement lines */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/prelevement.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; // Security check if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 1ba540731ad81ed1be16346c883dccd3cdfcd9c7..b72544ae2f9f78f811787eaa0ff415cbaeb06c3b 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -23,9 +23,9 @@ * \ingroup prelevement * \brief Page liste des prelevements */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; $langs->load("withdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 812fee4dae5df10430b3aefcd4960cb8bafbbbc9..ba6e059d8e18a552dd3267e413679fef6b0799ae 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010-2012 Juanjo Menent <jmenent@2byte.es> @@ -24,9 +24,9 @@ * \brief Reject page */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $langs->load("withdrawals"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 7d5e1eba9a9aff973ad933a9126cd0fb88b4e192..bf8b506137413d830e413b3abd519b88602719e5 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> @@ -24,8 +24,8 @@ * \brief Page de stats des prelevements */ -require("../bank/pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligneprelevement.class.php"); +require '../bank/pre.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php'; $langs->load("withdrawals"); $langs->load("companies"); @@ -193,7 +193,7 @@ if ($resql) $var=True; - require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejetprelevement.class.php"; + require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php'; $Rejet = new RejetPrelevement($db, $user); while ($i < $num) diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index bc3e580d8a5515bde8ceb9cfd0bf5fe931dd9567..c458f55813d44428ba03bae19a3145c964bda65d 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -22,9 +22,9 @@ * \brief Page de fiche recap compta */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("companies"); if ($conf->facture->enabled) $langs->load("bills"); diff --git a/htdocs/compta/resultat/bilan.php b/htdocs/compta/resultat/bilan.php index 14edb84f301894f54ef1538e270cb74390d11a9d..fb8526d077c9e43bf1788647b60c149b8611720f 100644 --- a/htdocs/compta/resultat/bilan.php +++ b/htdocs/compta/resultat/bilan.php @@ -21,9 +21,9 @@ * \brief Fichier page bilan compta */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; if (!$user->rights->compta->resultat->lire) accessforbidden(); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index a2e6045fe2b910b66a0b72a70109932865f46edc..bc23e2c3c73854d24e226dcdac3f17632d308f43 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -22,12 +22,12 @@ * \brief Page reporting */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("bills"); diff --git a/htdocs/compta/resultat/compteres.php b/htdocs/compta/resultat/compteres.php index dce0e32667a22b8f4c9bdc9b7e10fa8b662effbf..0e9a8db8595341716e65a32eca174eadf843bf8f 100644 --- a/htdocs/compta/resultat/compteres.php +++ b/htdocs/compta/resultat/compteres.php @@ -16,9 +16,9 @@ */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; if (!$user->rights->compta->resultat->lire) accessforbidden(); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 2ba45b22a7da06df0042f7c5b69bea15029c7f44..e423136b7ee3cf8f22a454ac5a748cd50a2edf88 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -22,8 +22,8 @@ * \brief Page reporting resultat */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; $year_start=GETPOST('year_start'); diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index f9124c2edfd1b7e9163f23757aa153a7abe90a0e..4dc224c73b2b26d7b6a60a7851a59c45b2f5e413 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -22,10 +22,10 @@ * \brief Social contribution car page */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formsocialcontrib.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 26cff9343f57f40a64c1deeaabca57676875f72c..a397ca5c29ca9721bb3da44f044cbbae3097aaf4 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -21,7 +21,7 @@ * \ingroup facture * \brief Fichier de la classe des charges sociales */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** \class ChargeSociales @@ -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 25f50e4a7e00cb49ae79ccf715f04c5998128631..7bff88b37a4c505a8333909d17c7a36d3e69ebd1 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -22,7 +22,7 @@ * \brief File of class to manage payment of social contributions */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** \class PaymentSocialContribution @@ -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; } @@ -474,7 +474,7 @@ class PaymentSocialContribution extends CommonObject if ($conf->banque->enabled) { - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); $acc->fetch($accountid); diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 860584234bc8d7d0c7a0d16f4139fa15aa57ff88..128ff9b8c86a05bc9427836f4ff644c0467b238f 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -26,12 +26,12 @@ * \brief Page with attached files on social contributions */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("companies"); diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 8f0a19d07e4eebd97e4983b3081fa7f6e1537e66..ec0441fba2fb2d0778758b955c6eb8cc329a5ffb 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -23,9 +23,9 @@ * \brief Page to list all social contributions */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formsocialcontrib.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php'; // Security check $socid = isset($_GET["socid"])?$_GET["socid"]:''; diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index d48386bb623103fb304d63626e700e4ea38ea442..08a14a166871b09f92b32fa18aa2b9c167a93f62 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -21,10 +21,10 @@ * \brief Page with info about social contribution */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 1f40ba120a78175258ac31992b6b76c4b2fea243..31a86e475df00e64eaf6b112ef6d5a6cbac6ee96 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -22,10 +22,10 @@ * \brief Page reporting Salesover by user */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; // Security check $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index c3c747a3aa6746efdf05b37f01ef57ed68f67202..3bf19f189424e2d833762026cbb3fed732d225b4 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -23,10 +23,10 @@ * \brief Page reporting CA par societe */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("companies"); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index bab35674fabd6902b302c62544014ea3bf9d44d6..12b878fc4be6df4ac13ebc74a757241f309c4ca1 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -22,8 +22,8 @@ * \brief Page reporting CA */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; $year_start=GETPOST("year_start"); diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index d320e394d27dbc461c734f37016ade82bd607caf..23d01de6631e3267a26e6e655dff439beff3869e 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -23,7 +23,7 @@ */ // Put here all includes required by your class file -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** @@ -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; } @@ -528,7 +528,7 @@ class Tva extends CommonObject if ($conf->banque->enabled) { // Insertion dans llx_bank - require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $acc = new Account($this->db); $result=$acc->fetch($this->accountid); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 9aeb55fa505a116320c80661ae0bb3260536b25d..71dbdb6c9478d0ae5fa8d39e5558b281d181d3ce 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -24,11 +24,11 @@ * \brief Page des societes */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index 9837fabe4181bac7bf598b9a756a5bc4169282fe..90a0acff0d295bfe60cc6e4a35040147009a641b 100644 --- a/htdocs/compta/tva/fiche.php +++ b/htdocs/compta/tva/fiche.php @@ -23,9 +23,9 @@ * \brief Page of VAT payments */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("compta"); $langs->load("banks"); @@ -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/compta/tva/index.php b/htdocs/compta/tva/index.php index fd09385c8fe0bd60b1c6f6b028fca183c3f96b55..e6ea960fa98f4b3f1cdec2b3ec8429fe944f46d0 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -23,10 +23,10 @@ * \ingroup tax * \brief Index page of VAT reports */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("other"); diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index c1bf23429e65396da5f3994f6970f8b9c60590c6..5ac598d7a66bb38bc7c683fce2bd28dda5793d45 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -26,8 +26,8 @@ * TODO Deal with recurrent invoices as well */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; $year=$_GET["year"]; if ($year == 0 ) diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 7123e828c1de03579d823da11eff5e81cf0a315f..1bcd7cabb47b0e3de027e6de4e987f3490729c1b 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -25,16 +25,16 @@ * TODO Deal with recurrent invoices as well */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/report.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/tax.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index f444cd921830c4854a90fd7ad138604e23702093..dec625e95a8eab996e1eceee163a43a47bd54a26 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -23,8 +23,8 @@ * \brief List of VAT payments */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; $langs->load("compta"); $langs->load("compta"); diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php index f0f3336b9722cfb01a8720762f8bd38966964911..9c8591477e0df4e873fe58242909a313be93bc1a 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net> * @@ -23,8 +23,8 @@ * \brief Page fiche ventilation */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("bills"); diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/fiche.php index 2766a7c0eac2e78b7345dcdbcd6af25330b55466..2a8e711745be377dea686013da034ce05365b157 100644 --- a/htdocs/compta/ventilation/fournisseur/fiche.php +++ b/htdocs/compta/ventilation/fournisseur/fiche.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com> * @@ -23,7 +23,7 @@ * \brief Page fiche ventilation */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; $mesg = ''; diff --git a/htdocs/compta/ventilation/fournisseur/index.php b/htdocs/compta/ventilation/fournisseur/index.php index a019ff63666d52c0a1d1002c6f1d6c67eab7ccd5..d24b22757329a1440030bbfa86fd25f08db41795 100644 --- a/htdocs/compta/ventilation/fournisseur/index.php +++ b/htdocs/compta/ventilation/fournisseur/index.php @@ -24,7 +24,7 @@ * \brief Page accueil ventilation */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; $langs->load("suppliers"); diff --git a/htdocs/compta/ventilation/fournisseur/lignes.php b/htdocs/compta/ventilation/fournisseur/lignes.php index 6418f61635427d48ad98c6d1e5cd6090126274f5..2e10e8cd189a6ddb1b8e57eee5bf5cf51baffffa 100644 --- a/htdocs/compta/ventilation/fournisseur/lignes.php +++ b/htdocs/compta/ventilation/fournisseur/lignes.php @@ -22,7 +22,7 @@ * \brief Page de detail des lignes de ventilation d'une facture */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; $langs->load("bills"); diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/liste.php index 9c763d258cc8f13bb1decd34b7b59191c43bee13..183baab771f9cef8b35611e13e4d07a1fd11c3f3 100644 --- a/htdocs/compta/ventilation/fournisseur/liste.php +++ b/htdocs/compta/ventilation/fournisseur/liste.php @@ -25,7 +25,7 @@ * \brief Page de ventilation des lignes de facture */ -require('../../../main.inc.php'); +require '../../../main.inc.php'; $langs->load("bills"); diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php index 184231e8ec7effd3ec545b7e014c7b1bf36dd164..4e703ea650fb6cac5362b58b613e0fc82f543436 100644 --- a/htdocs/compta/ventilation/index.php +++ b/htdocs/compta/ventilation/index.php @@ -23,7 +23,7 @@ * \brief Page accueil ventilation */ -require('../../main.inc.php'); +require '../../main.inc.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index c9949e9c3529c48d3fb0c4e23e201c22bf394b7d..60aa986f113457ced65e225887a70ba25e9e2f91 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -23,9 +23,9 @@ * \brief Page de detail des lignes de ventilation d'une facture */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("bills"); $langs->load("compta"); diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 7359d5d5333c5526a7c3e66c9bb4317c1f7fcf4e..294b1adc6bcd3b774252754a7d73f8c8af1982ba 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -25,9 +25,9 @@ * \brief Page de ventilation des lignes de facture */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index fb8711d7c12632631167995e57854488828c4418..6d37292f62fcb926fa930064c2075244124af03c 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -56,7 +56,7 @@ abstract class ActionsContactCardCommon if (file_exists($modelclassfile)) { // Include dataservice class (model) - $ret = require_once($modelclassfile); + $ret = require_once $modelclassfile; if ($ret) { // Instantiate dataservice class (model) @@ -396,8 +396,8 @@ 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'); - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.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); $generated_password=getRandomPassword(''); 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 60873f86a320da32c0516979363e35ce480394a6..fc3a386af0228c203f4b1296b08f53c3b78ab47c 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -25,7 +25,7 @@ * \ingroup societe * \brief File of contacts class */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.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; } @@ -868,7 +868,7 @@ class Contact extends CommonObject $ret=''; if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) { - require_once(DOL_DOCUMENT_ROOT ."/core/lib/company.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php'; $tmparray=getCountry($this->country_id,'all'); $this->country_code=$tmparray['code']; $this->country =$tmparray['label']; diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index fa4c5dae0d95359d42787dee423daed93a4f6df3..e8b55255418a4de60b619f15e694d9564354a017 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -22,9 +22,9 @@ * \brief Onglet exports-imports d'un contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; $langs->load("companies"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index f42414a980b8263644957c1a38066e63338619e9..96c8073946172a878e3ebac1135ebba69230aec1 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -25,12 +25,12 @@ * \brief Card of a contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("companies"); $langs->load("users"); @@ -54,7 +54,7 @@ $objcanvas=null; $canvas = (! empty($object->canvas)?$object->canvas:GETPOST("canvas")); if (! empty($canvas)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; $objcanvas = new Canvas($db, $action); $objcanvas->getCanvas('contact', 'contactcard', $canvas); } @@ -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,13 +706,13 @@ 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=''; if (! $ldap_sid) // TODO ldap_sid ? { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $generated_password=getRandomPassword(''); } $password=$generated_password; diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 4365f8952474d580aa6dc9a6e0af640cc79bddec..33be09b9a433d9bea69156e30108a00a39f0b2f5 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -23,10 +23,10 @@ * \brief Onglet info d'un contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index e8ed38b57cbe633504e2e520211819a5ec324b90..ed386d31a8d71f37489e40ff58af68402dd1b2e1 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -22,11 +22,11 @@ * \brief Page fiche LDAP contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("companies"); $langs->load("ldap"); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index d71dcc44225f6df4f15f1205ddbea6dabe3a74c1..ace7abcc6b996fa0d2ce1cb1dd9845941fe7c93a 100755 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -24,8 +24,8 @@ * \brief Page to list all contacts */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("companies"); $langs->load("suppliers"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 2755b29ccf46015b08e92f7977a8915f97994422..5cdd2c1568a126d37783a6d88adab4927dd9f308 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -23,9 +23,9 @@ * \brief Onglet informations personnelles d'un contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; $langs->load("companies"); $langs->load("other"); @@ -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/contact/vcard.php b/htdocs/contact/vcard.php index daca201b63c824eedf199b14ec485eed1226c9c8..20a230be6bae26910299ff7f0f3d7957dfffc43c 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -23,10 +23,10 @@ * \brief Onglet vcard d'un contact */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/vcard.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php'; $contact = new Contact($db); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index d963fb94ebc83e1f1a781b457cbb6e71a65c7f1f..c51c3f1a85f10c7a17b814d6af03f33fbdf27940 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -26,7 +26,7 @@ * \brief File of class to manage contracts */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.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 2eea1fd3dc0e4745fd0095fe9671eb29e2578ca7..d68c87aaba5f81858d4d24d139ed8de968a29275 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -24,10 +24,10 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("contracts"); @@ -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/document.php b/htdocs/contrat/document.php index 7474a098f34f16208fae8e0d4affdbbb903e9737..21e48a81467cbab813615c57b6b262481c4684bf 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -26,11 +26,11 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("products"); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index fb4183cfa4de132e80cc9ddcb6b27cf40fa51507..081b38c8ee9f03374c64150e989321431bc19e81 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -26,16 +26,16 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/contract/modules_contract.php"); -if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -if (! empty($conf->propal->enabled)) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php'; +if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; } $langs->load("contracts"); @@ -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')); @@ -803,19 +803,19 @@ else if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany= new FormCompany($db); $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/info.php b/htdocs/contrat/info.php index 315dc56943295fb06d2f0aacce704195c603ac7b..ac719b42124d08a90e85a9849db2aacb9584a952 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -22,9 +22,9 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $langs->load("contracts"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 921c36b5c02077f4eb4a11ec09efec8c99f612f7..21f1f41c4e49d692bea90749f41a49ec16e0926b 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -24,8 +24,8 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $langs->load("companies"); $langs->load("contracts"); @@ -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/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php index 1a4b4e34ddf7cbdbee36b75ee07df7a3c3242314..102f28d696e1596529c0f7e9f2728bce9dd2b269 100644 --- a/htdocs/core/ajax/ajaxdirpreview.php +++ b/htdocs/core/ajax/ajaxdirpreview.php @@ -34,10 +34,10 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! isset($mode) || $mode != 'noajax') // For ajax call { - require_once("../../main.inc.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'); - require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); + require_once '../../main.inc.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; $action=GETPOST("action"); $file=urldecode(GETPOST('file')); @@ -253,7 +253,7 @@ if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE { $param.=($param?'?':'').(preg_replace('/^&/','',$param)); - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; $useglobalvars=1; $form = new Form($db); $formquestion=array('urlfile'=>array('type'=>'hidden','value'=>'','name'=>'urlfile')); 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/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php index d32dbd777fdcaed07a7756f99a32c0735d8d0898..1d9f373902ec1c357ee0bd6ce79b42be5050cc7e 100644 --- a/htdocs/core/ajax/bankconciliate.php +++ b/htdocs/core/ajax/bankconciliate.php @@ -27,9 +27,9 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Required to knwo date format for dol_print_date -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $action=GETPOST('action'); diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php index 1c8eaf513f0b2ec8e20c53999c81fbef5ba82a2d..5497aec426e13c5ec31649e760e7709279e1a29e 100644 --- a/htdocs/core/ajax/box.php +++ b/htdocs/core/ajax/box.php @@ -28,8 +28,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/infobox.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'; $boxid=GETPOST('boxid','int'); $boxorder=GETPOST('boxorder'); diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php index 3ed30274972e17b8e07224841e2999e825ba7fce..a79a9f5d0ff6c2237afdffad726dbbe45ce29a88 100644 --- a/htdocs/core/ajax/constantonoff.php +++ b/htdocs/core/ajax/constantonoff.php @@ -27,8 +27,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; /* diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php index 025d1dc9dd05b475ae7e6c7cd470f17f54415571..3d71cd791cbad353e9b3f80d342a780c9266cb55 100644 --- a/htdocs/core/ajax/contacts.php +++ b/htdocs/core/ajax/contacts.php @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); +require '../../main.inc.php'; $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); 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/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php index 30c52242f74cb89a7a93c2ae9ad0e5df66fc9224..472e50b55744fde03fdee5b5abeb56fa247e212d 100644 --- a/htdocs/core/ajax/fileupload.php +++ b/htdocs/core/ajax/fileupload.php @@ -33,8 +33,8 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't nee //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/fileupload.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php'; error_reporting(E_ALL | E_STRICT); diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php index 45781e4637949efd0c05c6301701c02efd895c8e..831f3c5dea85885b7a547733f482d5dd2571b420 100644 --- a/htdocs/core/ajax/loadinplace.php +++ b/htdocs/core/ajax/loadinplace.php @@ -27,8 +27,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; $field = GETPOST('field','alpha'); $element = GETPOST('element','alpha'); diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php index 72a679ef5729ea5b91a182bc8d56f2c0fecfbe67..6921220583214a18b106649fdd6f7ae0b7bdf41d 100644 --- a/htdocs/core/ajax/row.php +++ b/htdocs/core/ajax/row.php @@ -27,8 +27,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; /* diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php index f62f5581b5e4c542023973d900afc277b044b037..8e32fe6551c5389bf4c27c1da0aa8d1dc2845e3d 100644 --- a/htdocs/core/ajax/saveinplace.php +++ b/htdocs/core/ajax/saveinplace.php @@ -27,8 +27,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/genericobject.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; $field = GETPOST('field','alpha',2); $element = GETPOST('element','alpha',2); diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php index 1db9034030076ffadbc5ed8f74969406e0bb046a..ec44c8c8c7649f72c1dfd9cd6093f706200c3a41 100644 --- a/htdocs/core/ajax/security.php +++ b/htdocs/core/ajax/security.php @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); +require '../../main.inc.php'; /* * View @@ -47,7 +47,7 @@ if (isset($_GET['action']) && ! empty($_GET['action'])) { if ($_GET['action'] == 'getrandompassword' && $user->admin) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $generic = $_GET['generic']; echo getRandomPassword($generic); } diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php index 985cfb9b71bed9ab1b99147ee304c239bc64be24..97ed9e4697c823faab8fa2e292aba08797146272 100644 --- a/htdocs/core/ajax/vatrates.php +++ b/htdocs/core/ajax/vatrates.php @@ -27,7 +27,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); //if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require('../../main.inc.php'); +require '../../main.inc.php'; $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php index d8568fddc9fa6b7b9d215f7d8b83e4c12e441d0b..c9dfed825d6f021fab01747bab11fc7523e23ac4 100644 --- a/htdocs/core/ajax/ziptown.php +++ b/htdocs/core/ajax/ziptown.php @@ -29,8 +29,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php index e4bea43e14a022f741e3408061d2079c205448f5..e4ea09a3755a83ba0993284ebd0e929500563f49 100644 --- a/htdocs/core/antispamimage.php +++ b/htdocs/core/antispamimage.php @@ -29,7 +29,7 @@ if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN',1); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC',1); if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); -require_once("../main.inc.php"); +require_once '../main.inc.php'; /* 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 0aaf343d87623d8846a888285362f3b81c594df2..fdc81cff8182812df44f4101b0e0d2fb2853d831 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -23,8 +23,8 @@ * \brief Module de generation de l'affichage de la box factures impayees */ -require_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"); -require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.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/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index e4d387395a467161604d22ad4a0d618e48faf70d..2da3527aa6ff2555601c2083e5ce849ed898801e 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -239,7 +239,7 @@ class CMailFile // Use SMTPS library // ------------------------------------------ - require_once(DOL_DOCUMENT_ROOT."/core/class/smtps.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/smtps.class.php'; $smtps = new SMTPs(); $smtps->setCharSet($conf->file->character_set_client); @@ -291,7 +291,7 @@ class CMailFile // Use PHPMailer library // ------------------------------------------ - require_once(DOL_DOCUMENT_ROOT."/includes/phpmailer/class.phpmailer.php"); + require_once DOL_DOCUMENT_ROOT.'/includes/phpmailer/class.phpmailer.php'; $this->phpmailer = new PHPMailer(); $this->phpmailer->CharSet = $conf->file->character_set_client; diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 97c3e0f780c376e26f963b71a6e6a3b3b2733387..d93bb51eb846419998e4a46b77ca7519bdfaef07 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -104,7 +104,7 @@ class Canvas { // Include actions class (controller) $this->control_file=$controlclassfile; - require_once($controlclassfile); + require_once $controlclassfile; // Instantiate actions class (controller) $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas); @@ -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/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index aee943be4df97a4c77bcf0d9dc104a871b61af10..2ef81f12248013e56a7e0745b2fa5c6bdcb6a1e8 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -21,7 +21,7 @@ * \brief File of the superclass of invoices classes (customer and supplier) */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** * \class CommonInvoice diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 465ba3b34a0ca06ec17ea9d2cb2ad9abfada4a0f..7f5e36e860a814a5eb0b91a1be7c65575bc18f76 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) { @@ -528,7 +528,7 @@ abstract class CommonObject */ function fetch_contact($contactid) { - require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $contact = new Contact($this->db); $result=$contact->fetch($contactid); $this->contact = $contact; @@ -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; @@ -2002,7 +2002,7 @@ abstract class CommonObject if (! is_array($optionsArray)) { // optionsArray not already loaded, so we load it - require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafields = new ExtraFields($this->db); $optionsArray = $extrafields->fetch_name_optionals_label(); } @@ -2061,7 +2061,7 @@ abstract class CommonObject { // Check parameters $langs->load('admin'); - require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafields = new ExtraFields($this->db); $optionsArray = $extrafields->fetch_name_optionals_label($this->elementType); @@ -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; } } @@ -2494,9 +2494,9 @@ abstract class CommonObject { // for view errors if ($conf->file->strict_mode) { - $res=include(dol_buildpath($reldir.'/freeproductline_create.tpl.php')); + $res=include dol_buildpath($reldir.'/freeproductline_create.tpl.php'); } else { - $res=@include(dol_buildpath($reldir.'/freeproductline_create.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_create.tpl.php'); } if ($res) break; } @@ -2652,7 +2652,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; } } @@ -2663,7 +2663,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; } } @@ -2679,7 +2679,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; } } @@ -2690,7 +2690,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; } } @@ -2837,7 +2837,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; } } @@ -2846,7 +2846,7 @@ abstract class CommonObject function getMarginInfos($force_price=false) { global $conf; - require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'); + require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $marginInfos = array( 'pa_products' => 0, 'pv_products' => 0, diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index bde0cc6fc118ca4fa46fb4b6e6275ab3503707fd..ebd628f2a5224e92dc8986cf0aa95a5d7ecf4931 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -21,7 +21,7 @@ * \brief File of the superclass of orders classes (customer and supplier) */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** * \class CommonOrder diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php index 8287a2d6f1b443b197fdb4ea5dc8e46c5f529829..ec5129a0dd88830a5b7a4fad10122fb673586fa4 100644 --- a/htdocs/core/class/cpays.class.php +++ b/htdocs/core/class/cpays.class.php @@ -23,9 +23,9 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** @@ -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/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 3a7382c44ce062eb695bb5e37db937a1f3056c15..442ae6d46f1bb46ee873accda1889ec44344e56f 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -88,7 +88,7 @@ class DolEditor } if ($this->tool == 'fckeditor') { - require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php"); + require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php'; $content=dol_htmlentitiesbr($content); // If content is not HTML, we convert to HTML. 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/events.class.php b/htdocs/core/class/events.class.php index 78fd96de91105072f5fd396c77dd96f947307a6c..3deb91544461fb00a687a5b8bca18728c1b2f2e9 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -24,9 +24,9 @@ */ // Put here all includes required by your class file -//require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 70b51714aef4a112d631895e0415164ab3b644d0..5361819f7b0d7e78b34f0bda975fb3e19170bef0 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -464,7 +464,7 @@ class ExtraFields } else if ($type == 'text') { - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('options_'.$key,$value,'',200,'dolibarr_notes','In',false,false,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_SOCIETE,5,100); $out=$doleditor->Create(1); } diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php index 34aa394998e2996234270befa6aa2b79588ab061..47d415d2f3ffc2c80bfdf75f3175ee8b4993de7a 100644 --- a/htdocs/core/class/fileupload.class.php +++ b/htdocs/core/class/fileupload.class.php @@ -21,8 +21,8 @@ * \brief File to return Ajax response on file upload */ -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; /** diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php index ace19b2a1748e1fc1f8ffb75e454a84825d06f8a..916625b21c1499537358e40aa08cf6c70895868c 100755 --- a/htdocs/core/class/genericobject.class.php +++ b/htdocs/core/class/genericobject.class.php @@ -20,7 +20,7 @@ * \ingroup core * \brief File of class of generic business class */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8f20cfe75bef65e371449516c00b7e525084994c..9eb0d2b7e67d97ae3b557e5208a6bb2683c41dac 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -177,7 +177,7 @@ class Form else if (preg_match('/^ckeditor/',$typeofdata)) { $tmp=explode(':',$typeofdata); - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor($htmlname, ($editvalue?$editvalue:$value), ($tmp[2]?$tmp[2]:''), ($tmp[3]?$tmp[3]:'100'), ($tmp[1]?$tmp[1]:'dolibarr_notes'), 'In', ($tmp[5]?$tmp[5]:0), true, true, ($tmp[6]?$tmp[6]:'20'), ($tmp[7]?$tmp[7]:'100')); $ret.=$doleditor->Create(1); } @@ -870,7 +870,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) @@ -1099,7 +1099,7 @@ class Form if ($selected && empty($selected_input_value)) { - require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $product = new Product($this->db); $product->fetch($selected); $selected_input_value=$product->ref; @@ -2422,7 +2422,7 @@ class Form { global $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load("project"); if ($htmlname != "none") @@ -2636,7 +2636,7 @@ class Form { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php"); + require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php'; //$this->load_cache_contacts(); //print $this->cache_contacts[$selected]; $theuser=new User($this->db); @@ -2782,7 +2782,7 @@ class Form { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php"); + require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php'; //$this->load_cache_contacts(); //print $this->cache_contacts[$selected]; $contact=new Contact($this->db); @@ -2827,7 +2827,7 @@ class Form { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; $soc = new Societe($this->db); $soc->fetch($selected); print $soc->getNomUrl($langs); @@ -3404,7 +3404,7 @@ class Form { if ($iSecond) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $hourSelected = convertSecondToTime($iSecond,'hour'); $minSelected = convertSecondToTime($iSecond,'min'); diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index cf63c366792f3d2dc52f579c1f10d48c4aba22b1..ed6321ec47ab9e42cb403259fc922a23fcf1c022 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -139,7 +139,7 @@ class FormActions global $langs,$conf,$user; global $bc; - require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $actioncomm = new ActionComm($this->db); $actioncomm->getActions($socid, $object->id, $typeelement); @@ -196,8 +196,8 @@ class FormActions { global $langs,$user; - require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php"); - require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php"); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; $caction=new CActionComm($this->db); $form=new Form($this->db); 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.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 597d143f6eaaf3bc9cedfaa2c95b28aa3e6fa7ea..5d408c47cbf556c6635e97752288665bc83a1fe3 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> @@ -22,7 +22,7 @@ * \ingroup core * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; /** @@ -112,7 +112,7 @@ class FormMail function clear_attached_files() { global $conf,$user; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -569,7 +569,7 @@ class FormMail // Complete substitution array if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL) { - require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; $langs->load('paypal'); @@ -613,7 +613,7 @@ class FormMail } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72); $out.= $doleditor->Create(1); } diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index 8f723de978a5595c3af995c1be86a6f9bc72581e..0bf1971e05479016f7d60c29f5b8df0ce7e8d0c1 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.class.php @@ -85,7 +85,7 @@ class FormOrder global $conf,$langs; $listemethodes=array(); - require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; $form=new Form($this->db); $sql = "SELECT rowid, code, libelle as label"; diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 15ce6928bbf25a2e80035faf0ddbcf86b6192744..2371d07bbae18bcf5ec0225a9b589d86b56a7435 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -252,7 +252,7 @@ class FormOther function select_categories($type,$selected=0,$htmlname='search_categ',$nocateg=0) { global $langs; - require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; // Load list of "categories" $static_categs = new Categorie($this->db); @@ -355,7 +355,7 @@ class FormOther { global $user, $langs; - require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); + require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; //print $modeproject.'-'.$modetask; $task=new Task($this->db); @@ -651,7 +651,7 @@ class FormOther { global $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $montharray = monthArray($langs); // Get array @@ -780,7 +780,7 @@ class FormOther { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php"); + require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php'; $address=new Address($this->db); $result=$address->fetch_address($selected); print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>'; @@ -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/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 996476c7960e762b2f202ab23684dacdf45cbe5e..511e563521ce8427cd6a5288d3100b604c8f5b73 100755 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> * @@ -21,7 +21,7 @@ * \ingroup core * \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; /** diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 5884a15156b044c11d6bca7b4a7dc80060871d27..750865189c23bd70de724ddc0a2b70a7f439911e 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -153,7 +153,7 @@ class InfoBox $error=0; - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid); 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 8cff2f5252c839fde19233b7d368e79509dbc280..1474cb7686ac2f35380790cbaa00c115b0a095ba 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -21,7 +21,7 @@ * \ingroup notification * \brief File of class to manage notifications */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/CMailFile.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/CMailFile.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 050d5a3d4df31253f5dd713fda6fd88955f610ab..88837c2a91221d2a60b7f5cd5853befdef6c1e25 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -224,7 +224,7 @@ class Translate { //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey); - require_once(DOL_DOCUMENT_ROOT ."/core/lib/memory.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/memory.lib.php'; $tmparray=dol_getcache($usecachekey); if (is_array($tmparray) && count($tmparray)) { @@ -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/datepicker.php b/htdocs/core/datepicker.php index daf63f06d19abe943a5a0c2e255a7a6caf8e1c94..93254a4ac80e3bda8b9c84027c4877fa0777b356 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -35,7 +35,7 @@ if (! defined('NOLOGIN')) define('NOLOGIN',1); // Not disabled cause need to if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); -require_once("../main.inc.php"); +require_once '../main.inc.php'; if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL by the main.inc.php $langs->load("main"); diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php index 5da35174c3a74072ffda4c63d186741cb2d6df51..5ee5ae29aaaf875306ae45f0e0e041431c69b939 100755 --- a/htdocs/core/filemanagerdol/browser/default/browser.php +++ b/htdocs/core/filemanagerdol/browser/default/browser.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php index f22f2cd15a4d492e717a48b8718ef4a3f019abce..7556f2b437db4d7052b3b24855a05462d7701df7 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php index 97b63d1b8ccdc562577bb5ad769f2593c6a36eaf..2e4da2e0cfe63d280427b092b65bc152d98ee1c7 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php +++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php index 74f09d2697d5e53d7b00c122ac2b1bd9d77287d5..badc164775434b01e868d85c4ee773dc978a5212 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php +++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php index ccb3786ad997c7b6a2cfa82e863890890b7f47a3..40c92065b6f688bc24c87174f2db09e40309d0a6 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php +++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php index 5365ddce84d71cc3d0432e70aae39df4c6d69576..88715e31549ead7102a08b811164e81461fddbdb 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmupload.php +++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php @@ -21,7 +21,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal -require('../../../../main.inc.php'); +require '../../../../main.inc.php'; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.php index 3248335120c1678a423abd2064d824cf35b291e1..196a3eefbb896e1a00548dec288221572e7b3b6b 100755 --- a/htdocs/core/filemanagerdol/connectors/php/config.php +++ b/htdocs/core/filemanagerdol/connectors/php/config.php @@ -30,7 +30,7 @@ define('NOTOKENRENEWAL',1); // Disables token renewal // a web page that require security controls and // is a security hole if anybody can access without // being an authenticated user. -require_once("../../../../main.inc.php"); +require_once '../../../../main.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/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php index 656c38c1c3a46ca8bacdf44bf18a099c4441c78f..ddafa4b1859ee73e76bf269926b954f90f3dcbf9 100755 --- a/htdocs/core/filemanagerdol/connectors/php/connector.php +++ b/htdocs/core/filemanagerdol/connectors/php/connector.php @@ -24,11 +24,11 @@ ob_start(); -require('./config.php'); -require('./util.php'); -require('./io.php'); -require('./basexml.php'); -require('./commands.php'); +require 'config.php'; +require 'util.php'; +require 'io.php'; +require 'basexml.php'; +require 'commands.php'; if ( !$Config['Enabled'] ) SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file'); diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php index dc3de2a74a1b24d0813efcbe2d960fc0894ce3f8..030fb67ea168a2367b4ed98e3a0709bbf83799b9 100755 --- a/htdocs/core/filemanagerdol/connectors/php/upload.php +++ b/htdocs/core/filemanagerdol/connectors/php/upload.php @@ -22,10 +22,10 @@ * This is the "File Uploader" for PHP. */ -require('./config.php'); -require('./util.php'); -require('./io.php'); -require('./commands.php'); +require 'config.php'; +require 'util.php'; +require 'io.php'; +require 'commands.php'; function SendError( $number, $text ) { diff --git a/htdocs/core/js/datepicker.js.php b/htdocs/core/js/datepicker.js.php index 45d360b888ca6783510e5f6b5c0b0f62a10bb530..b0d32b382ef8c94fc3f74d875f4569375365f15d 100644 --- a/htdocs/core/js/datepicker.js.php +++ b/htdocs/core/js/datepicker.js.php @@ -34,7 +34,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../main.inc.php"); +require_once '../../main.inc.php'; // Define javascript type header('Content-type: text/javascript; charset=UTF-8'); diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 9cba56eb1128ade34c98511021ad499418aa028e..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) @@ -1070,7 +1070,7 @@ function form_constantes($tableau) { print '<td>'; // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php) - require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; $arrayoflabels=array(); foreach(array_keys($_Avery_Labels) as $codecards) { @@ -1095,7 +1095,7 @@ function form_constantes($tableau) } else if (in_array($const,array('ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) { - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('constvalue_'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60); $doleditor->Create(); 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/company.lib.php b/htdocs/core/lib/company.lib.php index 220a3c65bc06183b2bcd5686c03be9228768c7dc..91824eb76404f0c0ae27cc304676d38662f7f985 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -431,7 +431,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') if ($num > 0) { - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $projectstatic = new Project($db); @@ -620,7 +620,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='') global $user; global $bc; - require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php"); + require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php'; $addressstatic = new Address($db); $num = $addressstatic->fetch_lines($object->id); @@ -723,7 +723,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) if ($conf->agenda->enabled) { - require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $actionstatic=new ActionComm($db); $userstatic=new User($db); $contactstatic = new Contact($db); @@ -995,10 +995,10 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) if ($conf->agenda->enabled || ($conf->mailing->enabled && ! empty($objcon->email))) { - require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); - require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); - require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); - require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; + require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $actionstatic=new ActionComm($db); $userstatic=new User($db); $contactstatic = new Contact($db); diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 9915cc703d64ce97947468304b71ea06ec7db0a3..3685169446069b1b329742db07b992809f4cd87b 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -567,7 +567,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable // If we need to make a virus scan if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'; $antivir=new AntiVir($db); $result = $antivir->dol_avscan_file($src_file); if ($result < 0) // If virus or error, we stop here @@ -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 39df413ae542530070b303e21204a4620d0e88cf..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'; } /** @@ -77,7 +77,7 @@ function getStaticMember($class, $member) */ function getDoliDBInstance($type, $host, $user, $pass, $name, $port) { - require_once(DOL_DOCUMENT_ROOT ."/core/db/".$type.".class.php"); + require_once DOL_DOCUMENT_ROOT ."/core/db/".$type.'.class.php'; $class='DoliDB'.ucfirst($type); $dolidb=new $class($type, $host, $user, $pass, $name, $port); @@ -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); @@ -1009,13 +1009,13 @@ function dol_now($mode='gmt') if ($mode == 'gmt') $ret=time(); // Time for now at greenwich. else if ($mode == 'tzserver') // Time for now with PHP server timezone added { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $tzsecond=getServerTimeZoneInt('now'); // Contains tz+dayling saving time $ret=dol_now('gmt')+($tzsecond*3600); } /*else if ($mode == 'tzref') // Time for now with parent company timezone is added { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $tzsecond=getParentCompanyTimeZoneInt(); // Contains tz+dayling saving time $ret=dol_now('gmt')+($tzsecond*3600); }*/ @@ -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(); @@ -3389,7 +3389,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' { global $conf,$user; - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Check if there is external substitution to do asked by plugins $dirsubstitutions=array_merge(array(),(array) $conf->modules_parts['substitutions']); @@ -3409,7 +3409,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object=' $module=$reg[1]; dol_syslog("Library functions_".$substitfile['name']." found into ".$dir); - require_once($dir.$substitfile['name']); + require_once $dir.$substitfile['name']; $function_name=$module."_".$callfunc; $function_name($substitutionarray,$outputlangs,$object,$parameters); } 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/images.lib.php b/htdocs/core/lib/images.lib.php index 0a25103020430921c2a7a76e86710df4687553d1..a1048e48b172bea655f271fd0538ddb4396d8724 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -97,7 +97,7 @@ function dol_getImageSize($file) */ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $src_y=0) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; global $conf,$langs; @@ -301,7 +301,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s */ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; global $conf,$langs; 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 2a7b004c7c3205709d70c5b9a7380115a4a1cdfa..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; @@ -81,9 +81,9 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P') return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together"; // We use by default TCPDF - if (empty($conf->global->MAIN_USE_FPDF)) require_once(TCPDF_PATH.'tcpdf.php'); + if (empty($conf->global->MAIN_USE_FPDF)) require_once TCPDF_PATH.'tcpdf.php'; // We need to instantiate fpdi object (instead of tcpdf) to use merging features. But we can disable it. - if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once(FPDI_PATH.'fpdi.php'); + if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php'; //$arrayformat=pdf_getFormat(); //$format=array($arrayformat['width'],$arrayformat['height']); @@ -105,7 +105,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P') */ if (! empty($conf->global->MAIN_USE_FPDF)) { - require_once(FPDI_PATH.'fpdi_protection.php'); + require_once FPDI_PATH.'fpdi_protection.php'; $pdf = new FPDI_Protection($pagetype,$metric,$format); // For FPDF, we specify permission we want to open $pdfrights = array('print'); @@ -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 dedd9f320a136481a19ca671230805991bc8d724..d7a4f21ee00dd66ccc1f06f8a4787f5bf3754257 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -23,7 +23,7 @@ * \brief Functions used by project module * \ingroup project */ -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.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'); @@ -659,7 +659,7 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0) { global $langs,$conf,$user,$bc; - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $projectstatic=new Project($db); 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 589075cc5f141b25cc52f10cad410c4aacd162c2..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"] = ''; @@ -437,7 +437,7 @@ function getRandomPassword($generic=false) $nomclass="modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED); $nomfichier=$nomclass.".class.php"; //print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass; - require_once(DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier); + require_once DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomfichier; $genhandler=new $nomclass($db,$conf,$langs,$user); $generated_password=$genhandler->getNewGeneratedPassword(); unset($genhandler); diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 8db20829196518e731c271a17957d0f04d7f8d88..f4f65b1be0413d24d4fe3111770b9ec3b77b898e 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -20,8 +20,8 @@ * \ingroup expedition * \brief Library for expedition module */ -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.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..428e0255d00329ea31ec3b50048f916789adba01 100755 --- a/htdocs/core/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -48,7 +48,7 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) if (! $error && ! empty($authentication['entity']) && ! is_numeric($authentication['entity'])) { $error++; - $errorcode='BAD_PARAMETERS'; $errorlabel="Parameter entity must be empty (or filled with numeric id of instance if multicompany module is used)."; + $errorcode='BAD_PARAMETERS'; $errorlabel="The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used)."; } if (! $error) @@ -57,7 +57,7 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) if ($result < 0) { $error++; - $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurs during fetch of user'; + $errorcode='ERROR_FETCH_USER'; $errorlabel='A technical error occurred during fetch of user'; } else if ($result == 0) { @@ -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/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index e3137a8afa601aabe22a8badd035b078fb252f4f..e38e33e2c7978c18ad996796cffdc8bb1650d0c4 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -71,7 +71,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n"; - require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; $ldap=new Ldap(); $ldap->server=array($ldaphost); $ldap->serverPort=$ldapport; diff --git a/htdocs/core/menus/smartphone/smartphone.lib.php b/htdocs/core/menus/smartphone/smartphone.lib.php index 6895867cbd8e79d7d2f9a6a6611c7a0a7dfddc14..050a2226cf64c3e68b4e97c5674c159a8e369081 100755 --- a/htdocs/core/menus/smartphone/smartphone.lib.php +++ b/htdocs/core/menus/smartphone/smartphone.lib.php @@ -34,7 +34,7 @@ */ function print_smartphone_menu($db,$atarget,$type_user,$limitmenuto) { - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; global $user,$conf,$langs,$dolibarr_main_db_name; diff --git a/htdocs/core/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php index ef7a127081285accd22e188feed652c1052c1d2f..2a4e2918dbe1cdb6da1bf3421aea36873eece4c7 100755 --- a/htdocs/core/menus/smartphone/smartphone_backoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php @@ -52,7 +52,7 @@ class MenuSmart */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'; print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/core/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php index cc2a8fd775e4fdb4b374c41b55fa87bb2ec078fd..551dfc5d23481ecb0c77eba147373e21d3baf9ba 100755 --- a/htdocs/core/menus/smartphone/smartphone_frontoffice.php +++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php @@ -52,7 +52,7 @@ class MenuSmart */ function showmenu($limitmenuto) { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php'; print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto); } diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index 032ea2d500d03452fd84080892c5908efcea46b5..137dbf2818f60ed2be7442d69922e0dba25bb880 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -34,7 +34,7 @@ */ function print_auguria_menu($db,$atarget,$type_user) { - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; global $user,$conf,$langs,$dolibarr_main_db_name; @@ -242,7 +242,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) */ if ($mainmenu) { - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $tabMenu=array(); $menuArbo = new Menubase($db,'auguria','left'); diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php index 8de0f9b43a7ae27a7185e359ffa229b2dcbceb9c..99f76275c3faa4f6f43ff398a94c705be39acf42 100644 --- a/htdocs/core/menus/standard/auguria_backoffice.php +++ b/htdocs/core/menus/standard/auguria_backoffice.php @@ -59,7 +59,7 @@ class MenuTop */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'; print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -99,7 +99,7 @@ class MenuLeft */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'; $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php index 8048d255960a30724c4e80b50c4ef048c342ed5b..4446cbe483dcf6206af3d2f1afeeaaf16e20c43a 100644 --- a/htdocs/core/menus/standard/auguria_frontoffice.php +++ b/htdocs/core/menus/standard/auguria_frontoffice.php @@ -58,7 +58,7 @@ class MenuTop */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'; print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php'; $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 3aae851a2d6e3e00d9e76daf8804f7a3ce36ac53..e0921df9638ca5bc24184b5e0986873aebde93ae 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -437,7 +437,7 @@ function print_eldy_menu($db,$atarget,$type_user) // Show personalized menus - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $tabMenu=array(); $menuArbo = new Menubase($db,'eldy','top'); @@ -1357,7 +1357,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) } // Add personalized menus and modules menus - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $tabMenu=array(); $menuArbo = new Menubase($db,'eldy','left'); diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php index 5f383288ae2cc14032ade2deff43b458cf00f8c9..cba3c2fbf2f9a0463f5abd446ade3356c81c291e 100644 --- a/htdocs/core/menus/standard/eldy_backoffice.php +++ b/htdocs/core/menus/standard/eldy_backoffice.php @@ -57,7 +57,7 @@ class MenuTop */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'; print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -98,7 +98,7 @@ class MenuLeft */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'; $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php index d78e138d88fcb4f7ab7d7dc1b5e5a9b621fb10db..b6ae55fad70cf85c8bb78a5fe0cfe01db1307ada 100644 --- a/htdocs/core/menus/standard/eldy_frontoffice.php +++ b/htdocs/core/menus/standard/eldy_frontoffice.php @@ -56,7 +56,7 @@ class MenuTop */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'; print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed); } @@ -96,7 +96,7 @@ class MenuLeft */ function showmenu() { - require_once(DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php'; $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after); diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 843f7e40cacc7f4a6669455e2e4eadc362abddd6..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); @@ -1037,7 +1037,7 @@ abstract class DolibarrModules { global $user; - require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php'; $err=0; diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index 114582a11dfb2ecdfaacbe29e5bb80ecb227cf4d..5a384852cbaeab30d5f2cedad3bca3444f1225e2 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -24,9 +24,9 @@ * \brief File to build PDF with events */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; /** * Classe permettant la generation des rapports d'actions diff --git a/htdocs/core/modules/barcode/modules_barcode.php b/htdocs/core/modules/barcode/modules_barcode.php index 0e092bc7daa579c566ad6416ce62b647e058cf72..212ba54c0b30e4c6bf9c6beda3adb0ea9045b974 100644 --- a/htdocs/core/modules/barcode/modules_barcode.php +++ b/htdocs/core/modules/barcode/modules_barcode.php @@ -24,7 +24,7 @@ * \ingroup barcode * \brief Fichier contenant la classe mere de generation des codes barres */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** diff --git a/htdocs/core/modules/barcode/phpbarcode.modules.php b/htdocs/core/modules/barcode/phpbarcode.modules.php index eb5e2420200335139ee418b6be85abf4dd041198..dac3ac08e43db6576f2a99520cdbed853e480ef8 100644 --- a/htdocs/core/modules/barcode/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/phpbarcode.modules.php @@ -23,8 +23,8 @@ * \brief Fichier contenant la classe du modele de generation code barre phpbarcode */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/barcode/modules_barcode.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/barcode.lib.php"); // This is to include def like $genbarcode_loc and $font_loc +require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // This is to include def like $genbarcode_loc and $font_loc /** \class modPhpbarcode diff --git a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php index 5943e534ca3454ad503f30260e4343295a884a39..f031ea2d4aa85ab65d137129a12c86b6b0d3a42a 100644 --- a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php @@ -25,9 +25,9 @@ * \brief File with parent class of check receipt document generators */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent /** @@ -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'); @@ -100,7 +100,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs) if (file_exists($dir.$file)) { $classname = "pdf_".$modele; - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname($db); $obj->message = $message; diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index 7fd66e94a765a7eebf88464ecd1d3f346e572398..c54a539f2973375898cd92b30c83d264eed9ad32 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -23,9 +23,9 @@ * \brief File to build cheque deposit receipts */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/cheque/pdf/modules_chequereceipts.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/pdf/modules_chequereceipts.php'; /** diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index 907dedc04fe5c77d518e744279fd16c130c84049..e46a7bfc2b667882f339003d7018b7cae766e516 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -23,12 +23,12 @@ * \brief File of class to build ODT documents for third parties */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/doc.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; /** @@ -342,7 +342,7 @@ class doc_generic_order_odt extends ModelePDFCommandes } // Open and load template - require_once(ODTPHP_PATH.'odf.php'); + require_once ODTPHP_PATH.'odf.php'; $odfHandler = new odf( $srctemplatepath, array( diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php index f88a39d2bf12fa2d1aabfe237a8ef47472570547..7ea8c0fed0a480c1be311cd7d583b7334d9f5a07 100644 --- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php @@ -25,9 +25,9 @@ * \brief Fichier de la classe permettant de generer les commandes au modele Edison */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** * Classe permettant de generer les commandes au modele Edison @@ -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 66dc38e385b07afab9b554a09b81b8f6962d3b08..59077af73cc8efaa8d878f529fe1d40f019e4d40 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -26,11 +26,11 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php index aa3df1c3a013c612987c5122e2cacd1624601db6..756c2b716471c9efe141198c4481860a4c012c1a 100644 --- a/htdocs/core/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -22,7 +22,7 @@ * \ingroup commande * \brief File of class to manage customer order numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php'; /** * Class to manage customer order numbering rules Marbre diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index c66b83cc01e0c5d15467ec83537ae1f4f1767fe6..8fde7a24a0e8f89c4591f9dfb32bc641624efd55 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -25,7 +25,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de commande Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/modules_commande.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php'; /** @@ -110,7 +110,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // We get cursor rule $mask=$conf->global->COMMANDE_SAPHIR_MASK; diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 9f819ed72adc771415d546858c566e026a08fa04..27eeb60fdaae1f3788f1545bd06a0211344b17f6 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -28,9 +28,9 @@ * et la classe mere de numerotation des commandes */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent -require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requis car utilise par les classes qui heritent +require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.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; @@ -215,7 +215,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); //$obj->message = $message; @@ -228,14 +228,14 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0 $outputlangs->charset_output=$sav_charset_output; // We delete old preview - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); // Success in building document. We build meta file. 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/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index 9f785cb757c8aef3cac0d7b3d4eebb4d51f858ed..0b90e0168da379d22b24de7d09ada2ee909818ce 100755 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -22,7 +22,7 @@ * \brief File of class to manage contract numbering rules Magre */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php'; /** * Class to manage contract numbering rules Magre @@ -101,7 +101,7 @@ class mod_contract_magre extends ModelNumRefContracts { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; $mask=$conf->global->CONTRACT_MAGRE_MASK; diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php index d48e11a65d0927f229f0e09ce744a6474e93c028..32e412ff87ab99b64244bb8ee9370489a771af5a 100755 --- a/htdocs/core/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -21,7 +21,7 @@ * \ingroup contract * \brief File of class to manage contract numbering rules Serpis */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/modules_contract.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php'; /** * Class to manage contract numbering rules Serpis diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index 8f3ef317dfae50d2fea8f905f5d60bee1b7dba19..9eed69b563712309aafb09f21614d211e7a05bf9 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -22,9 +22,9 @@ * \ingroup don * \brief Formulaire de don */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/dons/modules_don.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; /** diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php index 63d9746d471a78bbac6b773dfa7dbde659b3f3fd..73f6bdf2052089cd08d222c2b792c2655f65bf3d 100644 --- a/htdocs/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -24,8 +24,8 @@ * \ingroup don * \brief File of class to manage donation document generation */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.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; @@ -178,7 +178,7 @@ function don_create($db, $id, $message, $modele, $outputlangs) $object->fetch($id); - require_once($dir.$file); + require_once $dir.$file; $classname = $modele; $module = new $classname($db); @@ -190,7 +190,7 @@ function don_create($db, $id, $message, $modele, $outputlangs) $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); return 1; } diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php index 9ec24ad9bd2cc2107ac6626fe7302da7a53070b4..2b8f00e21d5de63c49e28e88d1e093bc4c2f6770 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php @@ -24,10 +24,10 @@ * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Merou */ -require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/modules_expedition.php"; -require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"; -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php index aee8b1de092fbff4efa3e037145c82391848aad7..31da749709e718a3efc01620fff810916372c9f9 100644 --- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php @@ -24,9 +24,9 @@ * \brief Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget */ -require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/modules_expedition.php"; -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php index 1a918c0fc3ea39a15cd706cfdf8442b23a5df6f8..564adf19a29e846d03cdc122858d9b0eff276235 100644 --- a/htdocs/core/modules/expedition/methode_expedition.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition.modules.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net> * @@ -23,7 +23,7 @@ * \brief Fichier contenant la classe mere de generation de bon de livraison en PDF * et la classe mere de numerotation des bons de livraisons */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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 c737e3df65843f15dacb33cd21773e7e20a2702c..6d3b300b4b889486ff95290def623e26bb7ff8cb 100644 --- a/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2008 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2008 Bearstech - http://bearstech.com/ * @@ -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 c7d913a46d868dc212f0b19788645c2356186ce5..0087018cc6f87de37ad462d7e0f88cb6a5ef607e 100644 --- a/htdocs/core/modules/expedition/methode_expedition_enl.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2003-2008 Rodolphe Quiedeville <rodolphe@quiedeville.org> * * This program is free software; you can redistribute it and/or modify @@ -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 761813f2d2a7245d9a73c654c2c5a7aa5e94513c..cadd71d15bae027e2ced2b4570468f74f3e099a9 100644 --- a/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr> * * This program is free software; you can redistribute it and/or modify @@ -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 dd3fd7f11a708b9e534bd139e98758879b9e30bf..24895ccd3f8eedd35f395c274af92435a5073d5c 100644 --- a/htdocs/core/modules/expedition/methode_expedition_trans.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2003-2008 Rodolphe Quiedeville <rodolphe@quiedeville.org> * * This program is free software; you can redistribute it and/or modify @@ -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/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php index e31882f73b64e3910cee6b3a898c5b903fc9c60e..def1c26c537c79b7f5d30865147ece5d49910a15 100755 --- a/htdocs/core/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -22,7 +22,7 @@ * \brief File of class to manage expedition numbering rules Ribera */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/expedition/modules_expedition.php'; /** * Class to manage expedition numbering rules Ribera @@ -101,7 +101,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; $mask=$conf->global->EXPEDITION_RIBERA_MASK; diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php index 74a6d9e89d33f7f29f085274b326648c41ec856f..92dcf508413667205b8720363d50c1eda78c2de1 100755 --- a/htdocs/core/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -21,7 +21,7 @@ * \ingroup expedition * \brief File of class to manage shipments numbering rules Safor */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/modules_expedition.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/expedition/modules_expedition.php'; /** * Class to manage expedition numbering rules Safor diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index 3b756c4bc5c18db439c3d2847d9a77f28251bfb0..a40fddc9ef624567ec022ec39bc89a96c5770840 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -27,7 +27,7 @@ * \ingroup expedition * \brief File of class to manage expedition numbering */ - require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; /** * Parent class of sending receipts models @@ -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; @@ -204,7 +204,7 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); @@ -218,11 +218,11 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs) $outputlangs->charset_output=$sav_charset_output; // we delete preview files - //require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + //require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; //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/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index e9c6000d40915fddb84e506857d46f4838ca4d8b..62afe13c90275e92bd24c442f162273e534b3a27 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php'; /** diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index ee0bd7211c35aee250fb45028725e6c5d4003a8c..620bc709e45df6a99063b0d0e05a4f480023e3eb 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -23,8 +23,8 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** @@ -167,9 +167,9 @@ class ExportExcel extends ModeleExports $outputlangs->load("exports"); if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) { - require_once(PHP_WRITEEXCEL_PATH."class.writeexcel_workbookbig.inc.php"); - require_once(PHP_WRITEEXCEL_PATH."class.writeexcel_worksheet.inc.php"); - require_once(PHP_WRITEEXCEL_PATH."functions.writeexcel_utility.inc.php"); + require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php'; + require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php'; + require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php'; $this->workbook = new writeexcel_workbookbig($file); $this->workbook->set_tempdir($conf->export->dir_temp); // Set temporary directory $this->workbook->set_sheetname($outputlangs->trans("Sheet")); @@ -177,8 +177,8 @@ class ExportExcel extends ModeleExports } else { - require_once(PHPEXCEL_PATH."PHPExcel.php"); - require_once(PHPEXCEL_PATH."PHPExcel/Style/Alignment.php"); + require_once PHPEXCEL_PATH.'PHPExcel.php'; + require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php'; $this->workbook = new PHPExcel(); $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION); //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION); @@ -375,7 +375,7 @@ class ExportExcel extends ModeleExports } else { - require_once(PHPEXCEL_PATH."PHPExcel/Writer/Excel5.php"); + require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php'; $objWriter = new PHPExcel_Writer_Excel5($this->workbook); $objWriter->save($this->file); $this->workbook->disconnectWorksheets(); diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index 4bb3f6ee624ae2c31fd9da8e5e8ba708c3c28fb8..16e1a7a0c7a2f54763a262704bbe3c0196016566 100755 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -23,9 +23,9 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/export/modules_export.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/export/export_excel.modules.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/export/export_excel.modules.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** @@ -168,9 +168,9 @@ class ExportExcel2007 extends ExportExcel $outputlangs->load("exports"); if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) { - require_once(PHP_WRITEEXCEL_PATH."class.writeexcel_workbookbig.inc.php"); - require_once(PHP_WRITEEXCEL_PATH."class.writeexcel_worksheet.inc.php"); - require_once(PHP_WRITEEXCEL_PATH."functions.writeexcel_utility.inc.php"); + require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php'; + require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php'; + require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php'; $this->workbook = new writeexcel_workbookbig($file); $this->workbook->set_tempdir($conf->export->dir_temp); // Set temporary directory $this->workbook->set_sheetname($outputlangs->trans("Sheet")); @@ -178,8 +178,8 @@ class ExportExcel2007 extends ExportExcel } else { - require_once(PHPEXCEL_PATH."PHPExcel.php"); - require_once(PHPEXCEL_PATH."PHPExcel/Style/Alignment.php"); + require_once PHPEXCEL_PATH.'PHPExcel.php'; + require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php'; $this->workbook = new PHPExcel(); $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION); //$this->workbook->getProperties()->setLastModifiedBy('Dolibarr '.DOL_VERSION); @@ -376,7 +376,7 @@ class ExportExcel2007 extends ExportExcel } else { - require_once(PHPEXCEL_PATH."PHPExcel/Writer/Excel5.php"); + require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php'; $objWriter = new PHPExcel_Writer_Excel2007($this->workbook); $objWriter->save($this->file); $this->workbook->disconnectWorksheets(); diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index d67cf3b80de7ed81fd8a8105a920b862688df75f..6a791cd5a935b4ee46cb984e3e5666068076d1b1 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -23,7 +23,7 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/export/modules_export.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php'; /** diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index 2a7cbbea6093dd395b2d986d8fa9676dac8a97f4..7ad5b05ebf2629993c38d6dcb57821a78308f911 100644 --- a/htdocs/core/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -22,7 +22,7 @@ * \brief File of parent class for export modules */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; /** @@ -69,7 +69,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac $file = $dir."/export_".$moduleid.".modules.php"; $classname = "Export".ucfirst($moduleid); - require_once($file); + require_once $file; $module = new $classname($db); // Picto diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 6054a0098fef60f638957a8c7632ca64aedd893f..e04c9b5c7594a64df6b0227f0ec71bcd08dc0292 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -22,12 +22,12 @@ * \brief File of class to build ODT documents for third parties */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/doc.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; /** @@ -352,7 +352,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures } // Open and load template - require_once(ODTPHP_PATH.'odf.php'); + require_once ODTPHP_PATH.'odf.php'; $odfHandler = new odf( $srctemplatepath, array( diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 2a5d38d81a1848aabc5b8bf2b7ca93ceda54b105..24fe33b632f031db48e37ac3f04bed4ab31456fb 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -25,11 +25,11 @@ * \brief File of class to generate customers invoices from crabe model */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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 4968c0eb6eb9f78e27001aee9b60e1abbc015350..b2b3254ab3aa4edf020ff6e0803033f3eb98ed88 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -27,10 +27,10 @@ * \author Sylvain SCATTOLINI base sur un modele de Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 5230c987690b916925b7c97adf9cf5ee9a6bcc4c..4d760852e6b181090c400056d55439d4f7043284 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -24,7 +24,7 @@ * \ingroup facture * \brief File containing class for numbering module Mercure */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; /** @@ -119,7 +119,7 @@ class mod_facture_mercure extends ModeleNumRefFactures { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // Get Mask value $mask = ''; diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index 99eb3a3e40f42b0ea8d098f9b1beb2c5baab2a9c..5b45e96c14b894473927aa1f09bfa63826d5e299 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -22,7 +22,7 @@ * \ingroup facture * \brief File containing class for numbering module Terre */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/facture/modules_facture.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php'; /** \class mod_facture_terre * \brief Classe du modele de numerotation de reference de facture Terre diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 54fdeaef810077df4aad7cb0b30a9272e842782b..66f02307d176f4aacfe2ffe37f8ba37d64bf54b6 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -26,9 +26,9 @@ * et la classe mere de numerotation des factures */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent /** @@ -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; @@ -217,7 +217,7 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); @@ -229,14 +229,14 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $outputlangs->charset_output=$sav_charset_output; // We delete old preview - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); // Success in building document. We build meta file. 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/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 062acb79557b7d672189e9e17a143575b0608827..b6a8130e105b6ca64c9ffaa549250b242f9050c6 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -25,10 +25,10 @@ * \ingroup ficheinter * \brief Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php index 39e915f1fcf7725d81a22544c98c2f7b99d807ae..7e4a91137536125672955379b5b0f3549982ac19 100644 --- a/htdocs/core/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -24,7 +24,7 @@ * \ingroup fiche intervention * \brief File with Arctic numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php'; /** * Class to manage numbering of intervention cards with rule Artic. @@ -108,7 +108,7 @@ class mod_arctic extends ModeleNumRefFicheinter { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On d�fini critere recherche compteur $mask=$conf->global->FICHINTER_ARTIC_MASK; diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php index cb83633c02371e66d474e6760b9d0305c3a49e1e..fb0197f5959f522142187f5c791370bdcc6cc899 100644 --- a/htdocs/core/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -22,7 +22,7 @@ * \ingroup fiche intervention * \brief File with Pacific numbering module for interventions */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/modules_fichinter.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/fichinter/modules_fichinter.php'; /** * Class to manage numbering of intervention cards with rule Pacific. diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index 0b06b7132ffbe18503d7cfeab91e671f610cfcc1..0cda5ac63b7e096fa8363a7483a02fb5af9ac244 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -26,7 +26,7 @@ * et la classe mere de numerotation des fiches interventions */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.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; @@ -209,7 +209,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $ // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); @@ -221,11 +221,11 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $ $outputlangs->charset_output=$sav_charset_output; // We delete old preview - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; 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/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index 30b00d885c85414776f566413eb08b8274d7ed54..783f9f053dda1b7c07dc5409260cb3ac55bce59a 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -23,7 +23,7 @@ * \brief File to load import files with CSV format */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/import/modules_import.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/import/modules_import.php'; /** diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index dd7a6df60a9777e1fb0739186214c62640b2d204..eda1702da5b02ddb1e609502fe6f4bc2dce59e68 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -22,7 +22,7 @@ * \ingroup export * \brief File of parent class for import file readers */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** @@ -88,7 +88,7 @@ class ModeleImports $file = $dir."/import_".$moduleid.".modules.php"; $classname = "Import".ucfirst($moduleid); - require_once($file); + require_once $file; $module = new $classname($db,''); // Picto diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php index b69dd6d61cbc1e0435c9b3af4fb35936396dc8e5..262277d267d895be95e80dbd1c67e174b1868d34 100644 --- a/htdocs/core/modules/livraison/mod_livraison_jade.php +++ b/htdocs/core/modules/livraison/mod_livraison_jade.php @@ -24,7 +24,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/modules_livraison.php'; /** diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php index 89d9faf57812a53c0df0a84b3a1b51bff4318c58..b19920dee00b793ae4bde4f9c0c0eb636f59646a 100644 --- a/htdocs/core/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php @@ -23,7 +23,7 @@ * \ingroup expedition * \brief Fichier contenant la classe du modele de numerotation de reference de livraison Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/modules_livraison.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/modules_livraison.php'; /** * \class mod_livraison_saphir @@ -109,7 +109,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On defini critere recherche compteur $mask=$conf->global->LIVRAISON_SAPHIR_MASK; diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index 429e26701f2d676911d535b596ad00bd07876ffc..663c71987559e780c5efd29534b258abf6c130dc 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -27,7 +27,7 @@ * et la classe mere de numerotation des bons de livraisons */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.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; @@ -210,7 +210,7 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='') // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); @@ -222,11 +222,11 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='') $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; 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/livraison/pdf/pdf_sirocco.modules.php b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php index 5b62ec84ddf780aa2cbae1987f9769302a5dc7f1..3b1405118b3ae2c7d11f37ca20d18319f6b900f4 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php @@ -25,9 +25,9 @@ * \brief File of class to manage receving receipts with template Sirocco */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index 5c1f1f92d2a303424a3b81c78e6513054a016f53..f371cfb8d437eba157c868d1b91c97136080bdfb 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -26,10 +26,10 @@ * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; +require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 57da94f1b9eac4db3df9b7edea9bde98033024ae..4a7a2050f0d0f61f1b7c66dd0a3666fdb9198884 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -23,7 +23,7 @@ * \ingroup mailing * \brief File with parent class of emailing target selectors modules */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** diff --git a/htdocs/core/modules/mailings/peche.modules.php b/htdocs/core/modules/mailings/peche.modules.php index 2e9be21c9fa25d5e020e477a7908e2ab7c73065e..5ae8e2c8bb138d9e85848ae5ad2ce88b5f09348d 100644 --- a/htdocs/core/modules/mailings/peche.modules.php +++ b/htdocs/core/modules/mailings/peche.modules.php @@ -22,7 +22,7 @@ * \brief File of class to offer a selector of emailing targets with Rule 'Peche'. */ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; /** @@ -120,7 +120,7 @@ class mailing_peche extends MailingTargets { global $conf,$langs,$_FILES; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // For compatibility with Unix, MS-Dos or Macintosh ini_set('auto_detect_line_endings', true); diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 3325747f3bafa94a8e7c11a92a5673a9df509c08..46cc1d0a6b4a9dea1780b0317d08c1b4f806db81 100755 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -14,7 +14,7 @@ * \brief File of class to offer a selector of emailing targets with Rule 'services expired'. */ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; /** diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index a2d554ccc824137b25835b7e952e23aaf37f963a..e80973afd67aa671f55d0e870e6b435de5565f4e 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -50,8 +50,8 @@ * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; /** diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index 705981e652ff6f64590078fa7ab52b01274cc089..32df2f5d0e86dadf70c008e3fd6f6a2d8def2135 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -25,8 +25,8 @@ * \brief File of parent class of document generator for members cards. */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.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; @@ -134,7 +134,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); 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 ba103b9516f7e19a920a65a26f858c5096c36982..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 @@ -198,7 +198,7 @@ class modAdherent extends DolibarrModules $r=0; $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $r++; $this->import_code[$r]=$this->rights_class.'_'.$r; 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 a898db1a9bbf2cb56368e0b9278e3b8086ab538e..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'; /** @@ -207,7 +207,7 @@ class modCommande extends DolibarrModules if (file_exists($src) && ! file_exists($dest)) { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_mkdir($dirodt); $result=dol_copy($src,$dest,0,0); if ($result < 0) 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 817b7c0fff27680002afa55be271cbee926c6906..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'; /** @@ -230,7 +230,7 @@ class modFacture extends DolibarrModules if (file_exists($src) && ! file_exists($dest)) { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_mkdir($dirodt); $result=dol_copy($src,$dest,0,0); if ($result < 0) 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 f550d715b9cc876cd2668b83b1b09445c1320cc3..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'; /** @@ -205,7 +205,7 @@ class modPropale extends DolibarrModules if (file_exists($src) && ! file_exists($dest)) { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_mkdir($dirodt); $result=dol_copy($src,$dest,0,0); if ($result < 0) 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 1f9ea080ee77906539df33758eec0d62974893ea..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'; /** @@ -389,7 +389,7 @@ class modSociete extends DolibarrModules if (file_exists($src) && ! file_exists($dest)) { - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_mkdir($dirodt); $result=dol_copy($src,$dest,0,0); if ($result < 0) 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/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php index 2b2d33d550b780174212e623358c2a85449e1491..575d0172402cfff5341d0ea6a820db8b267fbe25 100644 --- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php +++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php @@ -50,8 +50,8 @@ * \brief Fichier de la classe permettant d'editer au format PDF des etiquettes au format Avery ou personnalise */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; /** diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index cf770e6677c1e1bcdc8f03305051589f9f6839bd..96e7bbcc7c5de160827cedb361b78c0ed1624e1f 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -25,8 +25,8 @@ * \brief File of parent class of document generator for members labels sheets. */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.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; @@ -134,7 +134,7 @@ function members_label_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $ // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 3c6075f942a4b328d8ac70e4ccd94aa7a4b1d3be..3541f098b467a352d561fda252f596449b2e78e4 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -25,7 +25,7 @@ * \brief File of class to manage product code with elephant rule */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/product/modules_product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'; /** @@ -161,7 +161,7 @@ class mod_codeproduct_elephant extends ModeleProductCode { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // Get Mask value $mask = ''; @@ -233,7 +233,7 @@ class mod_codeproduct_elephant extends ModeleProductCode { global $conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; $result=0; $code = strtoupper(trim($code)); diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php index d1a6b529da90d2e875ea9a42ff1d449bc7b043a6..d023fdff730485fb4ba1ff9e6f90c277640a11da 100644 --- a/htdocs/core/modules/product/mod_codeproduct_leopard.php +++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php @@ -23,7 +23,7 @@ * \brief Fichier de la classe des gestion leopard des codes produits */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/product/modules_product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'; /** diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 345ac2ef6e31c19191d8ff87243060020371db3f..c4b8e0fd7a5337c78b89c89cd464951096b24908 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -23,7 +23,7 @@ * \brief File with class to manage the numbering module Simple for project references */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; /** diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php index fa7c78978dac0fc6b04e2620dd74cfefbebbd01b..9efe70d7cccb155353407a871568f9a81b13332e 100644 --- a/htdocs/core/modules/project/mod_project_universal.php +++ b/htdocs/core/modules/project/mod_project_universal.php @@ -22,7 +22,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/modules_project.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/project/modules_project.php'; /** @@ -108,7 +108,7 @@ class mod_project_universal extends ModeleNumRefProjects { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On defini critere recherche compteur $mask=$conf->global->PROJECT_UNIVERSAL_MASK; diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index ce03f694eb8121bbbd0cfdd1022bb46066b38244..3996a255e039dd84d8e00a65c11a60d7f09d77d7 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -22,7 +22,7 @@ * \brief File that contain parent class for projects models * and parent class for projects numbering models */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.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; @@ -207,7 +207,7 @@ function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); @@ -219,14 +219,14 @@ function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); // Success in building document. We build meta file. 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/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php index fd5aa42b38e0857549fde078a20abc65bc82901e..21bc5b99a9a39f481f47a86978ae6070013a4980 100644 --- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -23,11 +23,11 @@ * \author Regis Houssin */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/project/modules_project.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; /** diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 01a6e2ede67fef6181b0fafeef2080f21137e283..86ff65a677a9fd68bee5fcc99d1730dfca42b2c0 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -23,12 +23,12 @@ * \brief File of class to build ODT documents for third parties */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/doc.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; /** @@ -341,7 +341,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales } // Open and load template - require_once(ODTPHP_PATH.'odf.php'); + require_once ODTPHP_PATH.'odf.php'; $odfHandler = new odf( $srctemplatepath, array( diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index bf1e17caab96a6f440f69a5983e8de9d47c4c731..4a24f74c2a063765bb6fee8472092d29123e9608 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -25,11 +25,11 @@ * \brief Fichier de la classe permettant de generer les propales au modele Azur * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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 aa7ecaaf754aa46a164158cf4a48e86ad082a9fa..9be3c094e9215a9d34496fdabbb38658aa822c31 100644 --- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php @@ -25,11 +25,11 @@ * \brief Fichier de la classe permettant de generer les propales au modele Jaune * \author Laurent Destailleur */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/propale/modules_propale.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index 312893421987b72570d01adead6efb1607ba3c2f..33b7e3ad0c5a3177c9b1836e60d3b44fc292dc0c 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -23,7 +23,7 @@ * \brief File of class to manage commercial proposal numbering rules Marbre */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php'; /** \class mod_propale_marbre diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index 486710e50cd2389789813ec364934b2bae9d4f2a..85ad310158a589ed9fcbe68f36cfc3e8f10527ab 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -25,7 +25,7 @@ * \brief File that contains the numbering module rules Saphir */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/modules_propale.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php'; /** @@ -111,7 +111,7 @@ class mod_propale_saphir extends ModeleNumRefPropales { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On defini critere recherche compteur $mask=$conf->global->PROPALE_SAPHIR_MASK; diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index dd67007f789e3caa43b5d4b404c1b792cee2ff90..1a1e77d9d46a4af662beb7ed407f8e61e3f2037a 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -26,8 +26,8 @@ * et la classe mere de numerotation des propales */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // Requis car utilise dans les classes qui heritent +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis car utilise dans les classes qui heritent /** @@ -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; @@ -211,7 +211,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db); //$obj->message = $message; @@ -224,14 +224,14 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $outputlangs->charset_output=$sav_charset_output; // We delete old preview - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_delete_preview($object); // Success in building document. We build meta file. 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 394369f4df9584b1c015828f52fa36a4b8264848..b238ee3cfe63ce9b1f0fd34ba8a72ce325419bc9 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -22,8 +22,8 @@ * \ingroup banque * \brief File to build payment reports */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.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/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php index f13f16c418fb9f97f1ccfcda6575a27e4ccef91a..954d0c078221430ce32c54b44309c68da8019929 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php @@ -22,7 +22,7 @@ * \brief File to manage no password generation. */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php'; /** diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php index 1eb42a9f715250b30c944d03c65f7f3759af7246..c4d7f21c7befa84f6ebce3ad02aba331e1c7fe04 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php @@ -22,7 +22,7 @@ * \brief File to manage password generation according to standard rule */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/security/generate/modules_genpassword.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php'; /** diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php index 8202202457215300b3bdf2eb663bb393e59abb9d..3c9cf278d68351c5a796ba046edc753e0987aaf0 100644 --- a/htdocs/core/modules/security/generate/modules_genpassword.php +++ b/htdocs/core/modules/security/generate/modules_genpassword.php @@ -21,7 +21,7 @@ * \ingroup core * \brief File with parent class for password generating classes */ -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 5b7a3a8a2e6d164749b54adcfc076971f47e9ddf..7eeddd1f856febba1fcb4843b8878fd6e97d923a 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -22,11 +22,11 @@ * \brief File of class to build ODT documents for third parties */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/doc.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; /** @@ -212,7 +212,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc dol_mkdir($conf->societe->multidir_temp[$object->entity]); // Open and load template - require_once(ODTPHP_PATH.'odf.php'); + require_once ODTPHP_PATH.'odf.php'; $odfHandler = new odf( $srctemplatepath, array( diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index e0388366bb44f55039f193ad44b9708b05abba5d..f6e4b7062ce51c77b02c69c08916ece0ed9f74c3 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -25,7 +25,7 @@ * \brief File of class to manage third party code with elephant rule */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; /** @@ -162,7 +162,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // Get Mask value $mask = ''; @@ -231,7 +231,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { global $conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; $result=0; $code = strtoupper(trim($code)); diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php index be43447734d229b867b612d810968080b781fc07..c0bd7db36aa8deec43de93c2ce099651b61bb07c 100644 --- a/htdocs/core/modules/societe/mod_codeclient_leopard.php +++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php @@ -23,7 +23,7 @@ * \brief Fichier de la classe des gestion leopard des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; /** diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index 9c5033158b9d6ba6d3b5d59fa750d6280f81ed72..d7c052647e818f3fd0545161001fb05712d2fbd4 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -24,7 +24,7 @@ * \brief Fichier de la classe des gestion lion des codes clients */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; /** diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index e0e7faa530e1abc8c14499addf8b162f46d8d1c2..522ececffeba07de9f1faa30a47fda3f78e3a107 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -23,7 +23,7 @@ * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; /** diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php index 37c079f7aca9c009773725b2ae4911994f2cdd26..190adb680327548a92e942945083704fb37fccdf 100644 --- a/htdocs/core/modules/societe/mod_codecompta_panicum.php +++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php @@ -22,7 +22,7 @@ * \ingroup societe * \brief File of class to manage accountancy code of thirdparties with Panicum rules */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/societe/modules_societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; /** diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index dab868bcbf16aaca24750095f774303c7bed000a..fc96075f430d0c77c4aff25a0c5d32bb70ad616c 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -24,7 +24,7 @@ * \ingroup societe * \brief File with parent class of submodules to manage numbering and document generation */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.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; @@ -405,7 +405,7 @@ function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs) if (file_exists($dir.'/'.$file)) { $classname = "doc_".$modele; - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; $obj = new $classname($db); $obj->message = $message; @@ -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 c26c50ba3867599eb1cf4c14798b92b543a2cd55..fdcddaf6df1a0523ee2d47e84f1c8e872240d0bc 100755 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -22,7 +22,7 @@ * \ingroup facture fournisseur * \brief File that contain parent class for supplier invoices models */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.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; @@ -129,7 +129,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db,$object); @@ -141,11 +141,11 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; 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 e32d72e2e868cd2f7880c330909659376a7913cc..6dd866f8887cb5a9d19413e56c3adfe7ef978296 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -23,11 +23,11 @@ * \brief Class file to generate the supplier invoices with the canelle model */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_invoice/modules_facturefournisseur.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index f1a6557ec01a4b7b0a7ef4605bbc1b88887decd0..1050450de2d802a09fddaf5a67b2680f261f8215 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -23,7 +23,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefournisseur.php'; /** diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 33e4f35286805b6b5e40ec3af2feb6d63be14b6f..4717b43d8d25d5ee3c02d52ec031a96fbb2dd2ac 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -24,7 +24,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee */ -require_once(DOL_DOCUMENT_ROOT ."/core/modules/supplier_order/modules_commandefournisseur.php"); +require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefournisseur.php'; /** @@ -111,7 +111,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders { global $db,$conf; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; // On defini critere recherche compteur $mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK; diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index f80ad89142d142f50fd01c0531867c54bc2f6648..7c437a751cd9e491b90048fc66c21d2bc1272022 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -27,8 +27,8 @@ * \brief File that contain parent class for supplier orders models * and parent class for supplier orders numbering models */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); // requis car utilise par les classes qui heritent +require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requis car utilise par les classes qui heritent /** @@ -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; @@ -210,7 +210,7 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet // Charge le modele if ($filefound) { - require_once($file); + require_once $file; $obj = new $classname($db,$object); @@ -222,11 +222,11 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet $outputlangs->charset_output=$sav_charset_output; // we delete preview files - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; 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 bf11276c2bf05f00e655f3dab3f8daf7742d7067..a194480e834a9a89b4b9e702e20e7d744a3cf663 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -25,12 +25,12 @@ * \brief File of class to generate suppliers orders from muscadet model */ -require_once(DOL_DOCUMENT_ROOT."/core/modules/supplier_order/modules_commandefournisseur.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.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/photos_resize.php b/htdocs/core/photos_resize.php index 9da5a265c6f4ab61dbf941a7cac87750b982aa08..4de1eab4d30c40951e5e276afc58127b51b0578b 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -34,10 +34,10 @@ //if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); //if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session) -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("products"); $langs->load("other"); diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php index 886b898ae37d606c61b0ffda0eb2c9db45c84dc7..44662ec7d99a307863ab76cea6d424246f69bdfc 100755 --- a/htdocs/core/tools.php +++ b/htdocs/core/tools.php @@ -22,7 +22,7 @@ * \brief Home page for top menu tools */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("companies"); $langs->load("other"); 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/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 23077b3e5b54e7dfc309df59684d8d4b6a2b3d5e..5015205f631ad183d0d9a183cd639403bb190be4 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -136,7 +136,7 @@ if (! empty($conf->margin->enabled)) { <?php // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('product_desc', GETPOST('product_desc'), '', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70); diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php index 338dca58c1be072b63f62c34f2a949e62e752750..6a5e6e7ef30c59fb2dcc922cff51bcc6534ac211 100644 --- a/htdocs/core/tpl/freeproductline_edit.tpl.php +++ b/htdocs/core/tpl/freeproductline_edit.tpl.php @@ -48,7 +48,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index 40adc831a5c8fc053c5242dbdf30c00beb0e5a71..3450b4134a9e6fe8484807a25c8bdb25dffa7928 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -89,7 +89,7 @@ jQuery(document).ready(function() { } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php index 31034ad6b674350ca8add1bafecee7ba1af39abf..4c9cd208eee7428eab87ceb5615adee64a702e45 100644 --- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php @@ -58,7 +58,7 @@ // editeur wysiwyg $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('desc',$line->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); $doleditor->Create(); ?> 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_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php index 112c7bc053b18bcca5169866566dcd047e2e8927..3b63eb25c658f8ec847aa34458c5954840184f54 100755 --- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php +++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php @@ -105,13 +105,13 @@ class InterfacePaypalWorkflow if ($object->source == 'membersubscription') { - //require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherents.class.php"); + //require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherents.class.php'; // TODO add subscription treatment } else { - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $soc = new Societe($this->db); 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/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index d122546aa6468f7276cf386c4dbf0d6f2b82c9c6..2a291b198af87008c0c7d5be276d343214042c35 100755 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -552,15 +552,15 @@ class InterfaceActionsAuto { $now=dol_now(); - require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'); - require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $contactforaction=new Contact($this->db); $societeforaction=new Societe($this->db); if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid); if ($object->socid > 0) $societeforaction->fetch($object->socid); // Insertion action - require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $actioncomm = new ActionComm($this->db); $actioncomm->type_code = $object->actiontypecode; $actioncomm->label = $object->actionmsg2; diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index a6c68d809e6bd97e39e6a90a5403e1905776448b..d01f817d442b89c7639c77c6ea9b74dda375f031 100755 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -99,7 +99,7 @@ class InterfaceNotification { if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing - require_once(DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'); + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; if ($action == 'BILL_VALIDATE') { diff --git a/htdocs/cron/functions_cron.lib.php b/htdocs/cron/functions_cron.lib.php index 86fc5aaa8036b979025dec1b714211913866ecf6..a659b695f4095c0d0d77124998887ac9fd6a128f 100644 --- a/htdocs/cron/functions_cron.lib.php +++ b/htdocs/cron/functions_cron.lib.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net> * diff --git a/htdocs/document.php b/htdocs/document.php index 2d629bcae7a1f53c611d8d3823b889872236e86b..5ec0f4686ab03ffa85add2947b38506fb2437f56 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -46,8 +46,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); */ function llxHeader() { } -require("./main.inc.php"); // Load $user and permissions -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +require 'main.inc.php'; // Load $user and permissions +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $encoding = ''; $action=GETPOST('action','alpha'); diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index bb665e09cb13cd1fdd2c7de3bddc3733630a7404..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; } @@ -327,7 +327,7 @@ class EcmDirectory // extends CommonObject function delete($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -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/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php index 57238a97cde749e4b5a06bac3d4a35c5835510b8..da67d3ec92c9fc2db89165c88d97f38e5fa5ffef 100644 --- a/htdocs/ecm/class/htmlecm.form.class.php +++ b/htdocs/ecm/class/htmlecm.form.class.php @@ -19,7 +19,7 @@ * \file htdocs/ecm/class/htmlecm.form.class.php * \brief Fichier de la classe des fonctions predefinie de composants html */ -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; /** diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index 9165deae7e3fa9b8dd4f1f602589d9cf1c0fbc72..8aee5bc984d0a6adf46c6b94f1e389832353e1e3 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -23,10 +23,10 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/htmlecm.form.class.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php index 45e71682cea02e33dd4978dedc843765fb336415..2edeb595c9837f2b0511a7eec144ab71468ddc90 100644 --- a/htdocs/ecm/docfile.php +++ b/htdocs/ecm/docfile.php @@ -22,11 +22,11 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index cbbbfc6da43b53fb89cd89c2e7a26d99274b627b..16c407457d0eeca834f45b0009faf66e5cc91ccf 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -23,11 +23,11 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php index 2f91b9811240c24bb0c7a668928b95f5cbebb5e7..4c618c79e71c01c15862ae3e4f9518b41660302f 100644 --- a/htdocs/ecm/docother.php +++ b/htdocs/ecm/docother.php @@ -9,9 +9,9 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Load traductions files $langs->load("ecm"); diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 3e5927f40aab32237f8ba0e42bcca75d902325fc..d52e2e177d61cd62c3dcb5126d3f50af1b2c4a4b 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -25,12 +25,12 @@ if (! defined('REQUIRE_JQUERY_LAYOUT')) define('REQUIRE_JQUERY_LAYOUT','1'); -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; // Load traductions files $langs->load("ecm"); @@ -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/ecm/search.php b/htdocs/ecm/search.php index 102fca7ebdd43966b0a53ed2851bc677b08f8224..16ca5d56a366e5fdad375e1becccfb933af43656 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -23,12 +23,12 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; // Load traductions files $langs->load("ecm"); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index a69c7a0487376b0f8c73fa4bca129e2043474313..06d79a5cd00e721f106069dfb326eeef9db9fb8c 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -25,9 +25,9 @@ * \brief Fichier de la classe de gestion des expeditions */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.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(); @@ -158,7 +158,7 @@ class Expedition extends CommonObject $now=dol_now(); - require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; $error = 0; // Clean parameters @@ -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; } @@ -437,7 +437,7 @@ class Expedition extends CommonObject { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_syslog(get_class($this)."::valid"); @@ -498,7 +498,7 @@ class Expedition extends CommonObject // If stock increment is done on sending (recommanded choice) if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); @@ -539,30 +539,30 @@ class Expedition extends CommonObject if (! $error) { - $this->oldref=''; - - // Rename directory if dir was a temporary ref - if (preg_match('/^[\(]?PROV/i', $this->ref)) - { - // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) - // afin de ne pas perdre les fichiers attaches - $oldref = dol_sanitizeFileName($this->ref); - $newref = dol_sanitizeFileName($numref); - $dirsource = $conf->expedition->dir_output.'/sending/'.$oldref; - $dirdest = $conf->expedition->dir_output.'/sending/'.$newref; - if (file_exists($dirsource)) - { - dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest); - - if (@rename($dirsource, $dirdest)) - { - $this->oldref = $oldref; - - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($dirdest.'/'.$oldref.'*.*'); - } - } + $this->oldref=''; + + // Rename directory if dir was a temporary ref + if (preg_match('/^[\(]?PROV/i', $this->ref)) + { + // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) + // afin de ne pas perdre les fichiers attaches + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($numref); + $dirsource = $conf->expedition->dir_output.'/sending/'.$oldref; + $dirdest = $conf->expedition->dir_output.'/sending/'.$newref; + if (file_exists($dirsource)) + { + dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest); + + if (@rename($dirsource, $dirdest)) + { + $this->oldref = $oldref; + + dol_syslog("Rename ok"); + // Suppression ancien fichier PDF dans nouveau rep + dol_delete_file($dirdest.'/'.$oldref.'*.*'); + } + } } } @@ -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; } @@ -766,7 +766,7 @@ class Expedition extends CommonObject function delete() { global $conf, $langs, $user; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -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; @@ -1195,7 +1195,7 @@ class Expedition extends CommonObject $url=''; if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php") && ! empty($this->tracking_number)) { - require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); + require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_".strtolower($code).'.modules.php'; $shipmethod = new $classname(); $url = $shipmethod->provider_url_status($this->tracking_number); } diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index f1635301eaa41882ab75ee206e2bc780962d0c28..f74ccc9d02da1a16cf1fa287a975956a09fda56a 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -23,12 +23,12 @@ * \brief Onglet de gestion des contacts de expedition */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("orders"); $langs->load("sendings"); diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index c6fbc72976560563997e21a19c8746bbde5976c9..4b34720e0430a56bedcd65f5bcc94c1466763746 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -25,17 +25,17 @@ * \brief Fiche descriptive d'une expedition */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/modules_expedition.php"); -if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; +if ($conf->product->enabled || $conf->service->enabled) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if ($conf->stock->enabled) require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load("sendings"); $langs->load("companies"); @@ -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')); @@ -325,7 +325,7 @@ else if ($action == 'builddoc') // En get ou en post // Delete file in doc form elseif ($action == 'remove_file') { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $object = new Expedition($db); if ($object->fetch($id)) @@ -344,7 +344,7 @@ elseif ($action == 'remove_file') */ if (GETPOST('addfile','alpha')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -359,7 +359,7 @@ if (GETPOST('addfile','alpha')) */ if (GETPOST('removedfile','alpha')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -443,7 +443,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -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/expedition/index.php b/htdocs/expedition/index.php index 5c6baed4e4d8b77207e29936f100f2fe00106c97..aa35c12d092df8ab624c162ff55210a1a629c038 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -23,9 +23,9 @@ * \brief Home page of shipping area. */ -require("../main.inc.php"); -require(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); +require '../main.inc.php'; +require DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("orders"); $langs->load("sendings"); diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index d5e9c8a23aff682c3b38e0e8dcff6149c1f87182..1225eb75c7d11a95be5d00b4b23d5dc6bb551e76 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -23,8 +23,8 @@ * \brief Page to list all shipments */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("sendings"); $langs->load('companies'); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 10f30aba2730d34411638fdcfb54aa038f2844cd..f9b5d80fe626064144e780852bfa70d32d6db0fa 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -23,17 +23,17 @@ * \ingroup expedition */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); -if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -if (! empty($conf->projet->enabled)) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -if (! empty($conf->propal->enabled)) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if (! empty($conf->commande->enabled)) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if (! empty($conf->stock->enabled)) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; +if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if (! empty($conf->stock->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load('orders'); $langs->load("companies"); diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index d42b1892dc4d89ff93045047f99001c57f9ac771..3e1f74ca35d4e766c6a7ff6b48e9b1d26430a58e 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -23,8 +23,8 @@ * \brief Page des stats expeditions */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("sendings"); diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php index 27e96de17cd51190d57a452397456cc9a12bb0f3..538d8fa290b07b921bf81b2cdc12d778a96a2652 100644 --- a/htdocs/expedition/stats/month.php +++ b/htdocs/expedition/stats/month.php @@ -22,10 +22,10 @@ * \brief Page des stats expeditions par mois */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expeditionstats.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; /* diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 4cdd9cda153c7b87f9316890c33cd3b5fa3953f1..2b204b2b654d1f80b505c972f7e5c49a8d8d671b 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -75,7 +75,7 @@ class Export $i=0; // Define list of modules directories into modulesdir - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $modulesdir = dolGetModulesDirs(); @@ -103,7 +103,7 @@ class Export // Chargement de la classe $file = $dir.$modulename.".class.php"; $classname = $modulename; - require_once($file); + require_once $file; $module = new $classname($this->db); if (is_array($module->export_code)) @@ -250,7 +250,7 @@ class Export $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $file = "export_".$model.".modules.php"; $classname = "Export".$model; - require_once($dir.$file); + require_once $dir.$file; $objmodel = new $classname($this->db); if ($sqlquery) $sql = $sqlquery; @@ -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/export.php b/htdocs/exports/export.php index 8d0c498069ca2d7a617f402e71e6cfe858c6bfec..d69e300a28ddf68569944035c6648fec78029134 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -23,11 +23,11 @@ * \brief Pages of export Wizard */ -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/exports/class/export.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/exports/class/export.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; $langs->load("exports"); diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index c3f3bb51d0ad5523abf34a08806280e0e8c4dcbc..3317554ec1c66d43391ec7c4ac8eb42f25829046 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -21,8 +21,8 @@ * \brief Home page of export tools */ -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/exports/class/export.class.php"); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/exports/class/export.class.php'; $langs->load("exports"); @@ -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/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php index 29ca25d00dc0c1375d4dd579043f258e6b3b05b7..59a98ded0a22831a7d2f5d69c80c1fead01787fc 100644 --- a/htdocs/externalsite/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -26,8 +26,8 @@ * \brief Page de configuration du module externalsite */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; if (!$user->admin) diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 64c88630fbe77dce76e3796fde73a05d82e010b6..734096506f5d098b86668d4a42a031bfa71ad816 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -23,7 +23,7 @@ * \author Laurent Destailleur */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("externalsite@externalsite"); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 2ef4628759dda368ff7f02ac3321063bd678bd9f..2501f4cd88f1fcbd4193de493e425fa01b5a5f48 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -24,11 +24,11 @@ * \brief Page de l'onglet apercu d'une fiche d'intervention */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('interventions'); diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 0498ab21466d1106242eb1a4b6aa7a5af06b53b3..4f2cdbe06c09da7dcd860336f7437f26b13e2f94 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -23,7 +23,7 @@ * \ingroup ficheinter * \brief Fichier de la classe des gestion des fiches interventions */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.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; } @@ -517,7 +517,7 @@ class Fichinter extends CommonObject } // Chargement de la classe de numerotation - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname(); @@ -601,7 +601,7 @@ class Fichinter extends CommonObject function delete($user) { global $conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -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 0f1d347f0a5f93298bd7e86e3f39c6cc6152dfd9..4969213df7807ecc1e9e6bcbcf5ff2307869fda4 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -23,11 +23,11 @@ * \brief Onglet de gestion des contacts de fiche d'intervention */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("interventions"); $langs->load("sendings"); @@ -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/document.php b/htdocs/fichinter/document.php index 06309ce89e35a3e5e0284e6f3d9d83bef651112b..c4647054f49314ddf071ed40c0882c350af7258f 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -26,12 +26,12 @@ * \brief Page des documents joints sur les contrats */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("fichinter"); @@ -73,7 +73,7 @@ $modulepart='fichinter'; if (GETPOST('sendit','alpha') && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_add_file_process($upload_dir,0,1,'userfile'); } diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 34edbbc26758740ef31a5032d8de19e208cdb1e1..82046da91af14aaeec08a0bf6683052547751b7d 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -24,20 +24,20 @@ * \ingroup ficheinter */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/fichinter/modules_fichinter.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php'; } $langs->load("companies"); @@ -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')); @@ -210,7 +210,7 @@ else if ($action == 'remove_file') { if ($object->fetch($id)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $object->fetch_thirdparty(); @@ -467,7 +467,7 @@ else if ($action == 'down' && $user->rights->ficheinter->creer) */ if (GETPOST('addfile','alpha')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -482,7 +482,7 @@ if (GETPOST('addfile','alpha')) */ if (GETPOST('removedfile','alpha')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -565,7 +565,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $mimetype = $attachedfiles['mimes']; // Envoi de la propal - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -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; } @@ -957,20 +957,20 @@ else if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany= new FormCompany($db); $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'; } /* @@ -1073,7 +1073,7 @@ else if ($id > 0 || ! empty($ref)) print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print '</td>'; @@ -1128,7 +1128,7 @@ else if ($id > 0 || ! empty($ref)) print '<tr '.$bc[$var].">\n"; print '<td>'; // editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print '</td>'; @@ -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/info.php b/htdocs/fichinter/info.php index 1029880d487b0d0b8339b41915656d9bcc480ab7..fe2b880272170e8355d38653dc1a052c51d22bd8 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -23,10 +23,10 @@ * \brief Page d'affichage des infos d'une fiche d'intervention */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 62a146fa289e06d570b797c3e4f08a41b691f366..98e9600b56a8a40256c51153427b70ebee6bb2d0 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -24,10 +24,10 @@ * \ingroup ficheinter */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("companies"); $langs->load("interventions"); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 630abae78b20c909f5b04c4d9266bd3c1daabe7c..3026148e196b3ebbfb28b2dc9af36095eb3798e8 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -22,9 +22,9 @@ * \brief Fiche d'information sur une fiche d'intervention */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; $langs->load('companies'); $langs->load("interventions"); @@ -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/fichinter/rapport.php b/htdocs/fichinter/rapport.php index 0be18134f70c970412945d9ff2014d323745109c..88f5eedd2f820d6e18273b40e1f847e773f6a1ca 100644 --- a/htdocs/fichinter/rapport.php +++ b/htdocs/fichinter/rapport.php @@ -18,8 +18,8 @@ * */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("interventions"); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 1a8655c08f2c16424f52c305fc5037963e642ac3..2b208660b52944cf90acb91ac113a5e34a944dd9 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> @@ -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"); @@ -229,7 +229,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")) { @@ -239,8 +239,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/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php index a01a629d28b96036485bf202ae2d6f15640832b2..217a0a6809307208fd45a4d5231d6a03c9b4923b 100644 --- a/htdocs/fourn/ajax/getSupplierPrices.php +++ b/htdocs/fourn/ajax/getSupplierPrices.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); -require("../../main.inc.php"); +require '../../main.inc.php'; $idprod=GETPOST('idprod','int'); diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index e2cb076b2b720a5660deb3e248a1dc72a266dcdc..66363030d4cce1eb353090e1a44d544dcae14fbd 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -23,9 +23,9 @@ * \ingroup fournisseur,societe * \brief File of class to manage suppliers */ -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; /** diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index e7989d21438553a5d2dd94fdd8d2f54b3e1d65c0..53211070923386a28101d2e42d705474726ef007 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -26,8 +26,8 @@ * \brief File of class to manage suppliers orders */ -include_once(DOL_DOCUMENT_ROOT."/core/class/commonorder.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; /** @@ -304,7 +304,7 @@ class CommandeFournisseur extends CommonOrder function valid($user,$idwarehouse=0) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -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; } @@ -450,7 +450,7 @@ class CommandeFournisseur extends CommonOrder // If stock is incremented on validate order, we must redecrement it if ($conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $num=count($this->lines); for ($i = 0; $i < $num; $i++) @@ -621,7 +621,7 @@ class CommandeFournisseur extends CommonOrder { // Definition du nom de modele de numerotation de commande fournisseur $modName=$conf->global->COMMANDE_SUPPLIER_ADDON; - require_once($dir.'/'.$file); + require_once $dir.'/'.$file; // Recuperation de la nouvelle reference $objMod = new $modName($this->db); @@ -662,7 +662,7 @@ class CommandeFournisseur extends CommonOrder function approve($user, $idwarehouse=0) { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error=0; @@ -701,7 +701,7 @@ class CommandeFournisseur extends CommonOrder // If stock is incremented on validate order, we must increment it if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $cpt=count($this->lines); @@ -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; } @@ -1183,7 +1183,7 @@ class CommandeFournisseur extends CommonOrder { global $conf; $error = 0; - require_once DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"; + require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; // Check parameters if ($entrepot <= 0 || $qty <= 0) @@ -1284,7 +1284,7 @@ class CommandeFournisseur extends CommonOrder function delete($user='') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $error = 0; @@ -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 a25d9c54426f30efb48366aebe14a6f955ade2de..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; } @@ -839,7 +839,7 @@ class FactureFournisseur extends CommonInvoice // Si on incrémente le produit principal et ses composants à la validation de facture fournisseur if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $cpt=count($this->lines); @@ -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; } @@ -917,7 +917,7 @@ class FactureFournisseur extends CommonInvoice // Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; $langs->load("agenda"); $cpt=count($this->lines); @@ -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/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index aa87425bf6b2a62879155a4a69cb9d95449afc95..a3150e4df2aa2b2045d7abcda069296c6e0ca41c 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -25,8 +25,8 @@ * \brief File of class to manage predefined suppliers products */ -require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; -require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; /** diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 0e86f2c9365a4a188489c5b80bca83b44f9cd312..7b931323a40a810bfb90f00108b757f753b1fe0d 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -24,8 +24,8 @@ * \ingroup fournisseur, facture * \brief File of class to manage payments of suppliers invoices */ -require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; /** * \class PaiementFourn @@ -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 2349efa9c936cecfe9caa662fa48349b1d88a632..16b68a89d7d114e51588826ce20e044375d692c1 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -23,11 +23,11 @@ * \brief Onglet de gestion des contacts de commande */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("facture"); $langs->load("orders"); @@ -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/dispatch.php b/htdocs/fourn/commande/dispatch.php index d238bf1eb41b5321b9ad4950e4416a7e8e089a65..d877dfef3d8832d52891b13bb4c759c8c9818f2e 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -26,12 +26,12 @@ * \brief Fiche de ventilation des commandes fournisseurs */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('orders'); $langs->load('sendings'); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index a28889d97f9429bac57e5d13e0803e79433eeaad..da69298763e0546455c0383606671bfa04775803 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -24,13 +24,13 @@ * \brief Page de gestion des documents attachees a une commande fournisseur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $langs->load('orders'); $langs->load('other'); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 1d08ed2b038e16c727935564b7342c81ee669a77..dad9cbd659365badeefa830ec0b6f1d79d092c6d 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -28,16 +28,16 @@ * \brief Card supplier order */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formorder.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'); -require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"; -require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; -require_once DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"; -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -if ($conf->produit->enabled) require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if ($conf->produit->enabled) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('orders'); $langs->load('sendings'); @@ -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')); @@ -635,7 +635,7 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer) / // Delete file in doc form else if ($action == 'remove_file' && $user->rights->fournisseur->commande->creer) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if ($object->fetch($id)) { @@ -693,7 +693,7 @@ else if ($action == 'create' && $user->rights->fournisseur->commande->creer) */ if (GETPOST('addfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -708,7 +708,7 @@ if (GETPOST('addfile')) */ if (GETPOST('removedfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -792,7 +792,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -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; } @@ -997,7 +997,7 @@ if ($id > 0 || ! empty($ref)) $text=$langs->trans('ConfirmValidateOrder',$newref); if ($conf->notification->enabled) { - require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php"); + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='<br>'; $text.=$notify->confirmMessage(3,$object->socid); @@ -1015,7 +1015,7 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $formquestion=array( //'text' => $langs->trans("ConfirmClone"), @@ -1251,20 +1251,20 @@ if ($id > 0 || ! empty($ref)) if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); - require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $formcompany= new FormCompany($db); $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); @@ -1423,7 +1423,7 @@ if ($id > 0 || ! empty($ref)) } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1450,7 +1450,7 @@ if ($id > 0 || ! empty($ref)) if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline') { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print '<tr class="liste_titre">'; print '<td>'; @@ -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/history.php b/htdocs/fourn/commande/history.php index f911e8c2b71112f72d1eb423d1655a4ac0f5a98b..2ba34ecc885e2a8b5b221ce5987bb0c66c4a47af 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -23,9 +23,9 @@ * \brief Fiche commande */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $langs->load("orders"); $langs->load("suppliers"); diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 4ed3f9495b8e2e58d5f665272a2d95e2df416c1b..739795a5ef62076c1f1dff5862bc88a4bb36e44a 100755 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> @@ -24,10 +24,10 @@ * \brief Home page of supplier's orders area */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; // Security check $orderid = GETPOST('orderid'); diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index 8c76b779730808e60e597e77bc10aba1f7766db4..b9960a1e49912f2e0c64b7733115502cad24b202 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> @@ -23,9 +23,9 @@ * \brief List of suppliers orders */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $langs->load("orders"); diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 7ffc4489ab820565344f5ee3be7aedd0f6e818ae..d3e61d40999053c3a523630a497a0768ae78631e 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -23,9 +23,9 @@ * \brief Fiche note commande */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/fourn.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; $langs->load("orders"); $langs->load("suppliers"); @@ -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/contact.php b/htdocs/fourn/contact.php index 19d8d0cd01e8348592c1ec0384561c07d00d50ce..958c8cec9b2a18ed4149e9e9be33ad5ac1d1b251 100644 --- a/htdocs/fourn/contact.php +++ b/htdocs/fourn/contact.php @@ -23,7 +23,7 @@ * \brief Liste des contacts fournisseurs */ -require("../main.inc.php"); +require '../main.inc.php'; $langs->load("companies"); diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index fffbe36481e306d1245c22d73a11d537113c2df3..4ef956255537f73237399ab529ec6b8820277c85 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -23,12 +23,12 @@ * \brief Onglet de gestion des contacts des factures */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("bills"); $langs->load('other'); @@ -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/document.php b/htdocs/fourn/facture/document.php index 229828c90659be556175b27f4261df276296b022..a3f1df2bd881261c1fd380ebe8d85b26f5b5ac5f 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -24,13 +24,13 @@ * \brief Page de gestion des documents attachees a une facture fournisseur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load('bills'); $langs->load('other'); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 02a7167ad5105ba40bdc146d4a4e2aff8a97c4db..0782199e2c1fd492960d8d4194842eac441db531 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -26,15 +26,15 @@ * \brief Page for supplier invoice card (view, edit, validate) */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if ($conf->projet->enabled) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('bills'); @@ -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')); @@ -286,7 +286,7 @@ elseif ($action == 'add' && $user->rights->fournisseur->facture->creer) // Add lines if ($id > 0) { - require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'); + require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'; $classname = ucfirst($subelement); if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur'; $srcobject = new $classname($db); @@ -614,7 +614,7 @@ elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer) // Add file in email form if (GETPOST('addfile')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory TODO Use a dedicated directory for temp mails files $vardir=$conf->user->dir_output."/".$user->id; @@ -627,7 +627,7 @@ if (GETPOST('addfile')) // Remove file in email form if (! empty($_POST['removedfile'])) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; // Set tmp user directory $vardir=$conf->user->dir_output."/".$user->id; @@ -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(); @@ -708,7 +708,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $mimetype = $attachedfiles['mimes']; // Send mail - require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->error) { @@ -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) { @@ -827,7 +827,7 @@ elseif ($action == 'builddoc') // Delete file in doc form elseif ($action == 'remove_file') { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if ($object->fetch($id)) { @@ -952,7 +952,7 @@ if ($action == 'create') $element = 'fourn'; $subelement = 'fournisseur.commande'; } - require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'); + require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'; $classname = ucfirst($subelement); if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur'; $objectsrc = new $classname($db); @@ -1253,7 +1253,7 @@ else if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $formproduct=new FormProduct($db); $formquestion=array( //'text' => $langs->trans("ConfirmClone"), @@ -1523,13 +1523,13 @@ else if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); - require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $formcompany= new FormCompany($db); $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'; } @@ -1618,7 +1618,7 @@ else } // Description - Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('desc',$object->lines[$i]->description,'',128,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -1754,7 +1754,7 @@ else } // Editor wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $doleditor=new DolEditor('dp_desc',GETPOST("dp_desc"),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70); @@ -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/impayees.php b/htdocs/fourn/facture/impayees.php index 6a51edc9c2edcef896584b06693fbf6149164e78..5257a2c83f3cd3a5024036c56078c2dea17e68b0 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -26,10 +26,10 @@ * \brief Page to list all unpaid invoices */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; if (! $user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 074fff441eccdd6316d03c2ad645066b8b51b928..c141d627715a8618b15c75f5c9c47cf51b4a0017 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -23,11 +23,11 @@ * \brief List of suppliers invoices */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (!$user->rights->fournisseur->facture->lire) accessforbidden(); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 71daf72ec81c1aee0fa821094772cc0b7689083b..d93b48e86bce7d8a5391527c16cd83372c6c820c 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -23,11 +23,11 @@ * \brief Page des informations d'une facture fournisseur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; $langs->load('bills'); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 905b0f0332867c1cc179ce94f69535e43c6d7bbf..802875dda75dbd3b0fd18550332bd04edf6f172d 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -23,10 +23,10 @@ * \brief Fiche de notes sur une facture fournisseur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $langs->load('bills'); $langs->load("companies"); @@ -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/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index fa31e9c0a33530e5506e437955e18db097136b34..3154301214b0b2a316f2fc2acc58dfa60f74408d 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -26,10 +26,10 @@ * \brief Payment page for suppliers invoices */ -require("../../main.inc.php"); -require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); +require '../../main.inc.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $langs->load('companies'); $langs->load('bills'); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 6e33902453a8b45216e13a48748a7f58abf74e54..488f260237ac49ed506a77c39485c290ca24ca68 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -25,12 +25,12 @@ * \brief Page for supplier third party card (view, edit) */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +if ($conf->adherent->enabled) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $langs->load('suppliers'); $langs->load('products'); diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 8169429b8cb64f4cf65a65bfcde8ee709fca7e14..b3935d7c6e60f1540d19cfdd2c7db9e358024a86 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -23,10 +23,10 @@ * \brief Home page of suppliers area */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("suppliers"); $langs->load("orders"); diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php index 2e00277344151d127db096f96340598ea0213376..956dbf82b7eb7ff18ce3d068cdc8c4b1ca70ef6e 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/liste.php @@ -24,8 +24,8 @@ * \brief Home page of supplier area */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("suppliers"); $langs->load("orders"); diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index dfb40716ce8f75a3211059f4aa50dd30c84cdce3..cbb7798ec21fe723535cc120a8726b38153659ab 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -24,10 +24,10 @@ * \remarks Fichier presque identique a compta/paiement/fiche.php */ -require("../../main.inc.php"); -require(DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'); -require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'); -require(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); +require '../../main.inc.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; +require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $langs->load('bills'); $langs->load('banks'); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 95d1bc0a0ead4cb81d92bd6b163a192e6e685b37..5431bd2efff82bfbe3213fdc56d7b8cd509fa38e 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -22,9 +22,9 @@ * \brief Onglet info d'un paiement fournisseur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/paiementfourn.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $langs->load("bills"); $langs->load("suppliers"); diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php index 19afd4576e793c60de4957d094ce5e1bccf217aa..653093695d34e1246db9c5db27de22aceeb269c8 100644 --- a/htdocs/fourn/product/categorie.php +++ b/htdocs/fourn/product/categorie.php @@ -24,8 +24,8 @@ * \brief Page of products categories */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("categories"); diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index 4f9d8fd7c3e783f7b246e45d8ba1746497570994..bfee87d146d434ef164e6ad6817d53a4b2d71971 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -22,7 +22,7 @@ * \brief Page accueil des produits et services */ -require("../../main.inc.php"); +require '../../main.inc.php'; // Security check if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden(); diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index 85b0be9fa40c0ea4dc0a8058f49e8b5130dd01b7..5a864b7f722643fe8aaad748883a58cdd287e6f6 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.php @@ -24,10 +24,10 @@ * \brief Page liste des produits ou services */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; $langs->load("products"); $langs->load("suppliers"); diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php index d877fa6b06774bb5acdf12b348c6355a1f376ade..7dc2d69c44d3f1c234d263e997c623516d1dbfd7 100644 --- a/htdocs/fourn/product/photos.php +++ b/htdocs/fourn/product/photos.php @@ -22,8 +22,8 @@ * \brief Page de la fiche produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $id = GETPOST('id', 'int'); diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 78b9f4fa290c9e4df78cf04ce97187f854feebc5..48ccca8a0da10a3c675c83069d490d6cdd6855ab 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -22,9 +22,9 @@ * \brief Page de fiche recap fournisseur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 8ad93526b2cf2103ecab67e23e9cfed664be7552..ed4176da68994d08671fd26d86f1419970e6182b 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -22,8 +22,8 @@ * \brief Admin page to setup FTP client module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("ftp"); diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index d1acf7982b9f587b02fd6680c01da15dd06682bf..164e3fd3c1d28c4250c20cbf808c75d88ea5aaef 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -23,10 +23,10 @@ * \author Laurent Destailleur */ -require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php"); +require 'pre.inc.php'; // We use pre.inc.php to have a dynamic menu +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php'; // Load traductions files $langs->load("ftp"); @@ -82,7 +82,7 @@ $conn_id=0; // FTP connection ID // Envoie fichier if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $result=$ecmdir->fetch($_REQUEST["section"]); if (! $result > 0) diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index 05d312cc7551660a7daa51e87bfb1699a7de6125..40ec8d6a2740b513660c7a792f0827c4fab47311 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -67,7 +67,7 @@ class Import $var=true; $i=0; - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $modulesdir = dolGetModulesDirs(); // Load list of modules @@ -93,7 +93,7 @@ class Import // Init load class $file = $dir."/".$modulename.".class.php"; $classname = $modulename; - require_once($file); + require_once $file; $module = new $classname($this->db); if (is_array($module->import_code)) @@ -188,7 +188,7 @@ class Import $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".$model; - require_once($dir.$file); + require_once $dir.$file; $objmodel = new $classname($this->db,$datatoimport); $outputlangs=$langs; // Lang for output @@ -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/emptyexample.php b/htdocs/imports/emptyexample.php index 21ae9d9a80ca07a4e07187757db953a873b7bfa8..0363c1d29f68f43298654cc24b8d04590e7a9c76 100644 --- a/htdocs/imports/emptyexample.php +++ b/htdocs/imports/emptyexample.php @@ -26,10 +26,10 @@ function llxHeader() { print '<html><title>Build an import example file</title>< // This file is a wrapper, so empty footer function llxFooter() { print '</body></html>'; } -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/imports/class/import.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'; $datatoimport=GETPOST('datatoimport'); $format=GETPOST('format'); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index e56b520ef7a764a57838f26f8430adbf10301743..c9bd77bacb6f04c23985a41e79b74060f64bbc35 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -22,14 +22,14 @@ * \brief Pages of import Wizard */ -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/import.lib.php"); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/imports/class/import.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/import.lib.php'; $langs->load("exports"); $langs->load("errors"); @@ -575,7 +575,7 @@ if ($step == 4 && $datatoimport) $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname($db,$datatoimport); // Load source fields in input file @@ -1038,7 +1038,7 @@ if ($step == 5 && $datatoimport) $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname($db,$datatoimport); // Load source fields in input file @@ -1367,7 +1367,7 @@ if ($step == 6 && $datatoimport) $dir = DOL_DOCUMENT_ROOT . "/core/modules/import/"; $file = "import_".$model.".modules.php"; $classname = "Import".ucfirst($model); - require_once($dir.$file); + require_once $dir.$file; $obj = new $classname($db,$datatoimport); // Load source fields in input file diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index b4f4476faf25b63c45c5f618ba619afc62a30815..3682a8c59475061bb8e4ef37b17fddf847cb2829 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -21,8 +21,8 @@ * \brief Page accueil de la zone import */ -require_once("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php"); +require_once '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/imports/class/import.class.php'; $langs->load("exports"); @@ -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 c7a4761fe09ee1026065ef0da04662d582a17a4a..e356d9433a401dffc8e90623228cc10d7bd93546 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -25,8 +25,8 @@ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. -require("./main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require 'main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // If not defined, we select menu "home" @@ -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 52a64f007fef85cbf4c5c9366e30057eda6330c2..e407c037963ac97f7964ad8105c2e2c5d632c13b 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")) @@ -301,7 +301,7 @@ else } else { - require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); + require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index eed2ac2921a2f7b2a872d801c257a39ec2ee3395..7b225c137adec3f9280d0c767348c43cc71d5b8b 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 @@ -377,7 +377,7 @@ if (! $error && $db->connected && $action == "set") else { //ODT templates - require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $srcroot=$main_dir.'/install/doctemplates'; $destroot=$main_data_dir.'/doctemplates'; $docs=array('thirdparties' => 'thirdparty', 'proposals' => 'proposal', 'orders' => 'order', 'invoices' => 'invoice'); @@ -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 a8904cd10ab2b49ae98a6154f4fd52f18944cd0a..0e07722c93d9af34bbf992b1d9ab92ec1b54a6d4 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -22,9 +22,9 @@ * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data */ -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"); +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'; $etape = 2; $ok = 0; @@ -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 eb392ae2e86d980001fded424c4a65e91ec57001..a1af8a061d28642615e50453947292f5a98d3ff8 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -25,9 +25,9 @@ */ -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"); +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'; $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); @@ -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 f63eafe1ef3fef8fa9f2d0a947d31ddc46d98b07..0ff065ac53fa8954e006d8df11c0545692964bee 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -25,10 +25,10 @@ * \brief Last page of upgrade or install process */ -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 +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 $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); @@ -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); @@ -120,7 +120,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); + require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); @@ -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..704f8a54f41b977fc9beb5c5df0d50db80a1310e 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 d5490f6284f0bc414fe25d61f67bec56aff4cd39..780b159d2f866b186bddfd06849731bf7d164baf 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -26,7 +26,7 @@ // Just to define version DOL_VERSION if (! defined('DOL_INC_FOR_VERSION_ERROR')) define('DOL_INC_FOR_VERSION_ERROR','1'); -require_once('../filefunc.inc.php'); +require_once '../filefunc.inc.php'; // Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); @@ -37,11 +37,11 @@ if (! defined('ADODB_PATH')) define('ADODB_PATH', $foundpath); } -require_once(DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -require_once(ADODB_PATH.'adodb-time.inc.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once ADODB_PATH.'adodb-time.inc.php'; // Avoid warnings with strict mode E_STRICT $conf = new stdClass(); // instantiate $conf explicitely @@ -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..1c288ff9f23d2d162b2a5c3a23ca6bba9112f2ac 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..e2ef6449ac35d88fb7afbac3de11c0b2c1d71754 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 e02ff3bba0944aa06b478f2369cfd53723d037d0..ceb8516f1a1760d5c11caf3ebaa1cf2e498dbf8d 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -22,11 +22,11 @@ * \brief Run repair script */ -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"); +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'; $grant_query=''; $etape = 2; @@ -77,7 +77,7 @@ $error=0; // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); + require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); @@ -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 b89c3e2e2912fec827e2e1a8a840d7434805dc68..7f3d3be9bc9d939e4dc22429ade2efbab0e53af6 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -22,13 +22,13 @@ * \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").'; } -require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root."/core/lib/admin.lib.php"); +require_once $conffile; if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility +require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; $grant_query=''; $etape = 2; @@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); + require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index f7ea05e2ed198a48e1cda7d9b80e1f642252d99d..eb4658bf5aa5083ad5454a693861aa8b25c42a8e 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -23,20 +23,20 @@ * \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").'; } -require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root . '/compta/facture/class/facture.class.php'); -require_once($dolibarr_main_document_root . '/comm/propal/class/propal.class.php'); -require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php'); -require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'); -require_once($dolibarr_main_document_root . '/fourn/class/fournisseur.commande.class.php'); -require_once($dolibarr_main_document_root . '/core/lib/price.lib.php'); -require_once($dolibarr_main_document_root . '/core/class/menubase.class.php'); -require_once($dolibarr_main_document_root . '/core/lib/files.lib.php'); +require_once $conffile; if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility +require_once $dolibarr_main_document_root . '/compta/facture/class/facture.class.php'; +require_once $dolibarr_main_document_root . '/comm/propal/class/propal.class.php'; +require_once $dolibarr_main_document_root . '/contrat/class/contrat.class.php'; +require_once $dolibarr_main_document_root . '/commande/class/commande.class.php'; +require_once $dolibarr_main_document_root . '/fourn/class/fournisseur.commande.class.php'; +require_once $dolibarr_main_document_root . '/core/lib/price.lib.php'; +require_once $dolibarr_main_document_root . '/core/class/menubase.class.php'; +require_once $dolibarr_main_document_root . '/core/lib/files.lib.php'; $grant_query=''; $etape = 2; @@ -87,7 +87,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // If password is encoded, we decode it if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass)) { - require_once($dolibarr_main_document_root."/core/lib/security.lib.php"); + require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; if (preg_match('/crypted:/i',$dolibarr_main_db_pass)) { $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); @@ -341,8 +341,8 @@ else $error++; } -$ret=0; -if ($error && isset($argv[1])) $ret=1; +$ret=0; +if ($error && isset($argv[1])) $ret=1; dol_syslog("Exit ".$ret); pFooter($error,$setuplang); @@ -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/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 1968220f7da1d30c641ba2038a2e3a05e8f675f7..8edbf8a02002dbaed8ff9d7f367228a89594ba69 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -136,10 +136,14 @@ PaymentNumberUpdateSucceeded=Payment number updated succesfully PaymentNumberUpdateFailed=Payment number could not be updated PaymentDateUpdateSucceeded=Payment date update succesfully PaymentDateUpdateFailed=Payment date could not be updated +Transactions=Transactions BankTransactionLine=Bank transaction AllAccounts=All bank/cash accounts BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". - +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +EventualyAddCategory=Eventually, specify a category in which to classify the records +ToConciliate=To conciliate? +ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click \ No newline at end of file diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index a93dd9c4a99b49a33c672613f973b406c4f66a8a..6195a5147b999a0d2437dbb71595d0df3e4ab303 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -74,6 +74,7 @@ PaymentMode=Payment type PaymentConditions=Payment term PaymentConditionsShort=Payment term PaymentAmount=Payment amount +ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay HelpPaymentHigherThanReminderToPay= Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. ClassifyPaid=Classify 'Paid' @@ -214,6 +215,7 @@ NonPercuRecuperable=Non-recoverable SetConditions=Set payment terms SetMode=Set payment mode SetDate= Set date +SelectDate=Select a date Billed=Billed RepeatableInvoice=Pre-defined invoice RepeatableInvoices=Pre-defined invoices @@ -240,6 +242,7 @@ AddGlobalDiscount=Create absolute discount EditGlobalDiscounts=Edit absolute discounts AddCreditNote=Create credit note ShowDiscount=Show discount +ShowReduc=Show the deduction RelativeDiscount=Relative discount GlobalDiscount=Global discount CreditNote=Credit note @@ -353,6 +356,7 @@ LawApplicationPart2=the goods remain the property of LawApplicationPart3=the seller until the complete cashing of LawApplicationPart4=their price. LimitedLiabilityCompanyCapital=SARL with Capital of +UseLine=Apply UseDiscount=Use discount UseCredit=Use credit UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index d2f08c0ad49df833985dd9759ddfa46e91fd5a3d..8eebe14d634dafdd10439a9f423663c02a5d414f 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -81,6 +81,12 @@ ActionAC_SHIP=Send shipping by mail ActionAC_SUP_ORD=Send supplier order by mail ActionAC_SUP_INV=Send supplier invoice by mail ActionAC_OTH=Other +Stats=Sales statistics +CAOrder=Sales volume (validated orders) +FromTo=from %s to %s +MargeOrder=Margins (validated orders) +RecapAnnee=Summary of the year +NoData=There is no data StatusProsp=Prospect status DraftPropals=Draft commercial proposals SearchPropal=Search a commercial proposal \ No newline at end of file diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 9d56de642999fa0ae7d92e1d58f5a0d445f99596..085ea745d0a1ec3238e86cc9a0564be337f309ae 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -25,11 +25,11 @@ * \brief Fichier de la classe de gestion des bons de livraison */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; /** @@ -324,7 +324,7 @@ class Livraison extends CommonObject function valid($user) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_syslog(get_class($this)."::valid begin"); @@ -387,30 +387,30 @@ class Livraison extends CommonObject if ($resql) { - $this->oldref=''; - - // Rename directory if dir was a temporary ref - if (preg_match('/^[\(]?PROV/i', $this->ref)) - { - // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) - // afin de ne pas perdre les fichiers attaches - $oldref = dol_sanitizeFileName($this->ref); - $newref = dol_sanitizeFileName($numref); - $dirsource = $conf->expedition->dir_output.'/receipt/'.$oldref; - $dirdest = $conf->expedition->dir_output.'/receipt/'.$newref; - if (file_exists($dirsource)) - { - dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest); - - if (@rename($dirsource, $dirdest)) - { - $this->oldref = $oldref; - - dol_syslog("Rename ok"); - // Suppression ancien fichier PDF dans nouveau rep - dol_delete_file($dirdest.'/'.$oldref.'*.*'); - } - } + $this->oldref=''; + + // Rename directory if dir was a temporary ref + if (preg_match('/^[\(]?PROV/i', $this->ref)) + { + // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) + // afin de ne pas perdre les fichiers attaches + $oldref = dol_sanitizeFileName($this->ref); + $newref = dol_sanitizeFileName($numref); + $dirsource = $conf->expedition->dir_output.'/receipt/'.$oldref; + $dirdest = $conf->expedition->dir_output.'/receipt/'.$newref; + if (file_exists($dirsource)) + { + dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest); + + if (@rename($dirsource, $dirdest)) + { + $this->oldref = $oldref; + + dol_syslog("Rename ok"); + // Suppression ancien fichier PDF dans nouveau rep + dol_delete_file($dirdest.'/'.$oldref.'*.*'); + } + } } // Set new ref and current status @@ -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 @@ -552,7 +552,7 @@ class Livraison extends CommonObject { global $conf, $langs, $user; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $this->db->begin(); $error=0; @@ -596,13 +596,13 @@ class Livraison extends CommonObject } } - // Call triggers - 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) { - $error++; $this->errors=$interface->errors; - } + // Call triggers + 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) { + $error++; $this->errors=$interface->errors; + } // End call triggers return 1; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 1d881d2fe1130713ce062b86a86cd475732a3241..b0b949a4ed0be16b56a8e28f4b853a79cd762949 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -25,14 +25,14 @@ * \brief Fiche descriptive d'un bon de livraison=reception */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/livraison/modules_livraison.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/sendings.lib.php"); -if ($conf->product->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; +if ($conf->product->enabled || $conf->service->enabled) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +if ($conf->expedition_bon->enabled) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +if ($conf->stock->enabled) require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; if (!$user->rights->expedition->livraison->lire) accessforbidden(); @@ -188,21 +188,21 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post } } -// Delete file in doc form -elseif ($action == 'remove_file') -{ - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); - - $object = new Livraison($db); - if ($object->fetch($id)) - { - $object->fetch_thirdparty(); - $upload_dir = $conf->expedition->dir_output . "/receipt"; - $file = $upload_dir . '/' . GETPOST('file'); - $ret=dol_delete_file($file,0,0,0,$object); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); - } +// Delete file in doc form +elseif ($action == 'remove_file') +{ + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + + $object = new Livraison($db); + if ($object->fetch($id)) + { + $object->fetch_thirdparty(); + $upload_dir = $conf->expedition->dir_output . "/receipt"; + $file = $upload_dir . '/' . GETPOST('file'); + $ret=dol_delete_file($file,0,0,0,$object); + if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); + else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + } } diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index f565d8d67cdd7ae66dcbc71e2e282b7051738be5..eb6acf0ccfdbe9bb61335e494579f1647e73792c 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -26,9 +26,9 @@ * \brief File of class to manage members of a foundation */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** @@ -67,7 +67,7 @@ class MailmanSpip defined('ADHERENT_SPIP_DB') && ADHERENT_SPIP_DB != '' ) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $mdpass=dol_hash($object->pass); $htpass=crypt($object->pass,makesalt()); $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".$object->firstname." ".$object->lastname."\",\"".$object->email."\",\"".$object->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1aaa06fee46393e43badc8d0d65ecd7c2e4b5c72..a60133ba526680ee424f94aa54db5f713a1875c0 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -155,7 +155,7 @@ analyse_sql_and_script($_POST,0); if (! empty($_SERVER['DOCUMENT_ROOT'])) set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); // Include the conf.php and functions.lib.php -require_once("filefunc.inc.php"); +require_once 'filefunc.inc.php'; // Init session. Name of session is specific to Dolibarr instance. $prefix=dol_getprefix(); @@ -174,7 +174,7 @@ if (ini_get('register_globals')) // To solve bug in using $_SESSION // Init the 5 global objects // This include will set: $conf, $db, $langs, $user, $mysoc objects -require_once("master.inc.php"); +require_once 'master.inc.php'; // Activate end of page function register_shutdown_function('dol_shutdown'); @@ -232,9 +232,9 @@ if (! empty($conf->file->main_force_https)) // Chargement des includes complementaires de presentation -if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php"); // Need 10ko memory (11ko in 2.2) -if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php"); // Need 660ko memory (800ko in 2.2) -if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'); // Need 22ko memory +if (! defined('NOREQUIREMENU')) require_once DOL_DOCUMENT_ROOT .'/core/class/menu.class.php'; // Need 10ko memory (11ko in 2.2) +if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2) +if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory // If install or upgrade process not done or not completely finished, we call the install page. if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED)) @@ -248,7 +248,7 @@ if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_V || (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) { $versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/admin.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php'; $dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare); $dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION); $rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade); @@ -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); @@ -673,7 +673,7 @@ if (! defined('NOREQUIRETRAN')) // Use php template engine if (! empty($conf->global->MAIN_USE_TEMPLATE_ENGINE) && ! defined('NOTEMPLATEENGINE')) { - require_once(DOL_DOCUMENT_ROOT.'/includes/savant/Savant3.php'); + require_once DOL_DOCUMENT_ROOT.'/includes/savant/Savant3.php'; $tpl = new Savant3(); } @@ -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; } } @@ -1507,7 +1507,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Link to bugtrack if (! empty($conf->global->MAIN_SHOW_BUGTRACK_LINK)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $bugbaseurl='https://doliforge.org/tracker/?'; $bugbaseurl.='func=add&group_id=144&atid=246'; diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index 28f62175c6015ed030d160ec595a3557777ce35b..4736957c83018ad25722b2ed54b6a7da633572d4 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -21,10 +21,10 @@ * \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"); +require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); $langs->load("margins"); diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 82961207c56a4acaefa2733fd3874c0ccd62c29d..1ee828a95a20b078f57608168756293886e69b75 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -21,11 +21,11 @@ * \brief Page des marges par agent commercial */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/margin/lib/margins.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 1953e8c029343218559068d800f6f472eb007f36..0bfc0178be11c07eb99e893e90b7e301696d96f7 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -21,11 +21,11 @@ * \brief Page des marges par client */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/margin/lib/margins.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/margin/index.php b/htdocs/margin/index.php index e16f01ac6c0989ac0f43c44f0da0c23231351125..4e0f7386864cb496e703b2194b0a272200e0c114 100644 --- a/htdocs/margin/index.php +++ b/htdocs/margin/index.php @@ -21,6 +21,6 @@ * \brief Page d'index du module margin */ -require("./productMargins.php"); +require 'productMargins.php'; ?> diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php index 96bd0ed5b5d78b053d09873ad21d43326a0e6066..6609830ee60d4372b6270b24aa99ece7f9356e93 100644 --- a/htdocs/margin/lib/margins.lib.php +++ b/htdocs/margin/lib/margins.lib.php @@ -93,7 +93,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta $marque_tx_ret=''; if($fk_pa > 0) { - require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; + require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $product = new ProductFournisseur($db); if ($product->fetch_product_fournisseur_price($fk_pa)) { $paht_ret = $product->fourn_unitprice; @@ -106,7 +106,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta else $paht_ret = $paht; - require_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // calcul pu_ht remisés $tabprice=calcul_price_total(1, $pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT'); $pu_ht_remise = $tabprice[0]; diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index ca6de009da33291ab67fecf7ecb882f02ec38b9a..bf6e96726fb4abcc8c4d90185c9f71281004b70c 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -21,11 +21,11 @@ * \brief Page des marges par produit */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/margin/lib/margins.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 6fa027e4638eff490bfa3eb5f075420beb94bab4..732589eabc43e566f71c066c247090f5d944cc14 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -21,10 +21,10 @@ * \brief Page des marges des factures clients pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 9b1e712794b981a2a9a3df2cc873e7542241b9a7..ff6aa959b09d6a48f52b027b56b93765e529db8d 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -21,10 +21,10 @@ * \brief Page des marges des factures clients pour un tiers */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index d507a9db2fc9f958617c63d5a35058e02d32b0e0..d8dbb852e16a9a1827a9d3de2232c83a8f2d8543 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -31,14 +31,14 @@ * This script reads the conf file, init $lang, $db and and empty $user */ -require_once("filefunc.inc.php"); // May have been already require by main.inc.php. But may not by scripts. +require_once 'filefunc.inc.php'; // May have been already require by main.inc.php. But may not by scripts. /* * Create $conf object */ -require_once(DOL_DOCUMENT_ROOT."/core/class/conf.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php'; $conf = new Conf(); // Identifiant propres au serveur base de donnee @@ -80,9 +80,9 @@ $conf->file->strict_mode = empty($dolibarr_strict_mode)?'':$dolibarr_strict_mode $conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode; // Chargement des includes principaux de librairies communes -if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php"); // Need 500ko memory -if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php"); -if (! defined('NOREQUIRESOC')) require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php"); +if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php'; // Need 500ko memory +if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php'; +if (! defined('NOREQUIRESOC')) require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; /* * Creation objet $langs (must be before all other code) @@ -187,7 +187,7 @@ if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) */ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) { - require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php'; $mysoc=new Societe($db); $mysoc->id=0; @@ -216,7 +216,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/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index b28fe5f084eb751f9d5bdfaf64cecbb33411448c..af7821b5bd2ce28778251c60e8fdec14efa7e90e 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -23,9 +23,9 @@ * \brief Page to setup paybox module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $servicename='PayBox'; diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index 8023121d5b644c0564f8510185602929e8d2b703..5a2b28b722b0a222423e4656766fb7d3c16b8284 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -24,10 +24,10 @@ * \brief Page to setup paypal module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $servicename='PayPal'; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 017fc3cb2ab630ec38b3edf4de1dd75bbe4357e8..664866030dd402a8ae3bdaa5c47bd0043522c2f1 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -27,10 +27,10 @@ * \brief Setup page of product module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formbarcode.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php'; $langs->load("admin"); $langs->load("products"); @@ -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) { @@ -414,7 +414,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) if (is_dir($dir)) { - require_once(DOL_DOCUMENT_ROOT . "/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; $handle=opendir($dir); if (is_resource($handle)) @@ -426,7 +426,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY)) $classfile = $dir.$file.'/product.'.$file.'.class.php'; $classname = 'Product'.ucfirst($file); - require_once($classfile); + require_once $classfile; $object = new $classname(); $module = $object->module; diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php index acc396f9f637f3ea9e5a3656afb0c6efcd0bb459..7df63282be0270c671f9c2bea1a7b4d013835fa1 100755 --- a/htdocs/product/admin/product_extrafields.php +++ b/htdocs/product/admin/product_extrafields.php @@ -24,9 +24,9 @@ * \brief Page to setup extra fields of third party */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); $langs->load("admin"); @@ -54,7 +54,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); +require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php'; diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index 45a6456e21e78dd065bf9132cae6cc64207a7e71..7afe44418e92c7beb17f4d8ffb3fafb2d07490a0 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -21,10 +21,10 @@ * \brief Setup page of product module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("admin"); $langs->load("products"); diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index a0e7a5f4cabf657bfca8669c28147acac55fe17a..9a8f3b87f3de3f6f5578cf80c88e5dd7c825ebed 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -30,8 +30,8 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); if (empty($_GET['keysearch']) && ! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; $langs->load("products"); $langs->load("main"); 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 cc671d254d0f4f7cc138c2c297ac3924892c90ae..9129c111248c599f860951a9d97342491d09fbd8 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -25,7 +25,7 @@ * \ingroup produit * \brief File of class to manage predefined products or services */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** @@ -330,7 +330,7 @@ class Product extends CommonObject { if ($this->catid > 0) { - require_once(DOL_DOCUMENT_ROOT ."/categories/class/categorie.class.php"); + require_once DOL_DOCUMENT_ROOT .'/categories/class/categorie.class.php'; $cat = new Categorie($this->db, $this->catid); $cat->add_type($this,"product"); } @@ -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; @@ -2379,7 +2379,7 @@ class Product extends CommonObject { $this->db->begin(); - require_once(DOL_DOCUMENT_ROOT ."/product/stock/class/mouvementstock.class.php"); + require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; $op[0] = "+".trim($nbpiece); $op[1] = "-".trim($nbpiece); @@ -2457,7 +2457,7 @@ class Product extends CommonObject */ function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/photos"; @@ -2489,7 +2489,7 @@ class Product extends CommonObject */ function add_thumb($file, $maxWidth = 160, $maxHeight = 120) { - require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; $file_osencoded=dol_osencode($file); if (file_exists($file_osencoded)) @@ -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(); @@ -2780,7 +2780,7 @@ class Product extends CommonObject */ function delete_photo($file) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php index 0e828ac43d0f0ef74d9e531cbb1c3df1b8a5f17f..e306c327d7acc0981c0e03569932af37b8d0a03f 100644 --- a/htdocs/product/class/service.class.php +++ b/htdocs/product/class/service.class.php @@ -21,7 +21,7 @@ * \ingroup service * \brief Fichier de la classe des services predefinis */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index 3b24ca48227e6bed9b83872fb1c8cfceeb14e06a..9c365c950e8f1b422e9836fa332919d7753887da 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -26,11 +26,11 @@ * \brief Page de la fiche produit */ -require("../../main.inc.php"); +require '../../main.inc.php'; -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("bills"); $langs->load("products"); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 7c85be67781565a17682798b6230c5e860b63a5c..f6d1c8156d01fdf8d6083a4418ef539211edae8b 100755 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -25,12 +25,12 @@ * \brief Page des documents joints sur les produits */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("products"); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 82899baa08f3e2436f7e02db00f7dec805135235..20ef3342e98578642759792803513719ce209293 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -27,16 +27,16 @@ * \brief Page to show product */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -if (! empty($conf->propal->enabled)) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if (! empty($conf->facture->enabled)) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -if (! empty($conf->commande->enabled)) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $langs->load("products"); $langs->load("other"); @@ -62,7 +62,7 @@ $canvas = $object->canvas?$object->canvas:GETPOST("canvas"); $objcanvas=''; if (! empty($canvas)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; $objcanvas = new Canvas($db,$action); $objcanvas->getCanvas('product','card',$canvas); } @@ -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')); @@ -695,7 +695,7 @@ else if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer)) { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; // Load object modCodeProduct $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard'); @@ -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">'; @@ -891,7 +891,7 @@ else if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer)) { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $type = $langs->trans('Product'); if ($object->isservice()) $type = $langs->trans('Service'); @@ -1120,7 +1120,7 @@ else print '</td><td colspan="2">'; if ($action == 'editbarcodetype') { - require_once(DOL_DOCUMENT_ROOT."/core/class/html.formbarcode.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php'; $formbarcode = new FormBarCode($db); $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'barcodetype_id'); } diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index ba116f5ae92b35acc6dc1c6075bb9ca6e5a528b2..259d25c901c0bc6b5a426859f327c95031e82e0d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -26,10 +26,10 @@ * \brief Page of tab suppliers for products */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $langs->load("products"); $langs->load("suppliers"); @@ -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/index.php b/htdocs/product/index.php index e1adb65923ef8c88104865b49e66a468fcb9928a..d30303f91f7449049e3c31c26ccd179024b1c140 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -23,8 +23,8 @@ * \brief Page accueil des produits et services */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $type=isset($_GET["type"])?$_GET["type"]:(isset($_POST["type"])?$_POST["type"]:''); if ($type =='' && !$user->rights->produit->lire) $type='1'; // Force global page on service page only diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 2c2a0a5b469cc62384b2ab8247c6dc812fa621b5..cc3540f48958fe09c12c87032329135cf2f72aa7 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -23,12 +23,12 @@ * \brief Page to list products and services */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; if (! empty($conf->categorie->enabled)) - require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("products"); $langs->load("stocks"); @@ -65,7 +65,7 @@ $canvas=GETPOST("canvas"); $objcanvas=''; if (! empty($canvas)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; $objcanvas = new Canvas($db,$action); $objcanvas->getCanvas('product','list',$canvas); } @@ -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/photos.php b/htdocs/product/photos.php index 20cacf3045d4aca4c479e7b58774b36964241959..803485857b8dfe01193eb08bacf81e1e82db3f14 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -24,10 +24,10 @@ * \brief Onglet photos de la fiche produit */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 54067a5b9d01d14a9ce0bf93a9764ace652455ca..36aa1c1c4135a864859f9911846b0a191a64959a 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -24,8 +24,8 @@ * \brief Liste des produits/services par popularite */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; //Required to translate NbOfProposals $langs->load('propal'); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 8bfaae435e608e95aa7dc2023b6a4cee4ced05b7..724b13a0467b6280e12eef698358dfb1d8368801 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -25,9 +25,9 @@ * \brief Page to show product prices */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("products"); $langs->load("bills"); diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index b3f229c5ffbaf197478e7cfa55607a2b4160bf87..0fe19be03fb6d246ec4d7ba58e7e5d0a759e7d63 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -23,10 +23,10 @@ * \brief Page to list stocks */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $langs->load("products"); $langs->load("stocks"); @@ -66,7 +66,7 @@ $canvas=GETPOST("canvas"); $objcanvas=''; if (! empty($canvas)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; $objcanvas = new Canvas($db,$action); $objcanvas->getCanvas('product','list',$canvas); } diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 8e5dd7448e6d23263450542e64bb3ce4c30da7e8..7541ab43777648225f0b052083b1b930c9383d82 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -23,10 +23,10 @@ * \brief Page des stats des commandes clients pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("orders"); $langs->load("products"); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 47c18f7461754842dfa6ac7f22348940c0e499cf..b4a4df4163726a0364b072c9ab76a79cb5c5cfe3 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -23,10 +23,10 @@ * \brief Page des stats des commandes fournisseurs pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("orders"); $langs->load("products"); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index b39639d34f4e22759275e7709785103fc7f1e032..7f1424705c9443773638f2c859bf2725e7212c3f 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -23,10 +23,10 @@ * \brief Page des stats des contrats pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("contracts"); $langs->load("products"); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index c3d698a20fbd863a0ac1281678173645801c59d0..2492e52f9dcfe89a8685b3db1cf99f853ff44ac0 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -23,10 +23,10 @@ * \brief Page des stats des factures clients pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 45aad75722d6481318cadaa5d7fd70139c9ec159..b34bfb472ec8bebb72f914b90911041d78fb0f38 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -23,10 +23,10 @@ * \brief Page des stats des factures fournisseurs pour un produit */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index b65c5df965c4f62e9b7f9a6d1da1b5ad2fc4fc26..1cb107a3ff7df6d2eccd8882a4cba21ba1465f37 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -24,10 +24,10 @@ * \brief Page of product statistics */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 7652ebf7c64462ee7d0b143af836b9c917b8ac45..c597566eac6d7e9a00747b86f5358a23fadb103d 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -24,10 +24,10 @@ */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; $langs->load("products"); $langs->load("companies"); diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index c15d484aba8df89d5f5ea78a6e32036263929bef..cb3e891ff9d243fdd789fc6647ab3f71530ac0a9 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -24,7 +24,7 @@ * \brief Fichier de la classe de gestion des entrepots */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.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/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php index 31262e08e7ae8268b1c79de407a62353b1e1aa34..ef79496af20f1c9a207ca356f67624902fd671c2 100644 --- a/htdocs/product/stock/fiche-valo.php +++ b/htdocs/product/stock/fiche-valo.php @@ -22,9 +22,9 @@ * \brief Page fiche de valorisation du stock dans l'entrepot */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index d2750f6f832d2fade8f4873a961acd873fd6d851..b748d03069b5bfa0bf1581e972c01f27ef15034e 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -24,12 +24,12 @@ * \brief Page fiche entrepot */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("products"); $langs->load("stocks"); @@ -182,7 +182,7 @@ if ($action == 'create') // Description print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '</td></tr>'; @@ -503,7 +503,7 @@ else // Description print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70); $doleditor->Create(); print '</td></tr>'; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 8ba967646153e161c0d6a738b7458c60c7ee7639..4eca0b8c1b67722c084ca81bc9fbca6508bcdf9c 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -24,8 +24,8 @@ * \brief Home page of stock area */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load("stocks"); diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index 31fdd56e89035bd33bdabf323935843a6d3bb0f3..46e13daee1f0bce2065054440b8ac9be4a6178e2 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -21,10 +21,10 @@ * \brief Page des informations d'un entrepot */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; $langs->load("stocks"); diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php index de8ec8d2dbf5b14bab3000cf261a03496b3649fa..0f7ae3ae69bfec1c339160a974abead18f73a4cf 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/liste.php @@ -23,8 +23,8 @@ * \brief Page liste des stocks */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load("stocks"); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index f949102222c94f6573265e4e678ef9843b77d82e..b9fa376ff67644fa0777ecf90ba8f63ca83968a9 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -23,14 +23,14 @@ * \brief Page to list stock movements */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/stock.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("products"); $langs->load("stocks"); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 5673c31202c0b882695a4ce86d4ab230774981b7..23e884c2e4a802d97513f105a6fde86ce1fac5b5 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -25,11 +25,11 @@ * \brief Page to list detailed stock of a product */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; $langs->load("products"); $langs->load("orders"); diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 0533094b598e9bc35e342134df6eb1475d4c6272..741012ad3485669daef376e529f3378cae1e2a67 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -23,8 +23,8 @@ * \brief Page with stock values */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load("stocks"); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 20b154517c1e3def6e03bc28dee9cd9388feb5f8..ac85a45023151434f13129afea6c2ee25aaedd2a 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -24,11 +24,11 @@ * \brief Page de traduction des produits */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $langs->load("products"); $langs->load("languages"); @@ -161,7 +161,7 @@ print '</table>'; if ($action == 'edit') { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print '<form action="" method="POST">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; @@ -247,7 +247,7 @@ print "\n</div>\n"; if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer)) { //WYSIWYG Editor - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; print '<br>'; print '<form action="" method="post">'; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 3e423d569755147b49ed2c4e9e613684e7d086ca..d62856ae2db08b7202457299cb5757960a5e0acf 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -24,10 +24,10 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index fc876fcc7a50587a6fc9fbe62ed12b058775825e..f44aa850eb365b38341e1672964c84ae7cdd4650 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -25,10 +25,10 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load('projects'); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 6dab8f2189cfbc6bbe539fc0efa04904ee3db3f4..55c30ec4220c6368c3202a8601456dd230350ca1 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -23,7 +23,7 @@ * \ingroup projet * \brief Fichier de la classe de gestion des projets */ -require_once(DOL_DOCUMENT_ROOT . "/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; /** * \class Project @@ -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) @@ -427,7 +427,7 @@ class Project extends CommonObject function delete($user, $notrigger=0) { global $langs, $conf; - require_once(DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error = 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) @@ -972,7 +972,7 @@ class Project extends CommonObject if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.'.php'; $modProject = new $obj; $defaultref = $modProject->getNextValue($clone_project->societe->id,$clone_project); } @@ -1067,7 +1067,7 @@ class Project extends CommonObject //Duplicate file if ($clone_file) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $clone_project_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($defaultref); $ori_project_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($orign_project_ref); diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index c69a15b2c50a37a5278d6b89d9133e06b6c99d05..40601aeef08b03161b715981f156385f3117f609 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -22,7 +22,7 @@ * \brief This file is a CRUD class file for Task (Create/Read/Update/Delete) */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.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; } @@ -379,7 +379,7 @@ class Task extends CommonObject dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG); if (file_exists($dir)) { - require_once(DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $res = @dol_delete_dir_recursive($dir); if (!$res) { @@ -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; } @@ -1057,7 +1057,7 @@ class Task extends CommonObject //Duplicate file if ($clone_file) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; //retreive project origin ref to know folder to copy $projectstatic=new Project($this->db); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 4ee93dbda57c21e8a5fe9cf3c13b03ee527acc39..213cc3f2e4a75aa9a1b923a8583d3d2b5399eb0e 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -22,11 +22,11 @@ * \brief Onglet de gestion des contacts du projet */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index 83aaabc58f5d7d048bec65406856cbf1eb3c5dde..6c9565969797bc079800acb0a00d364f8dd59546 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -22,12 +22,12 @@ * \brief Page de gestion des documents attachees a un projet */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load('projects'); $langs->load('other'); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 6df314e09096a8f4547bfe53bc1f29a0b6006232..ee236837a3ef1ccf84b9adfdf94f45708fb17b33 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -24,19 +24,19 @@ * \brief Page of project referrers */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); -if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture-rec.class.php"); -if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); -if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); -if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php"); -if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); -if ($conf->ficheinter->enabled) require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); -if ($conf->deplacement->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php"); -if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +if ($conf->propal->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if ($conf->facture->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +if ($conf->facture->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php'; +if ($conf->commande->enabled) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if ($conf->fournisseur->enabled) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +if ($conf->fournisseur->enabled) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +if ($conf->contrat->enabled) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +if ($conf->ficheinter->enabled) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; +if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; +if ($conf->agenda->enabled) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index bb3376c6314972acc81dbe7e96e790546b849865..34c736a09d481b679734e3d3a6448761fa7ac6ce 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -23,12 +23,12 @@ * \brief Project card */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/modules/project/modules_project.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php'; $langs->load("projects"); $langs->load('companies'); @@ -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')); @@ -249,7 +249,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer) // Delete file in doc form if ($action == 'remove_file' && $user->rights->projet->creer) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if ($object->id > 0) { @@ -359,7 +359,7 @@ if ($action == 'create' && $user->rights->projet->creer) $obj = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON; if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php")) { - require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.".php"); + require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.'.php'; $modProject = new $obj; $defaultref = $modProject->getNextValue($soc,$object); } @@ -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 6a96df4cdb01aed3f3c20707f9a14cae5325026f..7619bc732eb7f6eb63e7f52a3935a31dc94d8a80 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -24,11 +24,11 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); @@ -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/index.php b/htdocs/projet/index.php index 1cc4fc638f8f9d17575549d70be89107611a395c..4ff4394e9953db707a2fc01c654f3999f11fa32f 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -23,9 +23,9 @@ * \brief Main project home page */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load("projects"); diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php index b66bcf5668738fd81ede87ae5965059562143c5c..0ce99e4f2c18dea5d7971fbb5d9c2a67bf65f14e 100644 --- a/htdocs/projet/jsgantt_language.js.php +++ b/htdocs/projet/jsgantt_language.js.php @@ -32,7 +32,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); -require_once("../main.inc.php"); +require_once '../main.inc.php'; // Define css type header('Content-type: text/javascript'); diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index 443a44f2b19684cc2d34d37a28c42be17015eb59..9795b61f6c1f8990df6c26564483383bfafc7a9f 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -24,8 +24,8 @@ * \brief Page to list projects */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load('projects'); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 4f3b888db10c010a794df5d837e63427463551be..350e1050696d66d9451e522d78e50b26e34fb42b 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -22,9 +22,9 @@ * \brief Fiche d'information sur un projet */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load('projects'); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 4aef7365650a8081338d3efcbcc61388b88a74ba..523afef075084ec1e2c8ea34d712b01fc3546d57 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -24,11 +24,11 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("users"); $langs->load("projects"); @@ -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/contact.php b/htdocs/projet/tasks/contact.php index f4b4d03fd23b1baecd2de3cf843fc8d50bb90dfe..36869d360681137cb74bfc152e4778626dbac4d7 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -24,11 +24,11 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 45f19ccc95a85bf40bafdfc945bc5ba8c31af57f..3e9e77415500f5d816c0325704037d1fb955294e 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -23,13 +23,13 @@ * \brief Page de gestion des documents attachees a une tache d'un projet */ -require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load('projects'); diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 40e2fcef507463eb05b8a38cdd8b21d6db8d43e3..3ed61393cd9c9ca3088ab4dce829de562153d547 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -24,10 +24,10 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load('projects'); $langs->load('users'); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 7f7f17f14cd2788a83788688c17651e948b46204..fdac534b81b192d2c3fedd9994464359b3bf22b7 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -22,9 +22,9 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; $langs->load('projects'); @@ -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 49499f25fd60bd181632c3b83febc19746fd8dd3..66ddbc09da2487bc2024d16d83fd8d365780951e 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -24,10 +24,10 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); @@ -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/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 68d2ced3d7e1334aaf4ba32c784c6aef7e416bbb..4b658f162b1b9e0468bbdc2fc7114c89ff60087f 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -24,11 +24,11 @@ * \brief Page to add new time spent on a task */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load('projects'); diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index a08bdad18145ffd09df0d2c1579ad3bbd2730895..d2c3eb24a7180dc1a4071d921286d520019eddca 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -49,8 +49,8 @@ function llxHeaderVierge() { print '<html><title>Export agenda cal</title><body> */ function llxFooterVierge() { print '</body></html>'; } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; // Security check if (! $conf->agenda->enabled) accessforbidden('',1,1,1); diff --git a/htdocs/public/agenda/index.php b/htdocs/public/agenda/index.php index 272dfb4385b19506e1cc15165d5bb5a04927394a..260c783ec7571184c3d11fc58e30b7108fdb3257 100644 --- a/htdocs/public/agenda/index.php +++ b/htdocs/public/agenda/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../../master.inc.php"); +require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index f53e2551ba28ba9feab8616bbbfb6409e5401267..d244baa0ba99122fa29affcb8b978c6e9b0615c4 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -27,7 +27,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("main"); $langs->load("install"); @@ -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/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 12fa44d9fc90da04e2fc273dac1f4fb9e2154118..c21daf2ce9e6407b89384b96785241b66f8037f6 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -38,8 +38,8 @@ function llxHeaderVierge() { print '<html><title>Export agenda cal</title><body> */ function llxFooterVierge() { print '</body></html>'; } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT ."/compta/dons/class/class/don.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT .'/compta/dons/class/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/donations/index.php b/htdocs/public/donations/index.php index 2aaf1de030e43032a7c93d5efac2381b20ce82ec..bb79f97d90dfcebb5d20f7b99cbe0d0cfc16d442 100644 --- a/htdocs/public/donations/index.php +++ b/htdocs/public/donations/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../../master.inc.php"); +require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/donations/therm.php b/htdocs/public/donations/therm.php index 527586d6c82b73b15e8b8022c5b29e4450eb2fe8..c8bdf5b78c1eb30b86e20d9674307533786d1fd7 100644 --- a/htdocs/public/donations/therm.php +++ b/htdocs/public/donations/therm.php @@ -25,9 +25,9 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php index 884509eebde1d4d3d948b495cf5c4c7f699bfb1c..6a17d7ace31ade5bd9d7642314c439b4933d47f4 100644 --- a/htdocs/public/emailing/mailing-read.php +++ b/htdocs/public/emailing/mailing-read.php @@ -28,7 +28,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); +require '../../main.inc.php'; $id=GETPOST('tag'); diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index 57a4a6fa2f74911bf992c2d3e066b80a2251d67b..db91864e3f6d07bdc209f9a1942ee83c9e991b47 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -28,8 +28,8 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/lib/company.lib.php'; global $user, $conf, $langs; diff --git a/htdocs/public/index.php b/htdocs/public/index.php index aeb6f2c8050d38a8638d34cf0eaaff5e0b89cbfa..dc5ac64e4057a52a3a7b489c5c893c502f5c99f8 100644 --- a/htdocs/public/index.php +++ b/htdocs/public/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../master.inc.php"); +require '../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/members/index.php b/htdocs/public/members/index.php index d257412fedcbe9264c7b90dfc9be89eeaa31e086..b55bfcde9ad581efd140e3a38dfc5629a9e3a72b 100644 --- a/htdocs/public/members/index.php +++ b/htdocs/public/members/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../../master.inc.php"); +require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 96de5c19145321285a6290313b94983ad15adc36..70ac3033c1dd8e4f9962d25294cae04243c2c487 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -45,12 +45,12 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Init vars $errmsg=''; diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 64379be919cbbaa28fb3631a23d0e1b86aa54b46..d9b6c1c58d3dc5b561fb4f18f76a43dc2d3b9e87 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -34,10 +34,10 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; // Security check if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 42a47f789f4b14f2b1a11442abfb8d4d4aa79198..7cfe37c5067a66e72420d87156ac60bd3eb48e27 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -34,7 +34,7 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); +require '../../main.inc.php'; // Security check if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paybox/index.php b/htdocs/public/paybox/index.php index afc81b401afab41c63197b457d40567b6329208a..b7992c42335187d309e861ddb2fb967a908da48c 100644 --- a/htdocs/public/paybox/index.php +++ b/htdocs/public/paybox/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../../master.inc.php"); +require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 6e85774afdef336c7886166684e71776771ef5ec..febd6130f67733bc62519e07e33e386ed3805a60 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -27,11 +27,11 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); @@ -286,7 +286,7 @@ if (GETPOST("source") == 'order' && $valid) $found=true; $langs->load("orders"); - require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); + require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $order=new Commande($db); $result=$order->fetch('',$ref); @@ -374,7 +374,7 @@ if (GETPOST("source") == 'invoice' && $valid) $found=true; $langs->load("bills"); - require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $invoice=new Facture($db); $result=$invoice->fetch('',$ref); @@ -461,7 +461,7 @@ if (GETPOST("source") == 'contractline' && $valid) $found=true; $langs->load("contracts"); - require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $contractline=new ContratLigne($db); $result=$contractline->fetch('',$ref); @@ -638,8 +638,8 @@ if (GETPOST("source") == 'membersubscription' && $valid) $found=true; $langs->load("members"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; + require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; $member=new Adherent($db); $result=$member->fetch('',$ref); diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index d7c62a7e3845682fc59df26b0153ef4e123ab2bc..ca7444494a210f0ccfbdbc9ab7f0b54335570483 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -26,9 +26,9 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index 0bd193183407cf25f35ee25ada3117867cd31b2b..5763dd3f3b080e76a9927ebf3bd33963b2c3f4e6 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -26,9 +26,9 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOCSRFCHECK",1); // We accept to go on this page from external web site. -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paybox/lib/paybox.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/index.php b/htdocs/public/paypal/index.php index d0d3c44daa93994872fe0a6330130cce28f67029..072500943e2951bc85de13090241112ce0b58397 100755 --- a/htdocs/public/paypal/index.php +++ b/htdocs/public/paypal/index.php @@ -22,7 +22,7 @@ * \author Laurent Destailleur */ -require("../../master.inc.php"); +require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index cba0d9e4e7e1ac3b6ece21c0719a521c00ef9610..acea9f714d0d9cedfe7f6b08a7818b2bca7ecfbf 100755 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -34,12 +34,12 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); @@ -387,7 +387,7 @@ if (GETPOST("source") == 'order' && $valid) $found=true; $langs->load("orders"); - require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php"); + require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; $order=new Commande($db); $result=$order->fetch('',$ref); @@ -494,7 +494,7 @@ if (GETPOST("source") == 'invoice' && $valid) $found=true; $langs->load("bills"); - require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $invoice=new Facture($db); $result=$invoice->fetch('',$ref); @@ -600,7 +600,7 @@ if (GETPOST("source") == 'contractline' && $valid) $found=true; $langs->load("contracts"); - require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); + require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $contractline=new ContratLigne($db); $result=$contractline->fetch('',$ref); @@ -795,8 +795,8 @@ if (GETPOST("source") == 'membersubscription' && $valid) $found=true; $langs->load("members"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; + require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; $member=new Adherent($db); $result=$member->fetch('',$ref); diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index 695504c92527d42a12df7a864837896628244c23..29d00042db8fc6ef3a45a2ce13247943075747ed 100755 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -36,10 +36,10 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index 61e0bb0040ee6bd7b10621e4d68b0d791461e632..5c24d29041dcf8dd8b9493e3fdbdc3cbe4e5d542 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -36,10 +36,10 @@ if (is_int($entity)) define("DOLENTITY", $entity); } -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypalfunctions.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); @@ -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 7b2a51f43872403bd82099bbad826ccedcd5965e..97e33167d228f8aaf7462bd6637d1b8f6650b725 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -25,9 +25,9 @@ * \brief Third party module setup page */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $langs->load("admin"); @@ -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/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 313e8fc0b33b3bf7febfce19b28ccb566a2dbd17..5149bcee1acb9c4bea288f0c78200b4fc572c712 100755 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -23,9 +23,9 @@ * \brief Page to setup extra fields of third party */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); $langs->load("admin"); @@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden(); * Actions */ -require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php"); +require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php'; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 3c033a9f80ea373feabfb29a2cb69db19fdc23cc..d25245c7288da553445ffeaf90483fd826d5722c 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -26,9 +26,9 @@ * \brief Page of third party events */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("companies"); @@ -61,8 +61,8 @@ $form = new Form($db); */ if ($socid) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("companies"); diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php index 49b49988eafaed4aed9c0300f9a77a2f5c9ac4cd..b960eb0b087c4e2e2c4476dbff1808301bc2f3d2 100644 --- a/htdocs/societe/ajaxcompanies.php +++ b/htdocs/societe/ajaxcompanies.php @@ -30,7 +30,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); -require('../main.inc.php'); +require '../main.inc.php'; /* diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php index ff79aaad0140d2871d0100117209e1f9f4a7f480..3afb95468b74090d261170a475fab147bd21c068 100644 --- a/htdocs/societe/ajaxcountries.php +++ b/htdocs/societe/ajaxcountries.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); -require('../main.inc.php'); +require '../main.inc.php'; /* diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 72eadfa4d1804be066d4285647e9ef660087e8b3..870ec8b67ccc368164e7807596d490cfba5fa591 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -58,7 +58,7 @@ abstract class ActionsCardCommon if (file_exists($modelclassfile)) { // Include dataservice class (model) - $ret = require_once($modelclassfile); + $ret = require_once $modelclassfile; if ($ret) { // Instantiate dataservice class (model) @@ -111,7 +111,7 @@ abstract class ActionsCardCommon if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"]) && ($action == 'add' || $action == 'update')) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $error=0; if (GETPOST("private") == 1) @@ -328,7 +328,7 @@ abstract class ActionsCardCommon } else { - require_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; $this->object->fetch_thirdparty(); @@ -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; @@ -577,7 +577,7 @@ abstract class ActionsCardCommon if ($conf->global->MAIN_MULTILANGS) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; //$s=picto_from_langcode($this->default_lang); //print ($s?$s.' ':''); $langs->load("languages"); 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/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php index bad57f91cdb814efab0419712dbe9f18d6c2ea88..70a77c19641a9ac21677327b632a67494c4c54f0 100644 --- a/htdocs/societe/checkvat/checkVatPopup.php +++ b/htdocs/societe/checkvat/checkVatPopup.php @@ -22,8 +22,8 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once NUSOAP_PATH.'/nusoap.php'; $langs->load("companies"); @@ -61,7 +61,7 @@ else // Set the WebService URL dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL." WSDL=".$WS_DOL_URL_WSDL); - require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $params=getSoapParams(); //ini_set('default_socket_timeout', $params['response_timeout']); //$soapclient = new SoapClient($WS_DOL_URL_WSDL,$params); 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/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index 4e5036ebbfc760950b3fc58151a428d04e3d1cf2..86f6b5acf43ae9eba199ef7bfb231d66e59538bc 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -23,7 +23,7 @@ * \brief File of class to manage bank accounts description of third parties */ -require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php"); +require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php'; /** diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index df8e9849a2422a62e90360c56929919b80cd2cfd..6ad2bde8468d6cde6f9c9fe11d5ab6b849ea5e6c 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -27,7 +27,7 @@ * \ingroup societe * \brief File for third party class */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.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; } @@ -378,7 +378,7 @@ class Societe extends CommonObject function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update') { global $langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $error=0; @@ -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; } @@ -842,7 +842,7 @@ class Societe extends CommonObject function delete($id) { global $user,$langs,$conf; - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; dol_syslog(get_class($this)."::delete", LOG_DEBUG); $error = 0; @@ -853,7 +853,7 @@ class Societe extends CommonObject { $this->db->begin(); - require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); + require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $static_cat = new Categorie($this->db); $toute_categs = array(); @@ -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; } @@ -1101,7 +1101,7 @@ class Societe extends CommonObject if ($this->id) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discount = new DiscountAbsolute($this->db); $discount->fk_soc=$this->id; @@ -1134,7 +1134,7 @@ class Societe extends CommonObject */ function getAvailableDiscounts($user='',$filter='',$maxvalue=0) { - require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discountstatic=new DiscountAbsolute($this->db); $result=$discountstatic->getAvailableDiscounts($this,$user,$filter,$maxvalue); @@ -1389,7 +1389,7 @@ class Societe extends CommonObject $ret=''; if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) { - require_once(DOL_DOCUMENT_ROOT ."/core/lib/company.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php'; $tmparray=getCountry($this->country_id,'all'); $this->country_code=$tmparray['code']; $this->country =$tmparray['label']; @@ -1569,7 +1569,7 @@ class Societe extends CommonObject { global $langs; - require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php"; + require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php'; $bac = new CompanyBankAccount($this->db); $bac->fetch(0,$this->id); @@ -1593,7 +1593,7 @@ class Societe extends CommonObject */ function load_ban() { - require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php"; + require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php'; $bac = new CompanyBankAccount($this->db); $bac->fetch(0,$this->id); @@ -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/commerciaux.php b/htdocs/societe/commerciaux.php index d2f78a4ad0776f5cdcd3cfcf2a9171bdc52664ce..efc39232b9b3383e1065e2601743be0c2873beee 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -23,8 +23,8 @@ * \brief Page of links to sales representatives */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index fc1c2cb45c2884d9f3f0f6389990ed700ef5a85f..f7b0744d98f27330dff2b44c324159be310ade78 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -24,11 +24,11 @@ * \ingroup societe */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("companies"); $langs->load('other'); diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index c1c7d6c205e224eeecca12e6146d575a22ced5d0..410aba47aa1d9e843df3f1a84c3b5da4073bf8b0 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -23,8 +23,8 @@ * \brief Home page for third parties area */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("companies"); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 67701ee4fa7ba6a144528274b13d4e5674ac3aea..28d626c37f2c53b42f4d9862a06bf4be3b6be0d8 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -23,10 +23,10 @@ * \brief Page des informations d'une societe */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $langs->load("companies"); $langs->load("other"); diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index a8d80f2f84a601bc7911d08f0af95b122d61308b..d30e344cd9dde4ab549ddfb2175a24660c37be4b 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -23,9 +23,9 @@ * \brief Page of links to other third parties */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $langs->load("companies"); $langs->load("customers"); diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php index e43c36c048446294cb89cc3f7b1be390feb44397..00e1a182dfedd3fa56e038b487a7c0ec7f621c5c 100644 --- a/htdocs/societe/note.php +++ b/htdocs/societe/note.php @@ -24,8 +24,8 @@ * \ingroup societe */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; $action = GETPOST('action'); @@ -118,7 +118,7 @@ if ($socid > 0) print '<input type="hidden" name="socid" value="'.$object->id.'" />'; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$object->note,'',360,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,20,70); $doleditor->Create(); } diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index 18ce7e898a76405ec60e755aca7ab2c31ef9596a..73a78eca50316d544cf349aedb02b79cd87ee11b 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -23,10 +23,10 @@ * \brief Tab for notifications of third party */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_50_modNotification_Notification.class.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php'; $langs->load("companies"); $langs->load("mails"); diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 42aad61b93b27405f9ca524f86aa297ef7c9792c..b6f4b362234c53564cbbfdf4ada96e3b10ff164c 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -22,7 +22,7 @@ * \brief List of done notifications */ -require("../../main.inc.php"); +require '../../main.inc.php'; $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 616bf860abf3f7e358b2bb55c2c13d2b7416ce0a..f17916c2e5b8e7c47cf0dd9d5455643725bd892d 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -24,10 +24,10 @@ * \brief BAN tab for companies */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/bank.lib.php"); -require_once DOL_DOCUMENT_ROOT."/societe/class/companybankaccount.class.php"; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php'; $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index dcc9373da144576fbbfc64380c32869badb81367..513e5c5554de8797773c8f6039017e86bda5be45 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -27,16 +27,16 @@ * \brief Third party card page */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +if ($conf->adherent->enabled) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $langs->load("companies"); $langs->load("commercial"); @@ -61,7 +61,7 @@ $canvas = $object->canvas?$object->canvas:GETPOST("canvas"); $objcanvas=''; if (! empty($canvas)) { - require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php'; $objcanvas = new Canvas($db, $action); $objcanvas->getCanvas('thirdparty', 'card', $canvas); } @@ -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')); @@ -101,7 +101,7 @@ if (empty($reshook)) if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode')) && ($action == 'add' || $action == 'update') && $user->rights->societe->creer) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; if ($action == 'update') { @@ -424,7 +424,7 @@ if (empty($reshook)) } else { - require_once(DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'); + require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'; $object->fetch($socid); @@ -457,7 +457,7 @@ if (empty($reshook)) { if ($object->fetch($socid)) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $langs->load("other"); $upload_dir = $conf->societe->dir_output; @@ -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; @@ -1679,7 +1679,7 @@ else // Default language if ($conf->global->MAIN_MULTILANGS) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'; //$s=picto_from_langcode($object->default_lang); //print ($s?$s.' ':''); @@ -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 3743efe126460f3c29443b29df03a9077367ca25..06c5ad9793d8c711240a8dd4b1a557bb2616bec0 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -23,9 +23,9 @@ * \brief Page to show a third party */ -require_once("../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php"); +require_once '../main.inc.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"); $langs->load("customers"); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 9ab29182ae6eb7e186ba9e215d930c532aafbe37..f27546d25289a7f3a4fcbb688742523778ecf9d9 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -26,7 +26,7 @@ // Just to define version DOL_VERSION if (! defined('DOL_INC_FOR_VERSION_ERROR')) define('DOL_INC_FOR_VERSION_ERROR','1'); -require_once('../filefunc.inc.php'); +require_once '../filefunc.inc.php'; // Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); @@ -37,11 +37,11 @@ if (! defined('ADODB_PATH')) define('ADODB_PATH', $foundpath); } -require_once(DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); -require_once(ADODB_PATH.'adodb-time.inc.php'); +require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once ADODB_PATH.'adodb-time.inc.php'; // Avoid warnings with strict mode E_STRICT $conf = new stdClass(); // instantiate $conf explicitely @@ -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..31c2869250d1c66fb20f29ab8e8e50d76655f558 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..2b7422bb3559f2d1f23663ff6ad8e3fad3f6ddbe 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/amarok/graph-color.php b/htdocs/theme/amarok/graph-color.php index 035e52089cc8666622180d86630e61e8d14cd095..e9652c460906bf3034fc40de1390e8443bf6d1f6 100644 --- a/htdocs/theme/amarok/graph-color.php +++ b/htdocs/theme/amarok/graph-color.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 82be342dd0d710be511986fd51684be73e232e1d..86f84f2e5a97052cc863e65725f4bb2af66a7383 100644 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -34,8 +34,8 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"); +require_once '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; // Define css type header('Content-type: text/css'); diff --git a/htdocs/theme/auguria/graph-color.php b/htdocs/theme/auguria/graph-color.php index 11a92082dbd8884dc068037ce98b7d4dcbfc420c..947b02136f6b176f2e750ddaeef33c9b464fba8e 100755 --- a/htdocs/theme/auguria/graph-color.php +++ b/htdocs/theme/auguria/graph-color.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index b7340ef3e2bc9b223565b8f56fc201df962bac3d..18fd25e3a9476be4ee08acf6d2d3e5707fb21c05 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -35,7 +35,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../main.inc.php"); +require_once '../../main.inc.php'; // Define css type header('Content-type: text/css'); @@ -517,7 +517,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: <?php echo ($conf->browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/bureau2crea/graph-color.php b/htdocs/theme/bureau2crea/graph-color.php index 5870778f5ce772d117c9d19075c5a37b0644e938..f8e35f9a2c87f48c16c061497d1ebbbd2c5bcbc5 100644 --- a/htdocs/theme/bureau2crea/graph-color.php +++ b/htdocs/theme/bureau2crea/graph-color.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2011 Emmanuel Chauve <emmanuel@bureau2crea.net> diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index d8ab2f33920013e2c34c326871fac4dd4d99c797..a2c592710e7c74ade55cf4c39caa8526ddc79c63 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); -require_once("../../main.inc.php"); +require_once '../../main.inc.php'; // Define css type header('Content-type: text/css'); @@ -576,7 +576,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: <?php echo ($conf->browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/cameleo/graph-color.php b/htdocs/theme/cameleo/graph-color.php index 3d69266b15eb358ec4b864d9512b11daf6884205..04ae2728881645396423025cab1f50e0107e6e21 100644 --- a/htdocs/theme/cameleo/graph-color.php +++ b/htdocs/theme/cameleo/graph-color.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2010-2011 Herve Prot <herve.prot@symeos.com> diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 78121b403c03a591a33ee4ae5612ed2274ef3c31..8364f7da44e5de84127291d9c8c77af5be265e4e 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../main.inc.php"); +require_once '../../main.inc.php'; // Define css type header('Content-type: text/css'); @@ -590,7 +590,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: <?php echo ($conf->browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/eldy/graph-color.php b/htdocs/theme/eldy/graph-color.php index a6a9c5735be9cc14ef57358ccec39d1e3b84fb0f..0071dd17edb557e5c714cee57e3d04a502563f21 100644 --- a/htdocs/theme/eldy/graph-color.php +++ b/htdocs/theme/eldy/graph-color.php @@ -1,4 +1,4 @@ -<?PHP +<?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net> * @@ -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/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b8470e3c0909622dc330936340151e06fb78ad9d..72f3069ecd7618ca5b60b05e48a4883d51e2fc50 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -36,7 +36,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../main.inc.php"); +require_once '../../main.inc.php'; // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']); @@ -758,7 +758,7 @@ div.login a:hover { text-decoration:underline; } -img.login, img.printer, img.entity { +img.login, img.printer, img.entity, img.model { padding: <?php echo ($conf->browser->phone?'0':'8')?>px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; diff --git a/htdocs/theme/phones/smartphone/theme/default/default.css.php b/htdocs/theme/phones/smartphone/theme/default/default.css.php index b12da962a76bd7bdd5c8c0620ed0a0a6f261a248..6f8b273cf67dccb97a0a8c2f79625a5a29c25505 100644 --- a/htdocs/theme/phones/smartphone/theme/default/default.css.php +++ b/htdocs/theme/phones/smartphone/theme/default/default.css.php @@ -33,7 +33,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); session_cache_limiter(FALSE); -require_once("../../../../../main.inc.php"); +require_once '../../../../../main.inc.php'; // Define css type header('Content-type: text/css'); 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/menu.tpl.php b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php index 9c3d53dbb1670ed0a16edea31ac396d694e8035c..0c96714ae103d256c9afce82dedbfb4bab3d7a53 100644 --- a/htdocs/theme/phones/smartphone/tpl/menu.tpl.php +++ b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php @@ -20,7 +20,7 @@ top_httphead(); <!DOCTYPE html> <html> <?php -require('header.tpl.php'); +require '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 a80f9a0223c3a33c0c5044a40228dd5e963088f5..087b9fbc1b49fa986265dec4760149f513aea5b7 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -28,7 +28,7 @@ * \ingroup core */ -require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.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; } @@ -803,7 +803,7 @@ class User extends CommonObject if (! empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) { - require_once(DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php"); + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; $langs->load("stocks"); $entrepot = new Entrepot($this->db); $entrepot->libelle = $langs->trans("PersonalStock",$this->getFullName($langs)); @@ -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; } @@ -1136,7 +1136,7 @@ class User extends CommonObject { if ($this->fk_member > 0 && ! $nosyncmember) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; // This user is linked with a member, so we also update members informations // if this is an update. @@ -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; } @@ -1256,7 +1256,7 @@ class User extends CommonObject function setPassword($user, $password='', $changelater=0, $notrigger=0, $nosyncmember=0) { global $conf, $langs; - require_once(DOL_DOCUMENT_ROOT ."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT .'/core/lib/security2.lib.php'; $error=0; @@ -1301,7 +1301,7 @@ class User extends CommonObject if ($this->fk_member && ! $nosyncmember) { - require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; // This user is linked with a member, so we also update members informations // if this is an update. @@ -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; @@ -1386,7 +1386,7 @@ class User extends CommonObject global $conf,$langs; global $dolibarr_main_url_root; - require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"; + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; $subject = $langs->trans("SubjectNewPassword"); $msgishtml=0; @@ -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 b6506045c1d827a05471cba8c78eb513b80e0839..487557b939dd3115a6e9d508ef6c52fb74845081 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -22,7 +22,7 @@ * \brief File of class to manage user groups */ -require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; if (! empty($conf->ldap->enabled)) require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); @@ -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/clicktodial.php b/htdocs/user/clicktodial.php index bac1632013e8cd68f0e81bf5cdef6d3ea1507ef2..3b3a43729b229e97bb18c0c5fb56408b0b709e06 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -22,8 +22,8 @@ * \brief Page for Click to dial datas */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 94b879c0ca78aa52468eaf81f8e702d2f5f3175c..059136e1757644a6f73cc22513590a27a42eec49 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -26,15 +26,15 @@ * \brief Tab of user card */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -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"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +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'); $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); @@ -281,7 +281,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) if ($action == 'update' && ! $_POST["cancel"]) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; if ($caneditfield) // Case we can edit all field { @@ -673,7 +673,7 @@ if (($action == 'create') || ($action == 'adduserldap')) $generated_password=''; if (empty($ldap_sid)) // ldap_sid is for activedirectory { - require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php"); + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $generated_password=getRandomPassword(''); } $password=$generated_password; @@ -831,7 +831,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '<tr><td valign="top">'; print $langs->trans("Note"); print '</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note','','',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,90); $doleditor->Create(); print "</td></tr>\n"; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 85746ce537d3587f261bb8b8db029fd360ffd67b..7d29918ae10c61e051944582aa359c19f6e4851e 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -23,10 +23,10 @@ * \brief Onglet groupes utilisateurs */ -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"); +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'); // Defini si peux lire/modifier utilisateurs et permisssions $canreadperms=($user->admin || $user->rights->user->user->lire); @@ -240,7 +240,7 @@ if ($action == 'create') } print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); print "</td></tr>\n"; @@ -498,7 +498,7 @@ else print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>'; print '<td class="valeur">'; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90); $doleditor->Create(); print '</td>'; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 33c7952a158c1c3ffaf6c66eb187994befdbb318..002e099c397effe0271bed80e9cbd5d29e70d477 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -24,7 +24,7 @@ * \brief Page of user groups */ -require("../../main.inc.php"); +require '../../main.inc.php'; if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 5bfc3b6a9af0710c0db149206056a788b710cdf9..5f64929c5a5e5940246dd312d0c70bfdb5ede608 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -22,12 +22,12 @@ * \brief Page fiche LDAP groupe */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("companies"); $langs->load("ldap"); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index efc308b45d4a389e97c38333042e431e995e8c03..6caf070d6752c9bd76a952911c11460b1a2ff963 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -24,10 +24,10 @@ * \brief Onglet user et permissions de la fiche utilisateur */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("users"); $langs->load("admin"); @@ -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/home.php b/htdocs/user/home.php index 234fc3191de3dfb96eace2ce1138dfa28a7cddb0..a98a7a3b5f8fc85c8be33d29959ec161079d868a 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -21,7 +21,7 @@ * \brief Home page of users and groups management */ -require("../main.inc.php"); +require '../main.inc.php'; if (! $user->rights->user->user->lire && ! $user->admin) { diff --git a/htdocs/user/index.php b/htdocs/user/index.php index b6ed67baece941f3948ac9af57bd151775ad9924..4d85ff977b1fbde183b7351348272d9fdac060d5 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -23,8 +23,8 @@ * \brief Page of users */ -require("../main.inc.php"); -if(! empty($conf->multicompany->enabled)) dol_include_once("/multicompany/class/actions_multicompany.class.php"); +require '../main.inc.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/info.php b/htdocs/user/info.php index 64ca2fb6c81c3978fdc6ebae1a5b42e3cd42b923..9ac58e67515efb8d01b018ba5bea5515ce9d9228 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -22,10 +22,10 @@ * \brief Page des informations d'un utilisateur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $langs->load("users"); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 47dfb03d81aaf913a69037da9a229f5b8ad91975..12324d5e608e3ffeffcc23d2b16dbec6caec4234 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -22,10 +22,10 @@ * \brief Page fiche LDAP utilisateur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php'; $langs->load("users"); $langs->load("admin"); diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php index 572aea960e758b059b02233bd2574d7836ef90d0..4ec89e0bad03e7be3d7ee1cba7aa1acf0ece41e6 100644 --- a/htdocs/user/logout.php +++ b/htdocs/user/logout.php @@ -30,7 +30,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) define('EVEN_IF_ONLY_LOGIN_ALLOWED','1'); -require_once("../main.inc.php"); +require_once '../main.inc.php'; // This can happen only with a bookmark or forged url call. if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuser' @@ -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/note.php b/htdocs/user/note.php index 33ea1745b27b91fc014bf3cbe8f8867bc855529f..ab2c376e621f87cfb0c8ae84da5e45a3523fee97 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -23,9 +23,9 @@ * \brief Fiche de notes sur un utilisateur Dolibarr */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $id = GETPOST('id','int'); $action = GETPOST('action'); @@ -119,7 +119,7 @@ if ($id) print "<input type=\"hidden\" name=\"action\" value=\"update\">"; print "<input type=\"hidden\" name=\"id\" value=\"".$fuser->id."\">"; // Editeur wysiwyg - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('note',$fuser->note,'',280,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80); $doleditor->Create(); } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index d88f90446abe247d7548763d23263d42de8baf24..76afed6ebd7a15ccc3c713f851771259066c50e0 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -21,10 +21,10 @@ * \brief Page to show user setup for display */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; $langs->load("companies"); $langs->load("products"); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 2ed1576328f6bcdeabc428dd64e160093b19f60c..2b7cc2c66b1eb25a44cc0ec0ebd8ee87394df84b 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -24,10 +24,10 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +if ($conf->ldap->enabled) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php'; $langs->load("errors"); $langs->load("users"); @@ -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 1c304ded7a9c045357c934d5e0c450c09d2c9f2a..e32bfa59620eef4447c436c7ed3cf7145338684c 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -24,9 +24,9 @@ * \brief Onglet user et permissions de la fiche utilisateur */ -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("users"); $langs->load("admin"); @@ -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 92bda6a4b00891d76c31c76782cbd4c7eb87339e..c8957633290981fd91ec827ec72f55475fecb33a 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -44,8 +44,8 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'companylogo') && ! de */ function llxHeader() { } -require("./main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); +require 'main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $action=GETPOST('action','alpha'); @@ -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/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 8e5370df465924ed2b87557565e6f45fcb8720c1..bc47a4a8be89862cc65a839f1545b9128203db50 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -23,8 +23,8 @@ * \brief Page to setup webservices module */ -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"); +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); diff --git a/htdocs/webservices/demo_wsclient_invoice.php b/htdocs/webservices/demo_wsclient_invoice.php index 17c76af208113d0b659d16269d30c144e71d905a..e02878706666ce0fb95c78bf1c3688293ae507cf 100755 --- a/htdocs/webservices/demo_wsclient_invoice.php +++ b/htdocs/webservices/demo_wsclient_invoice.php @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_other.php b/htdocs/webservices/demo_wsclient_other.php index 713d6741972ab8af425e1a1b1d8188862ca185cc..21ef7d966e7855f8299a51441a9534c92de052df 100755 --- a/htdocs/webservices/demo_wsclient_other.php +++ b/htdocs/webservices/demo_wsclient_other.php @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_productorservice.php b/htdocs/webservices/demo_wsclient_productorservice.php index 0bbd0f00393bb1aa508d77f17f610dd78b87abef..aa0f1a31ea5802ccee07d88192f66aa73b66facd 100755 --- a/htdocs/webservices/demo_wsclient_productorservice.php +++ b/htdocs/webservices/demo_wsclient_productorservice.php @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // To test with Soapui mock. If not a page, should end with / diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php b/htdocs/webservices/demo_wsclient_thirdparty.php index 96f78df4d1d8edcbfd2820ff22066e117a84e7f2..519d417edb3058f601ab74c88bdf855aed1e7cce 100755 --- a/htdocs/webservices/demo_wsclient_thirdparty.php +++ b/htdocs/webservices/demo_wsclient_thirdparty.php @@ -23,8 +23,8 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; //$WS_DOL_URL = 'http://localhost:8080/'; // If not a page, should end with / diff --git a/htdocs/webservices/index.php b/htdocs/webservices/index.php index 7651cc190bfce6f464e4eaf473a3f65e7ef647d7..a448425ac26963aa0705733c139d7969d9055ead 100644 --- a/htdocs/webservices/index.php +++ b/htdocs/webservices/index.php @@ -24,9 +24,9 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; $langs->load("admin"); diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index 1cc04f3c1a7c1cc8fc6e442ed5854ede14d7bd5d..d34749b745d7e8663af35b30c344216331c76075 100755 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -23,13 +23,13 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; dol_syslog("Call Dolibarr webservices interfaces"); diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php index e3f0402bbf14b4344f6cbd99d67c7da30a445beb..93795ff2d58a09fc20dc2f0fd362a739030b14d9 100644 --- a/htdocs/webservices/server_other.php +++ b/htdocs/webservices/server_other.php @@ -23,12 +23,12 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; dol_syslog("Call Dolibarr webservices interfaces"); diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index d7d062126d06281846f207af9e900820488408cc..d1fb254c46baaa7abb48275f7479bdffd00ffe89 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -23,12 +23,12 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); +require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; dol_syslog("Call Dolibarr webservices interfaces"); @@ -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_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php index 304c5bfd5984a302b3018f579318a28822f4a62e..35e4cf00e13ec363021ea370eb9a563e62b0c7a1 100755 --- a/htdocs/webservices/server_supplier_invoice.php +++ b/htdocs/webservices/server_supplier_invoice.php @@ -23,12 +23,12 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php"); +require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; dol_syslog("Call Dolibarr webservices interfaces"); diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index d140a7ef31bf950e70522b32d6051ab3b7f2d092..f23bee5f631de77e430f5cf6e0526168f2131da1 100755 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -23,12 +23,12 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); +require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; dol_syslog("Call Dolibarr webservices interfaces"); @@ -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']; diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 8a43026b983e6517a5bac7e244da939bfa4493b8..2ad6d9acb456065316b8853b5b213722ba3e103e 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -24,10 +24,10 @@ // This is to make Dolibarr working with Plesk set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); -require_once("../master.inc.php"); -require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP -require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +require_once '../master.inc.php'; +require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP +require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; dol_syslog("Call User webservices interfaces");