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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2011-10-25 22:36:26 +02:00
commit 0835224921
751 changed files with 3437 additions and 2720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
COPYRIGHT
View File

@ -11,27 +11,28 @@ However it uses some external libraries under different licences. This is compat
Composant Version License Compatible GPL Usage Composant Version License Compatible GPL Usage
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
PHP libraries: PHP libraries:
AdoDb-Date 0.21 Modified BSD License Yes Date convertion AdoDb-Date 0.21 Modified BSD License Yes Date convertion
ArtiChow 1.07 Public Domain Yes Graphics ArtiChow 1.07 Public Domain Yes Graphics
CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG
FPDI 1.4.1 Apache Software License 2.0 ? PDF templates management FPDI 1.4.1 Apache Software License 2.0 ? PDF templates management
NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services NuSoap 0.9.5 LGPL 2.1 Yes Library to develop SOAP Web services
OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files
Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation
PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files
TCPDF 5.9.098 LGPL 3.0 Yes PDF generation TCPDF 5.9.098 LGPL 3.0 Yes PDF generation
JS libraries: JS libraries:
jQuery 1.6.1 GPL and MIT Licence Yes JS library jQuery 1.6.4 GPL and MIT Licence Yes JS library
jQuery UI 1.8.14 GPL and MIT Licence Yes JS library plugin UI jQuery UI 1.8.16 GPL and MIT Licence Yes JS library plugin UI
jQuery Flot 0.7 MIT Licence Yes JS library to build graph jQuery Flot 0.7 MIT Licence Yes JS library to build graph
jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images) jQuery JCrop 0.9.8 MIT Licence Yes JS library plugin Crop (to crop images)
jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15) jQuery jeditable 1.7.1 MIT Licence Yes JS library plugin jeditable (to edit in place)
jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows) jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
jQuery jNotify 1.1.00 Apache Software License 2.0 ? JS library plugin jNotify (to use ajax popups) jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
jQuery Mobile 1.0b1 GPL and MIT Licence Yes JS library for smartphone (not used) jQuery jNotify 1.1.00 Apache Software License 2.0 ? JS library plugin jNotify (to use ajax popups)
jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips jQuery Mobile 1.0rc2 GPL and MIT Licence Yes JS library for smartphone (not used)
JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports) jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
For licenses compatibility informations: For licenses compatibility informations:

2
ChangeLog
View File

@ -37,6 +37,8 @@ For developers:
- Qual: Add more "hooks". - Qual: Add more "hooks".
- Qual: Add "canvas" feature to overwrite page of thirdparty, contact, product with yours. - Qual: Add "canvas" feature to overwrite page of thirdparty, contact, product with yours.
- Qual: More OOP (usage of "abstract", "static", ...), uniformize constructors. - Qual: More OOP (usage of "abstract", "static", ...), uniformize constructors.
- Qual: task #216 : Move /lib in /core/lib directory
- Qual: task #217 : Move core files in core directory (login, menus, triggers, boxes, modules)
***** ChangeLog for 3.1 compared to 3.0 ***** ***** ChangeLog for 3.1 compared to 3.0 *****

28
build.xml
View File

@ -2,7 +2,7 @@
<project name="dolibarr" default="hudson" basedir="."> <project name="dolibarr" default="hudson" basedir=".">
<!-- Exclude/ignore paths --> <!-- Exclude/ignore paths -->
<property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" /> <property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" /> <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*" />
<target name="clean"> <target name="clean">
@ -44,18 +44,7 @@
<exec executable="phpcpd"> <exec executable="phpcpd">
<arg line=" --log-pmd '${basedir}/hudson/logs/pmd-cpd.xml' <arg line=" --log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
--exclude '${basedir}/htdocs/core/filemanagerdol' --exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes/adodbtime' --exclude '${basedir}/htdocs/includes'
--exclude '${basedir}/htdocs/includes/artichow'
--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
--exclude '${basedir}/htdocs/includes/ckeditor'
--exclude '${basedir}/htdocs/includes/fpdfi'
--exclude '${basedir}/htdocs/includes/geoip'
--exclude '${basedir}/htdocs/includes/jquery'
--exclude '${basedir}/htdocs/includes/jsgantt'
--exclude '${basedir}/htdocs/includes/nusoap'
--exclude '${basedir}/htdocs/includes/odtphp'
--exclude '${basedir}/htdocs/includes/phpexcel'
--exclude '${basedir}/htdocs/includes/tcpdf'
--exclude '**/PEAR/*,**/NET/*,**/HTTP/*' --exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
htdocs htdocs
" /> " />
@ -67,18 +56,7 @@
<exec executable="phploc"> <exec executable="phploc">
<arg line=" --log-csv '${basedir}/hudson/logs/phploc.csv' <arg line=" --log-csv '${basedir}/hudson/logs/phploc.csv'
--exclude '${basedir}/htdocs/core/filemanagerdol' --exclude '${basedir}/htdocs/core/filemanagerdol'
--exclude '${basedir}/htdocs/includes/adodbtime' --exclude '${basedir}/htdocs/includes'
--exclude '${basedir}/htdocs/includes/artichow'
--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
--exclude '${basedir}/htdocs/includes/ckeditor'
--exclude '${basedir}/htdocs/includes/fpdfi'
--exclude '${basedir}/htdocs/includes/geoip'
--exclude '${basedir}/htdocs/includes/jquery'
--exclude '${basedir}/htdocs/includes/jsgantt'
--exclude '${basedir}/htdocs/includes/nusoap'
--exclude '${basedir}/htdocs/includes/odtphp'
--exclude '${basedir}/htdocs/includes/phpexcel'
--exclude '${basedir}/htdocs/includes/tcpdf'
--exclude '**/PEAR/*,**/NET/*,**/HTTP/*' --exclude '**/PEAR/*,**/NET/*,**/HTTP/*'
htdocs htdocs
" /> " />

2
build/deb/conf.php.install
View File

@ -136,7 +136,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
# This parameter contains the way authentication is done. # This parameter contains the way authentication is done.
# If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_* # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
# Default value: dolibarr # Default value: dolibarr
# Possible values: Any values found in files in htdocs/includes/login directory after # Possible values: Any values found in files in htdocs/core/login directory after
# the "function_" string and before the ".php" string. You can also separate several # the "function_" string and before the ".php" string. You can also separate several
# values using a ",". In this case, Dolibarr will check login/pass for each value in # values using a ",". In this case, Dolibarr will check login/pass for each value in
# order defined into value. However, note that this can't work with all values. # order defined into value. However, note that this can't work with all values.

2
build/doxygen/hudson-doxygen.doxyfile
View File

@ -611,7 +611,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag. # subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded # directories that are symbolic links (a Unix filesystem feature) are excluded

4
build/makepack-dolibarrmodule.conf
View File

