prune old expired and deleted items

diff --git a/boot.php b/boot.php
index 9b4d14645b305a6b8f5993e27e8e26716176a21c..4fb433fea2518abcd215d805faee4514221188d5 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1239' );
+define ( 'FRIENDICA_VERSION',      '2.3.1240' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1118      );
 

diff --git a/include/expire.php b/include/expire.php
index 64dbe2536d4d880294f8060bd6e1b684d1af83df..7608b905467f0f83a90c634bc5f72a081cf0199a 100755 (executable)
--- a/include/expire.php
+++ b/include/expire.php
@@ -29,6 +29,11 @@ function expire_run($argv, $argc){
        $a->set_baseurl(get_config('system','url'));
 
 
+       // physically remove anything that has been deleted from more than two months
+
+       $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+
+
        logger('expire: start');
        
        $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");

diff --git a/mod/settings.php b/mod/settings.php
index c61d5c227a66f10f63a7a96d40941f74d860892f..e75272539d1dc16d497196f200e81429f1b9be55 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -757,7 +757,7 @@ function settings_content(&$a) {
        $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
        $expire_arr = array(
-               'days' => array('expire',  t("Automatically expire posts after days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
+               'days' => array('expire',  t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
                'advanced' => t('Advanced expiration settings'),
                'label' => t('Advanced Expiration'),
                'items' => array('expire_items',  t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),