diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-01-13 17:39:53 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-01-13 17:39:53 +0000 |
| commit | 894743800af5dc4e29626704f8dbb92926ef21af (patch) | |
| tree | 8612e9f68312eb002e2f314737f6757a780ff373 | |
| parent | 37453c369598471f8b4b3f209970321af48907a7 (diff) | |
Additional timezones (patch 1389912)
git-svn-id: https://svn.roundcube.net/trunk@105 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 5 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/save_prefs.inc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index b33f8d434..ccc7871cc 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -84,12 +84,17 @@ function rcmail_user_prefs_form($attrib) $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'); diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index 16d7f2368..d78acbdb4 100644 --- a/roundcubemail/program/steps/settings/save_prefs.inc +++ b/roundcubemail/program/steps/settings/save_prefs.inc @@ -24,7 +24,7 @@ if (!is_array($a_user_prefs)) $a_user_prefs = array(); -$a_user_prefs['timezone'] = isset($_POST['_timezone']) ? (int)$_POST['_timezone'] : $CONFIG['timezone']; +$a_user_prefs['timezone'] = isset($_POST['_timezone']) ? floatval($_POST['_timezone']) : $CONFIG['timezone']; $a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize']; $a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE; |