do not show seen notifys in notifications - show them in mod notifications instead. Update notifications count also on notifications updates

1 files changed, 27 insertions, 8 deletions

diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php
index 652648701..dfa007548 100644
--- a/Zotlabs/Module/Notifications.php
+++ b/Zotlabs/Module/Notifications.php
@@ -12,25 +12,44 @@ class Notifications extends \Zotlabs\Web\Controller {
 			return;
 		}
 	
-		nav_set_selected('notifications');		
+		nav_set_selected('Notifications');
 	
 		$o = '';
-		
-		$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
+
+		$r = q("select count(*) as total from notify where uid = %d and seen = 0",
 			intval(local_channel())
 		);
+		if($r && intval($t[0]['total']) > 49) {
+			$r = q("select * from notify where uid = %d
+				and seen = 0 order by created desc limit 50",
+				intval(local_channel())
+			);
+		} else {
+			$r1 = q("select * from notify where uid = %d
+				and seen = 0 order by created desc limit 50",
+				intval(local_channel())
+			);
+			$r2 = q("select * from notify where uid = %d
+				and seen = 1 order by created desc limit %d",
+				intval(local_channel()),
+				intval(50 - intval($t[0]['total']))
+			);
+			$r = array_merge($r1,$r2);
+		}
 			
 		if($r) {
 			$notifications_available = 1;
-			foreach ($r as $it) {
-				$x = strip_tags(bbcode($it['msg']));
+			foreach ($r as $rr) {
+				$x = strip_tags(bbcode($rr['msg']));
 				if(strpos($x,','))
 					$x = substr($x,strpos($x,',')+1);
 				$notif_content .= replace_macros(get_markup_template('notify.tpl'),array(
-					'$item_link' => z_root().'/notify/view/'. $it['id'],
-					'$item_image' => $it['photo'],
+					'$item_link' => z_root().'/notify/view/'. $rr['id'],
+					'$item_image' => $rr['photo'],
 					'$item_text' => $x,
-					'$item_when' => relative_date($it['created'])
+					'$item_when' => relative_date($rr['created']),
+					'$item_seen' => (($rr['seen']) ? true : false),
+					'$new' => t('New')
 				));
 			}
 		}