From 34e42c4cb34c78d9cb8ac48e9d80e58984346156 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 16 Aug 2012 23:11:24 -0700
Subject: don't count ignored events in notifications

---
 mod/ping.php            | 16 +++++++++++++---
 view/tpl/abook_edit.tpl |  5 +++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index 59a56d919..1bf0a8840 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -16,6 +16,8 @@ function ping_init(&$a) {
 	$result['register'] = 0;
 	$result['events'] = 0;
 	$result['events_today'] = 0;
+	$result['birthdays'] = 0;
+	$result['birthdays_today'] = 0;
 	$result['notice'] = array();
 	$result['info'] = array();
 
@@ -155,8 +157,8 @@ function ping_init(&$a) {
 
 	$t5 = dba_timer();
 
-	$events = q("SELECT count(`event`.`id`) as total, start, adjust FROM `event`
-		WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s'
+	$events = q("SELECT count(`event`.`id`) as total, type, start, adjust FROM `event`
+		WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and ignore = 0
 		ORDER BY `start` ASC ",
 			intval(local_user()),
 			dbesc(datetime_convert('UTC','UTC','now + 7 days')),
@@ -169,8 +171,16 @@ function ping_init(&$a) {
 		if($result['events']) {
 			$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
 			foreach($events as $x) {
-				if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now)
+				$bd = false;
+				if($x['type'] === 'birthday') {
+					$result['birthdays'] ++;
+					$bd = true;
+				}
+				if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
 					$result['events_today'] ++;
+					if($bd)
+						$result['birthdays_today'] ++;
+				}
 			}
 		}
 	}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 8f72edc59..487a113bf 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -21,6 +21,10 @@ $slide
 <a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Full Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Cautious Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Follow Only</a><br />
 <br />
 
+<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">Advanced Permissions</div>
+
+<div id="abook-advanced-panel" style="display: none;">
+
 <span class="abook-them">$them</span><span class="abook-me">$me</span>
 <br />
 <br />
@@ -37,6 +41,7 @@ $slide
 
 <br />
 
+</div>
 
 <input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 
-- 
cgit v1.2.3