From 4d6b5d66997f2b88b8e88e0d60ea475d3cdbb95c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 1 Aug 2011 13:26:21 +0000
Subject: [PATCH] Fix: rename inc to includes
---
dev/skeletons/modMyModule.class.php | 4 ++--
htdocs/admin/boxes.php | 8 ++++----
htdocs/boxes.php | 6 +++---
htdocs/core/class/conf.class.php | 6 +++---
htdocs/includes/modules/modWorkflow.class.php | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 3cc548e1c0a..d7172d651f0 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -27,7 +27,7 @@
* \file htdocs/includes/modules/modMyModule.class.php
* \ingroup mymodule
* \brief Description and activation file for module MyModule
- * \version $Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
+ * \version $Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
*/
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
// 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/inc/triggers/ contains triggers or not
+ // Defined if the directory /mymodule/includes/triggers/ contains triggers or not
$this->triggers = 0;
// Data directories to create when module is enabled.
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 718c842d046..34e7f48cea8 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/admin/boxes.php
* \brief Page to setup boxes
- * \version $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
+ * \version $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
*/
require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
- $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+ $sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{
@@ -394,7 +394,7 @@ if ($resql)
{
$boxname = $regs[1];
$module = $regs[2];
- $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+ $sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{
@@ -470,5 +470,5 @@ print '</table>';
$db->close();
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
+llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
?>
diff --git a/htdocs/boxes.php b/htdocs/boxes.php
index 2affdf654d3..d426e618377 100644
--- a/htdocs/boxes.php
+++ b/htdocs/boxes.php
@@ -22,7 +22,7 @@
* \brief File of class to manage widget boxes
* \author Rodolphe Qiedeville
* \author Laurent Destailleur
- * \version $Id: boxes.php,v 1.54 2011/07/31 23:19:04 eldy Exp $
+ * \version $Id: boxes.php,v 1.55 2011/08/01 13:26:21 hregis Exp $
*/
@@ -220,7 +220,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
- $sourcefile = dol_buildpath("/".$module."/inc/boxes/".$boxname.".php");
+ $sourcefile = dol_buildpath("/".$module."/includes/boxes/".$boxname.".php");
}
else
{
@@ -281,7 +281,7 @@ class InfoBox
{
$boxname = $regs[1];
$module = $regs[2];
- $sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+ $sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
}
else
{
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index acb0b5d9167..c5664164e74 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -24,7 +24,7 @@
* \ingroup core
* \brief File of class to manage storage of current setup
* Config is stored into file conf.php
- * \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $
+ * \version $Id: conf.class.php,v 1.64 2011/08/01 13:26:22 hregis Exp $
*/
@@ -144,13 +144,13 @@ class Conf
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
{
$modulename = strtolower($reg[1]);
- $this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard
+ $this->triggers_modules[] = '/'.$modulename.'/includes/triggers/';
}
// If this is constant for login method activated by a module
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
{
$modulename = strtolower($reg[1]);
- $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
+ $this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/includes/login/';
}
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php
index 42780551928..c7bab37ad4b 100644
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -19,7 +19,7 @@
/**
* \defgroup workflow Module workflow
* \brief Workflow management
- * \version $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
+ * \version $Id: modWorkflow.class.php,v 1.11 2011/08/01 13:26:22 hregis Exp $
*/
/**
@@ -68,7 +68,7 @@ class modWorkflow extends DolibarrModules
// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
$this->picto='technic';
- // Defined if the directory /mymodule/inc/triggers/ contains triggers or not
+ // Defined if the directory /mymodule/includes/triggers/ contains triggers or not
$this->triggers = 1;
// Data directories to create when module is enabled
--
GitLab