X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=901fb3385da8cb2779212e7242fb02d4cf668cae;hb=f2f73799ba49560eff9ca2582080a6f762f01511;hp=712174b0ae79ee15bc014144912b315e3bd71f31;hpb=c9536ac05685e6e70b0e90f5d9f1bd24945a2dff;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 712174b0ae..901fb3385d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -3,22 +3,25 @@
 /**
  *
  * This is the POST destination for most all locally posted
- * text stuff. This function handles status, wall-to-wall status, 
- * local comments, and remote coments that are posted on this site 
+ * text stuff. This function handles status, wall-to-wall status,
+ * local comments, and remote coments that are posted on this site
  * (as opposed to being delivered in a feed).
- * Also processed here are posts and comments coming through the 
- * statusnet/twitter API. 
- * All of these become an "item" which is our basic unit of 
+ * Also processed here are posts and comments coming through the
+ * statusnet/twitter API.
+ * All of these become an "item" which is our basic unit of
  * information.
- * Posts that originate externally or do not fall into the above 
- * posting categories go through item_store() instead of this function. 
+ * Posts that originate externally or do not fall into the above
+ * posting categories go through item_store() instead of this function.
  *
- */  
+ */
 
 require_once('include/crypto.php');
 require_once('include/enotify.php');
 require_once('include/email.php');
