X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=959b581d59a25942b19cb824ec4b11cd1e479a8a;hb=89eaf508f19be57a07971c5f40b4bb538e36e891;hp=3abc1185cffc06eb3b44d2970b8f6de6595c30cd;hpb=1392c58377b462c10f9db5edc97cd82d3a683dc7;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index 3abc1185cf..959b581d59 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,78 +1,88 @@
 <?php
+/**
+ * @file mod/notify.php
+ */
 
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\L10n;
+use Friendica\Core\NotificationsManager;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Module\Login;
+use Friendica\Util\Temporal;
 
-function notify_init(&$a) {
-	if(! local_user())
+function notify_init(App $a)
+{
+	if (! local_user()) {
 		return;
+	}
+
+	$nm = new NotificationsManager();
+
+	if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
+		$note = $nm->getByID($a->argv[2]);
+		if ($note) {
+			$nm->setSeen($note);
 
-	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']);
+			// The friendica client has problems with the GUID. this is some workaround
+			if ($a->isFriendicaApp()) {
+				require_once("include/items.php");
+				$urldata = parse_url($note['link']);
+				$guid = basename($urldata["path"]);
+				$itemdata = Item::getIdAndNickByGuid($guid, local_user());
+				if ($itemdata["id"] != 0) {
+					$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+				}
+			}
+
+			System::externalRedirect($note['link']);
 		}
 
-		goaway($a->get_baseurl(true));
+		$a->internalRedirect();
 	}
 
-	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())
-		);
-		$j = json_encode(array('result' => ($r) ? 'success' : 'fail'));
+	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
+		$r = $nm->setAllSeen();
+		$j = json_encode(['result' => ($r) ? 'success' : 'fail']);
 		echo $j;
 		killme();
 	}
-
 }
 
+function notify_content(App $a)
+{
+	if (! local_user()) {
+		return Login::form();
+	}
 
-function notify_content(&$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');
+	$notif_tpl = Renderer::getMarkupTemplate('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 = Renderer::getMarkupTemplate('notify.tpl');
+
+	$r = $nm->getAll(['seen'=>0]);
+	if (DBA::isResult($r) > 0) {
+		foreach ($r as $it) {
+			$notif_content .= Renderer::replaceMacros($not_tpl, [
+				'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
+				'$item_image' => $it['photo'],
+				'$item_text' => strip_tags(BBCode::convert($it['msg'])),
+				'$item_when' => Temporal::getRelativeDate($it['date'])
+			]);
 		}
-		
-		$includes = array(
-			'$common_tabs' => 'common_tabs.tpl',
-		);
-		$includes = set_template_includes($a->theme['template_engine'], $includes);
+	} else {
+		$notif_content .= L10n::t('No more system notifications.');
+	}
 
-		$o .= replace_macros($notif_tpl,$includes + array(
-			'$notif_header' => t('System Notifications'),
-			'$tabs_data' => '', // $tabs,
-			'$notif_content' => $notif_content,
-		));
+	$o = Renderer::replaceMacros($notif_tpl, [
+		'$notif_header' => L10n::t('System Notifications'),
+		'$tabs' => false, // $tabs,
+		'$notif_content' => $notif_content,
+	]);
 
 	return $o;
-
-
 }