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

Better handling of defaults - options can be more than key => value maps

Browse Source
This commit is contained in:
Nathan Gray 2013-11-26 18:23:14 +00:00
parent 94ce4db297
commit 085733faa1
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,11 +372,25 @@ class preferences_settings
$GLOBALS['egw']->preferences->group[$appname][$setting['name']] : $GLOBALS['egw']->preferences->group[$appname][$setting['name']] :
$GLOBALS['egw']->preferences->default[$appname][$setting['name']]; $GLOBALS['egw']->preferences->default[$appname][$setting['name']];
if (isset($setting['values']) && !is_array($setting['values'][$default]) && (string)$setting['values'][$default] !== '') if (isset($setting['values']) && !is_array($default) && (string)$setting['values'][$default] !== '')
{ {
$default = $setting['values'][$default]; if(is_array($setting['values'][$default]))
{
foreach($setting['values'] as $key => $value)
{
if($value['value'] == $default && $value['label'])
{
$default = $value['label'];
break;
}
}
}
else
{
$default = $setting['values'][$default];
}
} }
elseif (strpos($default, ',') !== false) else if (strpos($default, ',') !== false)
{ {
$default = explode(',',$default); $default = explode(',',$default);
} }