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

diff --git a/mod/notify.php b/mod/notify.php
index 7c367708bb..0026f5ca6e 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,57 +1,61 @@
 <?php
 require_once('include/NotificationsManager.php');
-if(! function_exists('notify_init')) {
-function notify_init(&$a) {
-	if(! local_user()) return;
+
+function notify_init(App $a) {
+	if (! local_user()) {
+		return;
+	}
 
 	$nm = new NotificationsManager();
-		
-	if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
+
+	if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
 		$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"];
+				if ($itemdata["id"] != 0) {
+					$note['link'] = App::get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+				}
 			}
 
 			goaway($note['link']);
 		}
 
-		goaway($a->get_baseurl(true));
+		goaway(App::get_baseurl(true));
 	}
 
-	if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
+	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
 		$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();
+function notify_content(App $a) {
+	if (! local_user()) {
+		return login();
+	}
 
 	$nm = new NotificationsManager();
-	
+
 	$notif_tpl = get_markup_template('notifications.tpl');
 
 	$not_tpl = get_markup_template('notify.tpl');
 	require_once('include/bbcode.php');
 
 	$r = $nm->getAll(array('seen'=>0));
-	if ($r!==false && count($r) > 0) {
+	if (dbm::is_result($r) > 0) {
 		foreach ($r as $it) {
 			$notif_content .= replace_macros($not_tpl,array(
-				'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
+				'$item_link' => App::get_baseurl(true).'/notify/view/'. $it['id'],
 				'$item_image' => $it['photo'],
 				'$item_text' => strip_tags(bbcode($it['msg'])),
 				'$item_when' => relative_date($it['date'])
@@ -69,6 +73,5 @@ function notify_content(&$a) {
 
 	return $o;
 
-}
-}
 
+}