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

Merge pull request #11812 from atm-john/9.0_FIX_MISSING_HOOK

Browse Source 
Fix missing hook for agenda export
This commit is contained in:
Laurent Destailleur 2019-09-03 17:47:08 +02:00 committed by GitHub
commit 209a9eb569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,9 +95,22 @@ if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
exit; exit;
} }
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
$hookmanager->initHooks(array('agendaexport'));
$reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $action and $object may have been modified by some
if ($reshook < 0){
llxHeaderVierge();
if(!empty($hookmanager->errors) && is_array($hookmanager->errors)){
print '<div class="error">'.implode('<br/>', $hookmanager->errors).'</div>';
}else{
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();
@ -105,9 +118,8 @@ if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_
llxFooterVierge(); llxFooterVierge();
exit; exit;
} }
}
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
$hookmanager->initHooks(array('agendaexport'));
// 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)
$shortfilename='dolibarrcalendar'; $shortfilename='dolibarrcalendar';