rino recipient patch

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 64a23e7fb1ad6f1f8ff8a8ce92018317cbf60228..504856d7d2d9883618edefa4ac4f8b8157e7c42e 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -14,8 +14,7 @@ function item_post(&$a) {
 
        require_once('include/security.php');
 
-       $uid = $_SESSION['uid'];
-
+       $uid = local_user();
 
        $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
 
@@ -115,43 +114,67 @@ function item_post(&$a) {
        }
 
        $str_tags = '';
-       $tagged = array();
+       $inform   = '';
 
        $tags = get_tags($body);
 
 
-       if($tags) {
+       if(count($tags)) {
                foreach($tags as $tag) {
+                       if(strpos($tag,'#') === 0) {
+                               $basetag = str_replace('_',' ',substr($tag,1));
+                               $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+                               if(strlen($str_tags))
+                                       $str_tags .= ',';
+                               $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                               continue;
+                       }
                        if(strpos($tag,'@') === 0) {
                                $name = substr($tag,1);
-                               if(strpos($name,'@')) {
-
-                                       $links = @webfinger($name);
+                               if((strpos($name,'@')) || (strpos($name,'http://'))) {
+                                       $newname = $name;
+                                       $links = @lrdd($name);
                                        if(count($links)) {
                                                foreach($links as $link) {
                                                        if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
                                        $profile = $link['@attributes']['href'];
-                                                       if($link['@attributes']['rel'] === 'salmon')
-                                       $salmon = $link['@attributes']['href'];
+                                                       if($link['@attributes']['rel'] === 'salmon') {
+                                                               if(strlen($inform))
+                                                                       $inform .= ',';
+                                       $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+                                                       }
                                                }
                                        }
                                }
                                else {
-                                       $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($name),
-                                               intval($profile_uid)
-                                       );
+                                       $newname = $name;
+                                       if(strstr($name,'_')) {
+                                               $newname = str_replace('_',' ',$name);
+                                               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($newname),
+                                                       intval($profile_uid)
+                                               );
+                                       }
+                                       else {
+                                               $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($name),
+                                                       intval($profile_uid)
+                                               );
+                                       }
                                        if(count($r)) {
                                                $profile = $r[0]['url'];
-                                               $salmon = $r[0]['notify'];
+                                               $newname = $r[0]['name'];
+                                               if(strlen($inform))
+                                                       $inform .= ',';
+                                               $inform .= 'cid:' . $r[0]['id'];
                                        }
                                }
                                if($profile) {
+                                       $body = str_replace($name,'[url=' . $profile . ']' . $newname   . '[/url]', $body);
                                        $profile = str_replace(',','%2c',$profile);
-                                       $body = str_replace($name,'[url=' . $profile . ']' . $name      . '[/url]', $body);
                                        if(strlen($str_tags))
                                                $str_tags .= ',';
-                                       $str_tags .= '[url=' . $profile . ']' . $name   . '[/url]';
+                                       $str_tags .= '@[url=' . $profile . ']' . $newname       . '[/url]';
                                }
                        }
                }
@@ -171,9 +194,9 @@ function item_post(&$a) {
        $uri = item_new_uri($a->get_hostname(),$profile_uid);
 
        $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
-               `author-name`, `author-link`, `author-avatar`, `created`,
-               `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-               VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+               `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
+               `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
+               VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                intval($profile_uid),
                dbesc($post_type),
                intval($wall),
@@ -193,6 +216,8 @@ function item_post(&$a) {
                dbesc($body),
                dbesc($location),
                dbesc($coord),
+               dbesc($str_tags),
+               dbesc($inform),
                dbesc($verb),
                dbesc($str_contact_allow),
                dbesc($str_group_allow),
@@ -203,6 +228,7 @@ function item_post(&$a) {
                dbesc($uri));
        if(count($r)) {
                $post_id = $r[0]['id'];
+               logger('mod_item: saved item ' . $post_id);
 
                if($parent) {
 
@@ -235,6 +261,7 @@ function item_post(&$a) {
                                        '$username' => $user['username'],
                                        '$email' => $user['email'],
                                        '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                        '$body' => strip_tags(bbcode($body))
                                ));
 
@@ -257,6 +284,7 @@ function item_post(&$a) {
                                        '$username' => $user['username'],
                                        '$email' => $user['email'],
                                        '$from' => $from,
+                                       '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
                                        '$body' => strip_tags(bbcode($body))
                                ));
 
@@ -285,9 +313,10 @@ function item_post(&$a) {
        }
 
        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-       $proc_debug = get_config('system','proc_debug');
 
-       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" $proc_debug &",
+       logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
+
+       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
                array(),$foo));
 
        goaway($a->get_baseurl() . "/" . $_POST['return'] );
@@ -374,12 +403,10 @@ function item_content(&$a) {
                        }
                        $drop_id = intval($item['id']);
                        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                       $proc_debug = get_config('system','proc_debug');
-
                        
                        // send the notification upstream/downstream as the case may be
 
-                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" $proc_debug &",
+                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &",
                                array(), $foo));
 
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);