extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-10 07:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a patch from Stefan Werfling.

Browse Source 
-Add new hooks etemplate2_before_exec, etemplate2_before_process and etemplate2_after_process into etemplate2 execution process
This commit is contained in:
Hadi Nategh 2015-09-22 11:26:15 +00:00
parent d1abc872a6
commit 3a240eb67c
1 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
etemplate/inc/class.etemplate_new.inc.php
View File

@ -102,6 +102,32 @@ class etemplate_new extends etemplate_widget_template
*/ */
function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null) function exec($method,array $content,array $sel_options=null,array $readonlys=null,array $preserv=null,$output_mode=0,$ignore_validation='',array $changes=null)
{ {
$hook_data = $GLOBALS['egw']->hooks->process(
array('location' => 'etemplate2_before_exec') +
array('location_name' => $this->name) +
array('location_object' => &$this) +
$content
);
foreach($hook_data as $extras) {
if (!$extras) continue;
foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
if ($extra['data'] && is_array($extra['data'])) {
$content = array_merge($content, $extra['data']);
}
if ($extra['preserve'] && is_array($extra['preserve'])) {
$preserv = array_merge($preserv, $extra['preserve']);
}
if ($extra['readonlys'] && is_array($extra['readonlys'])) {
$readonlys = array_merge($readonlys, $extra['readonlys']);
}
}
}
unset($hook_data);
// Include the etemplate2 javascript code // Include the etemplate2 javascript code
egw_framework::validate_file('.', 'etemplate2', 'etemplate'); egw_framework::validate_file('.', 'etemplate2', 'etemplate');
@ -322,10 +348,61 @@ class etemplate_new extends etemplate_widget_template
// tell request call to remove request, if it is not modified eg. by call to exec in callback // tell request call to remove request, if it is not modified eg. by call to exec in callback
self::$request->remove_if_not_modified(); self::$request->remove_if_not_modified();
$hook_data = $GLOBALS['egw']->hooks->process(
array(
'location' => 'etemplate2_before_process',
'location_name' => $template->id) +
self::complete_array_merge(self::$request->preserv, $validated)
);
foreach($hook_data as $extras) {
if (!$extras) continue;
foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
if ($extra['data'] && is_array($extra['data'])) {
$validated = array_merge($validated, $extra['data']);
}
}
}
unset($hook_data);
//error_log(__METHOD__."(,".array2string($content).')'); //error_log(__METHOD__."(,".array2string($content).')');
//error_log(' validated='.array2string($validated)); //error_log(' validated='.array2string($validated));
$content = ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated)); $content = ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
$tcontent = array();
if( is_array($content) ) {
$tcontent = $content;
}
else {
$tcontent = self::complete_array_merge(
self::$request->preserv,
$validated
);
}
$hook_data = $GLOBALS['egw']->hooks->process(
array(
'location' => 'etemplate2_after_process',
'location_name' => $template->id) +
$tcontent
);
unset($tcontent);
if( is_array($content) ) {
foreach($hook_data as $extras) {
if (!$extras) continue;
foreach(isset($extras[0]) ? $extras : array($extras) as $extra) {
if ($extra['data'] && is_array($extra['data'])) {
$content = array_merge($content, $extra['data']);
}
}
}
}
unset($hook_data);
if (isset($GLOBALS['egw_info']['flags']['java_script'])) if (isset($GLOBALS['egw_info']['flags']['java_script']))
{ {
// Strip out any script tags // Strip out any script tags