@ -8,8 +8,8 @@
# Setup: Go on Dolibarr setup - modules page to enable module. # Setup: Go on Dolibarr setup - modules page to enable module.
# #
# Files in module # Files in module
htdocs/includes/modules/modMyModule.class.php htdocs/core/modules/modMyModule.class.php
htdocs/includes/triggers/interface_mymodule.class.php htdocs/core/triggers/interface_mymodule.class.php
htdocs/mymodule/page1.php htdocs/mymodule/page1.php
htdocs/mymodule/page2.php htdocs/mymodule/page2.php
htdocs/mymodule/sql/script1.sql htdocs/mymodule/sql/script1.sql

18
build/tgz/tar_exclude.txt
View File

@ -45,15 +45,15 @@ htdocs/includes/treemenu/docs
htdocs/includes/treemenu/images htdocs/includes/treemenu/images
htdocs/includes/treemenu/imagesAlt htdocs/includes/treemenu/imagesAlt
htdocs/includes/treemenu/imagesAlt2 htdocs/includes/treemenu/imagesAlt2
htdocs/includes/modules/modBookmark4u.class.php htdocs/core/modules/modBookmark4u.class.php
htdocs/includes/modules/modDocument.class.php htdocs/core/modules/modDocument.class.php
htdocs/includes/modules/modDroitPret.class.php htdocs/core/modules/modDroitPret.class.php
htdocs/includes/modules/modEditeur.class.php htdocs/core/modules/modEditeur.class.php
htdocs/includes/modules/modPostnuke.class.php htdocs/core/modules/modPostnuke.class.php
htdocs/includes/modules/modTelephonie.class.php htdocs/core/modules/modTelephonie.class.php
htdocs/includes/triggers/interface_user.class.php htdocs/core/triggers/interface_user.class.php
htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN htdocs/core/triggers/interface_contractfrombill.class.php-NORUN
htdocs/includes/triggers/interface_modEditeur_Editeur.class.php-NORUN htdocs/core/triggers/interface_modEditeur_Editeur.class.php-NORUN
htdocs/includes/tcpdf/fonts/utils htdocs/includes/tcpdf/fonts/utils
htdocs/includes/tcpdf/fonts/free*.ctg.z htdocs/includes/tcpdf/fonts/free*.ctg.z
htdocs/includes/tcpdf/fonts/free*.z htdocs/includes/tcpdf/fonts/free*.z

20
build/zip/zip_exclude.txt
View File

@ -46,16 +46,16 @@
*/htdocs/includes/treemenu/images/* */htdocs/includes/treemenu/images/*
*/htdocs/includes/treemenu/imagesAlt/* */htdocs/includes/treemenu/imagesAlt/*
*/htdocs/includes/treemenu/imagesAlt2/* */htdocs/includes/treemenu/imagesAlt2/*
*/htdocs/includes/modules/modBarcode.class.php */htdocs/core/modules/modBarcode.class.php
*/htdocs/includes/modules/modBookmark4u.class.php */htdocs/core/modules/modBookmark4u.class.php
*/htdocs/includes/modules/modClickToDial.class.php */htdocs/core/modules/modClickToDial.class.php
*/htdocs/includes/modules/modDocument.class.php */htdocs/core/modules/modDocument.class.php
*/htdocs/includes/modules/modDomain.class.php */htdocs/core/modules/modDomain.class.php
*/htdocs/includes/modules/modDroitPret.class.php */htdocs/core/modules/modDroitPret.class.php
*/htdocs/includes/modules/modEditeur.class.php */htdocs/core/modules/modEditeur.class.php
*/htdocs/includes/modules/modPostnuke.class.php */htdocs/core/modules/modPostnuke.class.php
*/htdocs/includes/triggers/interface_user.class.php */htdocs/core/triggers/interface_user.class.php
*/htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN */htdocs/core/triggers/interface_contractfrombill.class.php-NORUN
*/htdocs/includes/tcpdf/fonts/utils/* */htdocs/includes/tcpdf/fonts/utils/*
*/htdocs/includes/tcpdf/fonts/free*.ctg.z */htdocs/includes/tcpdf/fonts/free*.ctg.z
*/htdocs/includes/tcpdf/fonts/free*.z */htdocs/includes/tcpdf/fonts/free*.z

4
dev/initdata/generate-propale.php
View File

@ -106,9 +106,9 @@ if ($resql)
$user->rights->propale->valider=1; $user->rights->propale->valider=1;
if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
{ {
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php");
} }
$i=0; $i=0;

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

@ -20,12 +20,12 @@
/** /**
* \defgroup mymodule Module MyModule * \defgroup mymodule Module MyModule
* \brief Example of a module descriptor. * \brief Example of a module descriptor.
* Such a file must be copied into htdocs/mymodule/includes/modules directory. * Such a file must be copied into htdocs/mymodule/core/modules directory.
* \file htdocs/mymodule/includes/modules/modMyModule.class.php * \file htdocs/mymodule/core/modules/modMyModule.class.php
* \ingroup mymodule * \ingroup mymodule
* \brief Description and activation file for module MyModule * \brief Description and activation file for module MyModule
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
@ -69,7 +69,7 @@ class modMyModule extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module' // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='generic'; $this->picto='generic';
// Defined if the directory /mymodule/includes/triggers/ contains triggers or not // Defined if the directory /mymodule/core/triggers/ contains triggers or not
$this->triggers = 0; $this->triggers = 0;
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
@ -139,7 +139,7 @@ class modMyModule extends DolibarrModules
*/ */
// Boxes // Boxes
// Add here list of php file(s) stored in includes/boxes that contains class to show a box. // Add here list of php file(s) stored in core/boxes that contains class to show a box.
$this->boxes = array(); // List of boxes $this->boxes = array(); // List of boxes
$r=0; $r=0;
// Example: // Example:

2
dev/skeletons/skeleton_webservice_server.php
View File

@ -26,7 +26,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
require_once("../master.inc.php"); require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
require_once(DOL_DOCUMENT_ROOT."/lib/ws.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ws.lib.php");
require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php"); require_once(DOL_DOCUMENT_ROOT."/skeleton/class/skeleton.class.php");

2
dev/translation/autotranslator.php
View File

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Include Dolibarr environment // Include Dolibarr environment
require_once($path.'../../htdocs/master.inc.php'); require_once($path.'../../htdocs/master.inc.php');
require_once($path.'../../htdocs/lib/files.lib.php'); require_once($path.'../../htdocs/core/lib/files.lib.php');
// After this $db is an opened handler to database. We close it at end of file. // After this $db is an opened handler to database. We close it at end of file.
// Load main language strings // Load main language strings

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

