X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotify.php;h=02260514af91493b287a06438fd799e016c224e5;hb=67f699403a6df541c1eb9dc26008232858e8084a;hp=b4d60a747c0bb5fcf871f9775c8fb8b909e5932c;hpb=e50c0efcdfa05f682201deb630b6147755c87fe4;p=friendica.git diff --git a/mod/notify.php b/mod/notify.php index b4d60a747c..02260514af 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -17,6 +17,17 @@ function notify_init(&$a) { dbesc($r[0]['otype']), intval(local_user()) ); + + // 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($r[0]['link']); + $guid = basename($urldata["path"]); + $itemdata = get_item_id($guid, local_user()); + if ($itemdata["id"] != 0) + $r[0]['link'] = $a->get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"]; + } + goaway($r[0]['link']); } @@ -40,14 +51,14 @@ function notify_content(&$a) { return login(); $notif_tpl = get_markup_template('notifications.tpl'); - + $not_tpl = get_markup_template('notify.tpl'); require_once('include/bbcode.php'); $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", intval(local_user()) ); - + if (count($r) > 0) { foreach ($r as $it) { $notif_content .= replace_macros($not_tpl,array( @@ -60,7 +71,7 @@ function notify_content(&$a) { } else { $notif_content .= t('No more system notifications.'); } - + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('System Notifications'), '$tabs' => '', // $tabs,