thomascube
2005-11-08 583f1c8d80c42195d0ee41f30a885e13d777b79f
program/steps/settings/func.inc
@@ -21,10 +21,9 @@
// get user record
$sql_result = $DB->query(sprintf("SELECT username, mail_host FROM %s
                                  WHERE  user_id=%d",
                                 get_table_name('users'),
                                 $_SESSION['user_id']));
$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))
  $PAGE_TITLE = sprintf('%s %s@%s', rcube_label('settingsfor'), $USER_DATA['username'], $USER_DATA['mail_host']);
@@ -35,6 +34,9 @@
  {
  global $DB, $CONFIG, $sess_user_lang;
  // add some labels to client
  rcube_add_label('nopagesizewarning');
  list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');
  unset($attrib['form']);
@@ -143,12 +145,11 @@
  // get contacts from DB
  $sql_result = $DB->query(sprintf("SELECT * FROM %s
                                    WHERE  del!='1'
                                    AND    user_id=%d
                                    ORDER BY `default` DESC, name ASC",
                                   get_table_name('identities'),
                                   $_SESSION['user_id']));
  $sql_result = $DB->query("SELECT * FROM ".get_table_name('identities')."
                            WHERE  del<>'1'
                            AND    user_id=?
                            ORDER BY ".$DB->quoteIdentifier('default')." DESC, name ASC",
                            $_SESSION['user_id']);
  // add id to message list table if not specified