@ -28,8 +28,8 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("members"); $langs->load("members");
@ -417,7 +417,7 @@ function form_constantes($tableau)
{ {
print '<td>'; print '<td>';
// List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php) // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
$arrayoflabels=array(); $arrayoflabels=array();
foreach(array_keys($_Avery_Labels) as $codecards) foreach(array_keys($_Avery_Labels) as $codecards)
{ {
@ -442,7 +442,7 @@ function form_constantes($tableau)
} }
else if (in_array($const,array('ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) else if (in_array($const,array('ADHERENT_AUTOREGISTER_MAIL','ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL')))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('constvalue'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60); $doleditor=new DolEditor('constvalue'.$const,$obj->value,'',160,'dolibarr_notes','',false,false,$conf->fckeditor->enabled,5,60);
$doleditor->Create(); $doleditor->Create();

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

@ -24,7 +24,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
$langs->load("members"); $langs->load("members");
@ -52,7 +52,7 @@ if (!$user->admin) accessforbidden();
* Actions * Actions
*/ */
require(DOL_DOCUMENT_ROOT."/lib/admin_extrafields.inc.php"); require(DOL_DOCUMENT_ROOT."/core/admin_extrafields.inc.php");

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

@ -25,9 +25,9 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("members"); $langs->load("members");
$langs->load("admin"); $langs->load("admin");

6
htdocs/adherents/card_subscriptions.php
View File

@ -24,8 +24,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.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."/adherents/class/cotisation.class.php");
@ -372,7 +372,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
{ {
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php');
// Creation de la ligne paiement // Creation de la ligne paiement
$amounts[$invoice->id] = price2num($cotisation); $amounts[$invoice->id] = price2num($cotisation);

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

@ -23,10 +23,10 @@
* \brief Page to output members business cards * \brief Page to output members business cards
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.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."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); require_once(DOL_DOCUMENT_ROOT."/core/modules/member/cards/modules_cards.php");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php"); require_once(DOL_DOCUMENT_ROOT."/core/modules/member/labels/modules_labels.php");
$langs->load("members"); $langs->load("members");
$langs->load("errors"); $langs->load("errors");

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

@ -28,8 +28,8 @@
require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.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."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
/** /**
@ -162,7 +162,7 @@ class Adherent extends CommonObject
$from=$conf->email_from; $from=$conf->email_from;
if ($conf->global->ADHERENT_MAIL_FROM) $from=$conf->global->ADHERENT_MAIL_FROM; if ($conf->global->ADHERENT_MAIL_FROM) $from=$conf->global->ADHERENT_MAIL_FROM;
include_once(DOL_DOCUMENT_ROOT."/lib/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); $mailfile = new CMailFile($subjecttosend, $this->email, $from, $texttosend, $filename_list, $mimetype_list, $mimefilename_list, $addr_cc, $addr_bcc, $deliveryreceipt, $msgishtml);
if ($mailfile->sendfile()) if ($mailfile->sendfile())
{ {

6
htdocs/adherents/document.php
View File

@ -25,8 +25,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.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."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.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/adherent_type.class.php");
@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $
// Envoie fichier // Envoie fichier
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
if (create_exdir($upload_dir) >= 0) if (create_exdir($upload_dir) >= 0)
{ {

16
htdocs/adherents/fiche.php
View File

@ -25,10 +25,10 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php");
@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes')
if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$datenaiss=''; $datenaiss='';
if (isset($_POST["naissday"]) && $_POST["naissday"] if (isset($_POST["naissday"]) && $_POST["naissday"]
@ -696,7 +696,7 @@ if ($action == 'create')
// Civility // Civility
print '<tr><td>'.$langs->trans("UserTitle").'</td><td>'; print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').'</td>'; print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').'</td>';
print '</tr>'; print '</tr>';
// Lastname // Lastname
@ -923,7 +923,7 @@ if ($action == 'edit')
// Civilite // Civilite
print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">'; print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
print $htmlcompany->select_civilite(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n"; print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n";
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -1078,7 +1078,7 @@ if ($rowid && $action != 'edit')
if (empty($login)) if (empty($login))
{ {
// Full firstname and name separated with a dot : firstname.name // Full firstname and name separated with a dot : firstname.name
include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php');
$login=dol_buildlogin($object->nom,$object->prenom); $login=dol_buildlogin($object->nom,$object->prenom);
} }
if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4)); if (empty($login)) $login=strtolower(substr($object->prenom, 0, 4)) . strtolower(substr($object->nom, 0, 4));

2
htdocs/adherents/fiche_subscription.php
View File

@ -22,7 +22,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.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."/compta/bank/class/account.class.php");

4
htdocs/adherents/info.php
View File

@ -23,9 +23,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");

4
htdocs/adherents/info_subscription.php
View File

@ -23,9 +23,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
$langs->load("companies"); $langs->load("companies");

6
htdocs/adherents/ldap.php
View File

@ -23,9 +23,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
require_once(DOL_DOCUMENT_ROOT."/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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");

4
htdocs/adherents/note.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.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.class.php');
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
@ -136,7 +136,7 @@ if ($id)
{ {
print "<input type=\"hidden\" name=\"action\" value=\"update\">"; print "<input type=\"hidden\" name=\"action\" value=\"update\">";
print "<input type=\"hidden\" name=\"id\" value=\"".$adh->id."\">"; print "<input type=\"hidden\" name=\"id\" value=\"".$adh->id."\">";
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('note',$adh->note,'',280,'dolibarr_notes','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER,10,80); $doleditor=new DolEditor('note',$adh->note,'',280,'dolibarr_notes','',true,true,$conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MEMBER,10,80);
$doleditor->Create(); $doleditor->Create();
} }

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

@ -23,7 +23,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$graphwidth = 700; $graphwidth = 700;
$mapratio = 0.5; $mapratio = 0.5;

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

@ -26,7 +26,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherentstats.class.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/class/dolgraph.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/member.lib.php");
$WIDTH=500; $WIDTH=500;
$HEIGHT=200; $HEIGHT=200;

4
htdocs/adherents/type.php
View File

@ -240,7 +240,7 @@ if ($_GET["action"] == 'create')
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"60\" rows=\"3\"></textarea></td></tr>"; print "<textarea name=\"comment\" wrap=\"soft\" cols=\"60\" rows=\"3\"></textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/lib/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=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'; print '</td></tr>';
@ -620,7 +620,7 @@ if ($rowid > 0)
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"90\" rows=\"3\">".$adht->note."</textarea></td></tr>"; 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>'; print '<tr><td valign="top">'.$langs->trans("WelcomeEMail").'</td><td>';
require_once(DOL_DOCUMENT_ROOT."/lib/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=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90);
$doleditor->Create(); $doleditor->Create();
print "</td></tr>"; print "</td></tr>";

2
htdocs/admin/accounting.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load('admin'); $langs->load('admin');
$langs->load('compta'); $langs->load('compta');

4
htdocs/admin/agenda.php
View File

@ -24,8 +24,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();

8
htdocs/admin/agenda_extsites.php
View File

@ -23,11 +23,11 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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.formadmin.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php');
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
@ -101,8 +101,6 @@ $form=new Form($db);
$formadmin=new FormAdmin($db); $formadmin=new FormAdmin($db);
$formother=new FormOther($db); $formother=new FormOther($db);
//$arrayofjs=array('/includes/jquery/plugins/colorpicker/jquery.colorpicker.js');
//$arrayofcss=array('/includes/jquery/plugins/colorpicker/jquery.colorpicker.css');
$arrayofjs=array(); $arrayofjs=array();
$arrayofcss=array(); $arrayofcss=array();

4
htdocs/admin/agenda_xcal.php
View File

@ -22,8 +22,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php');
if (!$user->admin) if (!$user->admin)

6
htdocs/admin/barcode.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
$langs->load("admin"); $langs->load("admin");
@ -108,7 +108,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/barcode/"; $dir = $dirroot . "/core/modules/barcode/";
$handle=@opendir($dir); $handle=@opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
@ -193,7 +193,7 @@ if ($resql)
// Chargement de la classe de codage // Chargement de la classe de codage
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir=$dirroot . "/includes/modules/barcode/"; $dir=$dirroot . "/core/modules/barcode/";
$result=@include_once($dir.$obj->coder.".modules.php"); $result=@include_once($dir.$obj->coder.".modules.php");
//print $dir.$obj->coder.".modules.php - ".$result; //print $dir.$obj->coder.".modules.php - ".$result;
if ($result) break; if ($result) break;

12
htdocs/admin/boxes.php
View File

@ -23,8 +23,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php");
include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); include_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -277,12 +277,12 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);
@ -393,12 +393,12 @@ if ($resql)
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);

2
htdocs/admin/clicktodial.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

10
htdocs/admin/commande.php
View File

@ -29,7 +29,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
$langs->load("admin"); $langs->load("admin");
@ -72,7 +72,7 @@ if ($action == 'specimen')
$commande->initAsSpecimen(); $commande->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/commande/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -243,7 +243,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/commande/"; $dir = $dirroot . "/core/modules/commande/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -258,7 +258,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/".$file.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/commande/".$file.".php");
$module = new $file; $module = new $file;
@ -374,7 +374,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/commande/"; $dir = $dirroot . "/core/modules/commande/";
if (is_dir($dir)) if (is_dir($dir))
{ {

14
htdocs/admin/company.php
View File

@ -25,11 +25,11 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
@ -47,7 +47,7 @@ accessforbidden();
if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"])) if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
|| (isset($_POST["action"]) && $_POST["action"] == 'updateedit') ) || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$new_pays_id=$_POST["pays_id"]; $new_pays_id=$_POST["pays_id"];
$new_pays_code=getCountry($new_pays_id,2); $new_pays_code=getCountry($new_pays_id,2);
@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb')
if ($_GET["action"] == 'removelogo') if ($_GET["action"] == 'removelogo')
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo; $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
dol_delete_file($logofile); dol_delete_file($logofile);

2
htdocs/admin/compta.php
View File

@ -25,7 +25,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load('admin'); $langs->load('admin');
$langs->load('compta'); $langs->load('compta');

4
htdocs/admin/confexped.php
View File

@ -25,7 +25,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("sendings"); $langs->load("sendings");
@ -65,7 +65,7 @@ else if ($action == 'disable_delivery')
/* /*
* Affiche page * Affiche page
*/ */
$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/"; $dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
$html=new Form($db); $html=new Form($db);
llxHeader("",""); llxHeader("","");

22
htdocs/admin/const.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,13 +24,13 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
if (!$user->admin) if (! $user->admin) accessforbidden();
accessforbidden();
//var_dump($_POST); $action = GETPOST('action');
$typeconst=array('yesno','texte','chaine'); $typeconst=array('yesno','texte','chaine');
@ -39,7 +39,7 @@ $typeconst=array('yesno','texte','chaine');
* Actions * Actions
*/ */
if ($_POST["action"] == 'add') if ($action == 'add')
{ {
$error=0; $error=0;
@ -93,9 +93,9 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
} }
// Delete line from delete picto // Delete line from delete picto
if ($_GET["action"] == 'delete') if ($action == 'delete')
{ {
if (dolibarr_del_const($db, $_GET["rowid"],$_GET["entity"]) < 0) if (dolibarr_del_const($db, $_GET["rowid"], $_GET["entity"]) < 0)
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
@ -112,7 +112,7 @@ llxHeader('',$langs->trans("OtherSetup"));
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {
jQuery("#updateconst").hide(); jQuery("#updateconst").hide();
jQuery("#delconst").hide(); jQuery("#delconst").hide();

8
htdocs/admin/contract.php
View File

@ -22,7 +22,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'); require_once(DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php');
$langs->load("admin"); $langs->load("admin");
@ -80,7 +80,7 @@ if ($action == 'setmod')
llxHeader(); llxHeader();
$dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/"; $dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
$html=new Form($db); $html=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@ -101,7 +101,7 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$dir = "../includes/modules/contract/"; $dir = "../core/modules/contract/";
$handle = opendir($dir); $handle = opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {
@ -113,7 +113,7 @@ if (is_resource($handle))
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/".$file.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.".php");
$module = new $file; $module = new $file;

2
htdocs/admin/delais.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("orders"); $langs->load("orders");

2
htdocs/admin/dict.php
View File

@ -30,7 +30,7 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("other"); $langs->load("other");
$langs->load("admin"); $langs->load("admin");

6
htdocs/admin/dons.php
View File

@ -21,7 +21,7 @@
* \brief Page d'administration/configuration du module Dons * \brief Page d'administration/configuration du module Dons
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
$langs->load("admin"); $langs->load("admin");
@ -44,7 +44,7 @@ if ($_GET["action"] == 'specimen')
$don->initAsSpecimen(); $don->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/";
$file = $modele.".modules.php"; $file = $modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -126,7 +126,7 @@ if ($_GET["action"] == 'del')
* View * View
*/ */
$dir = "../includes/modules/dons/"; $dir = "../core/modules/dons/";
$html=new Form($db); $html=new Form($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');

4
htdocs/admin/events.php
View File

@ -22,8 +22,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/events.class.php");

12
htdocs/admin/expedition.php
View File

@ -28,7 +28,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'); require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php');
$langs->load("admin"); $langs->load("admin");
@ -58,7 +58,7 @@ if ($action == 'specimen')
//$exp->fetch_commande(); //$exp->fetch_commande();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition/pdf/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition/pdf/";
$file = "pdf_expedition_".$modele.".modules.php"; $file = "pdf_expedition_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -161,7 +161,7 @@ if ($action == 'setmethod' || $action== 'setmod')
$moduleid=GETPOST("moduleid"); $moduleid=GETPOST("moduleid");
$statut=GETPOST("statut"); $statut=GETPOST("statut");
require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_$module.modules.php"); require_once(DOL_DOCUMENT_ROOT."/core/modules/expedition/methode_expedition_$module.modules.php");
$classname = "methode_expedition_$module"; $classname = "methode_expedition_$module";
$expem = new $classname($db); $expem = new $classname($db);
@ -350,7 +350,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/expedition/"; $dir = $dirroot . "/core/modules/expedition/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -365,7 +365,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/".$file.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/expedition/".$file.".php");
$module = new $file; $module = new $file;
@ -486,7 +486,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/expedition/pdf/"; $dir = $dirroot . "/core/modules/expedition/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/admin/external_rss.php
View File

@ -28,7 +28,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/rssparser.class.php");
$langs->load("admin"); $langs->load("admin");

130
htdocs/admin/facture.php
View File

@ -1,9 +1,9 @@
<?php <?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -26,23 +26,17 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
$langs->load("admin"); $langs->load("admin");
//$langs->load("companies");
//$langs->load("bills");
//$langs->load("other");
$langs->load("errors"); $langs->load("errors");
if (!$user->admin) if (! $user->admin) accessforbidden();
accessforbidden();
$action = GETPOST("action"); $action = GETPOST("action");
$value = GETPOST("value"); $value = GETPOST("value");
//$typeconst=array('yesno','texte','chaine');
/* /*
* Actions * Actions
@ -77,7 +71,7 @@ if ($action == 'specimen')
$facture->initAsSpecimen(); $facture->initAsSpecimen();
// Load template // Load template
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/facture/doc/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -282,23 +276,6 @@ if ($action == 'setforcedate')
} }
} }
/*if ($action == 'update' || $action == 'add')
{
if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
{
dol_print_error($db);
}
}
if ($action == 'delete')
{
$rowid = GETPOST("rowid");
if (! dolibarr_del_const($db, $rowid,$conf->entity));
{
dol_print_error($db);
}
}*/
/* /*
* View * View
@ -313,17 +290,6 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
print '<br>'; print '<br>';
/*
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/facture.php";
$head[$h][1] = $langs->trans("Invoices");
$hselected=$h;
$h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
*/
/* /*
* Numbering module * Numbering module
@ -345,7 +311,7 @@ clearstatcache();
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/facture/"; $dir = $dirroot . "/core/modules/facture/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -364,7 +330,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
$filebis = $file."/".$file.".modules.php"; $filebis = $file."/".$file.".modules.php";
$classname = "mod_facture_".$file; $classname = "mod_facture_".$file;
} }
//print "x".$dir."-".$filebis."-".$classname;
if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php') 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 // Chargement de la classe de numerotation
@ -512,7 +477,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
foreach (array('','/doc') as $valdir) foreach (array('','/doc') as $valdir)
{ {
$dir = $dirroot . "/includes/modules/facture".$valdir; $dir = $dirroot . "/core/modules/facture".$valdir;
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -524,8 +489,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
$filelist[]=$file; $filelist[]=$file;
} }
closedir($handle); closedir($handle);
//sort($filelist);
//var_dump($filelist);
foreach($filelist as $file) foreach($filelist as $file)
{ {
@ -556,18 +519,11 @@ foreach ($conf->file->dol_document_root as $dirroot)
// Active // Active
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print '<td align="center">'."\n";
//if ($conf->global->FACTURE_ADDON_PDF != "$name") print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
//{ print img_picto($langs->trans("Enabled"),'switch_on');
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">'; print '</a>';
print img_picto($langs->trans("Enabled"),'switch_on'); print '</td>';
print '</a>';
//}
//else
//{
// print img_picto($langs->trans("Enabled"),'on');
//}
print "</td>";
} }
else else
{ {
@ -640,8 +596,8 @@ print '</table>';
print '<br>'; print '<br>';
print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice")); print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice"));
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$var=True; $var=True;
@ -668,9 +624,10 @@ if ($conf->banque->enabled)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
if ($num > 0) { if ($num > 0)
print '<select name="rib" class="flat" id="rib">'; {
print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>'; print '<select name="rib" class="flat" id="rib">';
print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($resql); $row = $db->fetch_row($resql);
@ -682,8 +639,10 @@ if ($conf->banque->enabled)
$i++; $i++;
} }
print "</select>"; print "</select>";
} else { }
print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>"; else
{
print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
} }
} }
} }
@ -742,39 +701,39 @@ $var=true;
// Force date validation // Force date validation
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print '<input type="hidden" name="action" value="setforcedate">'; print '<input type="hidden" name="action" value="setforcedate" />';
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("ForceInvoiceDate"); print $langs->trans("ForceInvoiceDate");
print '</td><td width="60" align="center">'; print '</td><td width="60" align="center">';
print $html->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1); print $html->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1);
print '</td><td align="right">'; print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print '<input type="hidden" name="action" value="set_FACTURE_FREE_TEXT">'; print '<input type="hidden" name="action" value="set_FACTURE_FREE_TEXT" />';
print '<tr '.$bc[$var].'><td colspan="2">'; print '<tr '.$bc[$var].'><td colspan="2">';
print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>'; print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')<br>';
print '<textarea name="FACTURE_FREE_TEXT" class="flat" cols="120">'.$conf->global->FACTURE_FREE_TEXT.'</textarea>'; print '<textarea name="FACTURE_FREE_TEXT" class="flat" cols="120">'.$conf->global->FACTURE_FREE_TEXT.'</textarea>';
print '</td><td align="right">'; print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
$var=!$var; $var=!$var;
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">"; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print "<input type=\"hidden\" name=\"action\" value=\"set_FACTURE_DRAFT_WATERMARK\">"; print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
print '<tr '.$bc[$var].'><td colspan="2">'; print '<tr '.$bc[$var].'><td colspan="2">';
print $langs->trans("WatermarkOnDraftBill").'<br>'; print $langs->trans("WatermarkOnDraftBill").'<br>';
print '<input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'">'; print '<input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
print '</td><td align="right">'; print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
@ -787,12 +746,15 @@ print '</table>';
print '<br>'; print '<br>';
print_titre($langs->trans("PathToDocuments")); print_titre($langs->trans("PathToDocuments"));
print "<table class=\"noborder\" width=\"100%\">\n"; print '<table class="noborder" width="100%">'."\n";
print "<tr class=\"liste_titre\">\n"; print '<tr class="liste_titre">'."\n";
print " <td>".$langs->trans("Name")."</td>\n"; print '<td>'.$langs->trans("Name").'</td>'."\n";
print " <td>".$langs->trans("Value")."</td>\n"; print '<td>'.$langs->trans("Value").'</td>'."\n";
print "</tr>\n"; print "</tr>\n";
print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->facture->dir_output."</td>\n</tr>\n"; print '<tr '.$bc[false].'>'."\n";
print '<td width="140">'.$langs->trans("PathDirectory").'</td>'."\n";
print '<td>'.$conf->facture->dir_output.'</td>'."\n";
print '</tr>'."\n";
print "</table>\n"; print "</table>\n";

4
htdocs/admin/fckeditor.php
View File

@ -24,8 +24,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("fckeditor"); $langs->load("fckeditor");

8
htdocs/admin/fichinter.php
View File

@ -28,7 +28,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
$langs->load("admin"); $langs->load("admin");
@ -106,7 +106,7 @@ if ($action == 'specimen')
$inter->initAsSpecimen(); $inter->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -242,7 +242,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/fichinter/"; $dir = $dirroot . "/core/modules/fichinter/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -360,7 +360,7 @@ clearstatcache();
$var=true; $var=true;
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/fichinter/"; $dir = $dirroot . "/core/modules/fichinter/";
if (is_dir($dir)) if (is_dir($dir))
{ {

12
htdocs/admin/fournisseur.php
View File

@ -28,7 +28,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.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_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
@ -77,7 +77,7 @@ if ($action == 'specimen') // For orders
$commande->thirdparty=$specimenthirdparty; $commande->thirdparty=$specimenthirdparty;
// Charge le modele // Charge le modele
$dir = "/includes/modules/supplier_order/pdf/"; $dir = "/core/modules/supplier_order/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -114,7 +114,7 @@ if ($action == 'specimenfacture') // For invoices
$facture->thirdparty=$specimenthirdparty; // Define who should has build the invoice (so the supplier) $facture->thirdparty=$specimenthirdparty; // Define who should has build the invoice (so the supplier)
// Charge le modele // Charge le modele
$dir = "/includes/modules/supplier_invoice/pdf/"; $dir = "/core/modules/supplier_invoice/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -269,7 +269,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/supplier_order/"; $dir = $dirroot . "/core/modules/supplier_order/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -404,7 +404,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/supplier_order/pdf/"; $dir = $dirroot . "/core/modules/supplier_order/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -537,7 +537,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/supplier_invoice/pdf/"; $dir = $dirroot . "/core/modules/supplier_invoice/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {

4
htdocs/admin/geoipmaxmind.php
View File

@ -23,8 +23,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/dolgeoip.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgeoip.class.php");
// Security check // Security check
if (!$user->admin) if (!$user->admin)

10
htdocs/admin/ihm.php
View File

@ -23,9 +23,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
@ -234,7 +234,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageLogin").'</td><td colspan="2">';
// Editeur wysiwyg // Editeur wysiwyg
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('main_home',$conf->global->MAIN_HOME,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90); $doleditor=new DolEditor('main_home',$conf->global->MAIN_HOME,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -242,7 +242,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
// Message of the day on home page // Message of the day on home page
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("MessageOfDay").'</td><td colspan="2">';
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php");
$doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90); $doleditor=new DolEditor('main_motd',$conf->global->MAIN_MOTD,'',142,'dolibarr_notes','In',false,true,true,ROWS_4,90);
$doleditor->Create(); $doleditor->Create();
print '</td></tr>'."\n"; print '</td></tr>'."\n";

6
htdocs/admin/ldap.php
View File

@ -27,9 +27,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
$langs->load("admin"); $langs->load("admin");

6
htdocs/admin/ldap_contacts.php
View File

@ -27,9 +27,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
$langs->load("admin"); $langs->load("admin");

6
htdocs/admin/ldap_groups.php
View File

@ -27,11 +27,11 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("errors"); $langs->load("errors");

6
htdocs/admin/ldap_members.php
View File

@ -27,11 +27,11 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("errors"); $langs->load("errors");

6
htdocs/admin/ldap_users.php
View File

@ -27,11 +27,11 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("errors"); $langs->load("errors");

4
htdocs/admin/limits.php
View File

@ -23,8 +23,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/price.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");

10
htdocs/admin/livraison.php
View File

@ -27,7 +27,7 @@
* \brief Page d'administration/configuration du module Livraison * \brief Page d'administration/configuration du module Livraison
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
$langs->load("admin"); $langs->load("admin");
@ -70,7 +70,7 @@ if ($action == 'specimen')
//$sending->fetch_commande(); //$sending->fetch_commande();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/livraison/pdf/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/livraison/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -238,7 +238,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/livraison/"; $dir = $dirroot . "/core/modules/livraison/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -252,7 +252,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/".$file.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/livraison/".$file.".php");
$module = new $file; $module = new $file;
@ -371,7 +371,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/livraison/pdf/"; $dir = $dirroot . "/core/modules/livraison/pdf/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/admin/mailing.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("mails"); $langs->load("mails");

10
htdocs/admin/mails.php
View File

@ -22,8 +22,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");
@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
*/ */
if ($_POST['addfile'] || $_POST['addfilehtml']) if ($_POST['addfile'] || $_POST['addfilehtml'])
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
// Set tmp user directory // Set tmp user directory
$vardir=$conf->user->dir_output."/".$user->id; $vardir=$conf->user->dir_output."/".$user->id;
@ -207,7 +207,7 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
$subject=make_substitutions($subject,$substitutionarrayfortest); $subject=make_substitutions($subject,$substitutionarrayfortest);
$body=make_substitutions($body,$substitutionarrayfortest); $body=make_substitutions($body,$substitutionarrayfortest);
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mailfile = new CMailFile( $mailfile = new CMailFile(
$subject, $sendto, $email_from, $body, $subject, $sendto, $email_from, $body,
$filepath, $mimetype, $filename, $filepath, $mimetype, $filename,
@ -639,7 +639,7 @@ else
// If we use SSL/TLS // If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mail = new CMailFile('','','',''); $mail = new CMailFile('','','','');
$result=$mail->check_server_port($server,$port); $result=$mail->check_server_port($server,$port);
if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>'; if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';

12
htdocs/admin/menus.php
View File

@ -24,9 +24,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("companies"); $langs->load("companies");
@ -38,9 +38,9 @@ $langs->load("other");
// Security check // Security check
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
// Cette page peut etre longue. On augmente le delai autorise. // Cette page peut etre longue. On augmente le delai autorise.
@ -77,7 +77,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
foreach ($listofmenuhandler as $key => $val) foreach ($listofmenuhandler as $key => $val)
{ {
// Load sql init_menu_handler.sql file // Load sql init_menu_handler.sql file
$dir = "/includes/menus/"; $dir = "/core/menus/";
$file='init_menu_'.$key.'.sql'; $file='init_menu_'.$key.'.sql';
$fullpath=dol_buildpath($dir.$file); $fullpath=dol_buildpath($dir.$file);

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

@ -33,9 +33,9 @@ $langs->load("admin");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
$dirmenu = array($dirleft,$dirsmartphone); $dirmenu = array($dirleft,$dirsmartphone);

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

@ -25,7 +25,7 @@
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
$langs->load("other"); $langs->load("other");
$langs->load("admin"); $langs->load("admin");
@ -33,9 +33,9 @@ $langs->load("admin");
if (! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();
$dirtop = "/includes/menus/standard"; $dirtop = "/core/menus/standard";
$dirleft = "/includes/menus/standard"; $dirleft = "/core/menus/standard";
$dirsmartphone = "/includes/menus/smartphone"; $dirsmartphone = "/core/menus/smartphone";
$dirmenu = array($dirleft,$dirsmartphone); $dirmenu = array($dirleft,$dirsmartphone);

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

@ -35,7 +35,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
session_cache_limiter(FALSE); session_cache_limiter(FALSE);
require_once("../../master.inc.php"); require_once("../../master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
// Define css type // Define css type
header('Content-type: application/javascript'); header('Content-type: application/javascript');

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

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("users"); $langs->load("users");
$langs->load("admin"); $langs->load("admin");

8
htdocs/admin/modules.php
View File

@ -26,7 +26,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("errors"); $langs->load("errors");
$langs->load("admin"); $langs->load("admin");
@ -85,7 +85,7 @@ $j = 0; // j is module number. Automatically affected if module number not defin
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') if ($type == 'alt')
{ {
@ -96,9 +96,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{ {
if (is_dir($dirroot . '/' . $file . '/includes/modules/')) if (is_dir($dirroot . '/' . $file . '/core/modules/'))
{ {
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; $modulesdir[] = $dirroot . '/' . $file . '/core/modules/';
} }
} }
} }

4
htdocs/admin/notification.php
View File

@ -23,8 +23,8 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/includes/triggers/interface_modNotification_Notification.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/triggers/interface_modNotification_Notification.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");

6
htdocs/admin/pdf.php
View File

@ -23,9 +23,9 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.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.formother.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");

8
htdocs/admin/perms.php
View File

@ -25,7 +25,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("users"); $langs->load("users");
@ -83,7 +83,7 @@ $modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') if ($type == 'alt')
{ {
@ -94,9 +94,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{ {
if (is_dir($dirroot . '/' . $file . '/includes/modules/')) if (is_dir($dirroot . '/' . $file . '/core/modules/'))
{ {
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; $modulesdir[] = $dirroot . '/' . $file . '/core/modules/';
} }
} }
} }

2
htdocs/admin/prelevement.php
View File

@ -26,7 +26,7 @@
require('../main.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("admin"); $langs->load("admin");

10
htdocs/admin/project.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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/project.class.php');
require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'); require_once(DOL_DOCUMENT_ROOT.'/projet/class/task.class.php');
@ -69,7 +69,7 @@ if ($action == 'specimen')
$project->initAsSpecimen(); $project->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/project/pdf/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/project/pdf/";
$file = "pdf_".$modele.".modules.php"; $file = "pdf_".$modele.".modules.php";
if (file_exists($dir.$file)) if (file_exists($dir.$file))
{ {
@ -183,7 +183,7 @@ print "<br>";
// Project numbering module // Project numbering module
$dir = DOL_DOCUMENT_ROOT."/includes/modules/project/"; $dir = DOL_DOCUMENT_ROOT."/core/modules/project/";
print_titre($langs->trans("ProjectsNumberingModules")); print_titre($langs->trans("ProjectsNumberingModules"));
@ -209,7 +209,7 @@ if (is_resource($handle))
{ {
$file = substr($file, 0, dol_strlen($file)-4); $file = substr($file, 0, dol_strlen($file)-4);
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$file.".php"); require_once(DOL_DOCUMENT_ROOT ."/core/modules/project/".$file.".php");
$module = new $file; $module = new $file;
@ -280,7 +280,7 @@ print '</table><br>';
* Modeles documents for projects * Modeles documents for projects
*/ */
$dir = DOL_DOCUMENT_ROOT.'/includes/modules/project/pdf/'; $dir = DOL_DOCUMENT_ROOT.'/core/modules/project/pdf/';
print_titre($langs->trans("ProjectsModelModule")); print_titre($langs->trans("ProjectsModelModule"));

8
htdocs/admin/propale.php
View File

@ -29,7 +29,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$langs->load("admin"); $langs->load("admin");
@ -71,7 +71,7 @@ if ($action == 'specimen')
$propal->initAsSpecimen(); $propal->initAsSpecimen();
// Charge le modele // Charge le modele
$dir = "/includes/modules/propale/"; $dir = "/core/modules/propale/";
$file = "pdf_propale_".$modele.".modules.php"; $file = "pdf_propale_".$modele.".modules.php";
$file = dol_buildpath($dir.$file); $file = dol_buildpath($dir.$file);
if (file_exists($file)) if (file_exists($file))
@ -276,7 +276,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/propale/"; $dir = $dirroot . "/core/modules/propale/";
if (is_dir($dir)) if (is_dir($dir))
{ {
@ -406,7 +406,7 @@ clearstatcache();
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/propale/"; $dir = $dirroot . "/core/modules/propale/";
if (is_dir($dir)) if (is_dir($dir))
{ {

2
htdocs/admin/proxy.php
View File

@ -22,7 +22,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("users"); $langs->load("users");

4
htdocs/admin/security.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("users"); $langs->load("users");
$langs->load("admin"); $langs->load("admin");
@ -211,7 +211,7 @@ print '<input type="hidden" name="constname" value="USER_PASSWORD_GENERATED">';
print '<input type="hidden" name="consttype" value="yesno">'; print '<input type="hidden" name="consttype" value="yesno">';
// Charge tableau des modules generation // Charge tableau des modules generation
$dir = "../includes/modules/security/generate"; $dir = "../core/modules/security/generate";
clearstatcache(); clearstatcache();
$handle=opendir($dir); $handle=opendir($dir);
$i=1; $i=1;

4
htdocs/admin/security_other.php
View File

@ -23,7 +23,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
$langs->load("users"); $langs->load("users");
@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp;
if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$result=create_exdir($upload_dir); // Create dir if not exists $result=create_exdir($upload_dir); // Create dir if not exists
if ($result >= 0) if ($result >= 0)

6
htdocs/admin/sms.php
View File

@ -22,7 +22,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");
@ -115,7 +115,7 @@ if ($action == 'send' && ! $_POST['cancel'])
complete_substitutions_array($substitutionarrayfortest, $langs); complete_substitutions_array($substitutionarrayfortest, $langs);
$body=make_substitutions($body,$substitutionarrayfortest); $body=make_substitutions($body,$substitutionarrayfortest);
require_once(DOL_DOCUMENT_ROOT."/lib/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 $smsfile = new CSMSFile($sendto, $smsfrom, $body, $deliveryreceipt, $deferred, $priority, $class); // This define OvhSms->login, pass, session and account
$result=$smsfile->sendfile(); // This send SMS $result=$smsfile->sendfile(); // This send SMS
@ -299,7 +299,7 @@ else
// If we use SSL/TLS // If we use SSL/TLS
if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server; if (! empty($conf->global->MAIN_MAIL_EMAIL_TLS) && function_exists('openssl_open')) $server='ssl://'.$server;
include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); include_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mail = new CSMSFile('','','',''); $mail = new CSMSFile('','','','');
$result=$mail->check_server_port($server,$port); $result=$mail->check_server_port($server,$port);
if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>'; if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';

2
htdocs/admin/stock.php
View File

@ -23,7 +23,7 @@
* \brief Page d'administration/configuration du module gestion de stock * \brief Page d'administration/configuration du module gestion de stock
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("stocks"); $langs->load("stocks");

2
htdocs/admin/syslog.php
View File

@ -24,7 +24,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();

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

@ -22,8 +22,8 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/memory.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");

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

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("user"); $langs->load("user");

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

@ -49,7 +49,7 @@ $modules_files = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/includes/modules/"; $modulesdir[] = $dirroot . "/core/modules/";
if ($type == 'alt') if ($type == 'alt')
{ {
@ -60,9 +60,9 @@ foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{ {
if (is_dir($dirroot . '/' . $file . '/includes/modules/')) if (is_dir($dirroot . '/' . $file . '/core/modules/'))
{ {
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/'; $modulesdir[] = $dirroot . '/' . $file . '/core/modules/';
} }
} }
} }

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

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
$langs->load("admin"); $langs->load("admin");

2
htdocs/admin/taxes.php
View File

@ -25,7 +25,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load('admin'); $langs->load('admin');

4
htdocs/admin/tools/export.php
View File

@ -21,8 +21,8 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.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."/core/class/html.formfile.class.php");
$what=$_REQUEST["what"]; $what=$_REQUEST["what"];

2
htdocs/admin/tools/listsessions.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php');
$langs->load("install"); $langs->load("install");

2
htdocs/admin/tools/purge.php
View File

@ -21,7 +21,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
$langs->load("admin"); $langs->load("admin");

2
htdocs/admin/tools/update.php
View File

@ -22,7 +22,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
include_once $dolibarr_main_document_root."/lib/files.lib.php"; include_once $dolibarr_main_document_root."/core/lib/files.lib.php";
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");

2
htdocs/admin/user.php
View File

@ -27,7 +27,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("members"); $langs->load("members");

2
htdocs/admin/workflow.php
View File

@ -25,7 +25,7 @@
*/ */
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("workflow"); $langs->load("workflow");

4
htdocs/asterisk/wrapper.php
View File

@ -61,8 +61,8 @@ function llxFooter()
} }
require_once("../main.inc.php"); require_once("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
// Security check // Security check

2
htdocs/bookmarks/admin/bookmark.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

2
htdocs/boutique/admin/boutique.php
View File

@ -26,7 +26,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("oscommerce"); $langs->load("oscommerce");

24
htdocs/boxes.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -135,7 +135,7 @@ function printBoxesArea($user,$areacode)
print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n"; print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
//print 'alert(\'boxorder=\' + boxorder);'; //print 'alert(\'boxorder=\' + boxorder);';
print 'var userid = \''.$user->id.'\';'."\n"; print 'var userid = \''.$user->id.'\';'."\n";
print 'jQuery.get(\'core/ajaxbox.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n"; print 'jQuery.get(\'core/ajax/box.php?boxorder=\'+boxorder+\'&userid=\'+'.$user->id.');'."\n";
print '}'."\n"; print '}'."\n";
print '</script>'."\n"; print '</script>'."\n";
} }
@ -204,12 +204,12 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php"); $sourcefile = dol_buildpath("/".$module."/core/boxes/".$boxname.".php");
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = DOL_DOCUMENT_ROOT."/includes/boxes/".$boxname.".php"; $sourcefile = DOL_DOCUMENT_ROOT."/core/boxes/".$boxname.".php";
} }
include_once($sourcefile); include_once($sourcefile);
@ -233,7 +233,8 @@ class InfoBox
$j++; $j++;
} }
} }
else { else
{
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR); dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR);
return array(); return array();
@ -265,12 +266,12 @@ class InfoBox
{ {
$boxname = $regs[1]; $boxname = $regs[1];
$module = $regs[2]; $module = $regs[2];
$sourcefile = "/".$module."/includes/boxes/".$boxname.".php"; $sourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
else else
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$sourcefile = "/includes/boxes/".$boxname.".php"; $sourcefile = "/core/boxes/".$boxname.".php";
} }
dol_include_once($sourcefile); dol_include_once($sourcefile);
@ -299,7 +300,8 @@ class InfoBox
$j++; $j++;
} }
} }
else { else
{
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR); dol_syslog("InfoBox::listBoxes Error ".$this->error, LOG_ERR);
return array(); return array();
@ -323,7 +325,7 @@ class InfoBox
{ {
global $conf; global $conf;
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid); dol_syslog("InfoBoxes::saveboxorder zone=".$zone." user=".$userid);

2
htdocs/cache.manifest
View File

@ -12,7 +12,7 @@ index.php
main.inc.php main.inc.php
master.inc.php master.inc.php
filefunc.inc.php filefunc.inc.php
lib/functions.lib.php core/lib/functions.lib.php
# The NETWORK section contains the path to a folder to ensure that requests # The NETWORK section contains the path to a folder to ensure that requests
# to load resources contained under /api will bypass the cache and always fetch the resource from the server. # to load resources contained under /api will bypass the cache and always fetch the resource from the server.

2
htdocs/cashdesk/admin/cashdesk.php
View File

@ -23,7 +23,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
// If socid provided by ajax company selector // If socid provided by ajax company selector

2
htdocs/cashdesk/class/Facturation.class.php
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
/** /**

6
htdocs/categories/categorie.php
View File

@ -175,7 +175,7 @@ $html = new Form($db);
*/ */
if ($socid) if ($socid)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); 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."/societe/class/societe.class.php");
$langs->load("companies"); $langs->load("companies");
@ -284,7 +284,7 @@ else if ($id || $ref)
/* /*
* Fiche categorie de produit * Fiche categorie de produit
*/ */
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
// Produit // Produit
@ -339,7 +339,7 @@ else if ($id || $ref)
/* /*
* Fiche categorie d'adherent * Fiche categorie d'adherent
*/ */
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.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.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");

6
htdocs/categories/class/categorie.class.php
View File

@ -1201,7 +1201,7 @@ class Categorie
*/ */
function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/"; $dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
$dir .= "photos/"; $dir .= "photos/";
@ -1236,7 +1236,7 @@ class Categorie
*/ */
function add_thumb($file, $maxWidth = 160, $maxHeight = 120) function add_thumb($file, $maxWidth = 160, $maxHeight = 120)
{ {
require_once(DOL_DOCUMENT_ROOT ."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
if (file_exists($file)) if (file_exists($file))
{ {
@ -1306,7 +1306,7 @@ class Categorie
*/ */
function delete_photo($file) function delete_photo($file)
{ {
require_once(DOL_DOCUMENT_ROOT."/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 $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette

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