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

Fix: hook replace behavior

Browse Source
This commit is contained in:
John Botella 2019-09-03 11:23:27 +02:00
parent f743056572
commit 42433f3beb
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/public/agenda/agendaexport.php
View File

@ -100,16 +100,17 @@ $hookmanager->initHooks(array('agendaexport'));
$reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $action and $object may have been modified by some $reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $action and $object may have been modified by some
if ($reshook < 0){ if ($reshook < 0){
llxHeaderVierge();
if(!empty($hookmanager->errors) && is_array($hookmanager->errors)){ if(!empty($hookmanager->errors) && is_array($hookmanager->errors)){
print '<div class="error">'.implode('<br/>', $hookmanager->errors).'</div>'; print '<div class="error">'.implode('<br/>', $hookmanager->errors).'</div>';
}else{ }else{
print '<div class="error">'.$hookmanager->error.'</div>'; print '<div class="error">'.$hookmanager->error.'</div>';
} }
llxFooterVierge();
} }
elseif(empty($reshook)) {
// Check exportkey // Check exportkey
if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) {
{
$user->getrights(); $user->getrights();
llxHeaderVierge(); llxHeaderVierge();
@ -117,6 +118,7 @@ if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_
llxFooterVierge(); llxFooterVierge();
exit; exit;
} }
}
// Define filename with prefix on filters predica (each predica set must have on cache file) // Define filename with prefix on filters predica (each predica set must have on cache file)