Just some more fixed notice

[friendica.git] / mod / notify.php

diff --git a/mod/notify.php b/mod/notify.php
index fae7ebb39b921cb7a29a4d603b749ca2ae5e8364..f22c1cf5b1d11342b5c92b861ed7714397e40186 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,11 +1,20 @@
 <?php
+/**
+ * @file mod/notify.php
+ */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
+use Friendica\Module\Login;
+use Friendica\Util\Temporal;
 
-function notify_init(App $a) {
+function notify_init(App $a)
+{
        if (! local_user()) {
                return;
        }
@@ -22,7 +31,7 @@ function notify_init(App $a) {
                                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"];
                                }
@@ -34,18 +43,18 @@ function notify_init(App $a) {
                goaway(System::baseUrl(true));
        }
 
-       if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
+       if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
                $r = $nm->setAllSeen();
-               $j = json_encode(array('result' => ($r) ? 'success' : 'fail'));
+               $j = json_encode(['result' => ($r) ? 'success' : 'fail']);
                echo $j;
                killme();
        }
-
 }
 
-function notify_content(App $a) {
+function notify_content(App $a)
+{
        if (! local_user()) {
-               return login();
+               return Login::form();
        }
 
        $nm = new NotificationsManager();
@@ -53,29 +62,26 @@ function notify_content(App $a) {
        $notif_tpl = get_markup_template('notifications.tpl');
 
        $not_tpl = get_markup_template('notify.tpl');
-       require_once('include/bbcode.php');
 
-       $r = $nm->getAll(array('seen'=>0));
+       $r = $nm->getAll(['seen'=>0]);
        if (DBM::is_result($r) > 0) {
                foreach ($r as $it) {
-                       $notif_content .= replace_macros($not_tpl,array(
+                       $notif_content .= replace_macros($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 .= t('No more system notifications.');
+               $notif_content .= L10n::t('No more system notifications.');
        }
 
-       $o .= replace_macros($notif_tpl, array(
-               '$notif_header' => t('System Notifications'),
+       $o = replace_macros($notif_tpl, [
+               '$notif_header' => L10n::t('System Notifications'),
                '$tabs' => false, // $tabs,
                '$notif_content' => $notif_content,
-       ));
+       ]);
 
        return $o;
-
-
 }