diff --git a/include/client/profile.inc.php b/include/client/profile.inc.php
index 6326d44b0296ec01fcc5bee8d814447455e7ca42..e981769e4eed2719ad5114af068b36241c771a25 100644
--- a/include/client/profile.inc.php
+++ b/include/client/profile.inc.php
@@ -20,23 +20,23 @@ if ($acct = $thisclient->getAccount()) {
</div>
</td>
</tr>
- <td><?php echo __('Time Zone'); ?>:</td>
- <td>
- <select name="timezone_id" id="timezone_id">
- <option value="0">— <?php echo __('Select Time Zone'); ?> —</option>
- <?php
- $sql='SELECT id, offset,timezone FROM '.TIMEZONE_TABLE.' ORDER BY id';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$offset, $tz)=db_fetch_row($res)){
- $sel=($info['timezone_id']==$id)?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>GMT %s - %s</option>',$id,$sel,$offset,$tz);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['timezone_id']; ?></span>
- </td>
-</tr>
+ <tr>
+ <td width="180">
+ <?php echo __('Time Zone');?>:
+ </td>
+ <td>
+ <select name="timezone" multiple="multiple" id="timezone-dropdown">
+ <option value=""><?php echo __('System Default'); ?></option>
+<?php foreach (DateTimeZone::listIdentifiers() as $zone) { ?>
+ <option value="<?php echo $zone; ?>" <?php
+ if ($info['timezone'] == $zone)
+ echo 'selected="selected"';
+ ?>><?php echo $zone; ?></option>
+<?php } ?>
+ </select>
+ <div class="error"><?php echo $errors['timezone']; ?></div>
+ </td>
+ </tr>
<tr>
<td width="180">
<?php echo __('Preferred Language'); ?>:
@@ -101,3 +101,17 @@ $selected = ($info['lang'] == $l['code']) ? 'selected="selected"' : ''; ?>
window.location.href='index.php';"/>
</p>
</form>
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.css"/>
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.filter.css"/>
+<script type="text/javascript" src="<?php echo ROOT_PATH; ?>/js/jquery.multiselect.filter.min.js"></script>
+<script type="text/javascript">
+$('#timezone-dropdown').multiselect({
+ multiple: false,
+ header: <?php echo JsonDataEncoder::encode(__('Time Zones')); ?>,
+ noneSelectedText: <?php echo JsonDataEncoder::encode(__('System Default')); ?>,
+ selectedList: 1,
+ minWidth: 400
+}).multiselectfilter({
+ placeholder: <?php echo JsonDataEncoder::encode(__('Search')); ?>
+});
+</script>
diff --git a/include/client/register.inc.php b/include/client/register.inc.php
index 1280dcce9d8d481f6dbaf0f74e12b0f52eb591ad..c1923685fb82c9b0a2017a726120ea1cde1d2c86 100644
--- a/include/client/register.inc.php
+++ b/include/client/register.inc.php
@@ -1,8 +1,7 @@
<?php
$info = $_POST;
-if (!isset($info['timezone_id']))
+if (!isset($info['timezone']))
$info += array(
- 'timezone' => $cfg->getDefaultTimezone(),
'backend' => null,
);
if (isset($user) && $user instanceof ClientCreateRequest) {
@@ -36,22 +35,23 @@ $info = Format::htmlchars(($errors && $_POST)?$_POST:$info);
</div>
</td>
</tr>
- <td><?php echo __('Time Zone'); ?>:</td>
- <td>
- <select name="timezone_id" id="timezone_id">
- <?php
- $sql='SELECT id, offset,timezone FROM '.TIMEZONE_TABLE.' ORDER BY id';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$offset, $tz)=db_fetch_row($res)){
- $sel=($info['timezone_id']==$id)?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>GMT %s - %s</option>',$id,$sel,$offset,$tz);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['timezone_id']; ?></span>
- </td>
-</tr>
+ <tr>
+ <td width="180">
+ <?php echo __('Time Zone');?>:
+ </td>
+ <td>
+ <select name="timezone" multiple="multiple" id="timezone-dropdown">
+ <option value=""><?php echo __('System Default'); ?></option>
+<?php foreach (DateTimeZone::listIdentifiers() as $zone) { ?>
+ <option value="<?php echo $zone; ?>" <?php
+ if ($info['timezone'] == $zone)
+ echo 'selected="selected"';
+ ?>><?php echo $zone; ?></option>
+<?php } ?>
+ </select>
+ <div class="error"><?php echo $errors['timezone']; ?></div>
+ </td>
+ </tr>
<tr>
<td colspan=2">
<div><hr><h3><?php echo __('Access Credentials'); ?></h3></div>
@@ -102,4 +102,28 @@ $info = Format::htmlchars(($errors && $_POST)?$_POST:$info);
window.location.href='index.php';"/>
</p>
</form>
-
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.css"/>
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.filter.css"/>
+<script type="text/javascript" src="<?php echo ROOT_PATH; ?>/js/jquery.multiselect.filter.min.js"></script>
+<script type="text/javascript">
+$('#timezone-dropdown').multiselect({
+ multiple: false,
+ header: <?php echo JsonDataEncoder::encode(__('Time Zones')); ?>,
+ noneSelectedText: <?php echo JsonDataEncoder::encode(__('System Default')); ?>,
+ selectedList: 1,
+ minWidth: 400
+}).multiselectfilter({
+ placeholder: <?php echo JsonDataEncoder::encode(__('Search')); ?>
+});
+</script>
+<?php if (!isset($info['timezone'])) { ?>
+<!-- Auto detect client's timezone where possible -->
+<script type="text/javascript" src="<?php echo ROOT_PATH; ?>/js/jstz.min.js"></script>
+<script type="text/javascript">
+$(function() {
+ var zone = jstz.determine();
+ $('#timezone-dropdown').multiselect('widget').find('[value="' + zone.name() + '"]')
+ .each(function() { console.log(this); $(this).click(); });
+});
+</script>
+<?php }
diff --git a/include/staff/templates/user-account.tmpl.php b/include/staff/templates/user-account.tmpl.php
index ef3c9eb3d6f1bed7996b8ac449fc1d901f50427f..da83774ea2654cd600744efb2ebbd3cd54e9c95c 100644
--- a/include/staff/templates/user-account.tmpl.php
+++ b/include/staff/templates/user-account.tmpl.php
@@ -60,30 +60,22 @@ if ($info['error']) {
<tbody>
<tr>
<th colspan="2"><em><strong><?php echo __('User Preferences'); ?></strong></em></th>
- </tr>
- <td><?php echo __('Time Zone'); ?>:</td>
- <td>
- <select name="timezone_id" id="timezone_id">
- <?php
- $sql='SELECT id, offset,timezone FROM '.TIMEZONE_TABLE.' ORDER BY id';
- if(($res=db_query($sql)) && db_num_rows($res)){
- while(list($id,$offset, $tz)=db_fetch_row($res)){
- $sel=($info['timezone_id']==$id)?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>GMT %s - %s</option>',$id,$sel,$offset,$tz);
- }
- }
- ?>
- </select>
- <span class="error"><?php echo $errors['timezone_id']; ?></span>
- </td>
</tr>
<tr>
<td width="180">
- <?php echo __('Daylight Saving'); ?>:
+ <?php echo __('Time Zone');?>:
</td>
<td>
- <input type="checkbox" name="dst" value="1" <?php echo $info['dst']?'checked="checked"':''; ?>>
- <?php echo __('Observe daylight saving'); ?>
+ <select name="timezone" multiple="multiple" id="timezone-dropdown">
+ <option value=""><?php echo __('System Default'); ?></option>
+ <?php foreach (DateTimeZone::listIdentifiers() as $zone) { ?>
+ <option value="<?php echo $zone; ?>" <?php
+ if ($info['timezone'] == $zone)
+ echo 'selected="selected"';
+ ?>><?php echo $zone; ?></option>
+ <?php } ?>
+ </select>
+ <div class="error"><?php echo $errors['timezone']; ?></div>
</td>
</tr>
</tbody>
@@ -110,7 +102,7 @@ if ($info['error']) {
data-content="<?php echo sprintf('%s: %s',
__('Users can always sign in with their email address'),
$user->getEmail()); ?>"></i>
- <div class="error"> <?php echo $errors['username']; ?></div>
+ <div class="error"><?php echo $errors['username']; ?></div>
</td>
</tr>
<tr>
@@ -170,6 +162,9 @@ if ($info['error']) {
</p>
</form>
<div class="clear"></div>
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.css"/>
+<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>/css/jquery.multiselect.filter.css"/>
+<script type="text/javascript" src="<?php echo ROOT_PATH; ?>/js/jquery.multiselect.filter.min.js"></script>
<script type="text/javascript">
$(function() {
$(document).on('click', 'input#sendemail', function(e) {
@@ -179,4 +174,13 @@ $(function() {
$('tbody#password').show();
});
});
+$('#timezone-dropdown').multiselect({
+ multiple: false,
+ header: <?php echo JsonDataEncoder::encode(__('Time Zones')); ?>,
+ noneSelectedText: <?php echo JsonDataEncoder::encode(__('System Default')); ?>,
+ selectedList: 1,
+ minWidth: 400
+}).multiselectfilter({
+ placeholder: <?php echo JsonDataEncoder::encode(__('Search')); ?>
+});
</script>
diff --git a/js/jstz.min.js b/js/jstz.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..d457648ef4b460c19b85427f6d95f74431241306
--- /dev/null
+++ b/js/jstz.min.js
@@ -0,0 +1,2 @@
+/*! jstz - v1.0.4 - 2012-12-18 */
+(function(e){var t=function(){"use strict";var e="s",n=function(e){var t=-e.getTimezoneOffset();return t!==null?t:0},r=function(e,t,n){var r=new Date;return e!==undefined&&r.setFullYear(e),r.setDate(n),r.setMonth(t),r},i=function(e){return n(r(e,0,2))},s=function(e){return n(r(e,5,2))},o=function(e){var t=e.getMonth()>7?s(e.getFullYear()):i(e.getFullYear()),r=n(e);return t-r!==0},u=function(){var t=i(),n=s(),r=i()-s();return r<0?t+",1":r>0?n+",1,"+e:t+",0"},a=function(){var e=u();return new t.TimeZone(t.olson.timezones[e])},f=function(e){var t=new Date(2010,6,15,1,0,0,0),n={"America/Denver":new Date(2011,2,13,3,0,0,0),"America/Mazatlan":new Date(2011,3,3,3,0,0,0),"America/Chicago":new Date(2011,2,13,3,0,0,0),"America/Mexico_City":new Date(2011,3,3,3,0,0,0),"America/Asuncion":new Date(2012,9,7,3,0,0,0),"America/Santiago":new Date(2012,9,3,3,0,0,0),"America/Campo_Grande":new Date(2012,9,21,5,0,0,0),"America/Montevideo":new Date(2011,9,2,3,0,0,0),"America/Sao_Paulo":new Date(2011,9,16,5,0,0,0),"America/Los_Angeles":new Date(2011,2,13,8,0,0,0),"America/Santa_Isabel":new Date(2011,3,5,8,0,0,0),"America/Havana":new Date(2012,2,10,2,0,0,0),"America/New_York":new Date(2012,2,10,7,0,0,0),"Asia/Beirut":new Date(2011,2,27,1,0,0,0),"Europe/Helsinki":new Date(2011,2,27,4,0,0,0),"Europe/Istanbul":new Date(2011,2,28,5,0,0,0),"Asia/Damascus":new Date(2011,3,1,2,0,0,0),"Asia/Jerusalem":new Date(2011,3,1,6,0,0,0),"Asia/Gaza":new Date(2009,2,28,0,30,0,0),"Africa/Cairo":new Date(2009,3,25,0,30,0,0),"Pacific/Auckland":new Date(2011,8,26,7,0,0,0),"Pacific/Fiji":new Date(2010,11,29,23,0,0,0),"America/Halifax":new Date(2011,2,13,6,0,0,0),"America/Goose_Bay":new Date(2011,2,13,2,1,0,0),"America/Miquelon":new Date(2011,2,13,5,0,0,0),"America/Godthab":new Date(2011,2,27,1,0,0,0),"Europe/Moscow":t,"Asia/Yekaterinburg":t,"Asia/Omsk":t,"Asia/Krasnoyarsk":t,"Asia/Irkutsk":t,"Asia/Yakutsk":t,"Asia/Vladivostok":t,"Asia/Kamchatka":t,"Europe/Minsk":t,"Australia/Perth":new Date(2008,10,1,1,0,0,0)};return n[e]};return{determine:a,date_is_dst:o,dst_start_for:f}}();t.TimeZone=function(e){"use strict";var n={"America/Denver":["America/Denver","America/Mazatlan"],"America/Chicago":["America/Chicago","America/Mexico_City"],"America/Santiago":["America/Santiago","America/Asuncion","America/Campo_Grande"],"America/Montevideo":["America/Montevideo","America/Sao_Paulo"],"Asia/Beirut":["Asia/Beirut","Europe/Helsinki","Europe/Istanbul","Asia/Damascus","Asia/Jerusalem","Asia/Gaza"],"Pacific/Auckland":["Pacific/Auckland","Pacific/Fiji"],"America/Los_Angeles":["America/Los_Angeles","America/Santa_Isabel"],"America/New_York":["America/Havana","America/New_York"],"America/Halifax":["America/Goose_Bay","America/Halifax"],"America/Godthab":["America/Miquelon","America/Godthab"],"Asia/Dubai":["Europe/Moscow"],"Asia/Dhaka":["Asia/Yekaterinburg"],"Asia/Jakarta":["Asia/Omsk"],"Asia/Shanghai":["Asia/Krasnoyarsk","Australia/Perth"],"Asia/Tokyo":["Asia/Irkutsk"],"Australia/Brisbane":["Asia/Yakutsk"],"Pacific/Noumea":["Asia/Vladivostok"],"Pacific/Tarawa":["Asia/Kamchatka"],"Africa/Johannesburg":["Asia/Gaza","Africa/Cairo"],"Asia/Baghdad":["Europe/Minsk"]},r=e,i=function(){var e=n[r],i=e.length,s=0,o=e[0];for(;s<i;s+=1){o=e[s];if(t.date_is_dst(t.dst_start_for(o))){r=o;return}}},s=function(){return typeof n[r]!="undefined"};return s()&&i(),{name:function(){return r}}},t.olson={},t.olson.timezones={"-720,0":"Etc/GMT+12","-660,0":"Pacific/Pago_Pago","-600,1":"America/Adak","-600,0":"Pacific/Honolulu","-570,0":"Pacific/Marquesas","-540,0":"Pacific/Gambier","-540,1":"America/Anchorage","-480,1":"America/Los_Angeles","-480,0":"Pacific/Pitcairn","-420,0":"America/Phoenix","-420,1":"America/Denver","-360,0":"America/Guatemala","-360,1":"America/Chicago","-360,1,s":"Pacific/Easter","-300,0":"America/Bogota","-300,1":"America/New_York","-270,0":"America/Caracas","-240,1":"America/Halifax","-240,0":"America/Santo_Domingo","-240,1,s":"America/Santiago","-210,1":"America/St_Johns","-180,1":"America/Godthab","-180,0":"America/Argentina/Buenos_Aires","-180,1,s":"America/Montevideo","-120,0":"Etc/GMT+2","-120,1":"Etc/GMT+2","-60,1":"Atlantic/Azores","-60,0":"Atlantic/Cape_Verde","0,0":"Etc/UTC","0,1":"Europe/London","60,1":"Europe/Berlin","60,0":"Africa/Lagos","60,1,s":"Africa/Windhoek","120,1":"Asia/Beirut","120,0":"Africa/Johannesburg","180,0":"Asia/Baghdad","180,1":"Europe/Moscow","210,1":"Asia/Tehran","240,0":"Asia/Dubai","240,1":"Asia/Baku","270,0":"Asia/Kabul","300,1":"Asia/Yekaterinburg","300,0":"Asia/Karachi","330,0":"Asia/Kolkata","345,0":"Asia/Kathmandu","360,0":"Asia/Dhaka","360,1":"Asia/Omsk","390,0":"Asia/Rangoon","420,1":"Asia/Krasnoyarsk","420,0":"Asia/Jakarta","480,0":"Asia/Shanghai","480,1":"Asia/Irkutsk","525,0":"Australia/Eucla","525,1,s":"Australia/Eucla","540,1":"Asia/Yakutsk","540,0":"Asia/Tokyo","570,0":"Australia/Darwin","570,1,s":"Australia/Adelaide","600,0":"Australia/Brisbane","600,1":"Asia/Vladivostok","600,1,s":"Australia/Sydney","630,1,s":"Australia/Lord_Howe","660,1":"Asia/Kamchatka","660,0":"Pacific/Noumea","690,0":"Pacific/Norfolk","720,1,s":"Pacific/Auckland","720,0":"Pacific/Tarawa","765,1,s":"Pacific/Chatham","780,0":"Pacific/Tongatapu","780,1,s":"Pacific/Apia","840,0":"Pacific/Kiritimati"},typeof exports!="undefined"?exports.jstz=t:e.jstz=t})(this);
\ No newline at end of file
diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql
index b0b3e6deacdbf5d64e017cb616992209e8b5cd29..1e9194372df071f7ed4577b2ef6987ce2911e145 100644
--- a/setup/inc/streams/core/install-mysql.sql
+++ b/setup/inc/streams/core/install-mysql.sql
@@ -818,7 +818,7 @@ CREATE TABLE `%TABLE_PREFIX%user_account` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user_id` int(10) unsigned NOT NULL,
`status` int(11) unsigned NOT NULL DEFAULT '0',
- `timezone` varchar(24) DEFAULT NULL,
+ `timezone` varchar(64) DEFAULT NULL,
`lang` varchar(16) DEFAULT NULL,
`username` varchar(64) DEFAULT NULL,
`passwd` varchar(128) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL,