Debug v20

This commit is contained in:
Laurent Destailleur
2024-04-18 02:21:42 +02:00
parent 42b0fa2e88
commit 57bb4cd7e4
3 changed files with 95 additions and 67 deletions

View File

@@ -1057,7 +1057,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
dol_mkdir($destdir.'/scripts');
dol_mkdir($destdir.'/sql');
// Scan dir class to find if an object with same name already exists.
// Scan dir class to find if an object with the same name already exists.
if (!$error) {
$dirlist = dol_dir_list($destdir.'/class', 'files', 0, '\.txt$');
$alreadyfound = false;
@@ -1072,7 +1072,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
}
}
// If we must reuse a table for properties, define $stringforproperties
// If we must reuse an existing table for properties, define $stringforproperties
$stringforproperties = '';
$tablename = GETPOST('initfromtablename', 'alpha');
if ($tablename) {
@@ -1479,38 +1479,41 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
'langs'=>'mymodule@mymodule',
'position'=>1000+\$r,
'enabled'=>'isModEnabled(\"mymodule\")',
'perms'=>'\$user->hasRight(\"mymodule\", \"myobject\", \"read\")',
'perms'=>'".(GETPOST('generatepermissions') ? '$user->hasRight("mymodule", "myobject", "read")' : '1')."',
'target'=>'',
'user'=>2,
'object'=>'MyObject'
);
\$this->menu[\$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',
'type'=>'left',
'titre'=>'List MyObject',
'mainmenu'=>'mymodule',
'leftmenu'=>'mymodule_myobject_list',
'url'=>'/mymodule/myobject_list.php',
'langs'=>'mymodule@mymodule',
'position'=>1000+\$r,
'enabled'=>'isModEnabled(\"mymodule\")',
'perms'=>'\$user->hasRight(\"mymodule\", \"myobject\", \"read\")',
'target'=>'',
'user'=>2,
\$this->menu[\$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',
'type'=>'left',
'titre'=>'List MyObject',
'mainmenu'=>'mymodule',
'leftmenu'=>'mymodule_myobject_list',
'url'=>'/mymodule/myobject_list.php',
'langs'=>'mymodule@mymodule',
'position'=>1000+\$r,
'enabled'=>'isModEnabled(\"mymodule\")',
'perms'=>'".(GETPOST('generatepermissions') ? '$user->hasRight("mymodule", "myobject", "read")' : '1')."',
'target'=>'',
'user'=>2,
'object'=>'MyObject'
);
\$this->menu[\$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',
'type'=>'left',
'titre'=>'New MyObject',
'mainmenu'=>'mymodule',
'leftmenu'=>'mymodule_myobject_new',
'url'=>'/mymodule/myobject_card.php?action=create',
'langs'=>'mymodule@mymodule',
'position'=>1000+\$r,
'enabled'=>'isModEnabled(\"mymodule\")',
'perms'=>'\$user->hasRight(\"mymodule\", \"myobject\", \"write\")',
'target'=>'',
'user'=>2
);\n";
\$this->menu[\$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',
'type'=>'left',
'titre'=>'New MyObject',
'mainmenu'=>'mymodule',
'leftmenu'=>'mymodule_myobject_new',
'url'=>'/mymodule/myobject_card.php?action=create',
'langs'=>'mymodule@mymodule',
'position'=>1000+\$r,
'enabled'=>'isModEnabled(\"mymodule\")',
'perms'=>'".(GETPOST('generatepermissions') ? '$user->hasRight("mymodule", "myobject", "write")' : '1')."',
'target'=>'',
'user'=>2,
'object'=>'MyObject'
);";
$stringtoadd = preg_replace('/MyObject/', $objectname, $stringtoadd);
$stringtoadd = preg_replace('/mymodule/', strtolower($module), $stringtoadd);
$stringtoadd = preg_replace('/myobject/', strtolower($objectname), $stringtoadd);
@@ -1545,7 +1548,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
$warning++;
setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), basename($moduledescriptorfile)), null, 'warnings');
} else {
$arrayofreplacement = array('/* END MODULEBUILDER LEFTMENU MYOBJECT */' => '/*LEFTMENU '.strtoupper($objectname).'*/'.$stringtoadd."\n\t\t".'/*END LEFTMENU '.strtoupper($objectname).'*/'."\n\t\t".'/* END MODULEBUILDER LEFTMENU MYOBJECT */');
$arrayofreplacement = array('/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */' => '/* BEGIN MODULEBUILDER LEFTMENU '.strtoupper($objectname).' */'.$stringtoadd."\n\t\t".'/* END MODULEBUILDER LEFTMENU '.strtoupper($objectname).' */'."\n\t\t".'/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT */');
dolReplaceInFile($moduledescriptorfile, $arrayofreplacement);
}
}
@@ -3345,7 +3348,7 @@ if ($module == 'initmodule') {
print $langs->trans("EnterNameOfModuleToDeleteDesc").'<br><br>';
print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="" autofocus>';
print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
print '</form>';
} elseif (!empty($module)) {
@@ -4057,7 +4060,7 @@ if ($module == 'initmodule') {
print $langs->trans("EnterNameOfObjectToDeleteDesc").'<br><br>';
print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
print '<input type="text" name="objectname" value="" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'" autofocus>';
print '<input type="submit" class="button smallpaddingimp" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
print '</form>';
} else {
@@ -5402,7 +5405,7 @@ if ($module == 'initmodule') {
print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
if ($menu['titre'] != 'Module'.$module.'Name') {
print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode((string) ($i)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)).'">'.img_edit().'</a>';
print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode((string) ($i - 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'&tabobj='.urlencode((string) ($tabobj)).'">'.img_delete().'</a>';
print '<a class="deletefielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode((string) ($i - 1)).'&tab='.urlencode((string) ($tab)).'&module='.urlencode((string) ($module)).'">'.img_delete().'</a>';
}
print '</td>';
}