From f3704e18d89e4065cede8509256d7fbf483b7fe6 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 04 Apr 2006 17:46:27 -0400
Subject: [PATCH] Added labels for nextpage/previouspage

---
 program/steps/settings/func.inc |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 9b7ef00..a22ac9a 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -34,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']);
 
@@ -75,18 +78,24 @@
   $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
   $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz', '-4');
   $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+  $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
   $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
   $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
   $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
   $select_timezone->add('(GMT +1:00) Central European Time', '1');
   $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
   $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
+  $select_timezone->add('(GMT +3:30) Tehran', '3.5');
   $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
+  $select_timezone->add('(GMT +4:30) Kabul', '4.5');
   $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
+  $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
+  $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
   $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
   $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
   $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
   $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
+  $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
   $select_timezone->add('(GMT +10:00) EAST/AEST: Guam, Vladivostok', '10');
   $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
   $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
@@ -98,6 +107,14 @@
                   $field_id,
                   rep_specialchars_output(rcube_label('timezone')),
                   $select_timezone->show($CONFIG['timezone']));
+
+
+  $field_id = 'rcmfd_dst';
+  $input_dst = new checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1));
+  $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                  $field_id,
+                  rep_specialchars_output(rcube_label('dstactive')),
+                  $input_dst->show($CONFIG['dst_active']));
 
 
   // show page size selection
@@ -143,9 +160,9 @@
 
   // get contacts from DB
   $sql_result = $DB->query("SELECT * FROM ".get_table_name('identities')."
-                            WHERE  del<>'1'
+                            WHERE  del<>1
                             AND    user_id=?
-                            ORDER BY ".$DB->quoteIdentifier('default')." DESC, name ASC",
+                            ORDER BY standard DESC, name ASC",
                             $_SESSION['user_id']);
 
 

--
Gitblit v1.9.1