X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=fae7ebb39b921cb7a29a4d603b749ca2ae5e8364;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=938e2ffbe35a908a79162b2a4c692a1d9a0d228c;hpb=04dceb955109eed93db5da1bd6c6d4cdd411a9be;p=friendica.git diff --git a/mod/notify.php b/mod/notify.php index 938e2ffbe3..fae7ebb39b 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -1,33 +1,40 @@ argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { + + if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) { $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 = get_item_id($guid, local_user()); - if ($itemdata["id"] != 0) - $note['link'] = $a->get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"]; + if ($itemdata["id"] != 0) { + $note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"]; + } } goaway($note['link']); } - goaway($a->get_baseurl(true)); + 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')); echo $j; @@ -36,21 +43,23 @@ function notify_init(&$a) { } -function notify_content(&$a) { - if(! local_user()) return login(); +function notify_content(App $a) { + if (! local_user()) { + return login(); + } $nm = new NotificationsManager(); - + $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)); - if ($r!==false && count($r) > 0) { + if (DBM::is_result($r) > 0) { foreach ($r as $it) { $notif_content .= replace_macros($not_tpl,array( - '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], + '$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'])