X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=87035817841d637b957037051ca087b34a9551ba;hb=a0fddca407f3594758bd09209aaf9e2075794137;hp=a277e59813ecb53a11907a2a7e9736a609408cdb;hpb=4ae37c61966a7f4c055369ee8fd0d4bc20808fdb;p=friendica.git

diff --git a/mod/notify.php b/mod/notify.php
index a277e59813..8703581784 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;
@@ -37,17 +38,17 @@ function notify_init(App $a)
 				}
 			}
 
-			goaway($note['link']);
+			System::externalRedirect($note['link']);
 		}
 
-		goaway(System::baseUrl(true));
+		$a->internalRedirect();
 	}
 
 	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();
+		exit();
 	}
 }
 
@@ -57,16 +58,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 +80,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,