Merge remote branch 'upstream/master'

1 files changed, 44 insertions, 29 deletions

diff --git a/include/items.php b/include/items.php
index a1dcdb6d8..b1dc1708f 100644
--- a/include/items.php
+++ b/include/items.php
@@ -952,7 +952,7 @@ function tag_deliver($uid,$item_id) {
 
 	$mention = false;
 
-	$u = q("select uid, nickname, language, username, email, `page-flags`, `notify-flags` from user where uid = %d limit 1",
+	$u = q("select * from user where uid = %d limit 1",
 		intval($uid)
 	);
 	if(! count($u))
@@ -1027,10 +1027,20 @@ function tag_deliver($uid,$item_id) {
 	if(! count($c))
 		return;
 
-	q("update item set wall = 1, origin = 1, forum_mode = 1, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s'  where id = %d limit 1",
+	// also reset all the privacy bits to the forum default permissions
+
+	$private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
+
+	q("update item set wall = 1, origin = 1, forum_mode = 1, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s', 
+		`private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'  where id = %d limit 1",
 		dbesc($c[0]['name']),
 		dbesc($c[0]['url']),
 		dbesc($c[0]['thumb']),
+		intval($private),
+		dbesc($u[0]['allow_cid']),
+		dbesc($u[0]['allow_gid']),
+		dbesc($u[0]['deny_cid']),
+		dbesc($u[0]['deny_gid']),
 		intval($item_id)
 	);
 
@@ -3029,32 +3039,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");
@@ -3116,6 +3101,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
@@ -3139,6 +3143,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
 
@@ -3171,7 +3186,7 @@ function drop_item($id,$interactive = true) {
 			}	
 		}
 		$drop_id = intval($item['id']);
-			
+
 		// send the notification upstream/downstream as the case may be
 
 		if(! $interactive)