diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-19 12:24:40 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-19 12:24:40 +0100 |
| commit | ea4be0db89b5e95b50211e023e94aa008aadae46 (patch) | |
| tree | 2d0654cae606cb3e543463e5569c2b2e689e45d6 /include/poller.php | |
| parent | c30342e2f7bde6fda899193f97ce3051cd8b2fdd (diff) | |
| parent | 2349852b4abd1638624b541f173f51d1fb1ea011 (diff) | |
| download | volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.gz volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.bz2 volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/poller.php')
| -rwxr-xr-x | include/poller.php | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/poller.php b/include/poller.php index cfbc46b87..8262c1d60 100755 --- a/include/poller.php +++ b/include/poller.php @@ -1,7 +1,6 @@ <?php require_once("boot.php"); -require_once("include/quoteconvert.php"); function poller_run($argv, $argc){ @@ -70,6 +69,19 @@ 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); + } + } + $manual_id = 0; $generation = 0; $hub_update = false; @@ -141,7 +153,10 @@ function poller_run($argv, $argc){ if($manual_id) $contact['last-update'] = '0000-00-00 00:00:00'; - if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS) + if($contact['network'] === NETWORK_DFRN) + $contact['priority'] = 2; + + if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS)) $contact['priority'] = 2; if($contact['priority'] || $contact['subhub']) { @@ -217,7 +232,7 @@ function poller_run($argv, $argc){ $importer_uid = $contact['uid']; - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", + $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($importer_uid) ); if(! count($r)) @@ -494,7 +509,7 @@ function poller_run($argv, $argc){ logger("Mail: can't fetch msg ".$msg_uid); continue; } - $datarray['body'] = escape_tags(convertquote($r['body'], false)); + $datarray['body'] = escape_tags($r['body']); logger("Mail: Importing ".$msg_uid); |