New cache system with subdirectories

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index ce8399a485baa52970234e31b0a959cb645d0613..6f2eeed822b80f757adafaf269caac0c656ee91e 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -3,7 +3,7 @@
 require_once("boot.php");
 
 
-function poller_run($argv, $argc){
+function poller_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)) {
@@ -71,7 +71,7 @@ function poller_run($argv, $argc){
        // delete user and contact records for recently removed accounts
 
        $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-       if (count($r)) {
+       if ($r) {
                foreach($r as $user) {
                        q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
                        q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
@@ -102,18 +102,8 @@ function poller_run($argv, $argc){
        // clear old cache
        Cache::clear();
 
-       // clear item cache files if they are older than one day
-       $cache = get_config('system','itemcache');
-       if (($cache != '') and is_dir($cache)) {
-               if ($dh = opendir($cache)) {
-                       while (($file = readdir($dh)) !== false) {
-                               $fullpath = $cache."/".$file;
-                               if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
-                                       unlink($fullpath);
-                       }
-                       closedir($dh);
-               }
-       }
+       // clear old item cache files
+       clear_cache();
 
        $manual_id  = 0;
        $generation = 0;
@@ -128,7 +118,7 @@ function poller_run($argv, $argc){
                $restart = true;
                $generation = intval($argv[2]);
                if(! $generation)
-                       killme();               
+                       killme();
        }
 
        if(($argc > 1) && intval($argv[1])) {