add commented_days parameter to item_expire(), default 7. Both expire_days and commented_days have to be exceeded to expire.

2 files changed, 11 insertions, 8 deletions

diff --git a/Zotlabs/Widget/Tagcloud.php b/Zotlabs/Widget/Tagcloud.php
index cf7a4932e..f79bd59ad 100644
--- a/Zotlabs/Widget/Tagcloud.php
+++ b/Zotlabs/Widget/Tagcloud.php
@@ -2,9 +2,6 @@
 
 namespace Zotlabs\Widget;
 
-// @FIXME The problem with this widget is that we don't have a search function for webpages 
-// that we can send the links to. Then we should also provide an option to search webpages
-// and conversations.
 
 class Tagcloud {
 
@@ -14,15 +11,15 @@ class Tagcloud {
 		$uid = \App::$profile_uid;
 		$count = ((x($args,'count')) ? intval($args['count']) : 24);
 		$flags = 0;
-		$type = TERM_CATEGORY;
+		$type = TERM_HASHTAG;
 
 		// @FIXME there exists no $authors variable
-		$r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type);
+		$r = tagadelic($uid, $count, $authors, $owner, $flags, 0, $type);
 
 		// @FIXME this should use a template
 
 		if($r) {
-			$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
+			$o = '<div class="tagblock widget"><h3>' . t('Tags') . '</h3><div class="tags" align="center">';
 			foreach($r as $rv) {
 				$o .= '<span class="tag' . $rv[2] . '">' . $rv[0] .' </span> ' . "\r\n";
 			}
diff --git a/include/items.php b/include/items.php
index 6ddab9bf8..8bc4595b6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3504,11 +3504,14 @@ function item_getfeedattach($item) {
 }
 
 
-function item_expire($uid,$days) {
+function item_expire($uid,$days,$comment_days = 7) {
 
 	if((! $uid) || ($days < 1))
 		return;
 
+	if(! $comment_days)
+		$comment_days = 7;
+	
 	// $expire_network_only = save your own wall posts
 	// and just expire conversations started by others
 	// do not enable this until we can pass bulk delete messages through zot
@@ -3527,6 +3530,7 @@ function item_expire($uid,$days) {
 	$r = q("SELECT id FROM item
 		WHERE uid = %d
 		AND created < %s - INTERVAL %s
+		AND commented < %s - INTERVAL %s
 		AND item_retained = 0
 		AND item_thread_top = 1
 		AND resource_type = ''
@@ -3534,7 +3538,9 @@ function item_expire($uid,$days) {
 		$sql_extra $item_normal LIMIT $expire_limit ",
 		intval($uid),
 		db_utcnow(),
-		db_quoteinterval(intval($days).' DAY')
+		db_quoteinterval(intval($days) . ' DAY'),
+		db_utcnow(),
+		db_quoteinterval(intval($comment_days) . ' DAY')
 	);
 
 	if(! $r)