Merge branch 'master' of https://github.com/habeascodice/red

1 files changed, 131 insertions, 87 deletions

diff --git a/mod/ping.php b/mod/ping.php
index 49475de66..d7b9e3d2e 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -41,6 +41,19 @@ function ping_init(&$a) {
 
 	header("content-type: application/json");
 
+	$vnotify = false;
+
+	if(local_user())  {
+		$vnotify = get_pconfig(local_user(),'system','vnotify');
+		$evdays = intval(get_pconfig(local_user(),'system','evdays'));
+	}
+
+	// if unset show all visual notification types
+	if($vnotify === false)
+		$vnotify = (-1);
+	if($evdays < 1)
+		$evdays = 3;
+
 	/**
 	 * If you have several windows open to this site and switch to a different channel
 	 * in one of them, the others may get into a confused state showing you a page or options 
@@ -71,6 +84,11 @@ function ping_init(&$a) {
 		}
 		unset($_SESSION['sysmsg_info']);
 	}
+	if(! ($vnotify & VNOTIFY_INFO))
+		$result['info'] = array();
+	if(! ($vnotify & VNOTIFY_ALERT))
+		$result['notice'] = array();
+
 
 	if($a->install) {
 		echo json_encode($result);
@@ -89,7 +107,7 @@ function ping_init(&$a) {
 		$basic_presence = false;
 		if($r) {
 			$basic_presence = true;	
-			q("update chatpresence set cp_last = '%s' where cp_id = %d limit 1",
+			q("update chatpresence set cp_last = '%s' where cp_id = %d",
 				dbesc(datetime_convert()),
 				intval($r[0]['cp_id'])
 			);
@@ -110,7 +128,9 @@ function ping_init(&$a) {
 	 * and shouldn't count as online anymore. We allow an expection for bots.
 	 */
 
-	q("delete from chatpresence where cp_last < UTC_TIMESTAMP() - INTERVAL 3 MINUTE and cp_client != 'auto' "); 
+	q("delete from chatpresence where cp_last < %s - INTERVAL %s and cp_client != 'auto' ",
+		db_utcnow(), db_quoteinterval('3 MINUTE')
+	); 
 
 	if((! local_user()) || ($result['invalid'])) {
 		echo json_encode($result);
@@ -130,14 +150,14 @@ function ping_init(&$a) {
 	if(x($_REQUEST, 'markRead') && local_user()) {
 		switch($_REQUEST['markRead']) {
 			case 'network':
-				$r = q("update item set item_flags = ( item_flags ^ %d ) where (item_flags & %d) and uid = %d", 
+				$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and uid = %d", 
 					intval(ITEM_UNSEEN),
 					intval(ITEM_UNSEEN),
 					intval(local_user())
 				);
 				break;
 			case 'home':
-				$r = q("update item set item_flags = ( item_flags ^ %d ) where (item_flags & %d) and (item_flags & %d) and uid = %d", 
+				$r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d)>0 and (item_flags & %d) and uid = %d", 
 					intval(ITEM_UNSEEN),
 					intval(ITEM_UNSEEN),
 					intval(ITEM_WALL),
@@ -145,7 +165,7 @@ function ping_init(&$a) {
 				);
 				break;
 			case 'messages':
-				$r = q("update mail set mail_flags = ( mail_flags ^ %d ) where channel_id = %d and not (mail_flags & %d)",
+				$r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d)>0",
 					intval(MAIL_SEEN),
 					intval(local_user()),
 					intval(MAIL_SEEN)
@@ -179,17 +199,17 @@ function ping_init(&$a) {
 		);
 		if($t && intval($t[0]['total']) > 49) {
 			$z = q("select * from notify where uid = %d
-				and seen = 0 order by date desc limit 0, 50",
+				and seen = 0 order by date desc limit 50",
 				intval(local_user())
 			);
 		}
 		else {
 			$z1 = q("select * from notify where uid = %d
-				and seen = 0 order by date desc limit 0, 50",
+				and seen = 0 order by date desc limit 50",
 				intval(local_user())
 			);
 			$z2 = q("select * from notify where uid = %d
-				and seen = 1 order by date desc limit 0, %d",
+				and seen = 1 order by date desc limit %d",
 				intval(local_user()),
 				intval(50 - intval($t[0]['total']))
 			);
@@ -204,7 +224,7 @@ function ping_init(&$a) {
 					'url' => $zz['url'],
 					'photo' => $zz['photo'],
 					'when' => relative_date($zz['date']), 
-					'class' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), 
+					'hclass' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), 
 					'message' => strip_tags(bbcode($zz['msg']))
 				);
 			}
@@ -217,8 +237,8 @@ function ping_init(&$a) {
 	if(argc() > 1 && argv(1) === 'messages') {
 		$channel = $a->get_channel();
 		$t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan 
-			where channel_id = %d and not ( mail_flags & %d ) and not (mail_flags & %d ) 
-			and from_xchan != '%s' order by created desc limit 0,50",
+			where channel_id = %d and not ( mail_flags & %d )>0 and not (mail_flags & %d )>0 
+			and from_xchan != '%s' order by created desc limit 50",
 			intval(local_user()),
 			intval(MAIL_SEEN),
 			intval(MAIL_DELETED),
@@ -233,7 +253,7 @@ function ping_init(&$a) {
 					'url' => $zz['xchan_url'],
 					'photo' => $zz['xchan_photo_s'],
 					'when' => relative_date($zz['created']), 
-					'class' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), 
+					'hclass' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), 
 					'message' => t('sent you a private message'),
 				);
 			}
@@ -247,7 +267,7 @@ function ping_init(&$a) {
 		$result = array();
 
 		$r = q("SELECT * FROM item
-			WHERE item_restrict = %d and ( item_flags & %d ) and uid = %d",
+			WHERE item_restrict = %d and ( item_flags & %d )>0 and uid = %d",
 			intval(ITEM_VISIBLE),
 			intval(ITEM_UNSEEN),
 			intval(local_user())
@@ -269,7 +289,7 @@ function ping_init(&$a) {
 	if(argc() > 1 && (argv(1) === 'intros')) {
 		$result = array();
 
-		$r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
+		$r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)",
 			intval(local_user()),
 			intval(ABOOK_FLAG_PENDING),
 			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
@@ -284,7 +304,7 @@ function ping_init(&$a) {
 					'url' => $rr['xchan_url'],
 					'photo' => $rr['xchan_photo_s'],
 					'when' => relative_date($rr['abook_created']), 
-					'class' => ('notify-unseen'), 
+					'hclass' => ('notify-unseen'), 
 					'message' => t('added your channel')
 				);
 			}
@@ -303,7 +323,7 @@ function ping_init(&$a) {
 			WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
 			ORDER BY `start` DESC ",
 			intval(local_user()),
-			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
+			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
 		);
 
@@ -325,7 +345,7 @@ function ping_init(&$a) {
 					'url'         => $rr['xchan_url'],
 					'photo'       => $rr['xchan_photo_s'],
 					'when'        => $when,
-					'class'       => ('notify-unseen'), 
+					'hclass'       => ('notify-unseen'), 
 					'message'     => t('posted an event')
 				);
 			}
@@ -341,101 +361,125 @@ function ping_init(&$a) {
 	 * Normal ping - just the counts, no detail
 	 */
 
-	$t = q("select count(*) as total from notify where uid = %d and seen = 0",
-		intval(local_user())
-	);
-	if($t)
-		$result['notify'] = intval($t[0]['total']);
+	if($vnotify & VNOTIFY_SYSTEM) {
+		$t = q("select count(*) as total from notify where uid = %d and seen = 0",
+			intval(local_user())
+		);
+		if($t)
+			$result['notify'] = intval($t[0]['total']);
+	}
 
 	$t1 = dba_timer();
 
-	$r = q("SELECT id, item_restrict, item_flags FROM item
-		WHERE (item_restrict = %d) and ( item_flags & %d ) and uid = %d",
-		intval(ITEM_VISIBLE),
-		intval(ITEM_UNSEEN),
-		intval(local_user())
-	);
+	if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
+		$r = q("SELECT id, item_restrict, item_flags FROM item
+			WHERE (item_restrict = %d) and ( item_flags & %d )>0 and uid = %d",
+			intval(ITEM_VISIBLE),
+			intval(ITEM_UNSEEN),
+			intval(local_user())
+		);
 
-	if(count($r)) {	
-		$arr = array('items' => $r);
-		call_hooks('network_ping', $arr);
+		if($r) {	
+			$arr = array('items' => $r);
+			call_hooks('network_ping', $arr);
 	
-		foreach ($r as $it) {
-			if($it['item_flags'] & ITEM_WALL)
-				$result['home'] ++;
-			else
-				$result['network'] ++;
+			foreach ($r as $it) {
+				if($it['item_flags'] & ITEM_WALL)
+					$result['home'] ++;
+				else
+					$result['network'] ++;
+			}
 		}
 	}
+	if(! ($vnotify & VNOTIFY_NETWORK))
+		$result['network'] = 0;
+	if(! ($vnotify & VNOTIFY_CHANNEL))
+		$result['home'] = 0;
+
 
 	$t2 = dba_timer();
 
-	$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
-		intval(local_user()),
-		intval(ABOOK_FLAG_PENDING),
-		intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
-		intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
-	);
+	if($vnotify & VNOTIFY_INTRO) {
+		$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)",
+			intval(local_user()),
+			intval(ABOOK_FLAG_PENDING),
+			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
+			intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+		);
 
-	$t3 = dba_timer();
+		$t3 = dba_timer();
 
-	if($intr)
-		$result['intros'] = intval($intr[0]['total']);
+		if($intr)
+			$result['intros'] = intval($intr[0]['total']);
+	}
 
 	$t4 = dba_timer();
 	$channel = get_app()->get_channel();
 
-	$mails = q("SELECT count(id) as total from mail
-		WHERE channel_id = %d AND not (mail_flags & %d) and from_xchan != '%s' ",
-		intval(local_user()),
-		intval(MAIL_SEEN),		
-		dbesc($channel['channel_hash'])
-	);
-	if($mails)
-		$result['mail'] = intval($mails[0]['total']);
-		
-	if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
-		$regs = q("SELECT count(account_id) as total from account where (account_flags & %d)",
-			intval(ACCOUNT_PENDING)
+	if($vnotify & VNOTIFY_MAIL) {
+		$mails = q("SELECT count(id) as total from mail
+			WHERE channel_id = %d AND not (mail_flags & %d)>0 and from_xchan != '%s' ",
+			intval(local_user()),
+			intval(MAIL_SEEN),		
+			dbesc($channel['channel_hash'])
 		);
-		if($regs)
-			$result['register'] = intval($regs[0]['total']);
+		if($mails)
+			$result['mail'] = intval($mails[0]['total']);
+	}
+	
+	if($vnotify & VNOTIFY_REGISTER) {
+		if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+			$regs = q("SELECT count(account_id) as total from account where (account_flags & %d)>0",
+				intval(ACCOUNT_PENDING)
+			);
+			if($regs)
+				$result['register'] = intval($regs[0]['total']);
+		}
 	} 
 
 	$t5 = dba_timer();
 
-	$events = q("SELECT type, start, adjust FROM `event`
-		WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
-		ORDER BY `start` ASC ",
-			intval(local_user()),
-			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
-			dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-	);
-
-	if($events) {
-		$result['all_events'] = count($events);
-
-		if($result['all_events']) {
-			$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
-			foreach($events as $x) {
-				$bd = false;
-				if($x['type'] === 'birthday') {
-					$result['birthdays'] ++;
-					$bd = true;
-				}
-				else {
-					$result['events'] ++;
-				}
-				if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
-					$result['all_events_today'] ++;
-					if($bd)
-						$result['birthdays_today'] ++;
-					else
-						$result['events_today'] ++;
+	if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) {
+		$events = q("SELECT type, start, adjust FROM `event`
+			WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
+			ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+		);
+
+		if($events) {
+			$result['all_events'] = count($events);
+
+			if($result['all_events']) {
+				$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
+				foreach($events as $x) {
+					$bd = false;
+					if($x['type'] === 'birthday') {
+						$result['birthdays'] ++;
+						$bd = true;
+					}
+					else {
+						$result['events'] ++;
+					}
+					if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['start'], 'Y-m-d') === $str_now) {
+						$result['all_events_today'] ++;
+						if($bd)
+							$result['birthdays_today'] ++;
+						else
+							$result['events_today'] ++;
+					}
 				}
 			}
 		}
 	}
+	if(! ($vnotify & VNOTIFY_EVENT))
+		$result['all_events'] = $result['events'] = 0;
+	if(! ($vnotify & VNOTIFY_EVENTTODAY))
+		$result['all_events_today'] = $result['events_today'] = 0;
+	if(! ($vnotify & VNOTIFY_BIRTHDAY))
+		$result['birthdays'] = 0;
+
 
 	$x = json_encode($result);