extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

verify hook might have changed $prefs by calling read_repository --> apply changes again

Browse Source
This commit is contained in:
Ralf Becker 2014-02-21 13:45:54 +00:00
parent 1e9668bef9
commit 0270078aab
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,6 @@
if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
}
}
$backup = $prefs;
//echo "prefix='$prefix', prefs=<pre>"; print_r($repository[$appname]); echo "</pre>\n";
// the following hook can be used to verify the prefs
@ -313,20 +312,20 @@
return $error;
}
if (!$only_verify)
{
// verify hook might have changed $prefs by calling read_repository --> apply changes again
foreach($backup as $var => $value)
foreach($prefs as $var => $value)
{
$prefs[$var] = $value;
if (!$only_verify) $GLOBALS['egw']->preferences->add($appname, $var, $value, $type);
$GLOBALS['egw']->preferences->add($appname, $var, $value, $type);
}
foreach(array_diff(array_keys($prefs), array_keys($backup)) as $var)
foreach(array_diff(array_keys($GLOBALS['egw']->preferences->{$type}[$appname]), array_keys($prefs)) as $var)
{
unset($prefs[$var]);
if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
$GLOBALS['egw']->preferences->delete($appname, $var, $type);
}
$GLOBALS['egw']->preferences->save_repository(True,$type);
}
if (!$only_verify) $GLOBALS['egw']->preferences->save_repository(True,$type);
// certain common prefs (language, template, ...) require the session to be re-created
if ($appname == 'common' && !$only_verify)
{