oembed: Now it is possible to use the service from embedly with an API key.

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index cc5f2a9834adabc75f8914cabcc8cbd165491d86..084067b190059c3c6f0290b2476811b1f2c87d82 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -62,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
        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 
@@ -82,7 +86,11 @@ function poller_run(&$argv, &$argc){
        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
 
@@ -117,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());
        }
 
@@ -163,9 +174,9 @@ function poller_run(&$argv, &$argc){
                : '' 
        );
 
-       $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+       $contacts = q("SELECT `contact`.`id` FROM `contact` INNER 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 
@@ -173,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)) {