X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fexpire.php;h=4c6fb7a19dd3e1bd37f79cda4eccd38299615a6c;hb=39d8fec290613cac87c2821b9f7b20fa94d319ca;hp=3c30e01c1b91437988ea648163b34d97518368c9;hpb=a0d2747d527221fc517e5d277035d6e5b07ebf93;p=friendica.git

diff --git a/include/expire.php b/include/expire.php
index 3c30e01c1b..4c6fb7a19d 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -2,7 +2,7 @@
 
 require_once("boot.php");
 
-function expire_run($argv, $argc){
+function expire_run(&$argv, &$argc){
 	global $a, $db;
 
 	if(is_null($a)) {
@@ -11,20 +11,33 @@ function expire_run($argv, $argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
 
-	require_once('session.php');
-	require_once('datetime.php');
-	require_once('simplepie/simplepie.inc');
+	require_once('include/session.php');
+	require_once('include/datetime.php');
+	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 
+	load_config('config');
+	load_config('system');
+
+
 	$a->set_baseurl(get_config('system','url'));
 
 
+	// physically remove anything that has been deleted for more than two months
+
+	$r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+
+	// make this optional as it could have a performance impact on large sites
+
+	if(intval(get_config('system','optimize_items')))
+		q("optimize table item");
+
 	logger('expire: start');
 	
 	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");