X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=7c367708bb224ce838008b22401170c2317f9d4b;hb=44592611e1582fd97ae1988343418a0dae1ae2a0;hp=6ff437a38c94b692f5d903a8c1455faf32666ab3;hpb=11c06e21b7a656c4aeae0d5c157e1db97d6db02e;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index 6ff437a38c..7c367708bb 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,73 +1,74 @@
 <?php
-
-
+require_once('include/NotificationsManager.php');
+if(! function_exists('notify_init')) {
 function notify_init(&$a) {
-	if(! local_user())
-		return;
+	if(! local_user()) return;
 
+	$nm = new NotificationsManager();
+		
 	if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
-		$r = q("select * from notify where id = %d and uid = %d limit 1",
-			intval($a->argv[2]),
-			intval(local_user())
-		);
-		if(count($r)) {
-			q("update notify set seen = 1 where ( link = '%s' or ( parent != 0 and parent = %d and otype = '%s' )) and uid = %d",
-				dbesc($r[0]['link']),
-				intval($r[0]['parent']),
-				dbesc($r[0]['otype']),
-				intval(local_user())
-			);
-			goaway($r[0]['link']);
+		$note = $nm->getByID($a->argv[2]);
+		if ($note) {
+			$nm->setSeen($note);
+		
+			// The friendica client has problems with the GUID. this is some workaround
+			if ($a->is_friendica_app()) {
+				require_once("include/items.php");
+				$urldata = parse_url($note['link']);
+				$guid = basename($urldata["path"]);
+				$itemdata = get_item_id($guid, local_user());
+				if ($itemdata["id"] != 0)
+					$note['link'] = $a->get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+			}
+
+			goaway($note['link']);
 		}
 
 		goaway($a->get_baseurl(true));
 	}
 
 	if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
-		$r = q("update notify set seen = 1 where uid = %d",
-			intval(local_user())
-		);
+		$r = $nm->setAllSeen();
 		$j = json_encode(array('result' => ($r) ? 'success' : 'fail'));
 		echo $j;
 		killme();
 	}
-
+}
 }
 
-
+if(! function_exists('notify_content')) {
 function notify_content(&$a) {
-	if(! local_user())
-		return login();
+	if(! local_user()) return login();
 
-		$notif_tpl = get_markup_template('notifications.tpl');
-		
-		$not_tpl = get_markup_template('notify.tpl');
-		require_once('include/bbcode.php');
+	$nm = new NotificationsManager();
+	
+	$notif_tpl = get_markup_template('notifications.tpl');
 
-		$r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
-			intval(local_user())
-		);
-		
-		if (count($r) > 0) {
-			foreach ($r as $it) {
-				$notif_content .= replace_macros($not_tpl,array(
-					'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
-					'$item_image' => $it['photo'],
-					'$item_text' => strip_tags(bbcode($it['msg'])),
-					'$item_when' => relative_date($it['date'])
-				));
-			}
-		} else {
-			$notif_content .= t('No more system notifications.');
+	$not_tpl = get_markup_template('notify.tpl');
+	require_once('include/bbcode.php');
+
+	$r = $nm->getAll(array('seen'=>0));
+	if ($r!==false && count($r) > 0) {
+		foreach ($r as $it) {
+			$notif_content .= replace_macros($not_tpl,array(
+				'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
+				'$item_image' => $it['photo'],
+				'$item_text' => strip_tags(bbcode($it['msg'])),
+				'$item_when' => relative_date($it['date'])
+			));
 		}
-		
-		$o .= replace_macros($notif_tpl, array(
-			'$notif_header' => t('System Notifications'),
-			'$tabs_data' => '', // $tabs,
-			'$notif_content' => $notif_content,
-		));
+	} else {
+		$notif_content .= t('No more system notifications.');
+	}
 
-	return $o;
+	$o .= replace_macros($notif_tpl, array(
+		'$notif_header' => t('System Notifications'),
+		'$tabs' => false, // $tabs,
+		'$notif_content' => $notif_content,
+	));
 
+	return $o;
 
 }
+}
+