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

Debug modulebuilder

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-05 11:35:42 +02:00
parent ea18a0a3ee
commit 180b7d3c11
2 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/core/lib/modulebuilder.lib.php
View File

@ -31,19 +31,21 @@
* @param string $module Module name * @param string $module Module name
* @param string $objectname Name of object * @param string $objectname Name of object
* @param string $newmask New mask * @param string $newmask New mask
* @return int <0 if KO, >0 if OK * @param string $readdir Directory source (use $destdir when not defined)
* @return int <=0 if KO, >0 if OK
*/ */
function rebuildObjectClass($destdir, $module, $objectname, $newmask) function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir='')
{ {
global $db, $langs; global $db, $langs;
if (empty($objectname)) return -1; if (empty($objectname)) return -1;
if (empty($readdir)) $readdir=$destdir;
$pathoffiletoeditsrc=$destdir.'/class/'.strtolower($objectname).'.class.php'; $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
$pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'; $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
if (! dol_is_file($pathoffiletoeditsrc)) if (! dol_is_file($pathoffiletoeditsrc))
{ {
//$pathoffiletoeditsrc=DOL_DOCUMENT_ROOT.'/modulebuilder/template/class/myobject.class.php'; $langs->load("errors");
setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors'); setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
return -1; return -1;
} }
@ -58,7 +60,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask)
else return -1; else return -1;
// Backup old file // Backup old file
dol_copy($pathoffiletoeditsrc, $pathoffiletoeditsrc.'.back', $newmask, 1); dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
// Edit class files // Edit class files
$contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r'); $contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
@ -110,6 +112,8 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask)
$contentclass = preg_replace('/\/\/ BEGIN MODULEBUILDER PROPERTIES.*END MODULEBUILDER PROPERTIES/ims', $texttoinsert, $contentclass); $contentclass = preg_replace('/\/\/ BEGIN MODULEBUILDER PROPERTIES.*END MODULEBUILDER PROPERTIES/ims', $texttoinsert, $contentclass);
dol_mkdir(dirname($pathoffiletoedittarget));
//file_put_contents($pathoffiletoedittmp, $contentclass); //file_put_contents($pathoffiletoedittmp, $contentclass);
file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass); file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);
@chmod($pathoffiletoedittarget, octdec($newmask)); @chmod($pathoffiletoedittarget, octdec($newmask));
@ -130,17 +134,29 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask)
* @param string $module Module name * @param string $module Module name
* @param string $objectname Name of object * @param string $objectname Name of object
* @param string $newmask New mask * @param string $newmask New mask
* @return int <0 if KO, >0 if OK * @param string $readdir Directory source (use $destdir when not defined)
* @return int <=0 if KO, >0 if OK
*/ */
function rebuildObjectSql($destdir, $module, $objectname, $newmask) function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='')
{ {
global $db, $langs; global $db, $langs;
if (empty($objectname)) return -1; if (empty($objectname)) return -1;
if (empty($readdir)) $readdir=$destdir;
// Edit .sql file
$pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($objectname).'.sql';
$pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
if (! dol_is_file($pathoffiletoeditsrc))
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
return -1;
}
try try
{ {
dol_include_once(strtolower($module).'/class/'.strtolower($objectname).'.class.php'); include_once $pathoffiletoeditsrc;
if (class_exists($objectname)) $object=new $objectname($db); if (class_exists($objectname)) $object=new $objectname($db);
else return -1; else return -1;
} }
@ -149,11 +165,10 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask)
print $e->getMessage(); print $e->getMessage();
} }
// Edit .sql file // Backup old file
$pathoffiletoeditsrc=dol_osencode($destdir.'/sql/llx_'.strtolower($objectname).'.sql'); dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
$pathoffiletoedittarget=dol_osencode($destdir.'/sql/llx_'.strtolower($objectname).'.sql');
$contentsql = file_get_contents($pathoffiletoeditsrc, 'r'); $contentsql = file_get_contents(dol_os_encode($pathoffiletoeditsrc), 'r');
$i=0; $i=0;
$texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n"; $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
@ -179,10 +194,10 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask)
// Edit .key.sql file // Edit .key.sql file
$pathoffiletoeditsrc=dol_osencode($destdir.'/sql/llx_'.strtolower($objectname).'.key.sql'); $pathoffiletoeditsrc=$destdir.'/sql/llx_'.strtolower($objectname).'.key.sql';
$pathoffiletoedittarget=dol_osencode($destdir.'/sql/llx_'.strtolower($objectname).'.key.sql'); $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
$contentsql = file_get_contents($pathoffiletoeditsrc, 'r'); $contentsql = file_get_contents(dol_os_encode($pathoffiletoeditsrc), 'r');
$i=0; $i=0;
$texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n"; $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
@ -202,6 +217,8 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask)
$contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql); $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
dol_mkdir(dirname($pathoffiletoedittarget));
file_put_contents($pathoffiletoedittarget, $contentsql); file_put_contents($pathoffiletoedittarget, $contentsql);
@chmod($pathoffiletoedittarget, octdec($newmask)); @chmod($pathoffiletoedittarget, octdec($newmask));

14
htdocs/modulebuilder/index.php
View File

@ -328,15 +328,25 @@ if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
{ {
$objectname = $tabobj; $objectname = $tabobj;
$srcdir = $dirread.'/'.strtolower($module);
$destdir = $dirins.'/'.strtolower($module); $destdir = $dirins.'/'.strtolower($module);
dol_mkdir($destdir);
// TODO Complete list of fields with new one // TODO Complete list of fields with new one
// Edit the class file to write properties // Edit the class file to write properties
rebuildObjectClass($destdir, $module, $objectname, $newmask); $result=rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir);
if ($result <= 0)
{
$error++;
}
// Edit sql with new properties // Edit sql with new properties
rebuildObjectSql($destdir, $module, $objectname, $newmask); rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir);
if ($result <= 0)
{
$error++;
}
if (! $error) if (! $error)
{ {