holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix parsing date/times containing timezone, they are not in server-time, but in timezone specified in their value

Browse Source
This commit is contained in:
Ralf Becker 2014-09-30 11:56:11 +00:00
parent b831d2c593
commit 78930b743c
1 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -3413,27 +3413,34 @@ class emailadmin_imapbase
} }
/** /**
* Helper function to handle wrong or unrecognized timezones * Parse dates, also handle wrong or unrecognized timezones, falling back to current time
* returns the date as it is parseable by strtotime, or current timestamp if everything failes *
* @param string date to be parsed/formatted * @param string $_date to be parsed/formatted
* @param string format string, if none is passed, use the users common dateformat supplemented by the time hour:minute:second * @param string $format ='' if none is passed, use user prefs
* @return string returns the date as it is parseable by strtotime, or current timestamp if everything failes * @return string returns the date as it is parseable by strtotime, or current timestamp if everything fails
*/ */
static function _strtotime($date='',$format=NULL,$convert2usertime=false) static function _strtotime($_date='', $format='', $convert2usertime=false)
{ {
if ($format==NULL) $format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12?'h:i:s a':'H:i:s'); try {
$date2return = ($convert2usertime ? egw_time::server2user($date,$format) : egw_time::to($date,$format)); $date = new egw_time($_date); // parse date & time including timezone (throws exception, if not parsable)
if ($date2return==null) if ($convert2usertime) $date->setUser(); // convert to user-time
{ $date2return = $date->format($format);
$dtarr = explode(' ',$date); }
$test = null; catch(Exception $e)
while ($test===null && count($dtarr)>=1) {
{ unset($e); // not used
array_pop($dtarr);
$test= ($convert2usertime ? egw_time::server2user(implode(' ',$dtarr),$format): egw_time::to(implode(' ',$dtarr),$format)); // remove last space-separated part and retry
if ($test) $date2return = $test; $parts = explode(' ',$_date);
if (count($parts) > 1)
{
array_pop($parts);
$date2return = self::_strtotime(implode(' ', $parts), $format, $convert2usertime);
}
else // not last part, use current time
{
$date2return = egw_time::to('now', $format);
} }
if ($test===null) $date2return = egw_time::to('now',$format);
} }
return $date2return; return $date2return;
} }
@ -3442,38 +3449,16 @@ class emailadmin_imapbase
* htmlentities * htmlentities
* helperfunction to cope with wrong encoding in strings * helperfunction to cope with wrong encoding in strings
* @param string $_string input to be converted * @param string $_string input to be converted
* @param mixed $charset false or string -> Target charset, if false emailadmin_imapbase displayCharset will be used * @param mixed $_charset false or string -> Target charset, if false emailadmin_imapbase displayCharset will be used
* @return string * @return string
*/ */
static function htmlentities($_string, $_charset=false) static function htmlentities($_string, $_charset=false)
{ {
//setting the charset (if not given) //setting the charset (if not given)
if ($_charset===false) $_charset = self::$displayCharset; if ($_charset===false) $_charset = self::$displayCharset;
$_stringORG = $_string; $string = @htmlentities($_string, ENT_QUOTES, $_charset, false);
$_string = @htmlentities($_string,ENT_QUOTES,$_charset, false); if (empty($string) && !empty($_string)) $string = @htmlentities(translation::convert($_string,translation::detect_encoding($_string),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
if (empty($_string) && !empty($_stringORG)) $_string = @htmlentities(translation::convert($_stringORG,translation::detect_encoding($_stringORG),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false); return $string;
return $_string;
}
/**
* htmlspecialchars
* helperfunction to cope with wrong encoding in strings;
* seems to be outdated and not needed any more for et2
* @param string $_string input to be converted
* @param mixed $charset false or string -> Target charset, if false mail displayCharset will be used
* @return string
*/
static function htmlspecialchars($_string, $_charset=false)
{
return $_string;
/*
//setting the charset (if not given)
if ($_charset===false) $_charset = self::$displayCharset;
$_stringORG = $_string;
$_string = @htmlspecialchars($_string,ENT_QUOTES,$_charset, false);
if (empty($_string) && !empty($_stringORG)) $_string = @htmlspecialchars(translation::convert($_stringORG,translation::detect_encoding($_stringORG),$_charset),ENT_QUOTES | ENT_IGNORE,$_charset, false);
return $_string;
*/
} }
/** /**