X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=7f9974d30a1e5737b1d61ddc4dd089a29641c70e;hb=708ffaff51d3f5112af6b1fbd25d7ff6391e496e;hp=6ec36d8f99f7fe387a77df94c049a9c908e52931;hpb=c0abff0bda84b9151fb3314c6b33a262d0b44d13;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index 6ec36d8f99..7f9974d30a 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -7,6 +7,7 @@ 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;
@@ -25,18 +26,6 @@ function notify_init(App $a)
 		$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->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']);
 		}
 
@@ -47,7 +36,7 @@ function notify_init(App $a)
 		$r = $nm->setAllSeen();
 		$j = json_encode(['result' => ($r) ? 'success' : 'fail']);
 		echo $j;
-		killme();
+		exit();
 	}
 }
 
@@ -57,16 +46,18 @@ function notify_content(App $a)
 		return Login::form();
 	}
 
+	$notif_content = '';
+
 	$nm = new NotificationsManager();
 
-	$notif_tpl = get_markup_template('notifications.tpl');
+	$notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
-	$not_tpl = get_markup_template('notify.tpl');
+	$not_tpl = Renderer::getMarkupTemplate('notify.tpl');
 
 	$r = $nm->getAll(['seen'=>0]);
 	if (DBA::isResult($r) > 0) {
 		foreach ($r as $it) {
-			$notif_content .= replace_macros($not_tpl, [
+			$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'])),
@@ -77,7 +68,7 @@ function notify_content(App $a)
 		$notif_content .= L10n::t('No more system notifications.');
 	}
 
-	$o = replace_macros($notif_tpl, [
+	$o = Renderer::replaceMacros($notif_tpl, [
 		'$notif_header' => L10n::t('System Notifications'),
 		'$tabs' => false, // $tabs,
 		'$notif_content' => $notif_content,