extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- moved user timezone list to egw_time

Browse Source 
- added standard widget to select timezones
- modified egw_time::server2user and ::user2server to return NULL, if
  time can not be parsed, not throwing an exception (as this are legacy
  function meant to easy convert existing code, eg. replace strtotime())
This commit is contained in:
Ralf Becker 2009-11-01 12:48:25 +00:00
parent 867636861e
commit 0a4c2614a5
3 changed files with 90 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.select_widget.inc.php
View File

@ -49,6 +49,7 @@ class select_widget
'select-app' => 'Select Application',
'select-lang' => 'Select Language',
'select-bool' => 'Select yes or no',
'select-timezone' => 'Select timezone', // select timezone
);
/**
* @var array
@ -432,10 +433,15 @@ class select_widget
$cell['sel_options'][$app] = $apps[$app];
}
break;
case 'select-lang':
$cell['sel_options'] = $GLOBALS['egw']->translation->list_langs();
$cell['sel_options'] = translation::list_langs();
$cell['no_lang'] = True;
break;
break;
case 'select-timezone': // options: #rows,$type
$cell['sel_options'] = $type ? egw_time::getTimezones() : egw_time::getUserTimezones($value);
break;
}
if ($rows > 1)
{

14
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -340,17 +340,11 @@ abstract class egw_framework
$now = new egw_time();
$user_info = '<b>'.common::display_fullname() .'</b>'. ' - ' . lang($now->format('l')) . ' ' . $now->format(true);
$tz = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz']);
$tz_selection = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
if (count($tz_selection) > 1)
$user_tzs = egw_time::getUserTimezones();
if (count($user_tzs) > 1)
{
if (!in_array($tz,$tz_selection)) $tz_selection = array_merge((array)$tz,$tz_selection);
$tz_selection = array_combine($tz_selection,$tz_selection);
foreach($tz_selection as $name => &$label)
{
$label = str_replace(array('_','/'),array(' ',' / '),$label);
}
$user_info .= html::form(html::select('tz',$tz,$tz_selection,true,' onchange="this.form.submit();"'),array(),
$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
$user_info .= html::form(html::select('tz',$tz,$user_tzs,true,' onchange="this.form.submit();"'),array(),
'/index.php','','tz_selection',' style="display: inline;"','GET');
}
return $user_info;

94
phpgwapi/inc/class.egw_time.inc.php
View File

@ -33,6 +33,9 @@
* keys: ('year', 'month', 'day') or 'full' plus 'hour', 'minute' and optional 'second' or a DateTime object as parameter.
* It defaults to user-time, not server time as DateTime!
*
* The constructor itself throws an Exception in that case (to be precise it does not handle the one thrown by DateTime constructor).
* Static methods server2user, user2server and to return NULL, if given time could not be parsed.
*
* @link http://www.php.net/manual/en/class.datetime.php
* @link http://www.php.net/manual/en/class.datetimezone.php
*/
@ -77,6 +80,7 @@ class egw_time extends DateTime
* array with values for keys('year','month','day') or 'full' plus 'hour','minute' and optional 'second'
* @param DateTimeZone $tz=null timezone, default user time (PHP DateTime default to server time!)
* @param string &$type=null on return type of $time (optional)
* @throws Exception if $time can NOT be parsed
* @return egw_time
*/
public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
@ -245,13 +249,6 @@ class egw_time extends DateTime
*/
public function __toString()
{
$tz = $this->getTimezone();
if (!$tz)
{
ob_start();
debug_print_backtrace();
error_log(ob_get_clean());
}
return $this->format(self::DATABASE);
}
@ -260,11 +257,21 @@ class egw_time extends DateTime
*
* @param int|string|array|DateTime $time
* @param string $type=null type or return-value, default (null) same as $time
* @return int|string|array|datetime
* @return int|string|array|datetime null if time could not be parsed
*/
public static function server2user($time,$type=null)
{
if (!is_a($time,$typeof='egw_time')) $time = new egw_time($time,self::$server_timezone,$typeof);
if (!is_a($time,$typeof='egw_time'))
{
try
{
$time = new egw_time($time,self::$server_timezone,$typeof);
}
catch(Exception $e)
{
return null; // time could not be parsed
}
}
$time->setUser();
if (is_null($type)) $type = $typeof;
@ -278,11 +285,21 @@ class egw_time extends DateTime
*
* @param int|string|array|datetime $time
* @param string $type=null type or return-value, default (null) same as $time
* @return int|string|array|datetime
* @return int|string|array|datetime null if time could not be parsed
*/
public static function user2server($time,$type=null)
{
if (!is_a($time,$typeof='egw_time')) $time = new egw_time($time,self::$user_timezone,$typeof);
if (!is_a($time,$typeof='egw_time'))
{
try
{
$time = new egw_time($time,self::$user_timezone,$typeof);
}
catch(Exception $e)
{
return null; // time could not be parsed
}
}
$time->setServer();
if (is_null($type)) $type = $typeof;
@ -298,12 +315,21 @@ class egw_time extends DateTime
* @param string $type='' 'integer'|'ts'=timestamp, 'server'=timestamp in servertime, 'string'='Y-m-d H:i:s', 'object'=DateTime,
* 'array'=array with values for keys ('year','month','day','hour','minute','second','full','raw') or string with format
* true = date only, false = time only as in user prefs, '' = date+time as in user prefs
* @return int|string|array|datetime see $type
* @return int|string|array|datetime see $type, null if time could not be parsed
*/
public static function to($time='now',$type='')
{
if (!is_a($time,'egw_time')) $time = new egw_time($time);
if (!is_a($time,'egw_time'))
{
try
{
$time = new egw_time($time);
}
catch(Exception $e)
{
return null; // time could not be parsed
}
}
return $time->format($type);
}
@ -419,7 +445,7 @@ class egw_time extends DateTime
unset($data);
// if user lang or installed langs contain a european language --> move Europe to top of tz list
$langs = $GLOBALS['egw']->translation->get_installed_langs();
$langs = translation::get_installed_langs();
if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs),
array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk')))
{
@ -427,9 +453,45 @@ class egw_time extends DateTime
}
return $tzs;
}
/**
* Get user timezones (the ones user selected in his prefs), plus evtl. an extra one
*
* @param string $extra extra timezone to add, if not already included in user timezones
* @return array tzid => label
*/
public static function getUserTimezones($extra=null)
{
$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
$user_tzs = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
if (count($user_tzs) <= 1)
{
$user_tzs = $tz ? array($tz) : array();
}
if ($tz && !in_array($tz,$user_tzs))
{
$user_tzs = array_merge(array($tz),$user_tzs);
}
if (!$user_tzs) // if we have no user timezones, eg. user set no pref --> use server default
{
$user_tzs = array(date_default_timezone_get());
}
if ($extra && !in_array($extra,$user_tzs))
{
$user_tzs = array_merge(array($extra),$user_tzs);
}
$user_tzs = array_combine($user_tzs,$user_tzs);
foreach($user_tzs as $name => &$label)
{
$label = str_replace(array('_','/'),array(' ',' / '),$label);
}
//_debug_array($user_tzs);
return $user_tzs;
}
}
egw_time::init();
/*
if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) // some tests
{
// test timestamps/dates before 1970
@ -459,4 +521,4 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
$ts = egw_time::to(array('full' => '20090627', 'hour' => 10, 'minute' => 0),'ts');
echo "<p>2009-06-27 10h UTC timestamp=$ts --> server time = ".egw_time::user2server($ts,'')." --> user time = ".egw_time::server2user(egw_time::user2server($ts),'')."</p>\n";
}
*/