From 97366b10798c6e3301c1d60d63d9091e83a1e6a7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 03 Mar 2008 16:48:53 -0500
Subject: [PATCH] Also fix timezone dropdown for 0.1.-stable branch
---
program/steps/settings/func.inc | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index ec9001f..a0666cd 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -20,13 +20,8 @@
*/
-// get user record
-$sql_result = $DB->query("SELECT username, mail_host FROM ".get_table_name('users')."
- WHERE user_id=?",
- $_SESSION['user_id']);
-
-if ($USER_DATA = $DB->fetch_assoc($sql_result))
- $OUTPUT->set_pagetitle(sprintf('%s %s@%s', rcube_label('settingsfor'), $USER_DATA['username'], $USER_DATA['mail_host']));
+if ($USER->ID)
+ $OUTPUT->set_pagetitle(rcube_label('settingsfor') . " ". $USER->get_username());
@@ -107,7 +102,7 @@
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$field_id,
Q(rcube_label('timezone')),
- $select_timezone->show($CONFIG['timezone']));
+ $select_timezone->show((string)$CONFIG['timezone']));
}
// daylight savings
@@ -202,16 +197,7 @@
function rcmail_identities_list($attrib)
{
- global $DB, $CONFIG, $OUTPUT;
-
-
- // get contacts from DB
- $sql_result = $DB->query("SELECT * FROM ".get_table_name('identities')."
- WHERE del<>1
- AND user_id=?
- ORDER BY standard DESC, name ASC",
- $_SESSION['user_id']);
-
+ global $OUTPUT, $USER;
// add id to message list table if not specified
if (!strlen($attrib['id']))
@@ -221,7 +207,7 @@
$a_show_cols = array('name', 'email', 'organization', 'reply-to');
// create XHTML table
- $out = rcube_table_output($attrib, $sql_result, $a_show_cols, 'identity_id');
+ $out = rcube_table_output($attrib, $USER->list_identities(), $a_show_cols, 'identity_id');
// set client env
$OUTPUT->add_gui_object('identitieslist', $attrib['id']);
@@ -268,7 +254,8 @@
// register UI objects
$OUTPUT->add_handlers(array(
'userprefs' => 'rcmail_user_prefs_form',
- 'itentitieslist' => 'rcmail_identities_list'
+ 'identitieslist' => 'rcmail_identities_list',
+ 'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility
));
--
Gitblit v1.9.1