diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 9d13914ef33..a2f0078a71c 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 5a35a3b116a..ba19e621b4f 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 3f265f2a181..4c0c04df0ab 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -34,12 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere root dolibarr $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); require ($path."../../htdocs/master.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); -include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); -include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); -include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php"); +include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; +include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; +include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; +include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; $villes = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono"); $prenoms = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie"); diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 71401511e7a..416b65150cb 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 7dd68e91f7f..de8ca3d11b4 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -105,7 +105,7 @@ class Skeleton_Class // extends CommonObject // want this action 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; } @@ -216,7 +216,7 @@ class Skeleton_Class // extends CommonObject // 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; } @@ -265,7 +265,7 @@ class Skeleton_Class // extends CommonObject // 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 82d6f74497c..13878312fce 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 885e5ebd37c..6cea7ce9389 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 7f9d3fe1ca5..b14042a141e 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 ce69c6a984d..5e7aa08f547 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 a716b92ba62..911b1e13f7f 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 c6b3d282ab8..2d571d2c615 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 360413b32f9..db8a055e32f 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 deda22920df..ece8bcf5cd7 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 28475d03571..276d0d51116 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 1566b934afe..3c0290b4eeb 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 ea2a6489f5b..d6a0ed1ce91 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 4db3884cdad..52d73691cb8 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 eb4624a4c40..75d2ffe2722 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 ee05be2e5ba..b0a75427697 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 37bdd7c150b..17b653d6a55 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 77421bdf6c4..75a9c9a60cf 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 ''.$langs->trans("Password").''; print ''; @@ -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 861e28086f2..b870ed6037a 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 02c505ebfb0..607b4104018 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 9b0d1895e1b..fff160275bb 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 067ce7fcf27..bfa4f885a6a 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 4634bc4a7d0..b900abf6867 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 304e0664225..a97c729a908 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 657e0cd17af..93549d1c516 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 69a9a0f613a..1870683a02e 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 ""; print "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 1c5c0c998bd..b97133c4606 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 515df6c5a74..9ce039b2375 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 995c0b18ae7..3c5150fa7f5 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 ''; print ''.$langs->trans("WelcomeEMail").''; - 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 ''; @@ -626,7 +626,7 @@ if ($rowid > 0) print ''; print ''.$langs->trans("WelcomeEMail").''; - 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 ""; diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index 5fdfc965143..4928aa2a172 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 969cd1fb2ce..c0d9d389627 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 b9309c2abb3..41ac8727563 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 53071557620..5a1ccc3c6df 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 3670f766b68..b1112017b80 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 36bdb3f5d59..e1ca04bb00e 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 c2d5590413b..3cb34186bd6 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 638064fd1dd..36c57926c4d 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 c0c1fcba460..03309c31c3b 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 0ffd319cf13..86d87117ac1 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 3e04767c840..f2cdf0bd22e 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 ccd5a72c0db..a10738939e6 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 aed99fdae8e..4678accc1ab 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 0acfed506b2..fe4edb90e2a 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 5b0ee0d7824..80f6d04921a 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 789884702c6..f04e7d897de 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 df875865a85..b06df9e432e 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 1adc2ecc660..d13378000c3 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 ''; print $name; print "\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 004c04bb12f..da5f2c36a65 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 eb88d57be98..6e54456f59e 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 497bed1c02a..7b978bb5c8d 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 4aac5a88fed..7a800152c65 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 ''; echo "$name"; print "\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db); print $module->description; print ''; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 4c6c3fa533d..d2f5ef39512 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 "\n"; print "".$name."\n"; print "\n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); print $module->description; print "\n"; @@ -587,7 +587,7 @@ foreach ($dirmodels as $reldir) print "\n"; print "".$name."\n"; print ""; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); print $module->description; print "\n"; diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php index 3d384a4b832..14a8553959d 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 6e4f965bd27..6227aa5fb72 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 "
\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 '
'; print ''; diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index c7f9e2efa2c..de1a4faab8f 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 30932ecadd0..ba4b76a7e2a 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 d7dc1ffc9e5..d1dd88c67a1 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 5b4eded2f99..141de8a7d31 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 cca1d5fbdcb..83dcb2c50c4 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 5f528bc5a5f..909364fb00e 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 cc5ac952972..6fbb135955b 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 f23b73a766d..9a23e3f968d 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 ''; print $name; print "\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 c423645d5c8..ccded6ec1c7 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 75bf3c41e76..e3e822577ee 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 '
'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
'; @@ -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 bfc9a74ac97..c5b3e378164 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 003dfb0c2bd..1dd106a1204 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 7dd3a5e805d..800f10a15d7 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 0401e57186d..529f411cefc 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 41168160d31..d9e6a2d8baf 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 5db40f5cdbd..c142bcde3ea 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 bc228be0711..821da019a73 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 b6e9bb5c848..a391f06b51e 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 5842587b5e8..be361ec177e 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 c7f1d417964..04cb8e6a569 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 1b4cd867dd9..ab8e3b898f3 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin @@ -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 80be64c8153..d5da8993efc 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 "\n $name"; print "\n \n"; - require_once($dir.$file); + require_once $dir.$file; $module = new $classname($db); print $module->description; print "\n"; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 1d9a4e919a2..02b57e63cb2 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 2cba5ee10c2..3b48bba8145 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 5b9622d9f49..9acd06e091d 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 900cbe42340..22f31b3ff67 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 68a4819d4ed..34c74319b4f 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 '
'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'
'; @@ -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 ceb137be24b..deb55ee311c 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 a24d7f38d89..312a99649c2 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 ''; 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 b33b20fd258..9f12412bff7 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 a7c27179818..009156f1a5d 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 da6623d72f4..a6b8d9fb944 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 7dfd6b9f2c8..c01aa0ee07c 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 5bfd44b14ac..e1db5b57d9c 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 bc6cc57405e..7f4bba4729e 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 5c9a262a268..95828249c00 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 dedae30cda0..afe4bd9f2b7 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 1a10f15ca1e..0c038dfd4f7 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 6d3366fe366..be2f6151e64 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 01ab2a200e3..db4630535de 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 6d237bdfff1..fe8ee87a8e4 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 8fd23b96af0..f2e78363016 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 3b829d33ec8..a9f7e6df158 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 f161fbd3927..73b69c50505 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 8fc78e72502..18dc96e652c 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 cd2119ca4c8..9ff98757a36 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 421e677b3d7..52838109c4f 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 39e34e041c3..55b9f5302cd 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 c6d6e6a0aa4..dfbd00d949e 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 2423438e6b4..9f44aa42400 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 10b7dfe6554..0233073b7c7 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 e9465de8f73..b835b4a5953 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 567dcfc8323..1487cddbe33 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 a80406f4ce0..a62d6b808cb 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 d3860512d1e..d46631fdbf5 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 aebb05abed9..8b002bd1409 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 c9fe8782a45..adf85c8e33b 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 34ee081b5b3..d907bab6e59 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 80d394fa452..21aa75a4cae 100644 --- a/htdocs/asterisk/wrapper.php +++ b/htdocs/asterisk/wrapper.php @@ -60,9 +60,9 @@ function llxFooter() print "\n".''."\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 5f056656ddc..a560abb35b7 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 f047be2349f..eb403c5ed22 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 808e1faf162..17263261056 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 10bbd015cf6..8e3d0ea9e92 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 ba6dc123bac..d08f03ee993 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 bd6428684e4..3e67a6a772f 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 c74a6d8ec03..cc509c2760f 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 4ed22127e3e..9c70d97876b 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 cb049194fd1..8bed790691e 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 6d18faef191..5753aba6187 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 7a55172367d..0bf180ae221 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 e8f67b59c2e..b06233575bc 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 b66b6ffd178..4b652c3ce55 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 c6dbbba4b1e..66db48a4aab 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 9d473b2e8db..09938bb5d35 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 06715f51588..3f53913bc88 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 825c440c22a..cfdf6fe9b83 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 d1fa8daf12d..b4388e04b0c 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -1,4 +1,4 @@ - * * 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 31bc0181993..da5d7ac80c0 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 0bb08d5a95d..c90356dfb58 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 0d3fbfb10e8..dd06226aaac 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 e92dd6e0f4d..ddc72aa795a 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 a4e3db7863b..a4d01739861 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 '
'; if ( $_GET['menu'] ) { - include($_GET['menu'].'.php'); + include $_GET['menu'].'.php'; } else { - include('facturation.php'); + include 'facturation.php'; } print '
'; diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php index 37f20100848..be86b0179a1 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 '
'."\n"; print '

