extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

use static Hooks methods

Browse Source
This commit is contained in:
Ralf Becker 2016-05-11 18:58:10 +00:00
parent c6e6da63ef
commit e87cbc4832
17 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Accounts.php
View File

@ -1057,7 +1057,7 @@ class Accounts
} }
// call hook to notify interested apps about the new account // call hook to notify interested apps about the new account
$GLOBALS['hook_values'] = $data; $GLOBALS['hook_values'] = $data;
$GLOBALS['egw']->hooks->process($data+array( Hooks::process($data+array(
'location' => 'addaccount', 'location' => 'addaccount',
// at login-time only the hooks from the following apps will be called // at login-time only the hooks from the following apps will be called
'order' => array('felamimail','fudforum'), 'order' => array('felamimail','fudforum'),

2
api/src/Auth.php
View File

@ -260,7 +260,7 @@ class Auth
'old_passwd' => $old_passwd, 'old_passwd' => $old_passwd,
'new_passwd' => $new_passwd, 'new_passwd' => $new_passwd,
); );
$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array( Hooks::process($GLOBALS['hook_values']+array(
'location' => 'changepassword' 'location' => 'changepassword'
),False,True); // called for every app now, not only enabled ones) ),False,True); // called for every app now, not only enabled ones)
} }

2
api/src/CalDAV.php
View File

@ -389,7 +389,7 @@ class CalDAV extends HTTP_WebDAV_Server
if ($path == '/') if ($path == '/')
{ {
$GLOBALS['egw']->hooks->process(array( Hooks::process(array(
'location' => 'groupdav_root_props', 'location' => 'groupdav_root_props',
'props' => &$files['files'][0]['props'], 'props' => &$files['files'][0]['props'],
'options' => $options, 'options' => $options,

4
api/src/Categories.php
View File

@ -626,11 +626,11 @@ class Categories
); );
if($this->is_global($cat_id, true)) // true = application global (otherwise eg. global addressbook categories call all apps) if($this->is_global($cat_id, true)) // true = application global (otherwise eg. global addressbook categories call all apps)
{ {
$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'],False,True); // called for every app now, not only enabled ones) Hooks::process($GLOBALS['hook_values'],False,True); // called for every app now, not only enabled ones)
} }
else else
{ {
$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'], self::id2name($cat_id,'appname')); Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id,'appname'));
} }
$this->db->delete(self::TABLE,$where,__LINE__,__FILE__); $this->db->delete(self::TABLE,$where,__LINE__,__FILE__);

4
api/src/Contacts.php
View File

@ -992,7 +992,7 @@ class Contacts extends Contacts\Storage
$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']); $GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
// call edit-accout hook, to let other apps know about changed account (names or email) // call edit-accout hook, to let other apps know about changed account (names or email)
$GLOBALS['hook_values'] = $GLOBALS['egw']->accounts->read($contact['account_id']); $GLOBALS['hook_values'] = $GLOBALS['egw']->accounts->read($contact['account_id']);
$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array( Hooks::process($GLOBALS['hook_values']+array(
'location' => 'editaccount', 'location' => 'editaccount',
),False,True); // called for every app now, not only enabled ones) ),False,True); // called for every app now, not only enabled ones)
} }
@ -1000,7 +1000,7 @@ class Contacts extends Contacts\Storage
if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate) if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
{ {
$to_write['location'] = 'editaccountcontact'; $to_write['location'] = 'editaccountcontact';
$GLOBALS['egw']->hooks->process($to_write,False,True); // called for every app now, not only enabled ones)); Hooks::process($to_write,False,True); // called for every app now, not only enabled ones));
} }
// Notify linked apps about changes in the contact data // Notify linked apps about changes in the contact data
Link::notify_update('addressbook', $contact['id'], $contact); Link::notify_update('addressbook', $contact['id'], $contact);

2
api/src/Db/Backup.php
View File

@ -487,7 +487,7 @@ class Backup
Api\Cache::flush(Api\Cache::INSTANCE); Api\Cache::flush(Api\Cache::INSTANCE);
// search-and-register-hooks // search-and-register-hooks
$GLOBALS['egw']->hooks->register_all_hooks(); Api\Hooks::read(true);
return ''; return '';
} }

6
api/src/Etemplate.php
View File

@ -102,7 +102,7 @@ class Etemplate 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( $hook_data = Hooks::process(
array('hook_location' => 'etemplate2_before_exec') + array('hook_location' => 'etemplate2_before_exec') +
array('location_name' => $this->name) + array('location_name' => $this->name) +
array('location_object' => &$this) + array('location_object' => &$this) +
@ -351,7 +351,7 @@ class Etemplate 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();
foreach($GLOBALS['egw']->hooks->process(array( foreach(Hooks::process(array(
'hook_location' => 'etemplate2_before_process', 'hook_location' => 'etemplate2_before_process',
'location_name' => $template->id, 'location_name' => $template->id,
) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras) ) + self::complete_array_merge(self::$request->preserv, $validated)) as $extras)
@ -374,7 +374,7 @@ class Etemplate extends Etemplate\Widget\Template
$tcontent = is_array($content) ? $content : $tcontent = is_array($content) ? $content :
self::complete_array_merge(self::$request->preserv, $validated); self::complete_array_merge(self::$request->preserv, $validated);
$hook_data = $GLOBALS['egw']->hooks->process( $hook_data = Hooks::process(
array( array(
'hook_location' => 'etemplate2_after_process', 'hook_location' => 'etemplate2_after_process',
'location_name' => $template->id 'location_name' => $template->id

2
api/src/Etemplate/Widget.php
View File

@ -323,7 +323,7 @@ class Widget
} }
// Use hook to load custom widgets from other apps // Use hook to load custom widgets from other apps
$widgets = $GLOBALS['egw']->hooks->process('etemplate2_register_widgets',array(),true); $widgets = Api\Hooks::process('etemplate2_register_widgets',array(),true);
foreach($widgets as $list) foreach($widgets as $list)
{ {
if (is_array($list)) if (is_array($list))

6
api/src/Header/ContentSecurityPolicy.php
View File

@ -12,6 +12,8 @@
namespace EGroupware\Api\Header; namespace EGroupware\Api\Header;
use EGroupware\Api;
/** /**
* Content Security Policy headers * Content Security Policy headers
*/ */
@ -50,8 +52,8 @@ class ContentSecurityPolicy
// set frame-src attrs of API and apps via hook // set frame-src attrs of API and apps via hook
if ($source == 'frame-src' && !isset($attrs)) if ($source == 'frame-src' && !isset($attrs))
{ {
$attrs = array('manual.egroupware.org', 'www.egroupware.org'); $attrs = array('www.egroupware.org');
if (($app_additional = $GLOBALS['egw']->hooks->process('csp-frame-src'))) if (($app_additional = Api\Hooks::process('csp-frame-src')))
{ {
foreach($app_additional as $addtional) foreach($app_additional as $addtional)
{ {

2
api/src/Link.php
View File

@ -207,7 +207,7 @@ class Link extends Link\Storage
// for performance reasons, we do it only once / cache it in the session // for performance reasons, we do it only once / cache it in the session
if (!($search_link_hooks = Cache::getSession(__CLASS__, 'search_link_hooks'))) if (!($search_link_hooks = Cache::getSession(__CLASS__, 'search_link_hooks')))
{ {
$search_link_hooks = $GLOBALS['egw']->hooks->process('search_link',array(), (bool)$GLOBALS['egw_info']['flags']['async-service']); $search_link_hooks = Hooks::process('search_link',array(), (bool)$GLOBALS['egw_info']['flags']['async-service']);
Cache::setSession(__CLASS__, 'search_link_hooks', $search_link_hooks); Cache::setSession(__CLASS__, 'search_link_hooks', $search_link_hooks);
} }
if (is_array($search_link_hooks)) if (is_array($search_link_hooks))

6
api/src/Mail/Types.php
View File

@ -14,6 +14,8 @@
namespace EGroupware\Api\Mail; namespace EGroupware\Api\Mail;
use EGroupware\Api;
class Types class Types
{ {
/** /**
@ -26,7 +28,7 @@ class Types
static public function getSMTPServerTypes($extended=true) static public function getSMTPServerTypes($extended=true)
{ {
$retData = self::server_types(false, $extended); $retData = self::server_types(false, $extended);
foreach($GLOBALS['egw']->hooks->process(array( foreach(Api\Hooks::process(array(
'location' => 'smtp_server_types', 'location' => 'smtp_server_types',
'extended' => $extended, 'extended' => $extended,
), array('managementserver'), true) as $app => $data) ), array('managementserver'), true) as $app => $data)
@ -56,7 +58,7 @@ class Types
static public function getIMAPServerTypes($extended=true) static public function getIMAPServerTypes($extended=true)
{ {
$retData = self::server_types(true, $extended); $retData = self::server_types(true, $extended);
foreach($GLOBALS['egw']->hooks->process(array( foreach(Api\Hooks::process(array(
'location' => 'imap_server_types', 'location' => 'imap_server_types',
'extended' => $extended, 'extended' => $extended,
), array('managementserver'), true) as $app => $data) ), array('managementserver'), true) as $app => $data)

4
api/src/Mailer.php
View File

@ -503,7 +503,7 @@ class Mailer extends Horde_Mime_Mail
} }
$body_sha1 = null; // skip sha1, it requires whole mail in memory, which we traing to avoid now $body_sha1 = null; // skip sha1, it requires whole mail in memory, which we traing to avoid now
$mail_id = $GLOBALS['egw']->hooks->process(array( $mail_id = Hooks::process(array(
'location' => 'send_mail', 'location' => 'send_mail',
'subject' => $subject=$this->getHeader('Subject'), 'subject' => $subject=$this->getHeader('Subject'),
'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'), 'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'),
@ -578,7 +578,7 @@ class Mailer extends Horde_Mime_Mail
} }
catch (\Exception $e) { catch (\Exception $e) {
// in case of errors/exceptions call hook again with previous returned mail_id and error-message to log // in case of errors/exceptions call hook again with previous returned mail_id and error-message to log
$GLOBALS['egw']->hooks->process(array( Hooks::process(array(
'location' => 'send_mail', 'location' => 'send_mail',
'subject' => $subject, 'subject' => $subject,
'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'), 'from' => $this->getHeader('Return-Path') ? $this->getHeader('Return-Path') : $this->getHeader('From'),

4
api/src/Session.php
View File

@ -566,7 +566,7 @@ class Session
$this->session_flags = 'N'; $this->session_flags = 'N';
} }
if (($hook_result = $GLOBALS['egw']->hooks->process(array( if (($hook_result = Hooks::process(array(
'location' => 'session_creation', 'location' => 'session_creation',
'sessionid' => $this->sessionid, 'sessionid' => $this->sessionid,
'session_flags' => $this->session_flags, 'session_flags' => $this->session_flags,
@ -1042,7 +1042,7 @@ class Session
),__LINE__,__FILE__)->fetchColumn(); ),__LINE__,__FILE__)->fetchColumn();
} }
$GLOBALS['egw']->hooks->process(array( Hooks::process(array(
'location' => 'session_destroyed', 'location' => 'session_destroyed',
'sessionid' => $sessionid, 'sessionid' => $sessionid,
),'',true); // true = run hooks from all apps, not just the ones the current user has perms to run ),'',true); // true = run hooks from all apps, not just the ones the current user has perms to run

2
api/src/Storage/Merge.php
View File

@ -500,7 +500,7 @@ abstract class Merge
$exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit']; $exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit'];
if ($app !='common') if ($app !='common')
{ {
$app_limit = $GLOBALS['egw']->hooks->single('export_limit',$app); $app_limit = Api\Hooks::single('export_limit',$app);
if ($app_limit) $exportLimitStore[$app] = $app_limit; if ($app_limit) $exportLimitStore[$app] = $app_limit;
} }
//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]); //error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);

2
api/src/Vfs.php
View File

@ -1768,7 +1768,7 @@ class Vfs extends Vfs\StreamWrapper
$extra[] = $extra_info; $extra[] = $extra_info;
} }
if (($vfs_extra = $GLOBALS['egw']->hooks->process(array( if (($vfs_extra = Hooks::process(array(
'location' => 'vfs_extra', 'location' => 'vfs_extra',
'path' => $path, 'path' => $path,
'content' => $content, 'content' => $content,

2
api/src/Vfs/Sqlfs/Utils.php
View File

@ -125,7 +125,7 @@ class Utils extends StreamWrapper
if ($check_msgs) $msgs = array_merge($msgs, $check_msgs); if ($check_msgs) $msgs = array_merge($msgs, $check_msgs);
} }
foreach ($GLOBALS['egw']->hooks->process(array( foreach (Api\Hooks::process(array(
'location' => 'fsck', 'location' => 'fsck',
'check_only' => $check_only) 'check_only' => $check_only)
) as $app_msgs) ) as $app_msgs)

10
api/src/Vfs/StreamWrapper.php
View File

@ -360,7 +360,7 @@ class StreamWrapper implements StreamWrapperIface
if (isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks)) if (isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
{ {
$GLOBALS['egw']->hooks->process(array( Api\Hooks::process(array(
'location' => str_replace('b','',$this->opened_stream_mode) == 'r' ? 'vfs_read' : 'location' => str_replace('b','',$this->opened_stream_mode) == 'r' ? 'vfs_read' :
($this->opened_stream_is_new ? 'vfs_added' : 'vfs_modified'), ($this->opened_stream_is_new ? 'vfs_added' : 'vfs_modified'),
'path' => $this->opened_stream_path, 'path' => $this->opened_stream_path,
@ -507,7 +507,7 @@ class StreamWrapper implements StreamWrapperIface
// call "vfs_unlink" hook only after successful unlink, with data from (not longer possible) stat call // call "vfs_unlink" hook only after successful unlink, with data from (not longer possible) stat call
if ($ok && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks)) if ($ok && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
{ {
$GLOBALS['egw']->hooks->process(array( Api\Hooks::process(array(
'location' => 'vfs_unlink', 'location' => 'vfs_unlink',
'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH), 'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
'url' => $url, 'url' => $url,
@ -560,7 +560,7 @@ class StreamWrapper implements StreamWrapperIface
// call "vfs_rename" hook // call "vfs_rename" hook
if ($ret && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks)) if ($ret && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
{ {
$GLOBALS['egw']->hooks->process(array( Api\Hooks::process(array(
'location' => 'vfs_rename', 'location' => 'vfs_rename',
'from' => $path_from[0] == '/' ? $path_from : self::parse_url($path_from, PHP_URL_PATH), 'from' => $path_from[0] == '/' ? $path_from : self::parse_url($path_from, PHP_URL_PATH),
'to' => $path_to[0] == '/' ? $path_to : self::parse_url($path_to, PHP_URL_PATH), 'to' => $path_to[0] == '/' ? $path_to : self::parse_url($path_to, PHP_URL_PATH),
@ -593,7 +593,7 @@ class StreamWrapper implements StreamWrapperIface
// call "vfs_mkdir" hook // call "vfs_mkdir" hook
if ($ret && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks)) if ($ret && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
{ {
$GLOBALS['egw']->hooks->process(array( Api\Hooks::process(array(
'location' => 'vfs_mkdir', 'location' => 'vfs_mkdir',
'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH), 'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
'url' => $url, 'url' => $url,
@ -631,7 +631,7 @@ class StreamWrapper implements StreamWrapperIface
// call "vfs_rmdir" hook, only after successful rmdir // call "vfs_rmdir" hook, only after successful rmdir
if ($ok && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks)) if ($ok && isset($GLOBALS['egw']) && isset($GLOBALS['egw']->hooks))
{ {
$GLOBALS['egw']->hooks->process(array( Api\Hooks::process(array(
'location' => 'vfs_rmdir', 'location' => 'vfs_rmdir',
'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH), 'path' => $path[0] == '/' ? $path : self::parse_url($path, PHP_URL_PATH),
'url' => $url, 'url' => $url,