From d1c22354b9b5a17dcabcd3b7ad3f9203cedc53f8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 25 Jun 2014 13:16:19 +0000 Subject: [PATCH] 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 --- preferences/inc/class.preferences_hooks.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 357b06aa1f..89e8913391 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -93,7 +93,8 @@ class preferences_hooks 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); if (empty($country)) $country = $lang; } @@ -129,7 +130,7 @@ class preferences_hooks 'size' => 3, 'xmlrpc' => True, 'admin' => False, - 'default' => 20, + 'forced' => 20, // hidden as not used in eTemplate2 ), 'template_set' => array( 'type' => 'select', @@ -139,7 +140,7 @@ class preferences_hooks 'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.', 'xmlrpc' => True, 'admin' => False, - 'forced' => 'idots', + 'forced' => file_exists(EGW_SERVER_ROOT.'/pixelegg') ? 'pixelegg' : 'idots', ), 'theme' => array( 'type' => 'select', @@ -149,7 +150,7 @@ class preferences_hooks 'help' => 'A theme defines the colors and fonts used by the template.', 'xmlrpc' => True, 'admin' => False, - 'forced' => 'idots', + 'forced' => file_exists(EGW_SERVER_ROOT.'/pixelegg') ? 'pixelegg' : 'idots', ), 'navbar_format' => array( 'type' => 'select',