holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check if we have a default/forced value from the settings hook,

Browse Source 
which is NOT stored as default currently
--> store it as default, to allow to propagate defaults to existing installations
This commit is contained in:
Ralf Becker 2010-06-24 07:02:40 +00:00
parent 8e98f6cea3
commit 0ca8c89bdd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,28 @@
$this->settings = array_merge($this->settings,$GLOBALS['settings']);
}
}
// check if we have a default/forced value from the settings hook,
// which is NOT stored as default currently
// --> store it as default, to allow to propagate defaults to existing installations
if ($appname == 'preferences') $appname = 'common';
foreach ($this->settings as $name => $data)
{
if ((string)$GLOBALS['egw']->preferences->default[$appname][$name] === '' &&
((string)$data['default'] !== '' || (string)$data['forced'] !== ''))
{
$default = (string)$data['forced'] !== '' ? $data['forced'] : $data['default'];
//echo "<p>".__METHOD__."($appname) $this->appname/$appname/$name=$default NOT yet set!</p>\n";
$GLOBALS['egw']->preferences->default[$appname][$name] = $default;
$need_update = true;
}
}
if ($need_update)
{
$GLOBALS['egw']->preferences->save_repository(false,'default',true);
}
if($this->debug)
{
// _debug_array($this->settings);
_debug_array($this->settings);
}
return True;
}