lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

Browse Source 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
This commit is contained in:
Regis Houssin 2012-08-23 07:53:48 +02:00
commit f4d75e87d3
851 changed files with 3553 additions and 3542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/initdata/generate-commande.php
View File

@ -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';
/*

12
dev/initdata/generate-produit.php
View File

@ -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';
/*

12
dev/initdata/generate-societe.php
View File

@ -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");

14
dev/skeletons/README
View File

@ -9,7 +9,7 @@ skeleton_*.php to build its generated code.
modMyModule.class.php:
Is a sample of module descriptor you can use if you want to build a new module/plugin for
Is a sample of module descriptor that you can use if you want to build a new module/plugin for
Dolibarr.
@ -20,11 +20,7 @@ skeleton_page.php:
Is a sample you can use as an example if you need to build an HTML page to include in Dolibarr GUI.
skeleton_class.class.php:
Is a sample you can use as an example if you need to build a class file to access a new table
required by a Dolibarr development.
However it is better to run the script build_class_from_table.php that accept a table name as a
parameter and will used table description in database and the skeleton_class.class.php file to
generate full code for your class file.
After running this script, the class to access your table (insert a record, update, delete and select)
is directly finished and can be used by your business code. No more coding for accesser on table
is needed with this script as the file is completely generated once.
Is a sample you can use as an example if you need to build a class file to access a new table required by a Dolibarr development.
However it is better to run the build_class_from_table.php script that accepts a table name as a parameter and will uses the description table within database and the skeleton_class.class.php file to generate full code for your class file.
After running this script, the class to access your table (insert a record, update, delete and select) is directly finished and can be used by your module's code.
No more coding is needed to get access to table with this script because the file is completely generated once.

2
dev/skeletons/modMyModule.class.php
View File

@ -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';
/**

22
dev/skeletons/skeleton_class.class.php
View File

@ -61,7 +61,7 @@ class Skeleton_Class // extends CommonObject
/**
* Create object into database
*
* @param User $user User that create
* @param User $user User that creates
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, Id of created object if OK
*/
@ -102,10 +102,10 @@ class Skeleton_Class // extends CommonObject
if (! $notrigger)
{
// Uncomment this and change MYOBJECT to your own tag if you
// want this action call a trigger.
// want this action calls a trigger.
//// Call triggers
//include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//$interface=new Interfaces($this->db);
//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
//if ($result < 0) { $error++; $this->errors=$interface->errors; }
@ -133,7 +133,7 @@ class Skeleton_Class // extends CommonObject
/**
* Load object in memory from database
* Load object in memory from the database
*
* @param int $id Id object
* @return int <0 if KO, >0 if OK
@ -178,7 +178,7 @@ class Skeleton_Class // extends CommonObject
/**
* Update object into database
*
* @param User $user User that modify
* @param User $user User that modifies
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
@ -193,7 +193,7 @@ class Skeleton_Class // extends CommonObject
//...
// Check parameters
// Put here code to add control on parameters values
// Put here code to add a control on parameters values
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."mytable SET";
@ -213,10 +213,10 @@ class Skeleton_Class // extends CommonObject
if (! $notrigger)
{
// Uncomment this and change MYOBJECT to your own tag if you
// want this action call a trigger.
// want this action calls a trigger.
//// Call triggers
//include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//$interface=new Interfaces($this->db);
//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
//if ($result < 0) { $error++; $this->errors=$interface->errors; }
@ -246,7 +246,7 @@ class Skeleton_Class // extends CommonObject
/**
* Delete object in database
*
* @param User $user User that delete
* @param User $user User that deletes
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
@ -262,10 +262,10 @@ class Skeleton_Class // extends CommonObject
if (! $notrigger)
{
// Uncomment this and change MYOBJECT to your own tag if you
// want this action call a trigger.
// want this action calls a trigger.
//// Call triggers
//include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//$interface=new Interfaces($this->db);
//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
//if ($result < 0) { $error++; $this->errors=$interface->errors; }

14
dev/skeletons/skeleton_page.php
View File

@ -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");

6
htdocs/adherents/admin/adherent.php
View File

@ -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");

8
htdocs/adherents/admin/adherent_extrafields.php
View File

@ -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';

8
htdocs/adherents/admin/mailman.php
View File

@ -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();

8
htdocs/adherents/admin/public.php
View File

@ -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");

6
htdocs/adherents/admin/spip.php
View File

@ -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");

14
htdocs/adherents/agenda.php
View File

@ -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");

30
htdocs/adherents/card_subscriptions.php
View File

@ -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);
}

12
htdocs/adherents/cartes/carte.php
View File

@ -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");

96
htdocs/adherents/class/adherent.class.php
View File

@ -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'];

2
htdocs/adherents/class/adherent_type.class.php
View File

@ -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';
/**

4
htdocs/adherents/class/adherentstats.class.php
View File

@ -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';
/**

6
htdocs/adherents/class/cotisation.class.php
View File

@ -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);

8
htdocs/adherents/cotisations.php
View File

@ -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");

16
htdocs/adherents/document.php
View File

@ -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');
}

32
htdocs/adherents/fiche.php
View File

@ -24,17 +24,17 @@
* \brief Page of member
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$langs->load("companies");
$langs->load("bills");
@ -85,7 +85,7 @@ if ($rowid)
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager=new HookManager($db);
$hookmanager->initHooks(array('membercard'));
@ -213,7 +213,7 @@ if ($action == 'confirm_sendinfo' && $confirm == 'yes')
if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
{
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$datenaiss='';
if (isset($_POST["naissday"]) && $_POST["naissday"]
@ -755,7 +755,7 @@ if ($action == 'create')
// Password
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
{
require_once(DOL_DOCUMENT_ROOT."/core/lib/security2.lib.php");
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$generated_password=getRandomPassword('');
print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
@ -1128,7 +1128,7 @@ if ($rowid && $action != 'edit')
if (empty($login))
{
// Full firstname and name separated with a dot : firstname.name
include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$login=dol_buildlogin($object->lastname,$object->firstname);
}
if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
@ -1564,7 +1564,7 @@ if ($rowid && $action != 'edit')
// Action SPIP
if ($conf->mailmanspip->enabled && $conf->global->ADHERENT_USE_SPIP)
{
include_once(DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php');
include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
$mailmanspip=new MailmanSpip($db);
$isinspip=$mailmanspip->is_in_spip($object);

10
htdocs/adherents/fiche_subscription.php
View File

@ -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");

4
htdocs/adherents/htpasswd.php
View File

@ -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();

6
htdocs/adherents/index.php
View File

@ -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");

8
htdocs/adherents/info.php
View File

@ -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");

10
htdocs/adherents/info_subscription.php
View File

@ -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");

12
htdocs/adherents/ldap.php
View File

@ -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");

8
htdocs/adherents/liste.php
View File

@ -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");

10
htdocs/adherents/note.php
View File

@ -22,10 +22,10 @@
* \brief Fiche de notes sur un adherent
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php');
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("companies");
$langs->load("members");
@ -138,7 +138,7 @@ if ($id)
{
print "<input type=\"hidden\" name=\"action\" value=\"update\">";
print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('note',$object->note,'',280,'dolibarr_notes','',true,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
$doleditor->Create();
}

6
htdocs/adherents/stats/geo.php
View File

@ -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

8
htdocs/adherents/stats/index.php
View File

@ -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;

10
htdocs/adherents/type.php
View File

@ -24,9 +24,9 @@
* \brief Member's type setup
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
$langs->load("members");
@ -244,7 +244,7 @@ if ($action == 'create')
print '<textarea name="comment" wrap="soft" cols="60" rows="3"></textarea></td></tr>';
print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
$doleditor->Create();
print '</td></tr>';
@ -626,7 +626,7 @@ if ($rowid > 0)
print '<textarea name="comment" wrap="soft" cols="90" rows="3">'.$adht->note.'</textarea></td></tr>';
print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
$doleditor->Create();
print "</td></tr>";

4
htdocs/admin/accounting.php
View File

@ -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');

6
htdocs/admin/agenda.php
View File

@ -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();

12
htdocs/admin/agenda_extsites.php
View File

@ -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();

6
htdocs/admin/agenda_xcal.php
View File

@ -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)

10
htdocs/admin/barcode.php
View File

@ -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)

8
htdocs/admin/boxes.php
View File

@ -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");

4
htdocs/admin/clicktodial.php
View File

@ -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");

12
htdocs/admin/commande.php
View File

@ -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;

20
htdocs/admin/company.php
View File

@ -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);

4
htdocs/admin/compta.php
View File

@ -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');

4
htdocs/admin/confexped.php
View File

@ -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");

4
htdocs/admin/const.php
View File

@ -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");

8
htdocs/admin/contract.php
View File

@ -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;

4
htdocs/admin/delais.php
View File

@ -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");

10
htdocs/admin/dict.php
View File

@ -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'));

10
htdocs/admin/dons.php
View File

@ -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

8
htdocs/admin/events.php
View File

@ -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)

14
htdocs/admin/expedition.php
View File

@ -28,9 +28,9 @@
* \brief Page d'administration/configuration du module Expedition
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php');
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
$langs->load("admin");
$langs->load("sendings");
@ -130,7 +130,7 @@ if ($action == 'specimen')
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db);
@ -192,7 +192,7 @@ if ($action == 'setmethod' || $action== 'setmod')
$moduleid=GETPOST('moduleid','alpha');
$statut=GETPOST('statut','alpha');
require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php");
require_once DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php";
$classname = "methode_expedition_$module";
$expem = new $classname($db);
@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir)
{
$file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.".php");
require_once DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.'.php';
$module = new $file;
@ -480,7 +480,7 @@ foreach ($dirmodels as $reldir)
print '<tr '.$bc[$var].'><td>';
print $name;
print "</td><td>\n";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname();
print $module->description;

6
htdocs/admin/external_rss.php
View File

@ -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");

12
htdocs/admin/facture.php
View File

@ -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;

6
htdocs/admin/fckeditor.php
View File

@ -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");

12
htdocs/admin/fichinter.php
View File

@ -28,9 +28,9 @@
* \brief Setup page of module Interventions
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
$langs->load("admin");
$langs->load("errors");
@ -125,7 +125,7 @@ if ($action == 'specimen')
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db);
@ -234,7 +234,7 @@ foreach ($dirmodels as $reldir)
$file = $reg[1];
$classname = substr($file,4);
require_once(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/".$file.".php");
require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/".$file.'.php';
$module = new $file;
@ -356,7 +356,7 @@ foreach ($dirmodels as $reldir)
print '<tr '.$bc[$var].'><td>';
echo "$name";
print "</td><td>\n";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname($db);
print $module->description;
print '</td>';

20
htdocs/admin/fournisseur.php
View File

@ -27,11 +27,11 @@
* \brief Page d'administration-configuration du module Fournisseur
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$langs->load("admin");
$langs->load('other');
@ -94,7 +94,7 @@ if ($action == 'specimen') // For orders
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db,$commande);
@ -140,7 +140,7 @@ if ($action == 'specimenfacture') // For invoices
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db,$facture);
@ -314,7 +314,7 @@ foreach ($dirmodels as $reldir)
{
$file = substr($file, 0, dol_strlen($file)-4);
require_once($dir.$file.".php");
require_once $dir.$file.'.php';
$module = new $file;
@ -455,7 +455,7 @@ foreach ($dirmodels as $reldir)
print "<tr ".$bc[$var].">\n";
print "<td>".$name."</td>\n";
print "<td>\n";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty);
print $module->description;
print "</td>\n";
@ -587,7 +587,7 @@ foreach ($dirmodels as $reldir)
print "<tr ".$bc[$var].">\n";
print "<td>".$name."</td>\n";
print "<td>";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty);
print $module->description;
print "</td>\n";

6
htdocs/admin/geoipmaxmind.php
View File

@ -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)

14
htdocs/admin/ihm.php
View File

@ -22,12 +22,12 @@
* \brief Page to setup GUI display options
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$langs->load("admin");
$langs->load("languages");
@ -103,7 +103,7 @@ print "<br>\n";
if ($action == 'edit') // Edit
{
//WYSIWYG Editor
require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

2
htdocs/admin/index.php
View File

@ -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");

8
htdocs/admin/ldap.php
View File

@ -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");

10
htdocs/admin/ldap_contacts.php
View File

@ -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");

12
htdocs/admin/ldap_groups.php
View File

@ -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");

12
htdocs/admin/ldap_members.php
View File

@ -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");

12
htdocs/admin/ldap_users.php
View File

@ -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");

6
htdocs/admin/limits.php
View File

@ -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");

12
htdocs/admin/livraison.php
View File

@ -27,9 +27,9 @@
* \ingroup livraison
* \brief Page d'administration/configuration du module Livraison
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
$langs->load("admin");
$langs->load("sendings");
@ -106,7 +106,7 @@ if ($action == 'specimen')
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db);
@ -236,7 +236,7 @@ foreach ($dirmodels as $reldir)
{
$file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.".php");
require_once DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.'.php';
$module = new $file;
@ -371,7 +371,7 @@ foreach ($dirmodels as $reldir)
print '<tr '.$bc[$var].'><td>';
print $name;
print "</td><td>\n";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname($db);
print $module->description;

6
htdocs/admin/mailing.php
View File

@ -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");

20
htdocs/admin/mails.php
View File

@ -21,9 +21,9 @@
* \brief Page to setup emails sending
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("companies");
$langs->load("products");
@ -78,7 +78,7 @@ if ($action == 'update' && empty($_POST["cancel"]))
*/
if (GETPOST('addfile') || GETPOST('addfilehtml'))
{
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id;
@ -117,7 +117,7 @@ if (! empty($_POST['removedfile']) || ! empty($_POST['removedfilehtml']))
{
setEventMessage($langs->trans("FileWasRemoved"), $filetodelete);
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->remove_attached_files($keytodelete);
}
@ -154,7 +154,7 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE
$deliveryreceipt= $_POST["deliveryreceipt"];
// Create form object
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$attachedfiles=$formmail->get_attached_files();
@ -184,7 +184,7 @@ if (($action == 'send' || $action == 'sendhtml') && ! GETPOST('addfile') && ! GE
$subject=make_substitutions($subject,$substitutionarrayfortest);
$body=make_substitutions($body,$substitutionarrayfortest);
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile(
$subject,
$sendto,
@ -644,7 +644,7 @@ else
// If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mail = new CMailFile('','','','');
$result=$mail->check_server_port($server,$port);
if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';
@ -664,7 +664,7 @@ else
print_titre($langs->trans("DoTestSend"));
// Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php");
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
@ -709,7 +709,7 @@ else
print_titre($langs->trans("DoTestSendHTML"));
// Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php");
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);

8
htdocs/admin/menus.php
View File

@ -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');

6
htdocs/admin/menus/edit.php
View File

@ -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");

6
htdocs/admin/menus/index.php
View File

@ -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");

4
htdocs/admin/menus/menu.js.php
View File

@ -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');

4
htdocs/admin/menus/other.php
View File

@ -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");

6
htdocs/admin/modules.php
View File

@ -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;

6
htdocs/admin/notification.php
View File

@ -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");

2
htdocs/admin/osc-languages.php
View File

@ -21,7 +21,7 @@
* \brief Page d'administration/configuration du module Boutique
*/
require("../main.inc.php");
require '../main.inc.php';
$langs->load("admin");

14
htdocs/admin/pdf.php
View File

@ -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;

8
htdocs/admin/perms.php
View File

@ -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

10
htdocs/admin/prelevement.php
View File

@ -1,4 +1,4 @@
<?PHP
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
@ -24,10 +24,10 @@
* \brief Page configuration des prelevements
*/
require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("admin");
$langs->load("withdrawals");

14
htdocs/admin/project.php
View File

@ -24,10 +24,10 @@
* \brief Page to setup project module
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php');
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
$langs->load("admin");
$langs->load("errors");
@ -89,7 +89,7 @@ if ($action == 'specimen')
if ($filefound)
{
require_once($file);
require_once $file;
$module = new $classname($db);
@ -198,7 +198,7 @@ foreach ($dirmodels as $reldir)
$file = $reg[1];
$classname = substr($file,4);
require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.".php");
require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.'.php';
$module = new $file;
@ -331,7 +331,7 @@ foreach ($dirmodels as $reldir)
$var=!$var;
print "<tr ".$bc[$var].">\n <td>$name";
print "</td>\n <td>\n";
require_once($dir.$file);
require_once $dir.$file;
$module = new $classname($db);
print $module->description;
print "</td>\n";

12
htdocs/admin/propal.php
View File

@ -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;

6
htdocs/admin/proxy.php
View File

@ -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");

8
htdocs/admin/security.php
View File

@ -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;

8
htdocs/admin/security_other.php
View File

@ -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);
}

12
htdocs/admin/sms.php
View File

@ -21,8 +21,8 @@
* \brief Page to setup emails sending
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
$langs->load("companies");
$langs->load("products");
@ -82,7 +82,7 @@ if ($action == 'send' && ! $_POST['cancel'])
$errors_to = GETPOST("errorstosms");
// Create form object
include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php');
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
$formsms = new FormSms($db);
if (! empty($formsms->error))
@ -115,7 +115,7 @@ if ($action == 'send' && ! $_POST['cancel'])
complete_substitutions_array($substitutionarrayfortest, $langs);
$body=make_substitutions($body,$substitutionarrayfortest);
require_once(DOL_DOCUMENT_ROOT."/core/class/CSMSFile.class.php");
require_once DOL_DOCUMENT_ROOT.'/core/class/CSMSFile.class.php';
$smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account
$result=$smsfile->sendfile(); // This send SMS
@ -295,7 +295,7 @@ else
// If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mail = new CSMSFile('','','','');
$result=$mail->check_server_port($server,$port);
if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';
@ -315,7 +315,7 @@ else
print_titre($langs->trans("DoTestSend"));
// Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/core/class/html.formsms.class.php");
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formsms.class.php';
$formsms = new FormSms($db);
$formsms->fromtype='user';
$formsms->fromid=$user->id;

4
htdocs/admin/stock.php
View File

@ -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");

6
htdocs/admin/syslog.php
View File

@ -23,8 +23,8 @@
* \brief Setup page for logs module
*/
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
if (!$user->admin) accessforbidden();
@ -193,7 +193,7 @@ print '</td></tr>';
try
{
set_include_path('/usr/share/php/');
$res=@include_once('FirePHPCore/FirePHP.class.php');
$res=@include_once 'FirePHPCore/FirePHP.class.php';
restore_include_path();
if ($res)
{

2
htdocs/admin/system/about.php
View File

@ -24,7 +24,7 @@
* \brief About Dolibarr File page
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");
$langs->load("help");

2
htdocs/admin/system/constall.php
View File

@ -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");

2
htdocs/admin/system/database-tables-contraintes.php
View File

@ -23,7 +23,7 @@
* \brief Page d'info des contraintes de la base
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

2
htdocs/admin/system/database-tables.php
View File

@ -24,7 +24,7 @@
* \brief Page d'infos des tables de la base
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

2
htdocs/admin/system/database.php
View File

@ -23,7 +23,7 @@
* \brief Page with system information of database
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

2
htdocs/admin/system/dbtable.php
View File

@ -24,7 +24,7 @@
* \brief Page d'info des contraintes d'une table
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

6
htdocs/admin/system/dolibarr.php
View File

@ -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");

4
htdocs/admin/system/index.php
View File

@ -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");

6
htdocs/admin/system/modules.php
View File

@ -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;

4
htdocs/admin/system/os.php
View File

@ -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");

2
htdocs/admin/system/phpinfo.php
View File

@ -22,7 +22,7 @@
* \brief Page des infos systeme de php
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

6
htdocs/admin/system/web.php
View File

@ -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");

2
htdocs/admin/system/xcache.php
View File

@ -20,7 +20,7 @@
* \brief Page administration XCache
*/
require("../../main.inc.php");
require '../../main.inc.php';
$langs->load("admin");

Some files were not shown because too many files have changed in this diff Show More