Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur
2020-09-10 17:49:05 +02:00
parent bd54033975
commit 8d93b76258
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/hookmanager.class.php
View File

@@ -144,7 +144,7 @@ class HookManager
*/ */
public function executeHooks($method, $parameters = array(), &$object = '', &$action = '') public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
{ {
if (!is_array($this->hooks) || empty($this->hooks)) return ''; if (!is_array($this->hooks) || empty($this->hooks)) return 0; // No hook available, do nothing.
$parameters['context'] = join(':', $this->contextarray); $parameters['context'] = join(':', $this->contextarray);
//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']); //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -225,14 +225,14 @@ class HookManager
// Loop on each hook to qualify modules that have declared context // Loop on each hook to qualify modules that have declared context
$modulealreadyexecuted = array(); $modulealreadyexecuted = array();
$resaction = 0; $error = 0; $result = ''; $resaction = 0; $error = 0;
foreach ($this->hooks as $context => $modules) // $this->hooks is an array with context as key and value is an array of modules that handle this context foreach ($this->hooks as $context => $modules) // $this->hooks is an array with context as key and value is an array of modules that handle this context
{ {
if (!empty($modules)) if (!empty($modules))
{ {
foreach ($modules as $module => $actionclassinstance) foreach ($modules as $module => $actionclassinstance)
{ {
//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n"; //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
// test to avoid running twice a hook, when a module implements several active contexts // test to avoid running twice a hook, when a module implements several active contexts
if (in_array($module, $modulealreadyexecuted)) continue; if (in_array($module, $modulealreadyexecuted)) continue;
@@ -290,7 +290,7 @@ class HookManager
} }
} }
//print "After hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n"; //print "After hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
unset($actionclassinstance->results); unset($actionclassinstance->results);
unset($actionclassinstance->resprints); unset($actionclassinstance->resprints);
@@ -298,6 +298,6 @@ class HookManager
} }
} }
return ($error ?-1 : $resaction); return ($error ? -1 : $resaction);
} }
} }

5
htdocs/core/lib/files.lib.php
View File

@@ -1155,6 +1155,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
return false; return false;
} }
$reshook = 0;
if (empty($nohook)) if (empty($nohook))
{ {
$hookmanager->initHooks(array('fileslib')); $hookmanager->initHooks(array('fileslib'));
@@ -1174,17 +1175,13 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
if ($reshook < 0) return false; if ($reshook < 0) return false;
return true; return true;
} else { } else {
//print "x".$file." ".$disableglob;exit;
dol_syslog("reshook=".$reshook);
$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset $file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
if (empty($disableglob) && !empty($file_osencoded)) if (empty($disableglob) && !empty($file_osencoded))
{ {
$ok = true; $ok = true;
$globencoded = str_replace('[', '\[', $file_osencoded); $globencoded = str_replace('[', '\[', $file_osencoded);
$globencoded = str_replace(']', '\]', $globencoded); $globencoded = str_replace(']', '\]', $globencoded);
dol_syslog("globencoded=".$globencoded);
$listofdir = glob($globencoded); $listofdir = glob($globencoded);
dol_syslog("listofdir=".join(', ', $listofdir));
if (!empty($listofdir) && is_array($listofdir)) if (!empty($listofdir) && is_array($listofdir))
{ {
foreach ($listofdir as $filename) foreach ($listofdir as $filename)