Merge pull request #896 from annando/master

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 692335aab2f3cd3038cb306387bb96c4683a4267..9b18fe3c6d9901dbe5f79c4f0cecb6e54f475270 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -9,7 +9,7 @@ function poller_run(&$argv, &$argc){
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
            @include(".htconfig.php");
        require_once("include/dba.php");
@@ -57,21 +57,21 @@ function poller_run(&$argv, &$argc){
        load_hooks();
 
        logger('poller: start');
-       
+
        // run queue delivery process in the background
 
        proc_run('php',"include/queue.php");
-       
+
        // run diaspora photo queue process in the background
 
        proc_run('php',"include/dsprphotoq.php");
-       
+
        // expire any expired accounts
 
        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");
@@ -81,12 +81,16 @@ function poller_run(&$argv, &$argc){
                        q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
                }
        }
-  
+
        $abandon_days = intval(get_config('system','account_abandon_days'));
        if($abandon_days < 1)
                $abandon_days = 0;
 
-       
+       // Check OStatus conversations
+       check_conversations();
+
+       // To-Do: Regenerate usage statistics
+       // q("ANALYZE TABLE `item`");
 
        // once daily run birthday_updates and then expire in background
 
@@ -121,6 +125,9 @@ function poller_run(&$argv, &$argc){
                // clear cache for photos
                clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
 
+               // clear smarty cache
+               clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+
                set_config('system','cache_last_cleared', time());
        }
 
@@ -169,7 +176,7 @@ function poller_run(&$argv, &$argc){
 
        $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-               AND NOT `network` IN ( '%s', '%s' )
+               AND NOT `network` IN ( '%s', '%s', '%s' )
                $sql_extra 
                AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
                AND `contact`.`archive` = 0 
@@ -177,7 +184,8 @@ function poller_run(&$argv, &$argc){
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA),
-               dbesc(NETWORK_FACEBOOK)
+               dbesc(NETWORK_FACEBOOK),
+               dbesc(NETWORK_PUMPIO)
        );
 
        if(! count($contacts)) {