From: Michael Vogel <icarus@dabo.de>
Date: Wed, 1 Apr 2015 21:11:18 +0000 (+0200)
Subject: Now past events aren't shown at any circumstance.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=97244fa48701334f2c54cdc685e31b562d0aa51c;p=friendica.git

Now past events aren't shown at any circumstance.
---

diff --git a/boot.php b/boot.php
index 5db214c9f3..bcbd312bc0 100644
--- a/boot.php
+++ b/boot.php
@@ -1833,8 +1833,8 @@ if(! function_exists('get_events')) {
 				WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
 				ORDER BY `start` ASC ",
 				intval(local_user()),
-				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-				dbesc(date("Y-m-d 00:00:00"))
+				dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+				dbesc(datetime_convert('UTC','UTC','now - 1 days'))
 		);
 
 		if($r && count($r)) {
@@ -1850,6 +1850,7 @@ if(! function_exists('get_events')) {
 			}
 			$classtoday = (($istoday) ? 'event-today' : '');
 
+			$skip = 0;
 
 			foreach($r as &$rr) {
 				if($rr['adjust'])
@@ -1863,6 +1864,12 @@ if(! function_exists('get_events')) {
 					$title = t('[No description]');
 
 				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+
+				if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+					$skip++;
+					continue;
+				}
+
 				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
 
 				$rr['link'] = $md;
@@ -1877,7 +1884,7 @@ if(! function_exists('get_events')) {
 		return replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
 			'$classtoday' => $classtoday,
-			'$count' => count($r),
+			'$count' => count($r) - $skip,
 			'$event_reminders' => t('Event Reminders'),
 			'$event_title' => t('Events this week:'),
 			'$events' => $r,