add rel=mentioned links for tagged persons

diff --git a/boot.php b/boot.php
index 30e5a111e55a6b6d48624721cbf4b8a75d235498..2de398cfc4377f96fee95d06494f22049000c995 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1358,3 +1358,17 @@ function like_puller($a,$item,&$arr,$mode) {
        return;
 }}
 
+
+function get_mentions($item) {
+       $o = '';
+       if(! strlen($item['tag']))
+               return $o;
+
+       $arr = explode(',',$item['tag']);
+       foreach($arr as $x) {
+               $matches = null;
+               if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches))
+                       $o .= "\t\t" . '<link rel="mentioned" href="' . $matches[1] . '" />' . "\r\n";
+       }
+       return $o;
+}
\ No newline at end of file

diff --git a/include/items.php b/include/items.php
index d37f7708f99beacfeb1db6d8401e2bc7ea1b49c3..7f62f6decd8b93494bb3291149741395d44867ab 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -187,6 +187,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
                else {
                        $verb = construct_verb($item);
                        $actobj = construct_activity($item);
+                       $mentioned = get_mentions($item);
 
                        if($item['parent'] == $item['id']) {
                                $atom .= replace_macros($item_template, array(
@@ -207,6 +208,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
                                        '$content'            => xmlify($item['body']),
                                        '$verb'               => xmlify($verb),
                                        '$actobj'             => $actobj,  // do not xmlify
+                                       '$mentioned'          => $mentioned,
                                        '$comment_allow'      => $allow
                                ));
                        }
@@ -224,6 +226,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
                                        '$alt'           => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']),
                                        '$verb'          => xmlify($verb),
                                        '$actobj'        => $actobj, // do not xmlify
+                                       '$mentioned'     => $mentioned,
                                        '$parent_id'     => xmlify($item['parent-uri']),
                                        '$comment_allow' => $allow
                                ));

diff --git a/include/notifier.php b/include/notifier.php
index 884493a79a2d9c91a893a668de1308333832d71f..1f6bfa36aa03006bce5fb01195e1de939cd89416 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -213,6 +213,7 @@
 
                                $verb = construct_verb($item);
                                $actobj = construct_activity($item);
+                               $mentioned = get_mentions($item);
 
                                if($item['id'] == $item_id) {
                                        $slap = replace_macros($cmnt_template, array(
@@ -231,6 +232,7 @@
                                                '$type'               => 'html',
                                                '$verb'               => xmlify($verb),
                                                '$actobj'             => $actobj,
+                                               '$mentioned'          => $mentioned,
                                                '$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
                                                '$content'            => xmlify(bbcode($item['body'])),
                                                '$parent_id'          => xmlify($item['parent-uri']),
@@ -253,6 +255,7 @@
                                                '$type'               => 'text',
                                                '$verb'               => xmlify($verb),
                                                '$actobj'             => $actobj,
+                                               '$mentioned'          => $mentioned,
                                                '$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
                                                '$content'            => xmlify($item['body']),
                                                '$parent_id'          => xmlify($item['parent-uri']),
@@ -283,6 +286,7 @@
 
                                        $verb = construct_verb($item);
                                        $actobj = construct_activity($item);
+                                       $mentioned = get_mentions($item);
 
                                        if($item['parent'] == $item['id']) {
                                                $atom .= replace_macros($item_template, array(
@@ -301,6 +305,7 @@
                                                        '$type'               => 'text',
                                                        '$verb'               => xmlify($verb),
                                                        '$actobj'             => $actobj,
+                                                       '$mentioned'          => $mentioned,
                                                        '$content'            => xmlify($item['body']),
                                                        '$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
                                                        '$comment_allow'      => (($item['last-child']) ? 1 : 0)
@@ -321,6 +326,7 @@
                                                        '$type'               => 'html',
                                                        '$verb'               => xmlify($verb),
                                                        '$actobj'             => $actobj,
+                                                       '$mentioned'          => $mentioned,
                                                        '$content'            => xmlify(bbcode($item['body'])),
                                                        '$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
                                                        '$comment_allow'      => (($item['last-child']) ? 1 : 0)
@@ -343,6 +349,7 @@
                                                        '$type'          => 'text',
                                                        '$verb'          => xmlify($verb),
                                                        '$actobj'        => $actobj,
+                                                       '$mentioned'     => $mentioned,
                                                        '$parent_id'     => xmlify($item['parent-uri']),
                                                        '$comment_allow' => (($item['last-child']) ? 1 : 0)
                                                ));
@@ -361,6 +368,7 @@
                                                        '$type'          => 'html',
                                                        '$verb'          => xmlify($verb),
                                                        '$actobj'        => $actobj,
+                                                       '$mentioned'     => $mentioned,
                                                        '$parent_id'     => xmlify($item['parent-uri']),
                                                        '$comment_allow' => (($item['last-child']) ? 1 : 0)
                                                ));

diff --git a/mod/item.php b/mod/item.php
index 67832204d6bf0930f569738af76f73a01e7dec30..703267992d9861435a31dcdb1d8a09ca0da373d0 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -165,7 +165,7 @@ function item_post(&$a) {
                                        if(strlen($str_tags))
                                                $str_tags .= ',';
                                        $profile = str_replace(',','%2c',$profile);
-                                       $str_tags .= '[url=' . $profile . ']' . $newname        . '[/url]';
+                                       $str_tags .= '@[url=' . $profile . ']' . $newname       . '[/url]';
                                }
                        }
                }

diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl
index 6c1a15faa91fd67f9dbced69afed1df225d777d6..b70a6dc4eaa33a59ea77d199e53b5eca4223d1f3 100644 (file)
--- a/view/atom_cmnt.tpl
+++ b/view/atom_cmnt.tpl
@@ -16,5 +16,6 @@
                <dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
                <as:verb>$verb</as:verb>
                $actobj
+               $mentioned
        </entry>
 

diff --git a/view/atom_item.tpl b/view/atom_item.tpl
index b26ba2e6948b5af0b2510b25c3208ea265104fc2..0d36b579d5c210f589fc8920f6a396f03171d8bb 100644 (file)
--- a/view/atom_item.tpl
+++ b/view/atom_item.tpl
@@ -23,5 +23,6 @@
                <dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
                <as:verb>$verb</as:verb>
                $actobj
+               $mentioned
 
        </entry>