Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: rename inc to includes

Browse Source
This commit is contained in:
Regis Houssin
2011-08-01 13:26:21 +00:00
parent 52b10f3470
commit 63b13e01a3
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
htdocs/admin/boxes.php
View File

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

6
htdocs/boxes.php
View File

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

6
htdocs/core/class/conf.class.php
View File

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

4
htdocs/includes/modules/modWorkflow.class.php
View File

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