From 31278471d3f2b882e28e01184814f3edc69973bf Mon Sep 17 00:00:00 2001 From: thomascube Date: Fri, 21 Jan 2011 16:50:07 +0000 Subject: Use improved strtotime() function + reduce duplicated code --- program/include/rcube_imap_generic.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'program/include/rcube_imap_generic.php') diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 6bebd8c7b..b4f01a9e2 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -3223,21 +3223,7 @@ class rcube_imap_generic */ private function strToTime($date) { - // support non-standard "GMTXXXX" literal - $date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date); - // if date parsing fails, we have a date in non-rfc format. - // remove token from the end and try again - while ((($ts = @strtotime($date))===false) || ($ts < 0)) { - $d = explode(' ', $date); - array_pop($d); - if (!$d) { - break; - } - $date = implode(' ', $d); - } - - $ts = (int) $ts; - + $ts = (int) rcube_strtotime($date); return $ts < 0 ? 0 : $ts; } -- cgit v1.2.3