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

setting Pixelegg template (if available) as forced preference, hidding/forcing maxmatches as it is no longer used in eTemplate2 and fixing not working propagation of language from setup

Browse Source
This commit is contained in:
Ralf Becker 2014-06-25 13:16:19 +00:00
parent d2bc16c79b
commit d1c22354b9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
preferences/inc/class.preferences_hooks.inc.php
View File

@ -93,7 +93,8 @@ class preferences_hooks
if ($hook_data['setup']) // called via setup if ($hook_data['setup']) // called via setup
{ {
$lang = get_var('ConfigLang',Array('POST','COOKIE'),'en'); $lang = setup::get_lang();
if (empty($lang)) $lang = 'en';
list(,$country) = explode('-',$lang); list(,$country) = explode('-',$lang);
if (empty($country)) $country = $lang; if (empty($country)) $country = $lang;
} }
@ -129,7 +130,7 @@ class preferences_hooks
'size' => 3, 'size' => 3,
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'default' => 20, 'forced' => 20, // hidden as not used in eTemplate2
), ),
'template_set' => array( 'template_set' => array(
'type' => 'select', 'type' => 'select',
@ -139,7 +140,7 @@ class preferences_hooks
'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.', 'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'idots', 'forced' => file_exists(EGW_SERVER_ROOT.'/pixelegg') ? 'pixelegg' : 'idots',
), ),
'theme' => array( 'theme' => array(
'type' => 'select', 'type' => 'select',
@ -149,7 +150,7 @@ class preferences_hooks
'help' => 'A theme defines the colors and fonts used by the template.', 'help' => 'A theme defines the colors and fonts used by the template.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'idots', 'forced' => file_exists(EGW_SERVER_ROOT.'/pixelegg') ? 'pixelegg' : 'idots',
), ),
'navbar_format' => array( 'navbar_format' => array(
'type' => 'select', 'type' => 'select',