X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=7f9974d30a1e5737b1d61ddc4dd089a29641c70e;hb=708ffaff51d3f5112af6b1fbd25d7ff6391e496e;hp=0026f5ca6eb6f66556c35326966604e81d6f9899;hpb=4d30f2b292ec0b77de13cae3c622df84f84aa54f;p=friendica.git diff --git a/mod/notify.php b/mod/notify.php index 0026f5ca6e..7f9974d30a 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -1,7 +1,21 @@ 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 = get_item_id($guid, local_user()); - if ($itemdata["id"] != 0) { - $note['link'] = App::get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"]; - } - } - - goaway($note['link']); + System::externalRedirect($note['link']); } - goaway(App::get_baseurl(true)); + $a->internalRedirect(); } - 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(); + exit(); } - } -function notify_content(App $a) { +function notify_content(App $a) +{ if (! local_user()) { - return login(); + 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'); - require_once('include/bbcode.php'); + $not_tpl = Renderer::getMarkupTemplate('notify.tpl'); - $r = $nm->getAll(array('seen'=>0)); - if (dbm::is_result($r) > 0) { + $r = $nm->getAll(['seen'=>0]); + if (DBA::isResult($r) > 0) { foreach ($r as $it) { - $notif_content .= replace_macros($not_tpl,array( - '$item_link' => App::get_baseurl(true).'/notify/view/'. $it['id'], + $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 .= 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 = Renderer::replaceMacros($notif_tpl, [ + '$notif_header' => L10n::t('System Notifications'), '$tabs' => false, // $tabs, '$notif_content' => $notif_content, - )); + ]); return $o; - - }