Move mod/home to src/Module/Home

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index f22c1cf5b1d11342b5c92b861ed7714397e40186..7f9974d30a1e5737b1d61ddc4dd089a29641c70e 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -7,8 +7,9 @@ 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\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Module\Login;
 use Friendica\Util\Temporal;
@@ -25,29 +26,17 @@ 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->is_friendica_app()) {
-                               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"];
-                               }
-                       }
-
-                       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 +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 (DBM::is_result($r) > 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,