Merge branch 'friendika-master'

1 files changed, 25 insertions, 1 deletions

diff --git a/mod/item.php b/mod/item.php
index 38ef580af..a83373f59 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -22,9 +22,12 @@ function item_post(&$a) {
 
 	$uid = local_user();
 
+	call_hooks('post_local_start', $_POST);
+
 	$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
 
 	$parent_item = null;
+	$parent_contact = null;
 
 	if($parent) {
 		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
@@ -35,6 +38,14 @@ function item_post(&$a) {
 			goaway($a->get_baseurl() . "/" . $_POST['return'] );
 		}
 		$parent_item = $r[0];
+		if($parent_item['contact-id'] && $uid) {
+			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval($parent_item['contact-id']),
+				intval($uid)
+			);
+			if(count($r))
+				$parent_contact = $r[0];
+		}
 	}
 
 	$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
@@ -185,8 +196,13 @@ function item_post(&$a) {
 	$str_tags = '';
 	$inform   = '';
 
+
 	$tags = get_tags($body);
 
+	if(($parent_contact) && ($parent_contact['network'] === 'stat') && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
+		$body = '@' . $parent_contact['nick'] . ' ' . $body;
+		$tags[] = '@' . $parent_contact['nick'];
+	}		
 
 	if(count($tags)) {
 		foreach($tags as $tag) {
@@ -199,6 +215,7 @@ function item_post(&$a) {
 				continue;
 			}
 			if(strpos($tag,'@') === 0) {
+				$stat = false;
 				$name = substr($tag,1);
 				if((strpos($name,'@')) || (strpos($name,'http://'))) {
 					$newname = $name;
@@ -232,7 +249,12 @@ function item_post(&$a) {
 					}
 					if(count($r)) {
 						$profile = $r[0]['url'];
-						$newname = $r[0]['name'];
+						if($r[0]['network'] === 'stat') {
+							$newname = $r[0]['nick'];
+							$stat = true;
+						}
+						else
+							$newname = $r[0]['name'];
 						if(strlen($inform))
 							$inform .= ',';
 						$inform .= 'cid:' . $r[0]['id'];
@@ -249,6 +271,8 @@ function item_post(&$a) {
 		}
 	}
 
+
+
 	$wall = 0;
 	if($post_type === 'wall' || $post_type === 'wall-comment')
 		$wall = 1;