From 4ea6f86b2089e0468139890a42cb5157f804c26e Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 24 Oct 2011 22:07:42 -0700 Subject: [PATCH] bug #166 --- boot.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ mod/network.php | 4 +++- mod/profile.php | 4 +++- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 86a37ce90b..636062136c 100644 --- a/boot.php +++ b/boot.php @@ -1031,6 +1031,57 @@ function get_birthdays() { }} +if(! function_exists('get_events')) { +function get_events() { + + require_once('include/bbcode.php'); + + $a = get_app(); + $o = ''; + + if(! local_user()) + return $o; + + $bd_format = t('g A l F d') ; // 8 AM Friday January 18 + $bd_short = t('F d'); + + $r = q("SELECT `event`.* FROM `event` + WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `finish` > '%s' + ORDER BY `start` DESC ", + intval(local_user()), + dbesc(datetime_convert('UTC','UTC','now + 6 days')), + dbesc(datetime_convert('UTC','UTC','now')) + ); + + if($r && count($r)) { + $o .= ''; + $o .= ''; + } + + return $o; +}} + + /** * * Wrap calls to proc_close(proc_open()) and call hook diff --git a/mod/network.php b/mod/network.php index 491603f354..9fed8592ec 100644 --- a/mod/network.php +++ b/mod/network.php @@ -328,8 +328,10 @@ function network_content(&$a, $update = 0) { } } - if((! $group) && (! $cid) && (! $update)) + if((! $group) && (! $cid) && (! $update)) { $o .= get_birthdays(); + $o .= get_events(); + } $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); diff --git a/mod/profile.php b/mod/profile.php index a453f72f1f..6d67ab74b2 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -223,8 +223,10 @@ function profile_content(&$a, $update = 0) { ); } - if($is_owner && ! $update) + if($is_owner && ! $update) { $o .= get_birthdays(); + $o .= get_events(); + } $o .= conversation($a,$r,'profile',$update);