Don't show exceptions in the iTip viewer that are in the past.

horde · Jul 29, 2014 · ea60603 · ea60603
1 parent 674e911
commit ea60603
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/imp/lib/Mime/Viewer/Itip.php b/imp/lib/Mime/Viewer/Itip.php
@@ -436,7 +436,9 @@ protected function _vEvent($vevent, $id, $method = 'PUBLISH', $components = arra
             foreach ($components as $key => $component) {
                 try {
                     if ($component->getAttribute('RECURRENCE-ID') && $component->getAttribute('UID') == $vevent->getAttribute('UID')) {
-                        $view->exceptions[] = $this->_vEventException($component, $key, $method);
+                        if ($ex = $this->_vEventException($component, $key, $method)) {
+                            $view->exceptions[] = $ex;
+                        }
                     }
                 } catch (Horde_Icalendar_Exception $e) {}
             }
@@ -545,6 +547,11 @@ protected function _vEventException($vevent, $id, $method = 'PUBLISH')
 
         try {
             $end = $vevent->getAttribute('DTEND');
+            // Check for exceptions that are over and done with.
+            $d = new Horde_Date($end);
+            if ($d->timestamp() < time()) {
+                return false;
+            }
             $view->end = is_array($end)
                 ? strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year']))
                 : strftime($prefs->getValue('date_format'), $end) . ' ' . date($prefs->getValue('twentyFour') ? ' G:i' : ' g:i a', $end);