Merge branch 'master' of git://github.com/friendica/friendica

1 files changed, 62 insertions, 41 deletions

diff --git a/include/items.php b/include/items.php
index 07f62ece5..e9df9b00c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2227,10 +2227,10 @@ function local_delivery($importer,$data) {
 				logger('local_delivery: received remote comment');
 				$is_like = false;
 				// remote reply to our post. Import and then notify everybody else.
-				$datarray = get_atom_elements($feed,$item);
 
+				$datarray = get_atom_elements($feed,$item);
 
-				$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body`  FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['importer_uid'])
 				);
@@ -2266,14 +2266,22 @@ function local_delivery($importer,$data) {
 //					return 0;
 //				}					
 
+				// our user with $importer['importer_uid'] is the owner
+
+				$own = q("select name,url,thumb from contact where uid = %d and self = 1 limit 1",
+					intval($importer['importer_uid'])
+				);
+
+
 				$datarray['type'] = 'remote-comment';
 				$datarray['wall'] = 1;
 				$datarray['parent-uri'] = $parent_uri;
 				$datarray['uid'] = $importer['importer_uid'];
-				$datarray['owner-name'] = $r[0]['name'];
-				$datarray['owner-link'] = $r[0]['url'];
-				$datarray['owner-avatar'] = $r[0]['thumb'];
+				$datarray['owner-name'] = $own[0]['name'];
+				$datarray['owner-link'] = $own[0]['url'];
+				$datarray['owner-avatar'] = $own[0]['thumb'];
 				$datarray['contact-id'] = $importer['id'];
+
 				if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
 					$is_like = true;
 					$datarray['type'] = 'activity';
@@ -2290,26 +2298,34 @@ function local_delivery($importer,$data) {
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
-
-
+					
 					$xo = parse_xml_string($datarray['object'],false);
 					$xt = parse_xml_string($datarray['target'],false);
 
-					if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) {
+					if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id)) {
+
+						// fetch the parent item
+
+						$tagp = q("select * from item where uri = '%s' and uid = %d limit 1",
+							dbesc($xt->id),
+							intval($importer['importer_uid'])
+						);
+						if(! count($tagp))
+							continue;	
 
 						// extract tag, if not duplicate, and this user allows tags, add to parent item						
 
 						if($xo->id && $xo->content) {
 							$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
-
-							if(! (stristr($r[0]['tag'],$newtag))) {
+							if(! (stristr($tagp[0]['tag'],$newtag))) {
 								$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
 									intval($importer['importer_uid'])
 								);
-								if(count($i) && ! ($i[0]['blocktags'])) {
-									q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
-										dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
-										intval($r[0]['id'])
+								if(count($i) && ! intval($i[0]['blocktags'])) {
+									q("UPDATE item SET tag = '%s', `edited` = '%s' WHERE id = %d LIMIT 1",
+										dbesc($tagp[0]['tag'] . (strlen($tagp[0]['tag']) ? ',' : '') . $newtag),
+										intval($tagp[0]['id']),
+										dbesc(datetime_convert())
 									);
 								}
 							}
@@ -3013,32 +3029,7 @@ function item_expire($uid,$days) {
 		if($expire_items==0 && $item['type']!='note')
 			continue;
 
-
-		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			intval($item['id'])
-		);
-
-		$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d",
-			intval($item['id']),
-			intval($uid)
-		);
-
-		$r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d",
-			intval($item['id']),
-			intval($uid)
-		);
-
-		// kill the kids
-
-		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($item['parent-uri']),
-			intval($item['uid'])
-		);
-
+		drop_item($item['id'],false);
 	}
 
 	proc_run('php',"include/notifier.php","expire","$uid");
@@ -3100,6 +3091,25 @@ function drop_item($id,$interactive = true) {
 			intval($item['id'])
 		);
 
+		// clean up categories and tags so they don't end up as orphans
+
+		$matches = false;
+		$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+		if($cnt) {
+			foreach($matches as $mtch) {
+				file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true);
+			}
+		}
+
+		$matches = false;
+
+		$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+		if($cnt) {
+			foreach($matches as $mtch) {
+				file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false);
+			}
+		}
+
 		// If item is a link to a photo resource, nuke all the associated photos 
 		// (visitors will not have photo resources)
 		// This only applies to photos uploaded from the photos page. Photos inserted into a post do not
@@ -3123,6 +3133,17 @@ function drop_item($id,$interactive = true) {
 			// ignore the result
 		}
 
+		// clean up item_id and sign meta-data tables
+
+		$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)",
+			intval($item['id']),
+			intval($item['uid'])
+		);
+
+		$r = q("DELETE FROM sign where iid in (select id from item where parent = %d and uid = %d)",
+			intval($item['id']),
+			intval($item['uid'])
+		);
 
 		// If it's the parent of a comment thread, kill all the kids
 
@@ -3155,7 +3176,7 @@ function drop_item($id,$interactive = true) {
 			}	
 		}
 		$drop_id = intval($item['id']);
-			
+
 		// send the notification upstream/downstream as the case may be
 
 		if(! $interactive)