X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=5ccf76b257c2d9837ec5ff6fff459c39f612d4e0;hb=c568493f572bdc88cae288d5c43e9fb55361ce07;hp=72c1a8b324346e042e668c1381766a9b916f2a00;hpb=fd4fe24406edb277814c7a45a6094a8eec0850d7;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 72c1a8b324..5ccf76b257 100644
--- a/include/items.php
+++ b/include/items.php
@@ -913,6 +913,9 @@ function get_item_contact($item,$contacts) {
 
 function tgroup_deliver($uid,$item_id) {
 
+
+	// setup a second delivery chain for forum/community posts if appropriate
+
 	$a = get_app();
 
 	$deliver_to_tgroup = false;
@@ -924,10 +927,7 @@ function tgroup_deliver($uid,$item_id) {
 	if(! count($u))
 		return;
 
-	// We will only forward public tgroup posts, as this opens a second delivery chain
-	// and privacy can only be controlled by the first chain.
-
-	$i = q("select * from item where id = %d and uid = %d and private = 0 limit 1",
+	$i = q("select * from item where id = %d and uid = %d limit 1",
 		intval($item_id),
 		intval($uid)
 	);
@@ -937,9 +937,9 @@ function tgroup_deliver($uid,$item_id) {
 	$item = $i[0];
 
 	// prevent delivery looping - only proceed
-	// if the message originated elsewhere
+	// if the message originated elsewhere and is a top-level post
 
-	if(($item['wall']) || ($item['origin']))
+	if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
 		return;
 
 
@@ -958,7 +958,12 @@ function tgroup_deliver($uid,$item_id) {
 	if(! $deliver_to_tgroup)
 		return;
 
-	// now deliver to all the tgroup members
+	// now change this copy of the post to a forum head message and deliver to all the tgroup members
+
+
+	q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
+		intval($item_id)
+	);
 
 	proc_run('php','include/notifier.php','tgroup',$item_id);			
 
@@ -2035,7 +2040,7 @@ function local_delivery($importer,$data) {
  
 			// was the top-level post for this reply written by somebody on this site? 
 			// Specifically, the recipient? 
-dbg(1);
+
 			$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
 				`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
 				LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
@@ -2047,7 +2052,7 @@ dbg(1);
 				dbesc($parent_uri),
 				intval($importer['importer_uid'])
 			);
-dbg(0);
+
 			if($r && count($r)) {	
 
 				logger('local_delivery: received remote comment');
@@ -2055,11 +2060,14 @@ dbg(0);
 				// remote reply to our post. Import and then notify everybody else.
 				$datarray = get_atom_elements($feed,$item);
 
-				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
-					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
+
+		// TODO: make this next part work against both delivery threads of a community post
+
+//				if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
+//					logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
 					// they won't know what to do so don't report an error. Just quietly die.
-					return 0;
-				}					
+//					return 0;
+//				}					
 
 				$datarray['type'] = 'remote-comment';
 				$datarray['wall'] = 1;
@@ -2104,14 +2112,14 @@ dbg(0);
 					}
 				}
 
-				if($community) {
-					$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
-					if(! stristr($datarray['tag'],$newtag)) {
-						if(strlen($datarray['tag']))
-							$datarray['tag'] .= ',';
-						$datarray['tag'] .= $newtag;
-					}
-				}
+// 				if($community) {
+//					$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
+//					if(! stristr($datarray['tag'],$newtag)) {
+//						if(strlen($datarray['tag']))
+//							$datarray['tag'] .= ',';
+//						$datarray['tag'] .= $newtag;
+//					}
+//				}
 
 
 				$posted_id = item_store($datarray);
@@ -2806,14 +2814,32 @@ function item_expire($uid,$days) {
 
 	if(! count($r))
 		return;
+
+	$expire_items = get_pconfig($uid, 'expire','items');
+	$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
+	
+	$expire_notes = get_pconfig($uid, 'expire','notes');
+	$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
+
+	$expire_starred = get_pconfig($uid, 'expire','starred');
+	$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
+	
+	$expire_photos = get_pconfig($uid, 'expire','photos');
+	$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
  
-	logger('expire: # items=' . count($r) );
+	logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
 	foreach($r as $item) {
 
 		// Only expire posts, not photos and photo comments
 
-		if(strlen($item['resource-id']))
+		if($expire_photos==0 && strlen($item['resource-id']))
+			continue;
+		if($expire_starred==0 && intval($item['starred']))
+			continue;
+		if($expire_notes==0 && $item['type']=='note')
+			continue;
+		if($expire_items==0 && $item['type']!='note')
 			continue;
 
 		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
@@ -2834,7 +2860,7 @@ function item_expire($uid,$days) {
 	}
 
 	proc_run('php',"include/notifier.php","expire","$uid");
-
+	
 }