The CSS code for shared messages is moved from "vier" to the global.css, so that...

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 0bbead189109062495c8640b9b9e0e9f3b1e8c6d..084067b190059c3c6f0290b2476811b1f2c87d82 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -30,9 +30,6 @@ function poller_run(&$argv, &$argc){
        load_config('config');
        load_config('system');
 
-       if ($hostname =  get_config('system', 'hostname'))
-               $a->set_hostname($hostname);
-
        $maxsysload = intval(get_config('system','maxloadavg'));
        if($maxsysload < 1)
                $maxsysload = 50;
@@ -92,6 +89,9 @@ function poller_run(&$argv, &$argc){
        // Check OStatus conversations
        check_conversations();
 
+       // To-Do: Regenerate usage statistics
+       // q("ANALYZE TABLE `item`");
+
        // once daily run birthday_updates and then expire in background
 
        $d1 = get_config('system','last_expire_day');
@@ -174,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 
@@ -184,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)) {