X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fexpire.php;h=855d7fb5e44abc544f7eb5f7f5364e7bd05253f6;hb=8939a2550273d16005e757e0dde134bd9538dc7b;hp=5fa0ec758b3d723b45ac53b2a7b0dd0a951962ec;hpb=4cf6bd54693b460f3ac28d2760ff33b740493e39;p=friendica.git

diff --git a/include/expire.php b/include/expire.php
old mode 100755
new mode 100644
index 5fa0ec758b..855d7fb5e4
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,30 +1,29 @@
 <?php
 
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 
-function expire_run($argv, $argc){
+function expire_run(&$argv, &$argc){
 	global $a, $db;
 
 	if(is_null($a)) {
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
-	    @include(".htconfig.php");
-    	require_once("dba.php");
-	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    	unset($db_host, $db_user, $db_pass, $db_data);
-  	};
+		@include(".htconfig.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('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');
-
+	Config::load();
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -32,22 +31,30 @@ function expire_run($argv, $argc){
 	// 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");
-	q("optimize table item");
+
+	// 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");
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
 			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
 			item_expire($rr['uid'],$rr['expire']);
 		}
 	}
 
+	load_hooks();
+
+	call_hooks('expire');
+
 	return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  expire_run($argv,$argc);
+  expire_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }