extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow "settings" hook to return the settings, instead of passing it via a global variable (depricated now)

Browse Source
This commit is contained in:
Ralf Becker 2009-04-29 06:26:58 +00:00
parent b72236a663
commit af286333bf
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
preferences/inc/class.bosettings.inc.php
View File

@ -66,17 +66,27 @@
{
$this->appname = $appname;
$GLOBALS['egw']->translation->add_app($this->appname);
translation::add_app($this->appname);
if($this->appname != 'preferences')
{
$GLOBALS['egw']->translation->add_app('preferences'); // we need the prefs translations too
translation::add_app('preferences'); // we need the prefs translations too
}
if(!$GLOBALS['egw']->hooks->single('settings',$this->appname))
// calling the settings hook
$settings = $GLOBALS['egw']->hooks->single('settings',$this->appname);
// it either returns the settings or save it in $GLOBALS['settings'] (deprecated!)
if (isset($settings) && is_array($settings) && $settings)
{
return False;
$this->settings = array_merge($this->settings,$settings);
}
elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
{
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
}
else
{
return False; // no settings returned
}
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
/* Remove ui-only settings */
if($this->xmlrpc)