From 1854c4525bf1fce227a8cc0fa8aad06615df0eae Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 7 May 2008 09:38:44 +0000
Subject: More code cleanup + oop-ization

---
 program/steps/settings/edit_identity.inc | 4 ++--
 program/steps/settings/func.inc          | 2 +-
 program/steps/settings/save_prefs.inc    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 0f849f172..18c5078ed 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -87,7 +87,7 @@ function rcube_identity_form($attrib)
     if (is_array($colprop))
       {
       $out = $form_start;
-      $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib, $colprop['type']); 
+      $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib + array('size' => 30), $colprop['type']); 
       return $out;
       }
     else
@@ -118,7 +118,7 @@ function rcube_identity_form($attrib)
       }
     else
       {
-      unset($attrib['size']);
+      $attrib['size'] = 40;
       unset($attrib['rows']);
       }
 
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index d2c08b875..d0bd182bb 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -47,7 +47,7 @@ function rcmail_user_prefs_form($attrib)
   // show language selection
   if (!isset($no_override['language']))
     {
-    $a_lang = rcube_list_languages();
+    $a_lang = $RCMAIL->list_languages();
     asort($a_lang);
   
     $field_id = 'rcmfd_lang';
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 8025ad8ed..53408f57d 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -38,8 +38,9 @@ foreach ((array)$CONFIG['dont_override'] as $p)
 
 
 // switch UI language
-if (isset($_POST['_language']))
-  $_SESSION['language'] = get_input_value('_language', RCUBE_INPUT_POST);
+if (isset($_POST['_language'])) {
+  $RCMAIL->load_language(get_input_value('_language', RCUBE_INPUT_POST));
+}
 
 // force min size
 if ($a_user_prefs['pagesize'] < 1)
-- 
cgit v1.2.3