Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 14:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now past events aren't shown at any circumstance.

Browse source
This commit is contained in:
Michael Vogel 2015-04-01 23:11:18 +02:00
parent 25299f0604
commit 97244fa487
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boot.php
View file

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