require_once("boot.php");
-function poller_run($argv, $argc){
+function poller_run(&$argv, &$argc){
global $a, $db;
if(is_null($a)) {
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);
};
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
AND `account_expires_on` != '0000-00-00 00:00:00'
AND `account_expires_on` < UTC_TIMESTAMP() ");
+
+ // 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 ($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']));
+ }
+ }
$abandon_days = intval(get_config('system','account_abandon_days'));
if($abandon_days < 1)
proc_run('php','include/expire.php');
}
- // 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);
- }
+ $last = get_config('system','cache_last_cleared');
+
+ if($last) {
+ $next = $last + (3600); // Once per hour
+ $clear_cache = ($next <= time());
+ } else
+ $clear_cache = true;
+
+ if ($clear_cache) {
+ // clear old cache
+ Cache::clear();
+
+ // clear old item cache files
+ clear_cache();
+
+ // clear cache for photos
+ clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+ set_config('system','cache_last_cleared', time());
}
$manual_id = 0;
$restart = true;
$generation = intval($argv[2]);
if(! $generation)
- killme();
+ killme();
}
if(($argc > 1) && intval($argv[1])) {
$sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0
- AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
+ AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA),