X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=6e6e822d0cfe1ac9d973f864141837499be8f6f1;hb=9d9176f87e6db2f34c85ee098cede766d0744e9b;hp=2cc2b9eb2cd9a1564cc8cedbb7e0224283a550c3;hpb=b87ddbd58aa2739521282f44a463be53c6397231;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 2cc2b9eb2c..6e6e822d0c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -35,7 +35,9 @@ function item_post(&$a) {
 		);
 		if(! count($r)) {
 			notice( t('Unable to locate original post.') . EOL);
-			goaway($a->get_baseurl() . "/" . $_POST['return'] );
+			if(x($_POST,'return')) 
+				goaway($a->get_baseurl() . "/" . $_POST['return'] );
+			killme();
 		}
 		$parent_item = $r[0];
 		if($parent_item['contact-id'] && $uid) {
@@ -53,7 +55,9 @@ function item_post(&$a) {
 
 	if(! can_write_wall($a,$profile_uid)) {
 		notice( t('Permission denied.') . EOL) ;
-		return;
+		if(x($_POST,'return')) 
+			goaway($a->get_baseurl() . "/" . $_POST['return'] );
+		killme();
 	}
 
 	$user = null;
@@ -92,8 +96,9 @@ function item_post(&$a) {
 
 	if(! strlen($body)) {
 		notice( t('Empty post discarded.') . EOL );
-		goaway($a->get_baseurl() . "/" . $_POST['return'] );
-
+		if(x($_POST,'return')) 
+			goaway($a->get_baseurl() . "/" . $_POST['return'] );
+		killme();
 	}
 
 	// get contact info for poster
@@ -207,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))
@@ -215,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://'))) {
@@ -234,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",
@@ -252,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'];
@@ -266,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]';
+					}
+
 				}
 			}
 		}
@@ -429,10 +451,11 @@ function item_post(&$a) {
 			}
 		}
 
-		$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
+		$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
 			WHERE `id` = %d LIMIT 1",
 			intval($parent),
 			dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
+			dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
 			dbesc(datetime_convert()),
 			intval($post_id)
 		);
@@ -454,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;
 
@@ -490,10 +509,17 @@ function item_post(&$a) {
 		}
 	}
 
-	if((x($_POST,'return')) && strlen($_POST['return']))
+	logger('post_complete');
+	if((x($_POST,'return')) && strlen($_POST['return'])) {
+		logger('return: ' . $_POST['return']);
 		goaway($a->get_baseurl() . "/" . $_POST['return'] );
-
+	}
 	$json = array('success' => 1);
+	if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
+		$json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];
+
+	logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
+
 	echo json_encode($json);
 	killme();
 	// NOTREACHED
@@ -510,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])) {
 
@@ -544,7 +570,7 @@ function item_content(&$a) {
 			// generate a resource-id and therefore aren't intimately linked to the item. 
 
 			if(strlen($item['resource-id'])) {
-				$q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
+				q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
 					dbesc($item['resource-id']),
 					intval($item['uid'])
 				);
@@ -582,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