diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index b25f05e6c26ab5dbbd5f00ba8608f03cc10e05d8..1a371afb19817cac57d40c294eccaf4ff188b2cb 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -83,11 +83,9 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
; Mysql data files (does not overwrite if exists)
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
; Dolibarr
-Source: "external-libs\*.*"; DestDir: "{app}\www\dolibarr\external-libs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,telephonie\*,*\conf.php,*\install.forced.php,*\modBookmark4u.class.php,*\modDocument.class.php,*\modDroitPret.class.php,*\modEditeur.class.php,*\modPostnuke.class.php,*\modTelephonie.class.php,*\interface_modEditeur_Editeur.class.php*,*\rodolphe"
Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*"
Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,xdebug\*"
-Source: "mysql\*.*"; DestDir: "{app}\www\dolibarr\mysql"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
; Config files
diff --git a/doc/dev/dolibarr-doxygen.conf b/doc/dev/dolibarr-doxygen.conf
index d3b4110ac1946fc75c938e9e98b1bb48b1e4b6c4..3089896d3d6a57da5f8e8ac0e0e756e0a29217b5 100644
--- a/doc/dev/dolibarr-doxygen.conf
+++ b/doc/dev/dolibarr-doxygen.conf
@@ -557,7 +557,6 @@ EXCLUDE = mssql \
dev \
doc \
documents \
- external-libs \
htdocs/conf/conf.php \
htdocs/includes/adodbtime \
htdocs/includes/barcode \
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index dac87b6ec9d07b864bc1a9fc4c11957028161b2d..ee75e8c84c5d72d47d6e82105e077b54a66c53a3 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -168,7 +168,7 @@ $dolibarr_main_force_https="0";
# Parameters not used yet
# dolibarr_smarty_libs_dir,dolibarr_smarty_compile,dolibarr_smarty_cache
# Examples:
-# $dolibarr_smarty_libs_dir="/var/www/dolibarr/external-libs/smarty/libs/";
+# $dolibarr_smarty_libs_dir="/var/www/dolibarr/htdocs/includes/smarty/libs/";
# $dolibarr_smarty_compile="/var/www/dolibarr/documents/temp/smarty_templates";
# $dolibarr_smarty_cache="/var/www/dolibarr/documents/temp/smarty_cache";
#
diff --git a/htdocs/core/dolgraph.class.php b/htdocs/core/dolgraph.class.php
index d16c8def323024a67e4bc06e0122a291f8a1f597..86b5d57ff217c702c50982a7387027f2402afb52 100644
--- a/htdocs/core/dolgraph.class.php
+++ b/htdocs/core/dolgraph.class.php
@@ -424,7 +424,7 @@ class DolGraph
$class='';
if ($this->type == 'bars') $class='BarPlot';
if ($this->type == 'lines') $class='LinePlot';
- include_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/".$class.".class.php";
+ include_once DOL_DOCUMENT_ROOT."/includes/artichow/".$class.".class.php";
// Definition de couleurs
$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
@@ -586,8 +586,8 @@ class DolGraph
*/
function BarLineAnnualArtichow($file='', $barvalues, $linevalues, $legends='')
{
- require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
- require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
+ require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
+ require_once DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php";
$graph = new Graph(240, 200);
@@ -685,8 +685,8 @@ class DolGraph
if (( sizeof($barvalues) * sizeof($linevalues) ) > 0)
{
- require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
- require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
+ require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
+ require_once DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php";
$graph = new Graph(540, 200);
@@ -772,7 +772,7 @@ class DolGraph
*/
function BarAnnualArtichow($file='', $values='', $legends='')
{
- require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
+ require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
$ok = 0;
foreach($values as $val)
diff --git a/external-libs/Artichow/Artichow.cfg.php b/htdocs/includes/artichow/Artichow.cfg.php
similarity index 100%
rename from external-libs/Artichow/Artichow.cfg.php
rename to htdocs/includes/artichow/Artichow.cfg.php
diff --git a/external-libs/Artichow/BarPlot.class.php b/htdocs/includes/artichow/BarPlot.class.php
similarity index 100%
rename from external-libs/Artichow/BarPlot.class.php
rename to htdocs/includes/artichow/BarPlot.class.php
diff --git a/external-libs/Artichow/Graph.class.php b/htdocs/includes/artichow/Graph.class.php
similarity index 100%
rename from external-libs/Artichow/Graph.class.php
rename to htdocs/includes/artichow/Graph.class.php
diff --git a/external-libs/Artichow/Image.class.php b/htdocs/includes/artichow/Image.class.php
similarity index 100%
rename from external-libs/Artichow/Image.class.php
rename to htdocs/includes/artichow/Image.class.php
diff --git a/external-libs/Artichow/LinePlot.class.php b/htdocs/includes/artichow/LinePlot.class.php
similarity index 100%
rename from external-libs/Artichow/LinePlot.class.php
rename to htdocs/includes/artichow/LinePlot.class.php
diff --git a/external-libs/Artichow/Pie.class.php b/htdocs/includes/artichow/Pie.class.php
similarity index 100%
rename from external-libs/Artichow/Pie.class.php
rename to htdocs/includes/artichow/Pie.class.php
diff --git a/external-libs/Artichow/README b/htdocs/includes/artichow/README
similarity index 100%
rename from external-libs/Artichow/README
rename to htdocs/includes/artichow/README
diff --git a/external-libs/Artichow/font/Tuffy.ttf b/htdocs/includes/artichow/font/Tuffy.ttf
similarity index 100%
rename from external-libs/Artichow/font/Tuffy.ttf
rename to htdocs/includes/artichow/font/Tuffy.ttf
diff --git a/external-libs/Artichow/font/TuffyBold.ttf b/htdocs/includes/artichow/font/TuffyBold.ttf
similarity index 100%
rename from external-libs/Artichow/font/TuffyBold.ttf
rename to htdocs/includes/artichow/font/TuffyBold.ttf
diff --git a/external-libs/Artichow/font/TuffyBoldItalic.ttf b/htdocs/includes/artichow/font/TuffyBoldItalic.ttf
similarity index 100%
rename from external-libs/Artichow/font/TuffyBoldItalic.ttf
rename to htdocs/includes/artichow/font/TuffyBoldItalic.ttf
diff --git a/external-libs/Artichow/font/TuffyItalic.ttf b/htdocs/includes/artichow/font/TuffyItalic.ttf
similarity index 100%
rename from external-libs/Artichow/font/TuffyItalic.ttf
rename to htdocs/includes/artichow/font/TuffyItalic.ttf
diff --git a/external-libs/Artichow/php4/AntiSpam.class.php b/htdocs/includes/artichow/php4/AntiSpam.class.php
similarity index 100%
rename from external-libs/Artichow/php4/AntiSpam.class.php
rename to htdocs/includes/artichow/php4/AntiSpam.class.php
diff --git a/external-libs/Artichow/php4/BarPlot.class.php b/htdocs/includes/artichow/php4/BarPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php4/BarPlot.class.php
rename to htdocs/includes/artichow/php4/BarPlot.class.php
diff --git a/external-libs/Artichow/php4/Component.class.php b/htdocs/includes/artichow/php4/Component.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Component.class.php
rename to htdocs/includes/artichow/php4/Component.class.php
diff --git a/external-libs/Artichow/php4/Graph.class.php b/htdocs/includes/artichow/php4/Graph.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Graph.class.php
rename to htdocs/includes/artichow/php4/Graph.class.php
diff --git a/external-libs/Artichow/php4/Image.class.php b/htdocs/includes/artichow/php4/Image.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Image.class.php
rename to htdocs/includes/artichow/php4/Image.class.php
diff --git a/external-libs/Artichow/php4/LinePlot.class.php b/htdocs/includes/artichow/php4/LinePlot.class.php
similarity index 100%
rename from external-libs/Artichow/php4/LinePlot.class.php
rename to htdocs/includes/artichow/php4/LinePlot.class.php
diff --git a/external-libs/Artichow/php4/MathPlot.class.php b/htdocs/includes/artichow/php4/MathPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php4/MathPlot.class.php
rename to htdocs/includes/artichow/php4/MathPlot.class.php
diff --git a/external-libs/Artichow/php4/Pattern.class.php b/htdocs/includes/artichow/php4/Pattern.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Pattern.class.php
rename to htdocs/includes/artichow/php4/Pattern.class.php
diff --git a/external-libs/Artichow/php4/Pie.class.php b/htdocs/includes/artichow/php4/Pie.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Pie.class.php
rename to htdocs/includes/artichow/php4/Pie.class.php
diff --git a/external-libs/Artichow/php4/Plot.class.php b/htdocs/includes/artichow/php4/Plot.class.php
similarity index 100%
rename from external-libs/Artichow/php4/Plot.class.php
rename to htdocs/includes/artichow/php4/Plot.class.php
diff --git a/external-libs/Artichow/php4/ScatterPlot.class.php b/htdocs/includes/artichow/php4/ScatterPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php4/ScatterPlot.class.php
rename to htdocs/includes/artichow/php4/ScatterPlot.class.php
diff --git a/external-libs/Artichow/php4/common.php b/htdocs/includes/artichow/php4/common.php
similarity index 100%
rename from external-libs/Artichow/php4/common.php
rename to htdocs/includes/artichow/php4/common.php
diff --git a/external-libs/Artichow/php4/inc/Axis.class.php b/htdocs/includes/artichow/php4/inc/Axis.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Axis.class.php
rename to htdocs/includes/artichow/php4/inc/Axis.class.php
diff --git a/external-libs/Artichow/php4/inc/Border.class.php b/htdocs/includes/artichow/php4/inc/Border.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Border.class.php
rename to htdocs/includes/artichow/php4/inc/Border.class.php
diff --git a/external-libs/Artichow/php4/inc/Color.class.php b/htdocs/includes/artichow/php4/inc/Color.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Color.class.php
rename to htdocs/includes/artichow/php4/inc/Color.class.php
diff --git a/external-libs/Artichow/php4/inc/Drawer.class.php b/htdocs/includes/artichow/php4/inc/Drawer.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Drawer.class.php
rename to htdocs/includes/artichow/php4/inc/Drawer.class.php
diff --git a/external-libs/Artichow/php4/inc/Font.class.php b/htdocs/includes/artichow/php4/inc/Font.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Font.class.php
rename to htdocs/includes/artichow/php4/inc/Font.class.php
diff --git a/external-libs/Artichow/php4/inc/Gradient.class.php b/htdocs/includes/artichow/php4/inc/Gradient.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Gradient.class.php
rename to htdocs/includes/artichow/php4/inc/Gradient.class.php
diff --git a/external-libs/Artichow/php4/inc/Grid.class.php b/htdocs/includes/artichow/php4/inc/Grid.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Grid.class.php
rename to htdocs/includes/artichow/php4/inc/Grid.class.php
diff --git a/external-libs/Artichow/php4/inc/Label.class.php b/htdocs/includes/artichow/php4/inc/Label.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Label.class.php
rename to htdocs/includes/artichow/php4/inc/Label.class.php
diff --git a/external-libs/Artichow/php4/inc/Legend.class.php b/htdocs/includes/artichow/php4/inc/Legend.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Legend.class.php
rename to htdocs/includes/artichow/php4/inc/Legend.class.php
diff --git a/external-libs/Artichow/php4/inc/Mark.class.php b/htdocs/includes/artichow/php4/inc/Mark.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Mark.class.php
rename to htdocs/includes/artichow/php4/inc/Mark.class.php
diff --git a/external-libs/Artichow/php4/inc/Math.class.php b/htdocs/includes/artichow/php4/inc/Math.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Math.class.php
rename to htdocs/includes/artichow/php4/inc/Math.class.php
diff --git a/external-libs/Artichow/php4/inc/Shadow.class.php b/htdocs/includes/artichow/php4/inc/Shadow.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Shadow.class.php
rename to htdocs/includes/artichow/php4/inc/Shadow.class.php
diff --git a/external-libs/Artichow/php4/inc/Text.class.php b/htdocs/includes/artichow/php4/inc/Text.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Text.class.php
rename to htdocs/includes/artichow/php4/inc/Text.class.php
diff --git a/external-libs/Artichow/php4/inc/Tick.class.php b/htdocs/includes/artichow/php4/inc/Tick.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Tick.class.php
rename to htdocs/includes/artichow/php4/inc/Tick.class.php
diff --git a/external-libs/Artichow/php4/inc/Tools.class.php b/htdocs/includes/artichow/php4/inc/Tools.class.php
similarity index 100%
rename from external-libs/Artichow/php4/inc/Tools.class.php
rename to htdocs/includes/artichow/php4/inc/Tools.class.php
diff --git a/external-libs/Artichow/php5/AntiSpam.class.php b/htdocs/includes/artichow/php5/AntiSpam.class.php
similarity index 100%
rename from external-libs/Artichow/php5/AntiSpam.class.php
rename to htdocs/includes/artichow/php5/AntiSpam.class.php
diff --git a/external-libs/Artichow/php5/BarPlot.class.php b/htdocs/includes/artichow/php5/BarPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php5/BarPlot.class.php
rename to htdocs/includes/artichow/php5/BarPlot.class.php
diff --git a/external-libs/Artichow/php5/Component.class.php b/htdocs/includes/artichow/php5/Component.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Component.class.php
rename to htdocs/includes/artichow/php5/Component.class.php
diff --git a/external-libs/Artichow/php5/Graph.class.php b/htdocs/includes/artichow/php5/Graph.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Graph.class.php
rename to htdocs/includes/artichow/php5/Graph.class.php
diff --git a/external-libs/Artichow/php5/Image.class.php b/htdocs/includes/artichow/php5/Image.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Image.class.php
rename to htdocs/includes/artichow/php5/Image.class.php
diff --git a/external-libs/Artichow/php5/LinePlot.class.php b/htdocs/includes/artichow/php5/LinePlot.class.php
similarity index 100%
rename from external-libs/Artichow/php5/LinePlot.class.php
rename to htdocs/includes/artichow/php5/LinePlot.class.php
diff --git a/external-libs/Artichow/php5/MathPlot.class.php b/htdocs/includes/artichow/php5/MathPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php5/MathPlot.class.php
rename to htdocs/includes/artichow/php5/MathPlot.class.php
diff --git a/external-libs/Artichow/php5/Pattern.class.php b/htdocs/includes/artichow/php5/Pattern.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Pattern.class.php
rename to htdocs/includes/artichow/php5/Pattern.class.php
diff --git a/external-libs/Artichow/php5/Pie.class.php b/htdocs/includes/artichow/php5/Pie.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Pie.class.php
rename to htdocs/includes/artichow/php5/Pie.class.php
diff --git a/external-libs/Artichow/php5/Plot.class.php b/htdocs/includes/artichow/php5/Plot.class.php
similarity index 100%
rename from external-libs/Artichow/php5/Plot.class.php
rename to htdocs/includes/artichow/php5/Plot.class.php
diff --git a/external-libs/Artichow/php5/ScatterPlot.class.php b/htdocs/includes/artichow/php5/ScatterPlot.class.php
similarity index 100%
rename from external-libs/Artichow/php5/ScatterPlot.class.php
rename to htdocs/includes/artichow/php5/ScatterPlot.class.php
diff --git a/external-libs/Artichow/php5/common.php b/htdocs/includes/artichow/php5/common.php
similarity index 100%
rename from external-libs/Artichow/php5/common.php
rename to htdocs/includes/artichow/php5/common.php
diff --git a/external-libs/Artichow/php5/inc/Axis.class.php b/htdocs/includes/artichow/php5/inc/Axis.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Axis.class.php
rename to htdocs/includes/artichow/php5/inc/Axis.class.php
diff --git a/external-libs/Artichow/php5/inc/Border.class.php b/htdocs/includes/artichow/php5/inc/Border.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Border.class.php
rename to htdocs/includes/artichow/php5/inc/Border.class.php
diff --git a/external-libs/Artichow/php5/inc/Color.class.php b/htdocs/includes/artichow/php5/inc/Color.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Color.class.php
rename to htdocs/includes/artichow/php5/inc/Color.class.php
diff --git a/external-libs/Artichow/php5/inc/Drawer.class.php b/htdocs/includes/artichow/php5/inc/Drawer.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Drawer.class.php
rename to htdocs/includes/artichow/php5/inc/Drawer.class.php
diff --git a/external-libs/Artichow/php5/inc/Font.class.php b/htdocs/includes/artichow/php5/inc/Font.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Font.class.php
rename to htdocs/includes/artichow/php5/inc/Font.class.php
diff --git a/external-libs/Artichow/php5/inc/Gradient.class.php b/htdocs/includes/artichow/php5/inc/Gradient.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Gradient.class.php
rename to htdocs/includes/artichow/php5/inc/Gradient.class.php
diff --git a/external-libs/Artichow/php5/inc/Grid.class.php b/htdocs/includes/artichow/php5/inc/Grid.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Grid.class.php
rename to htdocs/includes/artichow/php5/inc/Grid.class.php
diff --git a/external-libs/Artichow/php5/inc/Label.class.php b/htdocs/includes/artichow/php5/inc/Label.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Label.class.php
rename to htdocs/includes/artichow/php5/inc/Label.class.php
diff --git a/external-libs/Artichow/php5/inc/Legend.class.php b/htdocs/includes/artichow/php5/inc/Legend.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Legend.class.php
rename to htdocs/includes/artichow/php5/inc/Legend.class.php
diff --git a/external-libs/Artichow/php5/inc/Mark.class.php b/htdocs/includes/artichow/php5/inc/Mark.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Mark.class.php
rename to htdocs/includes/artichow/php5/inc/Mark.class.php
diff --git a/external-libs/Artichow/php5/inc/Math.class.php b/htdocs/includes/artichow/php5/inc/Math.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Math.class.php
rename to htdocs/includes/artichow/php5/inc/Math.class.php
diff --git a/external-libs/Artichow/php5/inc/Shadow.class.php b/htdocs/includes/artichow/php5/inc/Shadow.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Shadow.class.php
rename to htdocs/includes/artichow/php5/inc/Shadow.class.php
diff --git a/external-libs/Artichow/php5/inc/Text.class.php b/htdocs/includes/artichow/php5/inc/Text.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Text.class.php
rename to htdocs/includes/artichow/php5/inc/Text.class.php
diff --git a/external-libs/Artichow/php5/inc/Tick.class.php b/htdocs/includes/artichow/php5/inc/Tick.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Tick.class.php
rename to htdocs/includes/artichow/php5/inc/Tick.class.php
diff --git a/external-libs/Artichow/php5/inc/Tools.class.php b/htdocs/includes/artichow/php5/inc/Tools.class.php
similarity index 100%
rename from external-libs/Artichow/php5/inc/Tools.class.php
rename to htdocs/includes/artichow/php5/inc/Tools.class.php
diff --git a/external-libs/smarty/BUGS b/htdocs/includes/smarty/BUGS
similarity index 100%
rename from external-libs/smarty/BUGS
rename to htdocs/includes/smarty/BUGS
diff --git a/external-libs/smarty/COPYING.lib b/htdocs/includes/smarty/COPYING.lib
similarity index 100%
rename from external-libs/smarty/COPYING.lib
rename to htdocs/includes/smarty/COPYING.lib
diff --git a/external-libs/smarty/README b/htdocs/includes/smarty/README
similarity index 100%
rename from external-libs/smarty/README
rename to htdocs/includes/smarty/README
diff --git a/external-libs/smarty/libs/Config_File.class.php b/htdocs/includes/smarty/libs/Config_File.class.php
similarity index 100%
rename from external-libs/smarty/libs/Config_File.class.php
rename to htdocs/includes/smarty/libs/Config_File.class.php
diff --git a/external-libs/smarty/libs/Smarty.class.php b/htdocs/includes/smarty/libs/Smarty.class.php
similarity index 100%
rename from external-libs/smarty/libs/Smarty.class.php
rename to htdocs/includes/smarty/libs/Smarty.class.php
diff --git a/external-libs/smarty/libs/Smarty_Compiler.class.php b/htdocs/includes/smarty/libs/Smarty_Compiler.class.php
similarity index 100%
rename from external-libs/smarty/libs/Smarty_Compiler.class.php
rename to htdocs/includes/smarty/libs/Smarty_Compiler.class.php
diff --git a/external-libs/smarty/libs/debug.tpl b/htdocs/includes/smarty/libs/debug.tpl
similarity index 100%
rename from external-libs/smarty/libs/debug.tpl
rename to htdocs/includes/smarty/libs/debug.tpl
diff --git a/external-libs/smarty/libs/internals/core.assemble_plugin_filepath.php b/htdocs/includes/smarty/libs/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.assemble_plugin_filepath.php
rename to htdocs/includes/smarty/libs/internals/core.assemble_plugin_filepath.php
diff --git a/external-libs/smarty/libs/internals/core.assign_smarty_interface.php b/htdocs/includes/smarty/libs/internals/core.assign_smarty_interface.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.assign_smarty_interface.php
rename to htdocs/includes/smarty/libs/internals/core.assign_smarty_interface.php
diff --git a/external-libs/smarty/libs/internals/core.create_dir_structure.php b/htdocs/includes/smarty/libs/internals/core.create_dir_structure.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.create_dir_structure.php
rename to htdocs/includes/smarty/libs/internals/core.create_dir_structure.php
diff --git a/external-libs/smarty/libs/internals/core.display_debug_console.php b/htdocs/includes/smarty/libs/internals/core.display_debug_console.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.display_debug_console.php
rename to htdocs/includes/smarty/libs/internals/core.display_debug_console.php
diff --git a/external-libs/smarty/libs/internals/core.get_include_path.php b/htdocs/includes/smarty/libs/internals/core.get_include_path.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.get_include_path.php
rename to htdocs/includes/smarty/libs/internals/core.get_include_path.php
diff --git a/external-libs/smarty/libs/internals/core.get_microtime.php b/htdocs/includes/smarty/libs/internals/core.get_microtime.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.get_microtime.php
rename to htdocs/includes/smarty/libs/internals/core.get_microtime.php
diff --git a/external-libs/smarty/libs/internals/core.get_php_resource.php b/htdocs/includes/smarty/libs/internals/core.get_php_resource.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.get_php_resource.php
rename to htdocs/includes/smarty/libs/internals/core.get_php_resource.php
diff --git a/external-libs/smarty/libs/internals/core.is_secure.php b/htdocs/includes/smarty/libs/internals/core.is_secure.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.is_secure.php
rename to htdocs/includes/smarty/libs/internals/core.is_secure.php
diff --git a/external-libs/smarty/libs/internals/core.is_trusted.php b/htdocs/includes/smarty/libs/internals/core.is_trusted.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.is_trusted.php
rename to htdocs/includes/smarty/libs/internals/core.is_trusted.php
diff --git a/external-libs/smarty/libs/internals/core.load_plugins.php b/htdocs/includes/smarty/libs/internals/core.load_plugins.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.load_plugins.php
rename to htdocs/includes/smarty/libs/internals/core.load_plugins.php
diff --git a/external-libs/smarty/libs/internals/core.load_resource_plugin.php b/htdocs/includes/smarty/libs/internals/core.load_resource_plugin.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.load_resource_plugin.php
rename to htdocs/includes/smarty/libs/internals/core.load_resource_plugin.php
diff --git a/external-libs/smarty/libs/internals/core.process_cached_inserts.php b/htdocs/includes/smarty/libs/internals/core.process_cached_inserts.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.process_cached_inserts.php
rename to htdocs/includes/smarty/libs/internals/core.process_cached_inserts.php
diff --git a/external-libs/smarty/libs/internals/core.process_compiled_include.php b/htdocs/includes/smarty/libs/internals/core.process_compiled_include.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.process_compiled_include.php
rename to htdocs/includes/smarty/libs/internals/core.process_compiled_include.php
diff --git a/external-libs/smarty/libs/internals/core.read_cache_file.php b/htdocs/includes/smarty/libs/internals/core.read_cache_file.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.read_cache_file.php
rename to htdocs/includes/smarty/libs/internals/core.read_cache_file.php
diff --git a/external-libs/smarty/libs/internals/core.rm_auto.php b/htdocs/includes/smarty/libs/internals/core.rm_auto.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.rm_auto.php
rename to htdocs/includes/smarty/libs/internals/core.rm_auto.php
diff --git a/external-libs/smarty/libs/internals/core.rmdir.php b/htdocs/includes/smarty/libs/internals/core.rmdir.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.rmdir.php
rename to htdocs/includes/smarty/libs/internals/core.rmdir.php
diff --git a/external-libs/smarty/libs/internals/core.run_insert_handler.php b/htdocs/includes/smarty/libs/internals/core.run_insert_handler.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.run_insert_handler.php
rename to htdocs/includes/smarty/libs/internals/core.run_insert_handler.php
diff --git a/external-libs/smarty/libs/internals/core.smarty_include_php.php b/htdocs/includes/smarty/libs/internals/core.smarty_include_php.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.smarty_include_php.php
rename to htdocs/includes/smarty/libs/internals/core.smarty_include_php.php
diff --git a/external-libs/smarty/libs/internals/core.write_cache_file.php b/htdocs/includes/smarty/libs/internals/core.write_cache_file.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.write_cache_file.php
rename to htdocs/includes/smarty/libs/internals/core.write_cache_file.php
diff --git a/external-libs/smarty/libs/internals/core.write_compiled_include.php b/htdocs/includes/smarty/libs/internals/core.write_compiled_include.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.write_compiled_include.php
rename to htdocs/includes/smarty/libs/internals/core.write_compiled_include.php
diff --git a/external-libs/smarty/libs/internals/core.write_compiled_resource.php b/htdocs/includes/smarty/libs/internals/core.write_compiled_resource.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.write_compiled_resource.php
rename to htdocs/includes/smarty/libs/internals/core.write_compiled_resource.php
diff --git a/external-libs/smarty/libs/internals/core.write_file.php b/htdocs/includes/smarty/libs/internals/core.write_file.php
similarity index 100%
rename from external-libs/smarty/libs/internals/core.write_file.php
rename to htdocs/includes/smarty/libs/internals/core.write_file.php
diff --git a/external-libs/smarty/libs/plugins/block.textformat.php b/htdocs/includes/smarty/libs/plugins/block.textformat.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/block.textformat.php
rename to htdocs/includes/smarty/libs/plugins/block.textformat.php
diff --git a/external-libs/smarty/libs/plugins/compiler.assign.php b/htdocs/includes/smarty/libs/plugins/compiler.assign.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/compiler.assign.php
rename to htdocs/includes/smarty/libs/plugins/compiler.assign.php
diff --git a/external-libs/smarty/libs/plugins/function.assign_debug_info.php b/htdocs/includes/smarty/libs/plugins/function.assign_debug_info.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.assign_debug_info.php
rename to htdocs/includes/smarty/libs/plugins/function.assign_debug_info.php
diff --git a/external-libs/smarty/libs/plugins/function.config_load.php b/htdocs/includes/smarty/libs/plugins/function.config_load.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.config_load.php
rename to htdocs/includes/smarty/libs/plugins/function.config_load.php
diff --git a/external-libs/smarty/libs/plugins/function.counter.php b/htdocs/includes/smarty/libs/plugins/function.counter.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.counter.php
rename to htdocs/includes/smarty/libs/plugins/function.counter.php
diff --git a/external-libs/smarty/libs/plugins/function.cycle.php b/htdocs/includes/smarty/libs/plugins/function.cycle.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.cycle.php
rename to htdocs/includes/smarty/libs/plugins/function.cycle.php
diff --git a/external-libs/smarty/libs/plugins/function.debug.php b/htdocs/includes/smarty/libs/plugins/function.debug.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.debug.php
rename to htdocs/includes/smarty/libs/plugins/function.debug.php
diff --git a/external-libs/smarty/libs/plugins/function.eval.php b/htdocs/includes/smarty/libs/plugins/function.eval.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.eval.php
rename to htdocs/includes/smarty/libs/plugins/function.eval.php
diff --git a/external-libs/smarty/libs/plugins/function.fckeditor.php b/htdocs/includes/smarty/libs/plugins/function.fckeditor.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.fckeditor.php
rename to htdocs/includes/smarty/libs/plugins/function.fckeditor.php
diff --git a/external-libs/smarty/libs/plugins/function.fetch.php b/htdocs/includes/smarty/libs/plugins/function.fetch.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.fetch.php
rename to htdocs/includes/smarty/libs/plugins/function.fetch.php
diff --git a/external-libs/smarty/libs/plugins/function.html_checkboxes.php b/htdocs/includes/smarty/libs/plugins/function.html_checkboxes.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_checkboxes.php
rename to htdocs/includes/smarty/libs/plugins/function.html_checkboxes.php
diff --git a/external-libs/smarty/libs/plugins/function.html_image.php b/htdocs/includes/smarty/libs/plugins/function.html_image.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_image.php
rename to htdocs/includes/smarty/libs/plugins/function.html_image.php
diff --git a/external-libs/smarty/libs/plugins/function.html_options.php b/htdocs/includes/smarty/libs/plugins/function.html_options.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_options.php
rename to htdocs/includes/smarty/libs/plugins/function.html_options.php
diff --git a/external-libs/smarty/libs/plugins/function.html_radios.php b/htdocs/includes/smarty/libs/plugins/function.html_radios.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_radios.php
rename to htdocs/includes/smarty/libs/plugins/function.html_radios.php
diff --git a/external-libs/smarty/libs/plugins/function.html_select_date.php b/htdocs/includes/smarty/libs/plugins/function.html_select_date.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_select_date.php
rename to htdocs/includes/smarty/libs/plugins/function.html_select_date.php
diff --git a/external-libs/smarty/libs/plugins/function.html_select_time.php b/htdocs/includes/smarty/libs/plugins/function.html_select_time.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_select_time.php
rename to htdocs/includes/smarty/libs/plugins/function.html_select_time.php
diff --git a/external-libs/smarty/libs/plugins/function.html_table.php b/htdocs/includes/smarty/libs/plugins/function.html_table.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.html_table.php
rename to htdocs/includes/smarty/libs/plugins/function.html_table.php
diff --git a/external-libs/smarty/libs/plugins/function.mailto.php b/htdocs/includes/smarty/libs/plugins/function.mailto.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.mailto.php
rename to htdocs/includes/smarty/libs/plugins/function.mailto.php
diff --git a/external-libs/smarty/libs/plugins/function.math.php b/htdocs/includes/smarty/libs/plugins/function.math.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.math.php
rename to htdocs/includes/smarty/libs/plugins/function.math.php
diff --git a/external-libs/smarty/libs/plugins/function.popup.php b/htdocs/includes/smarty/libs/plugins/function.popup.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.popup.php
rename to htdocs/includes/smarty/libs/plugins/function.popup.php
diff --git a/external-libs/smarty/libs/plugins/function.popup_init.php b/htdocs/includes/smarty/libs/plugins/function.popup_init.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/function.popup_init.php
rename to htdocs/includes/smarty/libs/plugins/function.popup_init.php
diff --git a/external-libs/smarty/libs/plugins/modifier.capitalize.php b/htdocs/includes/smarty/libs/plugins/modifier.capitalize.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.capitalize.php
rename to htdocs/includes/smarty/libs/plugins/modifier.capitalize.php
diff --git a/external-libs/smarty/libs/plugins/modifier.cat.php b/htdocs/includes/smarty/libs/plugins/modifier.cat.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.cat.php
rename to htdocs/includes/smarty/libs/plugins/modifier.cat.php
diff --git a/external-libs/smarty/libs/plugins/modifier.count_characters.php b/htdocs/includes/smarty/libs/plugins/modifier.count_characters.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.count_characters.php
rename to htdocs/includes/smarty/libs/plugins/modifier.count_characters.php
diff --git a/external-libs/smarty/libs/plugins/modifier.count_paragraphs.php b/htdocs/includes/smarty/libs/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.count_paragraphs.php
rename to htdocs/includes/smarty/libs/plugins/modifier.count_paragraphs.php
diff --git a/external-libs/smarty/libs/plugins/modifier.count_sentences.php b/htdocs/includes/smarty/libs/plugins/modifier.count_sentences.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.count_sentences.php
rename to htdocs/includes/smarty/libs/plugins/modifier.count_sentences.php
diff --git a/external-libs/smarty/libs/plugins/modifier.count_words.php b/htdocs/includes/smarty/libs/plugins/modifier.count_words.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.count_words.php
rename to htdocs/includes/smarty/libs/plugins/modifier.count_words.php
diff --git a/external-libs/smarty/libs/plugins/modifier.date_format.php b/htdocs/includes/smarty/libs/plugins/modifier.date_format.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.date_format.php
rename to htdocs/includes/smarty/libs/plugins/modifier.date_format.php
diff --git a/external-libs/smarty/libs/plugins/modifier.debug_print_var.php b/htdocs/includes/smarty/libs/plugins/modifier.debug_print_var.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.debug_print_var.php
rename to htdocs/includes/smarty/libs/plugins/modifier.debug_print_var.php
diff --git a/external-libs/smarty/libs/plugins/modifier.default.php b/htdocs/includes/smarty/libs/plugins/modifier.default.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.default.php
rename to htdocs/includes/smarty/libs/plugins/modifier.default.php
diff --git a/external-libs/smarty/libs/plugins/modifier.escape.php b/htdocs/includes/smarty/libs/plugins/modifier.escape.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.escape.php
rename to htdocs/includes/smarty/libs/plugins/modifier.escape.php
diff --git a/external-libs/smarty/libs/plugins/modifier.indent.php b/htdocs/includes/smarty/libs/plugins/modifier.indent.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.indent.php
rename to htdocs/includes/smarty/libs/plugins/modifier.indent.php
diff --git a/external-libs/smarty/libs/plugins/modifier.lower.php b/htdocs/includes/smarty/libs/plugins/modifier.lower.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.lower.php
rename to htdocs/includes/smarty/libs/plugins/modifier.lower.php
diff --git a/external-libs/smarty/libs/plugins/modifier.nl2br.php b/htdocs/includes/smarty/libs/plugins/modifier.nl2br.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.nl2br.php
rename to htdocs/includes/smarty/libs/plugins/modifier.nl2br.php
diff --git a/external-libs/smarty/libs/plugins/modifier.regex_replace.php b/htdocs/includes/smarty/libs/plugins/modifier.regex_replace.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.regex_replace.php
rename to htdocs/includes/smarty/libs/plugins/modifier.regex_replace.php
diff --git a/external-libs/smarty/libs/plugins/modifier.replace.php b/htdocs/includes/smarty/libs/plugins/modifier.replace.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.replace.php
rename to htdocs/includes/smarty/libs/plugins/modifier.replace.php
diff --git a/external-libs/smarty/libs/plugins/modifier.spacify.php b/htdocs/includes/smarty/libs/plugins/modifier.spacify.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.spacify.php
rename to htdocs/includes/smarty/libs/plugins/modifier.spacify.php
diff --git a/external-libs/smarty/libs/plugins/modifier.string_format.php b/htdocs/includes/smarty/libs/plugins/modifier.string_format.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.string_format.php
rename to htdocs/includes/smarty/libs/plugins/modifier.string_format.php
diff --git a/external-libs/smarty/libs/plugins/modifier.strip.php b/htdocs/includes/smarty/libs/plugins/modifier.strip.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.strip.php
rename to htdocs/includes/smarty/libs/plugins/modifier.strip.php
diff --git a/external-libs/smarty/libs/plugins/modifier.strip_tags.php b/htdocs/includes/smarty/libs/plugins/modifier.strip_tags.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.strip_tags.php
rename to htdocs/includes/smarty/libs/plugins/modifier.strip_tags.php
diff --git a/external-libs/smarty/libs/plugins/modifier.truncate.php b/htdocs/includes/smarty/libs/plugins/modifier.truncate.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.truncate.php
rename to htdocs/includes/smarty/libs/plugins/modifier.truncate.php
diff --git a/external-libs/smarty/libs/plugins/modifier.upper.php b/htdocs/includes/smarty/libs/plugins/modifier.upper.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.upper.php
rename to htdocs/includes/smarty/libs/plugins/modifier.upper.php
diff --git a/external-libs/smarty/libs/plugins/modifier.wordwrap.php b/htdocs/includes/smarty/libs/plugins/modifier.wordwrap.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/modifier.wordwrap.php
rename to htdocs/includes/smarty/libs/plugins/modifier.wordwrap.php
diff --git a/external-libs/smarty/libs/plugins/outputfilter.trimwhitespace.php b/htdocs/includes/smarty/libs/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/outputfilter.trimwhitespace.php
rename to htdocs/includes/smarty/libs/plugins/outputfilter.trimwhitespace.php
diff --git a/external-libs/smarty/libs/plugins/shared.escape_special_chars.php b/htdocs/includes/smarty/libs/plugins/shared.escape_special_chars.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/shared.escape_special_chars.php
rename to htdocs/includes/smarty/libs/plugins/shared.escape_special_chars.php
diff --git a/external-libs/smarty/libs/plugins/shared.make_timestamp.php b/htdocs/includes/smarty/libs/plugins/shared.make_timestamp.php
similarity index 100%
rename from external-libs/smarty/libs/plugins/shared.make_timestamp.php
rename to htdocs/includes/smarty/libs/plugins/shared.make_timestamp.php
diff --git a/htdocs/lib/antispamimage.php b/htdocs/lib/antispamimage.php
index eff8e248fe931c978d6ccd41ac27922407c4595b..7a02e72679e21df403af380d483f3f11efaa0196 100644
--- a/htdocs/lib/antispamimage.php
+++ b/htdocs/lib/antispamimage.php
@@ -39,7 +39,7 @@ session_name($sessionname);
session_start();
require_once("../master.inc.php");
-require_once DOL_DOCUMENT_ROOT.'/../external-libs/Artichow/Artichow.cfg.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php';
require_once ARTICHOW."/AntiSpam.class.php";
// On cree l'objet anti-spam
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6f85f1f54a426c07113cb809b1feade71ca757ba..2352bbfe7b488d1ca760a2cdadad263643e44177 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -265,7 +265,7 @@ if (! isset($_SESSION["dol_login"]))
// Verification du code securite graphique
if ($test && isset($_POST["username"]) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
{
- require_once DOL_DOCUMENT_ROOT.'/../external-libs/Artichow/Artichow.cfg.php';
+ require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php';
require_once ARTICHOW."/AntiSpam.class.php";
// On cree l'objet anti-spam
@@ -598,10 +598,10 @@ else // Si utilisateur externe
if (sizeof($conf->need_smarty) > 0)
{
// SMARTY (Defined into conf file)
- // $dolibarr_smarty_libs_dir="/home/www/dolibarr/external-libs/smarty/libs/";
+ // $dolibarr_smarty_libs_dir="/home/www/dolibarr/htdocs/includes/smarty/libs/";
// $dolibarr_smarty_compile="/home/www/dolibarr/documents/smarty/templates/temp";
// $dolibarr_smarty_cache="/home/www/dolibarr/documents/smarty/cache/temp";
- if (empty($dolibarr_smarty_libs_dir)) $dolibarr_smarty_libs_dir=DOL_DOCUMENT_ROOT.'/../external-libs/smarty/libs/';
+ if (empty($dolibarr_smarty_libs_dir)) $dolibarr_smarty_libs_dir=DOL_DOCUMENT_ROOT.'/includes/smarty/libs/';
if (empty($dolibarr_smarty_compile)) $dolibarr_smarty_compile=DOL_DATA_ROOT.'/smarty/templates/temp';
if (empty($dolibarr_smarty_cache)) $dolibarr_smarty_cache=DOL_DATA_ROOT.'/smarty/cache/temp';
diff --git a/htdocs/telephonie/stats/graph/SimpleBar.class.php b/htdocs/telephonie/stats/graph/SimpleBar.class.php
index 4897c822542323000ca621d59d769f8862fbd65e..178854acd4fbe021ce55b75db48084ab0fbbd0ad 100644
--- a/htdocs/telephonie/stats/graph/SimpleBar.class.php
+++ b/htdocs/telephonie/stats/graph/SimpleBar.class.php
@@ -16,10 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
- *
*/
-require_once (DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php");
+
+require_once (DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php");
class DolibarrSimpleBar {
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 4f745b0950576a4255a9ebdb69c6f295858c01d5..a05e11ac62534d4cbca2125c64d5835cc1480b59 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -89,7 +89,7 @@ if ($_GET["action"] == 'validatenewpassword' && $_GET["username"] && $_GET["pass
// Action modif mot de passe
if ($_POST["action"] == 'buildnewpassword' && $_POST["username"])
{
- require_once DOL_DOCUMENT_ROOT.'/../external-libs/Artichow/Artichow.cfg.php';
+ require_once DOL_DOCUMENT_ROOT.'/includes/artichow/Artichow.cfg.php';
require_once ARTICHOW."/AntiSpam.class.php";
// We create anti-spam object
diff --git a/scripts/energie/graph-line.php b/scripts/energie/graph-line.php
index 67530086a28a931cf46b2c40fdbf30f6e8b1bed4..8e5c833cf127422e961bfe6944db63c3b938d4a6 100644
--- a/scripts/energie/graph-line.php
+++ b/scripts/energie/graph-line.php
@@ -25,7 +25,7 @@ require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
-require_once (DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php");
+require_once (DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php");
$error = 0;
@@ -158,7 +158,7 @@ if ($resql_c)
$graph->border->hide();
$graph->setAntiAliasing(true);
- $graph->title->set("Consommation journali�re");
+ $graph->title->set("Consommation journali�re");
$graph->title->setFont(new Tuffy(10));
$bgcolor= new Color(222,231,236);
@@ -182,7 +182,7 @@ if ($resql_c)
$graph->border->hide();
$graph->setAntiAliasing(true);
- $graph->title->set("Consommation journali�re");
+ $graph->title->set("Consommation journali�re");
$graph->title->setFont(new Tuffy(10));
$bgcolor= new Color(222,231,236);
diff --git a/scripts/energie/graph.php b/scripts/energie/graph.php
index 7b2913f75fd9d41273a57b7a14b0ab7ceffe6142..f47646c5cdbbb7dcba89c54f872680561b863f2e 100644
--- a/scripts/energie/graph.php
+++ b/scripts/energie/graph.php
@@ -24,8 +24,8 @@ require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
-require_once (DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php");
-require_once (DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php");
+require_once (DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php");
+require_once (DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php");
$error = 0;