no sharing icon for private msgs

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 8c6b181c0d557dfdbd4631e45fb09359d0375877..6e6e822d0cfe1ac9d973f864141837499be8f6f1 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -212,6 +212,8 @@ function item_post(&$a) {
        if(count($tags)) {
                foreach($tags as $tag) {
                        if(strpos($tag,'#') === 0) {
+                               if(strpos($tag,'[url='))
+                                       continue;
                                $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))
@@ -220,6 +222,8 @@ function item_post(&$a) {
                                continue;
                        }
                        if(strpos($tag,'@') === 0) {
+                               if(strpos($tag,'[url='))
+                                       continue;
                                $stat = false;
                                $name = substr($tag,1);
                                if((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -239,6 +243,7 @@ function item_post(&$a) {
                                }
                                else {
                                        $newname = $name;
+                                       $alias = '';
                                        if(strstr($name,'_')) {
                                                $newname = str_replace('_',' ',$name);
                                                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
@@ -257,6 +262,8 @@ function item_post(&$a) {
                                                if($r[0]['network'] === 'stat') {
                                                        $newname = $r[0]['nick'];
                                                        $stat = true;
+                                                       if($r[0]['alias'])
+                                                               $alias = $r[0]['alias'];
                                                }
                                                else
                                                        $newname = $r[0]['name'];
@@ -271,6 +278,16 @@ function item_post(&$a) {
                                        if(strlen($str_tags))
                                                $str_tags .= ',';
                                        $str_tags .= '@[url=' . $profile . ']' . $newname       . '[/url]';
+
+                                       // Status.Net seems to require the numeric ID URL in a mention if the person isn't 
+                                       // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both. 
+
+                                       if(strlen($alias)) {
+                                               if(strlen($str_tags))
+                                                       $str_tags .= ',';
+                                               $str_tags .= '@[url=' . $alias . ']' . $newname . '[/url]';
+                                       }
+
                                }
                        }
                }
@@ -460,11 +477,7 @@ function item_post(&$a) {
                // NOTREACHED
        }
 
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-
-       logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
-
-       proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
+       proc_run('php', "include/notifier.php", $notify_type, "$post_id");
 
        $datarray['id'] = $post_id;
 
@@ -523,7 +536,7 @@ function item_content(&$a) {
 
        require_once('include/security.php');
 
-       $uid = $_SESSION['uid'];
+       $uid = local_user();
 
        if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 
@@ -595,12 +608,10 @@ function item_content(&$a) {
                                }       
                        }
                        $drop_id = intval($item['id']);
-                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
                        
                        // send the notification upstream/downstream as the case may be
 
-                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(), $foo));
-                       proc_run($php_path,"include/notifier.php","drop","$drop_id");
+                       proc_run('php',"include/notifier.php","drop","$drop_id");
 
                        goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
                        //NOTREACHED