also allow service classes to set post expiration. These take priority over the site default.

2 files changed, 15 insertions, 13 deletions

diff --git a/include/expire.php b/include/expire.php
index e414a6e7d..b244e65f5 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -41,12 +41,7 @@ function expire_run($argv, $argc){
 
 	logger('site_expire: ' . $site_expire);
 
-	if(intval($site_expire)) {
-		$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
-	}
-	else {
-		$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where channel_expire_days != 0");
-	}
+	$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
 
 	if($r) {
 		foreach($r as $rr) {
@@ -55,16 +50,23 @@ function expire_run($argv, $argc){
 			if($rr['channel_pageflags'] & PAGE_SYSTEM)
 				continue;
 
-			if(intval($site_expire) && (intval($site_expire) < intval($rr['channel_expire_days'])) ||
+			// service class default (if non-zero) over-rides the site default
+
+			$service_class_expire = service_class_fetch($rr['channel_id'],'expire_days');
+			if(intval($service_class_expire))
+				$channel_expire = $service_class_expire;
+			else
+				$channel_expire = $site_expire;
+
+			if(intval($channel_expire) && (intval($channel_expire) < intval($rr['channel_expire_days'])) ||
 				intval($rr['channel_expire_days'] == 0)) {
-				$expire_days = $site_expire;
+				$expire_days = $channel_expire;
 			}
 			else {
 				$expire_days = $rr['channel_expire_days'];
 			}
 
-
-			// if the site expiration is non-zero and less than person expiration, use that
+			// if the site or service class expiration is non-zero and less than person expiration, use that
 			logger('Expire: ' . $rr['channel_address'] . ' interval: ' . $expire_days, LOGGER_DEBUG);
 			item_expire($rr['channel_id'], $expire_days);
 		}
diff --git a/include/items.php b/include/items.php
index da0e50c4c..a8947202d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3926,15 +3926,15 @@ function item_expire($uid,$days) {
 	if(! intval($expire_limit))
 		$expire_limit = 5000;
 
-	$sql_extra = ((intval($expire_network_only)) ? " AND not (item_flags & " . intval(ITEM_WALL) . ") > 0 " : "");
+	$sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : "");
 
 	$r = q("SELECT * FROM `item` 
 		WHERE `uid` = %d 
 		AND `created` < %s - INTERVAL %s 
 		AND `id` = `parent` 
 		$sql_extra
-		AND NOT ( item_flags & %d )>0
-		AND (item_restrict = 0 ) LIMIT $expire_limit ",
+		AND ( item_flags & %d ) = 0
+		AND ( item_restrict = 0 ) LIMIT $expire_limit ",
 		intval($uid),
 		db_utcnow(), db_quoteinterval(intval($days).' DAY'),
 		intval(ITEM_RETAINED)