-require_once('Text/LanguageDetect.php');
+require_once('library/langdet/Text/LanguageDetect.php');
+require_once('include/tags.php');
+require_once('include/files.php');
+require_once('include/threads.php');
 
 function item_post(&$a) {
 
@@ -43,9 +46,25 @@ function item_post(&$a) {
 	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+	$message_id = ((x($_REQUEST,'message_id') && $api_source)  ? strip_tags($_REQUEST['message_id'])       : '');
+
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
 
+
+	// Check for doubly-submitted posts, and reject duplicates
+	// Note that we have to ignore previews, otherwise nothing will post
+	// after it's been previewed
+	if(!$preview && x($_REQUEST['post_id_random'])) {
+		if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+			logger("item post: duplicate post", LOGGER_DEBUG);
+			item_post_return($a->get_baseurl(), $api_source, $return_path);
+		}
+		else
+			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
+	}
+
 	/**
 	 * Is this a reply to something?
 	 */
@@ -58,9 +77,12 @@ function item_post(&$a) {
 	$thr_parent = '';
 	$parid = 0;
 	$r = false;
+	$objecttype = null;
 
 	if($parent || $parent_uri) {
 
+		$objecttype = ACTIVITY_OBJ_COMMENT;
+
 		if(! x($_REQUEST,'type'))
 			$_REQUEST['type'] = 'net-comment';
 
@@ -89,7 +111,7 @@ function item_post(&$a) {
 
 		if(($r === false) || (! count($r))) {
 			notice( t('Unable to locate original post.') . EOL);
-			if(x($_REQUEST,'return')) 
+			if(x($_REQUEST,'return'))
 				goaway($a->get_baseurl() . "/" . $return_path );
 			killme();
 		}
@@ -98,7 +120,7 @@ function item_post(&$a) {
 
 		// multi-level threading - preserve the info but re-parent to our single level threading
 		//if(($parid) && ($parid != $parent))
-			$thr_parent = $parent_uri;
+		$thr_parent = $parent_uri;
 
 		if($parent_item['contact-id'] && $uid) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -124,7 +146,7 @@ function item_post(&$a) {
 
 	if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
 		notice( t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return')) 
+		if(x($_REQUEST,'return'))
 			goaway($a->get_baseurl() . "/" . $return_path );
 		killme();
 	}
@@ -140,7 +162,7 @@ function item_post(&$a) {
 
 	if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
 		notice( t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return')) 
+		if(x($_REQUEST,'return'))
 			goaway($a->get_baseurl() . "/" . $return_path );
 		killme();
 	}
@@ -176,6 +198,7 @@ function item_post(&$a) {
 		$location          = $orig_post['location'];
 		$coord             = $orig_post['coord'];
 		$verb              = $orig_post['verb'];
+		$objecttype        = $orig_post['object-type'];
 		$emailcc           = $orig_post['emailcc'];
 		$app			   = $orig_post['app'];
 		$categories        = $orig_post['file'];
@@ -183,9 +206,10 @@ function item_post(&$a) {
 		$body              = escape_tags(trim($_REQUEST['body']));
 		$private           = $orig_post['private'];
 		$pubmail_enable    = $orig_post['pubmail'];
+		$network           = $orig_post['network'];
+		$guid              = $orig_post['guid'];
 
-	}
-	else {
+	} else {
 
 		// if coming from the API and no privacy settings are set, 
 		// use the user default permissions - as they won't have
@@ -217,15 +241,31 @@ function item_post(&$a) {
 		$verb              = notags(trim($_REQUEST['verb']));
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
 		$body              = escape_tags(trim($_REQUEST['body']));
+		$network           = notags(trim($_REQUEST['network']));
+		$guid              = get_guid(32);
 
 
 		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
 
 		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
 			$l = new Text_LanguageDetect;
-			$lng = $l->detectConfidence($naked_body);
+			//$lng = $l->detectConfidence($naked_body);
+			//$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+
+			$lng = $l->detect($naked_body, 3);
 
-			$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+			if (sizeof($lng) > 0) {
+				$postopts = "";
+
+				foreach ($lng as $language => $score) {
+					if ($postopts == "")
+						$postopts = "lang=";
+					else
+						$postopts .= ":";
+
+					$postopts .= $language.";".$score;
+				}
+			}
 
 			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
 		}
@@ -235,15 +275,25 @@ function item_post(&$a) {
 
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
+
+		if($user['hidewall'])
+			$private = 2;
+
 		// If this is a comment, set the permissions from the parent.
 
 		if($parent_item) {
 			$private = 0;
 
-			if(($parent_item['private']) 
-				|| strlen($parent_item['allow_cid']) 
-				|| strlen($parent_item['allow_gid']) 
-				|| strlen($parent_item['deny_cid']) 
+			// for non native networks use the network of the original post as network of the item
+			if (($parent_item['network'] != NETWORK_DIASPORA)
+				AND ($parent_item['network'] != NETWORK_OSTATUS)
+				AND ($network == ""))
+				$network = $parent_item['network'];
+
+			if(($parent_item['private'])
+				|| strlen($parent_item['allow_cid'])
+				|| strlen($parent_item['allow_gid'])
+				|| strlen($parent_item['deny_cid'])
 				|| strlen($parent_item['deny_gid'])) {
 				$private = (($parent_item['private']) ? $parent_item['private'] : 1);
 			}
@@ -253,7 +303,6 @@ function item_post(&$a) {
 			$str_contact_deny  = $parent_item['deny_cid'];
 			$str_group_deny    = $parent_item['deny_gid'];
 		}
-	
 		$pubmail_enable    = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
 		// if using the API, we won't see pubmail_enable - figure out if it should be set
@@ -273,7 +322,7 @@ function item_post(&$a) {
 			if($preview)
 				killme();
 			info( t('Empty post discarded.') . EOL );
-			if(x($_REQUEST,'return')) 
+			if(x($_REQUEST,'return'))
 				goaway($a->get_baseurl() . "/" . $return_path );
 			killme();
 		}
@@ -296,7 +345,11 @@ function item_post(&$a) {
 	// First figure out if it's a status post that would've been
 	// created using tinymce. Otherwise leave it alone. 
 
-	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+/*	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled($profile_uid,'richtext') : 0);
+	if((! $parent) && (! $api_source) && (! $plaintext)) {
+		$body = fix_mce_lf($body);
+	}*/
+	$plaintext = (local_user() ? !feature_enabled($profile_uid,'richtext') : 0);
 	if((! $parent) && (! $api_source) && (! $plaintext)) {
 		$body = fix_mce_lf($body);
 	}
@@ -322,7 +375,7 @@ function item_post(&$a) {
 					break;
 				}
 			}
-		}				
+		}
 		if($contact_id) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($contact_id)
@@ -336,7 +389,7 @@ function item_post(&$a) {
 	}
 
 	// get contact info for owner
-	
+
 	if($profile_uid == local_user()) {
 		$contact_record = $author;
 	}
@@ -361,7 +414,7 @@ function item_post(&$a) {
 
 	/**
 	 *
-	 * When a photo was uploaded into the message using the (profile wall) ajax 
+	 * When a photo was uploaded into the message using the (profile wall) ajax
 	 * uploader, The permissions are initially set to disallow anybody but the
 	 * owner from seeing it. This is because the permissions may not yet have been
 	 * set for the post. If it's private, the photo permissions should be set
@@ -376,6 +429,9 @@ function item_post(&$a) {
 	if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
 		$images = $match[2];
 		if(count($images)) {
+
+			$objecttype = ACTIVITY_OBJ_IMAGE;
+
 			foreach($images as $image) {
 				if(! stristr($image,$a->get_baseurl() . '/photo/'))
 					continue;
@@ -394,7 +450,7 @@ function item_post(&$a) {
 
 				if(! count($r))
 					continue;
- 
+
 
 				$r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
 					WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ",
@@ -406,7 +462,7 @@ function item_post(&$a) {
 					intval($profile_uid),
 					dbesc( t('Wall Photos'))
 				);
- 
+
 			}
 		}
 	}
@@ -425,10 +481,10 @@ function item_post(&$a) {
 				$r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 					intval($profile_uid),
 					intval($attach)
-				);				
+				);
 				if(count($r)) {
 					$r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
-						WHERE `uid` = %d AND `id` = %d LIMIT 1",
+						WHERE `uid` = %d AND `id` = %d",
 						dbesc($str_contact_allow),
 						dbesc($str_group_allow),
 						dbesc($str_contact_deny),
@@ -445,6 +501,7 @@ function item_post(&$a) {
 
 	$bookmark = 0;
 	if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) {
+		$objecttype = ACTIVITY_OBJ_BOOKMARK;
 		$bookmark = 1;
 	}
 
@@ -460,6 +517,20 @@ function item_post(&$a) {
 	$body = scale_external_images($body,false);
 
 
+	// Setting the object type if not defined before
+	if (!$objecttype) {
+		$objecttype = ACTIVITY_OBJ_NOTE; // Default value
+		require_once("include/plaintext.php");
+		$objectdata = get_attached_data($body);
+
+		if ($post["type"] == "link")
+			$objecttype = ACTIVITY_OBJ_BOOKMARK;
+		elseif ($post["type"] == "video")
+			$objecttype = ACTIVITY_OBJ_VIDEO;
+		elseif ($post["type"] == "photo")
+			$objecttype = ACTIVITY_OBJ_IMAGE;
+
+	}
 
 	/**
 	 * Look for any tags and linkify them
@@ -480,7 +551,7 @@ function item_post(&$a) {
 		&& ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
 		$body = '@' . $parent_contact['nick'] . ' ' . $body;
 		$tags[] = '@' . $parent_contact['nick'];
-	}		
+	}
 
 	$tagged = array();
 
@@ -516,7 +587,7 @@ function item_post(&$a) {
 		// we tagged a private forum in a top level post and the message was public.
 		// Restrict it.
 		$private = 1;
-		$str_contact_allow = '<' . $private_id . '>'; 
+		$str_contact_allow = '<' . $private_id . '>';
 	}
 
 	$attachments = '';
@@ -545,16 +616,19 @@ function item_post(&$a) {
 	if(! strlen($verb))
 		$verb = ACTIVITY_POST ;
 
+	if ($network == "")
+		$network = NETWORK_DFRN;
+
 	$gravity = (($parent) ? 6 : 0 );
 
 	// even if the post arrived via API we are considering that it 
 	// originated on this site by default for determining relayability.
 
 	$origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
-	
+
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
-	$uri = item_new_uri($a->get_hostname(),$profile_uid);
+	$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid));
 
 	// Fallback so that we alway have a thr-parent
 	if(!$thr_parent)
@@ -565,6 +639,7 @@ function item_post(&$a) {
 	$datarray['type']          = $post_type;
 	$datarray['wall']          = $wall;
 	$datarray['gravity']       = $gravity;
+	$datarray['network']       = $network;
 	$datarray['contact-id']    = $contact_id;
 	$datarray['owner-name']    = $contact_record['name'];
 	$datarray['owner-link']    = $contact_record['url'];
@@ -577,6 +652,7 @@ function item_post(&$a) {
 	$datarray['commented']     = datetime_convert();
 	$datarray['received']      = datetime_convert();
 	$datarray['changed']       = datetime_convert();
+	$datarray['guid']          = $guid;
 	$datarray['uri']           = $uri;
 	$datarray['title']         = $title;
 	$datarray['body']          = $body;
@@ -587,6 +663,7 @@ function item_post(&$a) {
 	$datarray['file']          = $categories;
 	$datarray['inform']        = $inform;
 	$datarray['verb']          = $verb;
+	$datarray['object-type']   = $objecttype;
 	$datarray['allow_cid']     = $str_contact_allow;
 	$datarray['allow_gid']     = $str_group_allow;
 	$datarray['deny_cid']      = $str_contact_deny;
@@ -612,8 +689,6 @@ function item_post(&$a) {
 
 	if($orig_post)
 		$datarray['edit']      = true;
-	else
-		$datarray['guid']      = get_guid();
 
 	// preview mode - prepare the body for display and send it via json
 
@@ -644,17 +719,22 @@ function item_post(&$a) {
 
 
 	if($orig_post) {
-		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
 			dbesc($datarray['title']),
 			dbesc($datarray['body']),
 			dbesc($datarray['tag']),
 			dbesc($datarray['attach']),
 			dbesc($datarray['file']),
 			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
 			intval($post_id),
 			intval($profile_uid)
 		);
 
+		create_tags_from_item($post_id);
+		create_files_from_item($post_id);
+		update_thread($post_id);
+
 		// update filetags in pconfig
                 file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
@@ -669,15 +749,16 @@ function item_post(&$a) {
 		$post_id = 0;
 
 
-	$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
+	$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
-		`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
-		VALUES( '%s', %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', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
+		`tag`, `inform`, `verb`, `object-type`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
+		VALUES( '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
 		dbesc($datarray['guid']),
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
 		intval($datarray['gravity']),
+		dbesc($datarray['network']),
 		intval($datarray['contact-id']),
 		dbesc($datarray['owner-name']),
 		dbesc($datarray['owner-link']),
@@ -700,6 +781,7 @@ function item_post(&$a) {
 		dbesc($datarray['tag']),
 		dbesc($datarray['inform']),
 		dbesc($datarray['verb']),
+		dbesc($datarray['object-type']),
 		dbesc($datarray['postopts']),
 		dbesc($datarray['allow_cid']),
 		dbesc($datarray['allow_gid']),
@@ -719,10 +801,22 @@ function item_post(&$a) {
 	if(count($r)) {
 		$post_id = $r[0]['id'];
 		logger('mod_item: saved item ' . $post_id);
+		add_thread($post_id);
 
 		// update filetags in pconfig
                 file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
+		// Store the fresh generated item into the cache
+		$cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body']));
+
+		if (($cachefile != '') AND !file_exists($cachefile)) {
+			$s = prepare_text($datarray['body']);
+			$stamp1 = microtime(true);
+			file_put_contents($cachefile, $s);
+			$a->save_timestamp($stamp1, "file");
+			logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
+		}
+
 		if($parent) {
 
 			// This item is the last leaf and gets the comment box, clear any ancestors
@@ -730,11 +824,12 @@ function item_post(&$a) {
 				dbesc(datetime_convert()),
 				intval($parent)
 			);
+			update_thread($parent, true);
 
-			// Inherit ACL's from the parent item.
+			// Inherit ACLs from the parent item.
 
 			$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d
-				WHERE `id` = %d LIMIT 1",
+				WHERE `id` = %d",
 				dbesc($parent_item['allow_cid']),
 				dbesc($parent_item['allow_gid']),
 				dbesc($parent_item['deny_cid']),
@@ -752,7 +847,8 @@ function item_post(&$a) {
 					'to_email'     => $user['email'],
 					'uid'          => $user['uid'],
 					'item'         => $datarray,
-					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					//'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'link'		   => $a->get_baseurl().'/display/'.$datarray['guid'],
 					'source_name'  => $datarray['author-name'],
 					'source_link'  => $datarray['author-link'],
 					'source_photo' => $datarray['author-avatar'],
@@ -761,15 +857,14 @@ function item_post(&$a) {
 					'parent'       => $parent,
 					'parent_uri'   => $parent_item['uri']
 				));
-			
+
 			}
 
 
 			// Store the comment signature information in case we need to relay to Diaspora
 			store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id);
 
-		}
-		else {
+		} else {
 			$parent = $post_id;
 
 			if($contact_record != $author) {
@@ -781,7 +876,8 @@ function item_post(&$a) {
 					'to_email'     => $user['email'],
 					'uid'          => $user['uid'],
 					'item'         => $datarray,
-					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					//'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+					'link'		   => $a->get_baseurl().'/display/'.$datarray['guid'],
 					'source_name'  => $datarray['author-name'],
 					'source_link'  => $datarray['author-link'],
 					'source_photo' => $datarray['author-avatar'],
@@ -797,10 +893,11 @@ function item_post(&$a) {
 			$parent = $post_id;
 
 		$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
-			WHERE `id` = %d LIMIT 1",
+			WHERE `id` = %d",
 			intval($parent),
 			dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
-			dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
+			//dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
+			dbesc($a->get_baseurl().'/display/'.$datarray['guid']),
 			dbesc(datetime_convert()),
 			intval($post_id)
 		);
@@ -810,9 +907,10 @@ function item_post(&$a) {
 		// They will show up as people comment on them.
 
 		if(! $parent_item['visible']) {
-			$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1",
+			$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d",
 				intval($parent_item['id'])
 			);
+			update_thread($parent_item['id']);
 		}
 	}
 	else {
@@ -824,14 +922,16 @@ function item_post(&$a) {
 
 	// update the commented timestamp on the parent
 
-	q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+	q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d",
 		dbesc(datetime_convert()),
 		dbesc(datetime_convert()),
 		intval($parent)
 	);
+	update_thread($parent);
 
 	$datarray['id']    = $post_id;
-	$datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
+	//$datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
+	$datarray['plink'] = $a->get_baseurl().'/display/'.$datarray['guid'];
 
 	call_hooks('post_local_end', $datarray);
 
@@ -846,20 +946,33 @@ function item_post(&$a) {
 					. '<br />';
 				$disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
 				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; 
-
-				$subject  = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
-				$headers  = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
-				$headers .= 'MIME-Version: 1.0' . "\n";
-				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-				$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+                                if (!$datarray['title']=='') {
+                                    $subject = email_header_encode($datarray['title'],'UTF-8');
+                                } else {
+				    $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
+                                }
 				$link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
 				$html    = prepare_body($datarray);
 				$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-				@mail($addr, $subject, $message, $headers);
+                                include_once('include/html2plain.php');
+                                $params = array (
+                                    'fromName' => $a->user['username'],
+                                    'fromEmail' => $a->user['email'],
+                                    'toEmail' => $addr,
+                                    'replyTo' => $a->user['email'],
+                                    'messageSubject' => $subject,
+                                    'htmlVersion' => $message,
+                                    'textVersion' => html2plain($html.$disclaimer),
+                                );
+                                enotify::send($params);
 			}
 		}
 	}
 
+	create_tags_from_item($post_id);
+	create_files_from_item($post_id);
+	update_thread($post_id);
+
 	// This is a real juggling act on shared hosting services which kill your processes
 	// e.g. dreamhost. We used to start delivery to our native delivery agents in the background
 	// and then run our plugin delivery from the foreground. We're now doing plugin delivery first,
@@ -867,36 +980,38 @@ function item_post(&$a) {
 	// likely to get killed off. If you end up looking at an /item URL and a blank page,
 	// it's very likely the delivery got killed before all your friends could be notified.
 	// Currently the only realistic fixes are to use a reliable server - which precludes shared hosting,
-	// or cut back on plugins which do remote deliveries.  
+	// or cut back on plugins which do remote deliveries.
 
 	proc_run('php', "include/notifier.php", $notify_type, "$post_id");
 
 	logger('post_complete');
 
+	item_post_return($a->get_baseurl(), $api_source, $return_path);
+	// NOTREACHED
+}
+
+function item_post_return($baseurl, $api_source, $return_path) {
 	// figure out how to return, depending on from whence we came
 
 	if($api_source)
 		return;
 
 	if($return_path) {
-		goaway($a->get_baseurl() . "/" . $return_path);
+		goaway($baseurl . "/" . $return_path);
 	}
 
 	$json = array('success' => 1);
 	if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
-		$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+		$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
 
 	logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
 
 	echo json_encode($json);
 	killme();
-	// NOTREACHED
 }
 
 
 
-
-
 function item_content(&$a) {
 
 	if((! local_user()) && (! remote_user()))
@@ -904,10 +1019,17 @@ function item_content(&$a) {
 
 	require_once('include/security.php');
 
+	$o = '';
 	if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
-		require_once('include/items.php');
-		drop_item($a->argv[2]);
+		require_once('include/items.php'); 
+		$o = drop_item($a->argv[2], !is_ajax());
+		if (is_ajax()){
+			// ajax return: [<item id>, 0 (no perm) | <owner id>] 
+			echo json_encode(array(intval($a->argv[2]), intval($o)));
+			killme();
+		}
 	}
+	return $o;
 }
 
 /**
@@ -994,6 +1116,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 						intval($tagcid),
 						intval($profile_uid)
 				);
+			}
 			else {
 				$newname = str_replace('_',' ',$name);
 
@@ -1032,7 +1155,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 			if(count($r)) {
 				$profile = $r[0]['url'];
 				//set newname to nick, find alias
-				if($r[0]['network'] === 'stat') {
+				if(($r[0]['network'] === NETWORK_OSTATUS) OR ($r[0]['network'] === NETWORK_TWITTER)
+					OR ($r[0]['network'] === NETWORK_STATUSNET) OR ($r[0]['network'] === NETWORK_APPNET)) {
 					$newname = $r[0]['nick'];
 					$stat = true;
 					if($r[0]['alias'])