POINT OF SALE

'."\n"; print '
'."\n"; -include_once('tpl/menu.tpl.php'); +include_once 'tpl/menu.tpl.php'; print '
'."\n"; print '
'."\n"; -include_once('affContenu.php'); +include_once 'affContenu.php'; print '
'."\n"; -include_once('affPied.php'); +include_once 'affPied.php'; print '
'."\n"; print ''."\n"; diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index b625eccd28e..28e7bf25fb7 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 19d7bba3914..fb072f27d33 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 . */ -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 20e058d9362..e52eb9fe8dc 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 335925cf764..d327b2af07c 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 408e36bc725..86be5906cc4 100644 --- a/htdocs/cashdesk/facturation_verif.php +++ b/htdocs/cashdesk/facturation_verif.php @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -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 3f5edb9e290..4fe0a225e3f 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 - + diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php index 50b18218902..d71b2cb866f 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 cf9fd00cbe6..8e2bd0a985a 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 78fbc8a4f74..ba9767e5983 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 . */ -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 49e99bd0d9c..d9767cdb834 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 . */ -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 768458b8b16..32473e765fc 100644 --- a/htdocs/cashdesk/validation_ticket.php +++ b/htdocs/cashdesk/validation_ticket.php @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -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 f3772d617fa..fcd8eda6873 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -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 99ec4c512ce..48832c0eb86 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 84c7810e2a6..34adae9b9d0 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 dc2d979239e..cec7444503e 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 ''; print ''; print ''.$langs->trans("Description").''; print ''; -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 ''; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 39a1d7c5dcb..987ad62e7bf 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 ''.$langs->trans("Description").''; - 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 ''; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index c70c37ee270..fcde9d3361f 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 143aac02eec..cc642df17e5 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 b783e77ec22..36bd186c627 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 b16c550de98..8f5a3d1dd3f 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 966b0f25d7b..caab3dcc3a6 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 34ad7b13af5..bde511d28ff 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 aaba6d94455..1a04f8f86a3 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 ''.$langs->trans("Description").''; - 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 ''; @@ -791,7 +791,7 @@ if ($id) // Description print ''.$langs->trans("Description").''; // 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 ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 75d25216b81..bf0f58e5843 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 fe2781fcdf5..09f92d6ef62 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 812fc56743f..1b429736f08 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 f37cc761736..e1154d435a1 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 a4bfa25786e..69adcb1bd9e 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 c03f87538ca..6c36bb91774 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 3d3acc182cf..8e581f0cb51 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 4e74ec1c293..d1e29fe5a40 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 67b96147dbc..f5b3b5a611b 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 b1913cef72b..0a76606695e 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 0631a22383d..f7da122ad49 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 f092d263999..da9f1b6e3f8 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin @@ -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 3b3b8caf5b9..950ef71a734 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 b95cc35a04f..96b21b1a192 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin @@ -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 ''; print ''; // 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 ''; @@ -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 ''; print ''; // 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 ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 5390fce71a5..15c823aba57 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 685e88a16de..34e987fe032 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 74cf10241e2..d9f2cdc1256 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 7e5e00f7d8f..a5e185690f5 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -1,4 +1,4 @@ - * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2006 Andre Cianfarani @@ -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 a64a166d7af..5840e661442 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) { @@ -908,7 +908,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; @@ -1146,7 +1146,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.='
'; $text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid); @@ -1504,19 +1504,19 @@ print '
'; 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'; } /* @@ -1525,7 +1525,7 @@ if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print ''; @@ -1710,7 +1710,7 @@ if ($action != 'presend') print ''; // 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 834db513855..4c598a5871f 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 c80bb788eb3..7dff9bcc60e 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 a478ce54ecd..3640cee6279 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 9ef8ffceb89..fe240ac2266 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 b124a83714f..3550b5b50b5 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -1,4 +1,4 @@ - * Copyright (C) 2004-2011 Laurent Destailleur * @@ -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 828d231d3b8..7d66dfbfb65 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -1,4 +1,4 @@ - * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2008 Raphael Bertrand (Resultic) @@ -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 0407eced627..83822aa2407 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 11ce0f53b4b..ff2a070d08a 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) { @@ -763,7 +763,7 @@ class Commande extends CommonOrder if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('ORDER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -850,7 +850,7 @@ class Commande extends CommonOrder } // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('ORDER_CLONE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -945,7 +945,7 @@ class Commande extends CommonOrder // Actions hooked (by external module) if (! is_object($hookmanager)) { - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); } $hookmanager->initHooks(array('orderdao')); @@ -1010,7 +1010,7 @@ class Commande extends CommonOrder { dol_syslog(get_class($this)."::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -1349,8 +1349,8 @@ class Commande extends CommonOrder { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $this->db->begin(); @@ -2090,7 +2090,7 @@ class Commande extends CommonOrder if ($this->db->query($sql)) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('ORDER_CLASSIFY_BILLED',$this,$user,$langs,$conf); if ($result < 0) { @@ -2161,7 +2161,7 @@ class Commande extends CommonOrder global $conf; dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; if ($this->brouillon) { @@ -2287,7 +2287,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; @@ -2296,7 +2296,7 @@ class Commande extends CommonOrder if (! $error && ! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('ORDER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2957,7 +2957,7 @@ class OrderLine if ($resql) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('LINEORDER_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3056,7 +3056,7 @@ class OrderLine if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('LINEORDER_INSERT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3147,7 +3147,7 @@ class OrderLine if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEORDER_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php index 88875f1d08f..cee15c0645f 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 7569d449af0..0d8ec10ea73 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 8386f77d88a..d607879c5c0 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 c01b8a98b5a..aa6ff9914f7 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 2e7b4f21ea6..23f2f1334b6 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')); @@ -1016,7 +1016,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; @@ -1033,7 +1033,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; @@ -1048,7 +1048,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; @@ -1120,7 +1120,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -1129,7 +1129,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) { @@ -1153,7 +1153,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $object->elementtype = $object->element; // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($db); $result=$interface->run_triggers('ORDER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { @@ -1291,7 +1291,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')); @@ -1480,7 +1480,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G // Template to use by default print ''; print '"; @@ -1656,7 +1656,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.='
'; $text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$object->socid); @@ -1665,7 +1665,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"), @@ -1685,7 +1685,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"), @@ -1716,7 +1716,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"), @@ -2055,19 +2055,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'; } /* @@ -2079,7 +2079,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print '
'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'propal',$socid); @@ -1725,7 +1725,7 @@ if ($action != 'presend') if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -1757,7 +1757,7 @@ if ($action == 'presend') print_titre($langs->trans('SendPropalByMail')); // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index a8a08f823d9..5b4fc238342 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 2d5a785e353..e8d2332a40d 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; @@ -467,7 +467,7 @@ class Propal extends CommonObject global $conf,$user,$langs; dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters $remise_percent=price2num($remise_percent); @@ -799,7 +799,7 @@ class Propal extends CommonObject if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_CREATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -915,7 +915,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); @@ -936,7 +936,7 @@ class Propal extends CommonObject } // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_CLONE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1187,7 +1187,7 @@ class Propal extends CommonObject if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1544,7 +1544,7 @@ class Propal extends CommonObject } // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_CLOSE_SIGNED',$this,$user,$langs,$conf); if ($result < 0) { @@ -1555,7 +1555,7 @@ class Propal extends CommonObject else { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_CLOSE_REFUSED',$this,$user,$langs,$conf); if ($result < 0) { @@ -1797,7 +1797,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; @@ -1806,7 +1806,7 @@ class Propal extends CommonObject if (! $error && ! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('PROPAL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2305,7 +2305,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(); @@ -2659,7 +2659,7 @@ class PropaleLigne if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEPROPAL_INSERT',$this,$user,$langs,$conf); if ($result < 0) { @@ -2697,7 +2697,7 @@ class PropaleLigne if ($this->db->query($sql) ) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEPROPAL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -2787,7 +2787,7 @@ class PropaleLigne if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEPROPAL_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index 7c3b0c27eb0..f588ada366f 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 a0ee9f76a47..c2b2a74f66c 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 5529f2c9b9c..f0b78a81888 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 6d041e5e83e..a6c97c67bab 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 eec618f987f..46fa8dd652b 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 06b7320e3d3..cfa4b625f5d 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 61a27c4aa4c..e285d9e3ac2 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 '
'; - 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 91ad9cee969..dc4d24d5dd1 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 b6ce9b07032..884317265a1 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 ce876da83cd..3a16307a760 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 '
'.$langs->trans('Model').''; - 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 "
'; @@ -2256,7 +2256,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G print ''; print '"; @@ -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 dff729f34e9..a92dd6cb2f3 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 cbbd486e2d4..66911efc924 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 d36a075bcc2..c2ec0e4ef88 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 d1dce30d069..e9ceafdaf52 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 fc293e38130..18c6b530b98 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 ffe87be45ce..99ac5b91834 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 2dd36be46fe..21a41b848d7 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 c7f693e04e6..10c76e97fd0 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 d12b2560f97..6baac904c16 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 4b540a51b2b..2fc7e3a2125 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 be5365ccfef..7b527926a3d 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 2ca362f4696..43a21712b98 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 c8efd9c883e..3442f476b3a 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 2bfb23e59ae..65abe9ccb5f 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 ''; print ''; @@ -590,7 +590,7 @@ else print ''; print ''; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 8d95f2789aa..04199d68a84 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 f4ca4a278e7..61e73c4a9a3 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 4e01b6fcee0..26a8d93b847 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 1275cd176db..7d18abb7de4 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 ''; 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 9fcd7646e8b..cd1147ec608 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 bd7926bfeac..f7389344721 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 64fd20ca008..f69cf6344e5 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 8d40350f21e..868420a5a6c 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 90f4598f94a..389e60a5ad4 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 20c5acab754..eec442017e7 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 1d016e626b6..73e79864a6a 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 c6a41159583..05a45243d80 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 0d3d6e09b31..8d4abc48075 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 f41a8c663cf..60bd8e531e7 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 2c99bb9078c..8de8ae47970 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 ''; diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 7c828beffb3..a5188e38f04 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 1d0874af388..61c70855f54 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 ae672f499c3..2002a0e0f0a 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 a5aa5ccf864..2ca118c47cf 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 4efe9a39e02..591df7333a5 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 e779308164e..2ac166d5558 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 40bd2e1e843..6c0f789b9b8 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 8c733a150a4..ced00f94c50 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 08fc93a686b..8ccdfde750e 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 f1b2b081a64..bb78087c507 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"]); @@ -1317,7 +1317,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; @@ -1332,7 +1332,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; @@ -1422,7 +1422,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO } // Create form object - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $attachedfiles=$formmail->get_attached_files(); @@ -1431,7 +1431,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) { @@ -1453,7 +1453,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $object->elementtype = $object->element; // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($db); $result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1556,7 +1556,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(); @@ -1948,7 +1948,7 @@ if ($action == 'create') // Modele PDF print ''; print '"; @@ -2195,7 +2195,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.='
'; $text.=$notify->confirmMessage('NOTIFY_VAL_FAC',$object->socid); @@ -2205,7 +2205,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( @@ -2229,7 +2229,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( @@ -2916,20 +2916,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'; } /* @@ -2939,7 +2939,7 @@ else if ($id > 0 || ! empty($ref)) if ($conf->use_javascript_ajax && $object->statut == 0) { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } print '
'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'order',$socid); @@ -2271,7 +2271,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G if ($action == 'presend') { $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -2303,7 +2303,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G print_titre($langs->trans('SendOrderByMail')); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 283eea505eb..a6000d2a44e 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 cad4ee3e70c..bd31c21b337 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 9416732af77..08c68939903 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 5e2c8b45f14..dab125c5c61 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 '
'; - include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'); + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; print ''; } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index b99b92391a9..87dfe719398 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 '
'.$langs->trans('Model').''; - 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 "
'.$langs->trans("Comment").''; // 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 '
'.$langs->trans("Comment").''; // 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 '
'.$langs->trans('Model').''; - 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 "
'; @@ -3210,7 +3210,7 @@ else if ($id > 0 || ! empty($ref)) // Link for paypal payment if ($conf->paypal->enabled && $object->statut != 0) { - include_once(DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; print showPaypalPaymentUrl('invoice',$object->ref); } @@ -3219,7 +3219,7 @@ else if ($id > 0 || ! empty($ref)) print '
'; // List of actions on element - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown=$formactions->showactions($object,'invoice',$socid); @@ -3246,7 +3246,7 @@ else if ($id > 0 || ! empty($ref)) } $ref = dol_sanitizeFileName($object->ref); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref); $file=$fileparams['fullname']; @@ -3278,7 +3278,7 @@ else if ($id > 0 || ! empty($ref)) print_titre($langs->trans($titreform)); // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->fromtype = 'user'; $formmail->fromid = $user->id; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index ab65134c7dc..bac78a55c78 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 1b19a2205f9..7eef830a887 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 462ba7d6289..6674996a83a 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); @@ -428,7 +428,7 @@ class Facture extends CommonInvoice if ($result > 0) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -601,7 +601,7 @@ class Facture extends CommonInvoice } // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_CLONE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -693,7 +693,7 @@ class Facture extends CommonInvoice if ($ret > 0) { // Actions hooked (by external module) - include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager=new HookManager($this->db); $hookmanager->initHooks(array('invoicedao')); @@ -1036,7 +1036,7 @@ class Facture extends CommonInvoice if (! $notrigger) { // Call triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_MODIFY',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1073,8 +1073,8 @@ class Facture extends CommonInvoice { global $langs; - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); - include_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $this->db->begin(); @@ -1181,7 +1181,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; @@ -1195,7 +1195,7 @@ class Facture extends CommonInvoice if (! $error && ! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { @@ -1404,7 +1404,7 @@ class Facture extends CommonInvoice if ($resql) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_PAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1459,7 +1459,7 @@ class Facture extends CommonInvoice if ($resql) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_UNPAYED',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1524,7 +1524,7 @@ class Facture extends CommonInvoice if ($resql) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_CANCEL',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1560,7 +1560,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(); @@ -1683,7 +1683,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 @@ -1745,7 +1745,7 @@ class Facture extends CommonInvoice if (! $error) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result=$interface->run_triggers('BILL_VALIDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -1802,7 +1802,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); @@ -1874,7 +1874,7 @@ class Facture extends CommonInvoice function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0) { dol_syslog(get_class($this)."::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters if (empty($remise_percent)) $remise_percent=0; @@ -2027,7 +2027,7 @@ class Facture extends CommonInvoice */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0) { - include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line", LOG_DEBUG); @@ -2336,7 +2336,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); @@ -2358,7 +2358,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); @@ -2400,7 +2400,7 @@ class Facture extends CommonInvoice { $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) - $mybool|=@include_once($dir.$file); + $mybool|=@include_once $dir.$file; } // For compatibility @@ -2413,7 +2413,7 @@ class Facture extends CommonInvoice { $dir = $dirroot."/core/modules/facture/"; // Load file with numbering class (if found) - $mybool|=@include_once($dir.$file); + $mybool|=@include_once $dir.$file; } } //print "xx".$mybool.$dir.$file."-".$classname; @@ -3358,7 +3358,7 @@ class FactureLigne if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEBILL_INSERT',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3455,7 +3455,7 @@ class FactureLigne if (! $notrigger) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEBILL_UPDATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } @@ -3491,7 +3491,7 @@ class FactureLigne if ($this->db->query($sql) ) { // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); $result = $interface->run_triggers('LINEBILL_DELETE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index c56183ca777..fd42cb19b76 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 ba5dc74c734..4357ac46731 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 dbf19328cf9..d3625faf622 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 55a1b536fda..f7394051b0d 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 d2ceb3f091d..9b16565678d 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 ba8522ad480..6cd4850ddd8 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 4bcf7acea5c..70e92d844f4 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 1fb29318f04..8a19de20180 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 bc14ed5f760..45cfad096ec 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 '
'; - 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 ab3b2ba3d8a..161a1a57705 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 9ba9672b176..1de79ee5600 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 41fa2b33be0..8bcdf9c72ef 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 1dcd13e3086..4b7e347204d 100755 --- a/htdocs/compta/journal/index.php +++ b/htdocs/compta/journal/index.php @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -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 3a96441a39b..07cd3d146e2 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 1e1bec80c3c..66ed316c35e 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 99ae27599c0..6f0c46b813b 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 bea4c61aec4..e62dc08adc9 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 3f7bf5a37fe..aa27f201a26 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 c24638d8d72..0e200544a30 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 6b3a96a92f0..6d4bf4de6dc 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 4cd6a58611a..7e581061b8b 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'); diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 7cfe2104b45..1cfef2ad7a8 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 0d91e7d4edf..c202c8e8b71 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 981d2d97b66..3d2729d50d7 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 9b0168bd0c2..61999dfc4b5 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 36b3fd860bd..114d3d457b4 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 98ed62325d6..c3b8ec4243b 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 2e2abf4c79f..74d891a7764 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 d683713f870..535e3a013da 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 d7eebe8dd83..2f2f32bcbc2 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 609785976bd..79bd009f056 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 e09dfbaf7be..714d8a20d59 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 877e8121ad7..f9e6f61852f 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 00ccd303408..d10f051fba3 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 d9bee27e91a..01b5fe1bf01 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 c63e9521d00..19ff8546b8f 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2010-2012 Juanjo Menent @@ -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 25387018ac0..2f527713c4f 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 b58e072d613..f9727792638 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 07981443bbd..dfcf992f2b6 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 51df78b7836..20f388c7d1d 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 4f6134664ed..d6f94d15861 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 088afb188f8..aed9237e028 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 41675d1c1ec..700cf00dec5 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2009 Regis Houssin * @@ -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 6adf25293de..2ca9479f441 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin @@ -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 0ef042b9705..5497b1acf2a 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2010-2012 Juanjo Menent @@ -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 d01e622bb1d..3560d9ade29 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2010-2012 Juanjo Menent @@ -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 414c1a388f3..8dba0b37cae 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 5013687b729..934389d9dad 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 f93e4f21e2a..4e9636af6a4 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 1ba540731ad..b72544ae2f9 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 812fee4dae5..ba6e059d8e1 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent @@ -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 7d5e1eba9a9..bf8b5061374 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin @@ -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 bc3e580d8a5..c458f55813d 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 14edb84f301..fb8526d077c 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 a2e6045fe2b..bc23e2c3c73 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 dce0e32667a..0e9a8db8595 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 2ba45b22a7d..e423136b7ee 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 f9124c2edfd..4dc224c73b2 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 26cff9343f5..a397ca5c29c 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 25f50e4a7e0..7bff88b37a4 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 860584234bc..128ff9b8c86 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 8f0a19d07e4..ec0441fba2f 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 d48386bb623..08a14a16687 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 1f40ba120a7..31a86e475df 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 c3c747a3aa6..3bf19f18942 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 bab35674fab..12b878fc4be 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 d320e394d27..23d01de6631 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 9aeb55fa505..71dbdb6c947 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 9837fabe418..90a0acff0d2 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 fd09385c8fe..e6ea960fa98 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 c1bf23429e6..5ac598d7a66 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 7123e828c1d..1bcd7cabb47 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 f444cd92183..dec625e95a8 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 f0f3336b972..9c8591477e0 100644 --- a/htdocs/compta/ventilation/fiche.php +++ b/htdocs/compta/ventilation/fiche.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2006 Laurent Destailleur * @@ -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 2766a7c0eac..2a8e711745b 100644 --- a/htdocs/compta/ventilation/fournisseur/fiche.php +++ b/htdocs/compta/ventilation/fournisseur/fiche.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005 Simon TOSSER * @@ -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 a019ff63666..d24b2275732 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 6418f616354..2e10e8cd189 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 9c763d258cc..183baab771f 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 184231e8ec7..4e703ea650f 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 c9949e9c352..60aa986f113 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 7359d5d5333..294b1adc6bc 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 fb8711d7c12..6d37292f62f 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 1cb87732ddc..485de6470e5 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 60873f86a32..fc3a386af02 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 fa4c5dae0d9..e8b55255418 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 f42414a980b..96c80739461 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 4365f895247..33be09b9a43 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 e8ed38b57cb..ed386d31a8d 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 d71dcc44225..ace7abcc6b9 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 2755b29ccf4..5cdd2c1568a 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 ''; 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 '\n"; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 85746ce537d..7d29918ae10 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 "".'\n"; @@ -498,7 +498,7 @@ else print ''; print ''; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 33c7952a158..002e099c397 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 5bfc3b6a9af..5f64929c5a5 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 efc308b45d4..6caf070d675 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 234fc3191de..a98a7a3b5f8 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 b6ed67baece..4d85ff977b1 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 64ca2fb6c81..9ac58e67515 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 47dfb03d81a..12324d5e608 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 572aea960e7..4ec89e0bad0 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 33ea1745b27..ab2c376e621 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 ""; print "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 d88f90446ab..76afed6ebd7 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 2ed1576328f..2b7cc2c66b1 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 1c304ded7a9..e32bfa59620 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 92bda6a4b00..c8957633290 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 8e5370df465..bc47a4a8be8 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 17c76af2081..e0287870666 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 713d6741972..21ef7d966e7 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 0bbd0f00393..aa0f1a31ea5 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 96f78df4d1d..519d417edb3 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 7651cc190bf..a448425ac26 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 1cc04f3c1a7..d34749b745d 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 e3f0402bbf1..93795ff2d58 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 d7d062126d0..d1fb254c46b 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 304c5bfd598..35e4cf00e13 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 d140a7ef31b..f23bee5f631 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 8a43026b983..2ad6d9acb45 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");
'.$langs->trans("DateToBirth").''.dol_print_date($object->birthday,"day"); diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index daca201b63c..20a230be6ba 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 d963fb94ebc..c51c3f1a85f 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 2eea1fd3dc0..d68c87aaba5 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 '
'; // 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 7474a098f34..21e48a81467 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 fb4183cfa4d..081b38c8ee9 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 315dc569432..ac719b42124 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 921c36b5c02..21f1f41c4e4 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 '
'; - 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 1a4b4e34ddf..102f28d696e 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 d24a241eee5..9de59a527d1 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 d32dbd777fd..1d9f373902e 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 1c8eaf513f0..5497aec426e 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 3ed30274972..a79a9f5d0ff 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 025d1dc9dd0..3d71cd791cb 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 7dd1ce04743..0f81b28aae1 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 30c52242f74..472e50b5574 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 45781e46379..831f3c5dea8 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 72a679ef572..69212205832 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 f62f5581b5e..8e32fe6551c 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 1db90340300..ec44c8c8c76 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 985cfb9b71b..97ed9e4697c 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 d8568fddc9f..c9dfed825d6 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 e4bea43e14a..e4ea09a3755 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 41d74fdebee..9145cd1a2a9 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 9166267ccbc..762d79bda25 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 0be97f83a4c..291c7f52596 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 a0ab16baf0e..87d42a42ad5 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 f89e37f191e..1e76c3d4d0b 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 390dbe52ac2..09f84afca78 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 577ef3262ff..a1ee44fe161 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 57cc7eafaa1..9f0448f0534 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 cceaafa5985..78b241154b8 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 ee8e01a24f8..2feadec09c6 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 eb3cf5e67c9..a8f66935a48 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 fc167601cc6..1920af9ebc8 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 0aaf343d876..fdc81cff818 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 bb9a4adbfa6..38ffa7dbe7b 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 e64649ec1fd..67e44abebbb 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 e19ef1c0169..dab5d325d76 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 fe12c196138..f0645659062 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 9f9bd706ac0..f36205a9616 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 4251b9f1953..c50272baee8 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 bd1686da45a..d4a701ca5ef 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 bcb31e96464..86b50c45951 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 6577cb432cf..355d5319855 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 e4d387395a4..2da3527aa6f 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 97c3e0f780c..d93bb51eb84 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 aee943be4df..2ef81f12248 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 973f4882654..b3b80b8b459 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; } } @@ -2492,7 +2492,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_create.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_create.tpl.php'); if ($res) break; } } @@ -2647,7 +2647,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/predefinedproductline_view.tpl.php')); + $res=@include dol_buildpath($reldir.'/predefinedproductline_view.tpl.php'); if ($res) break; } } @@ -2658,7 +2658,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_view.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_view.tpl.php'); if ($res) break; } } @@ -2674,7 +2674,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/predefinedproductline_edit.tpl.php')); + $res=@include dol_buildpath($reldir.'/predefinedproductline_edit.tpl.php'); if ($res) break; } } @@ -2685,7 +2685,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/freeproductline_edit.tpl.php')); + $res=@include dol_buildpath($reldir.'/freeproductline_edit.tpl.php'); if ($res) break; } } @@ -2832,7 +2832,7 @@ abstract class CommonObject $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl')); foreach($dirtpls as $reldir) { - $res=@include(dol_buildpath($reldir.'/originproductline.tpl.php')); + $res=@include dol_buildpath($reldir.'/originproductline.tpl.php'); if ($res) break; } } @@ -2841,7 +2841,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 bde0cc6fc11..ebd628f2a52 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 8287a2d6f1b..ec5129a0dd8 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 b91943d146f..f979ef45551 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 3a7382c44ce..442ae6d46f1 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 2fb677aeffe..3eeb0cb9255 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 cd82c00e0e6..a3bbb7d4e14 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 78fd96de911..3deb9154446 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 70b51714aef..5361819f7b0 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 34aa394998e..47d415d2f3f 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 ace19b2a174..916625b21c1 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 3d62245868f..57c4308fb80 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); } @@ -866,7 +866,7 @@ class Form $i = 0; if ($num) { - include_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'); + include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $contactstatic=new Contact($this->db); while ($i < $num) @@ -1092,7 +1092,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; @@ -2391,7 +2391,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") @@ -2605,7 +2605,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); @@ -2751,7 +2751,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); @@ -2796,7 +2796,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); @@ -3373,7 +3373,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 cf63c366792..ed6321ec47a 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 1597a92e0d6..34b6a9448d7 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.= '		'; 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 597d143f6ea..5d408c47cbf 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1,4 +1,4 @@ - * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent @@ -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 8f723de978a..0bf1971e054 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 15ce6928bbf..2371d07bbae 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 ''.$address->label.''; @@ -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 996476c7960..511e563521c 100755 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -1,4 +1,4 @@ - * Copyright (C) 2010 Juanjo Menent * @@ -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 5884a15156b..750865189c2 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 f6892455301..d3466e5268c 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 8cff2f5252c..1474cb7686a 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 c3af2d046b4..f86c40b0879 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 7dee233f436..51bb4664861 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 050d5a3d4df..88837c2a912 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 daf63f06d19..93254a4ac80 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 5da35174c3a..5ee5ae29aaa 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'; ?> diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php index f22f2cd15a4..7556f2b437d 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'; ?> diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index a80f9a0223c..087b9fbc1b4 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 b6506045c1d..487557b939d 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 bac1632013e..3b3a43729b2 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 94b879c0ca7..059136e1757 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 '
'; print $langs->trans("Note"); print ''; - 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 "
'.$langs->trans("Note").''; - 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 "
'.$langs->trans("Note").''; - 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 '