[task Dolibarr#217] Move core files in core directory

DChancogne72 · Oct 24, 2011 · 3338649 · 3338649
1 parent b1de04b
commit 3338649
Show file tree

Hide file tree

Showing 310 changed files with 693 additions and 693 deletions.
diff --git a/build/deb/conf.php.install b/build/deb/conf.php.install
@@ -136,7 +136,7 @@ $dolibarr_main_db_collation='latin1_swedish_ci';
 # This parameter contains the way authentication is done.
 # If value "ldap" is used, you must also set parameters dolibarr_main_auth_ldap_*
 # 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
 # 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.

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

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

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

diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
@@ -106,9 +106,9 @@
 $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;

diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
@@ -20,12 +20,12 @@
 /**
  * 		\defgroup   mymodule     Module MyModule
  *      \brief      Example of a module descriptor.
- *					Such a file must be copied into htdocs/mymodule/includes/modules directory.
- *      \file       htdocs/mymodule/includes/modules/modMyModule.class.php
+ *					Such a file must be copied into htdocs/mymodule/core/modules directory.
+ *      \file       htdocs/mymodule/core/modules/modMyModule.class.php
  *      \ingroup    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 @@ function modMyModule($DB)
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		$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;
 
 		// Data directories to create when module is enabled.
@@ -139,7 +139,7 @@ function modMyModule($DB)
         */
 
         // 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
 		$r=0;
 		// Example:

diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
@@ -25,8 +25,8 @@
 require("../../main.inc.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."/includes/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/cards/modules_cards.php");
+require_once(DOL_DOCUMENT_ROOT."/core/modules/member/labels/modules_labels.php");
 
 $langs->load("members");
 $langs->load("errors");

diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
@@ -108,7 +108,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/barcode/";
+	$dir = $dirroot . "/core/modules/barcode/";
 
 	$handle=@opendir($dir);
 	if (is_resource($handle))
@@ -193,7 +193,7 @@
 			// Chargement de la classe de codage
 			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");
 				//print $dir.$obj->coder.".modules.php - ".$result;
 				if ($result) break;

diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
@@ -23,7 +23,7 @@
  */
 
 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."/core/lib/admin.lib.php");
 
 $langs->load("admin");
@@ -277,12 +277,12 @@
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/core/boxes/".$boxname.".php";
 		}
 		else
 		{
 			$boxname=preg_replace('/.php$/i','',$obj->file);
-			$sourcefile = "/includes/boxes/".$boxname.".php";
+			$sourcefile = "/core/boxes/".$boxname.".php";
 		}
 
 		dol_include_once($sourcefile);
@@ -393,12 +393,12 @@
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/core/boxes/".$boxname.".php";
 		}
 		else
 		{
 			$boxname=preg_replace('/.php$/i','',$obj->file);
-			$sourcefile = "/includes/boxes/".$boxname.".php";
+			$sourcefile = "/core/boxes/".$boxname.".php";
 		}
 
 		dol_include_once($sourcefile);

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
@@ -72,7 +72,7 @@
 	$commande->initAsSpecimen();
 
 	// Charge le modele
-	$dir = DOL_DOCUMENT_ROOT . "/includes/modules/commande/";
+	$dir = DOL_DOCUMENT_ROOT . "/core/modules/commande/";
 	$file = "pdf_".$modele.".modules.php";
 	if (file_exists($dir.$file))
 	{
@@ -243,7 +243,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/commande/";
+	$dir = $dirroot . "/core/modules/commande/";
 
 	if (is_dir($dir))
 	{
@@ -258,7 +258,7 @@
 				{
 					$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;
 
@@ -374,7 +374,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/commande/";
+	$dir = $dirroot . "/core/modules/commande/";
 
 	if (is_dir($dir))
 	{

diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
@@ -65,7 +65,7 @@
 /*
  * Affiche page
  */
-$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/";
+$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
 $html=new Form($db);
 
 llxHeader("","");

diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
@@ -80,7 +80,7 @@
 
 llxHeader();
 
-$dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/";
+$dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
 $html=new Form($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -101,7 +101,7 @@
 
 clearstatcache();
 
-$dir = "../includes/modules/contract/";
+$dir = "../core/modules/contract/";
 $handle = opendir($dir);
 if (is_resource($handle))
 {
@@ -113,7 +113,7 @@
         {
             $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;
 

diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
@@ -44,7 +44,7 @@
     $don->initAsSpecimen();
 
     // Charge le modele
-    $dir = DOL_DOCUMENT_ROOT . "/includes/modules/dons/";
+    $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/";
     $file = $modele.".modules.php";
     if (file_exists($dir.$file))
     {
@@ -126,7 +126,7 @@
  * View
  */
 
-$dir = "../includes/modules/dons/";
+$dir = "../core/modules/dons/";
 $html=new Form($db);
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');

diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
@@ -58,7 +58,7 @@
 	//$exp->fetch_commande();
 
 	// 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";
 	if (file_exists($dir.$file))
 	{
@@ -161,7 +161,7 @@
 	$moduleid=GETPOST("moduleid");
 	$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";
 	$expem = new $classname($db);
@@ -350,7 +350,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/expedition/";
+	$dir = $dirroot . "/core/modules/expedition/";
 
 	if (is_dir($dir))
 	{
@@ -365,7 +365,7 @@
 				{
 					$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;
 
@@ -486,7 +486,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/expedition/pdf/";
+	$dir = $dirroot . "/core/modules/expedition/pdf/";
 
 	if (is_dir($dir))
 	{

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
@@ -77,7 +77,7 @@
     $facture->initAsSpecimen();
 
     // Load template
-    $dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/";
+    $dir = DOL_DOCUMENT_ROOT . "/core/modules/facture/doc/";
     $file = "pdf_".$modele.".modules.php";
     if (file_exists($dir.$file))
     {
@@ -345,7 +345,7 @@
 $var=true;
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-    $dir = $dirroot . "/includes/modules/facture/";
+    $dir = $dirroot . "/core/modules/facture/";
 
     if (is_dir($dir))
     {
@@ -512,7 +512,7 @@
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/includes/modules/facture".$valdir;
+        $dir = $dirroot . "/core/modules/facture".$valdir;
 
         if (is_dir($dir))
         {

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
@@ -106,7 +106,7 @@
 	$inter->initAsSpecimen();
 
 	// Charge le modele
-	$dir = DOL_DOCUMENT_ROOT . "/includes/modules/fichinter/";
+	$dir = DOL_DOCUMENT_ROOT . "/core/modules/fichinter/";
 	$file = "pdf_".$modele.".modules.php";
 	if (file_exists($dir.$file))
 	{
@@ -242,7 +242,7 @@
 
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/fichinter/";
+	$dir = $dirroot . "/core/modules/fichinter/";
 
 	if (is_dir($dir))
 	{
@@ -360,7 +360,7 @@
 $var=true;
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	$dir = $dirroot . "/includes/modules/fichinter/";
+	$dir = $dirroot . "/core/modules/fichinter/";
 
 	if (is_dir($dir))
 	{