X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fexpire.php;h=aa34cbaa5bf88b8c4af782e0680058c2a22df3b0;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=873c594e8499ea93aeaa55727abeb09f34e81e28;hpb=1471385157866b1deabe69dd6678dac220afd90e;p=friendica.git

diff --git a/include/expire.php b/include/expire.php
index 873c594e84..aa34cbaa5b 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,48 +1,35 @@
 <?php
 
-require_once("boot.php");
+use Friendica\Core\Config;
 
 function expire_run(&$argv, &$argc){
-	global $a, $db;
+	global $a;
 
-	if(is_null($a)) {
-		$a = new App;
-	}
-
-	if(is_null($db)) {
-	    @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('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");
+	$r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+	if (dbm::is_result($r)) {
+		while ($row = dba::fetch($r)) {
+			dba::delete('item', array('id' => $row['id']));
+		}
+		dba::close($r);
+	}
 
 	// make this optional as it could have a performance impact on large sites
-
-	if(intval(get_config('system','optimize_items')))
-		q("optimize table item");
+	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) {
+	$r = q("SELECT `uid`, `username`, `expire` FROM `user` WHERE `expire` != 0");
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
 			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
-			item_expire($rr['uid'],$rr['expire']);
+			item_expire($rr['uid'], $rr['expire']);
 		}
 	}
 
@@ -52,8 +39,3 @@ function expire_run(&$argv, &$argc){
 
 	return;
 }
-
-if (array_search(__file__,get_included_files())===0){
-  expire_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
-}