Rewrite Proxy module

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index 8ae925a0653cd8eee0b14381335b113075350836..959b581d59a25942b19cb824ec4b11cd1e479a8a 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -2,12 +2,17 @@
 /**
  * @file mod/notify.php
  */
+
 use Friendica\App;
-use Friendica\Core\NotificationsManager;
+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;
 
 function notify_init(App $a)
 {
@@ -23,20 +28,20 @@ function notify_init(App $a)
                        $nm->setSeen($note);
 
                        // The friendica client has problems with the GUID. this is some workaround
-                       if ($a->is_friendica_app()) {
+                       if ($a->isFriendicaApp()) {
                                require_once("include/items.php");
                                $urldata = parse_url($note['link']);
                                $guid = basename($urldata["path"]);
-                               $itemdata = get_item_id($guid, local_user());
+                               $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') {
@@ -55,26 +60,25 @@ function notify_content(App $a)
 
        $nm = new NotificationsManager();
 
-       $notif_tpl = get_markup_template('notifications.tpl');
+       $notif_tpl = Renderer::getMarkupTemplate('notifications.tpl');
 
-       $not_tpl = get_markup_template('notify.tpl');
-       require_once('include/bbcode.php');
+       $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($it['msg'])),
-                               '$item_when' => relative_date($it['date'])
+                               '$item_text' => strip_tags(BBCode::convert($it['msg'])),
+                               '$item_when' => Temporal::getRelativeDate($it['date'])
                        ]);
                }
        } else {
                $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,