Merge pull request #3449 from Hypolite/improvement/move-probe-to-src

[friendica.git] / include / pubsubpublish.php

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 05e93b864c833cbdfc74008fdc8c31ad29e89f1e..24d7b6963792eebde36b51b18288cb0d561d1288 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -1,5 +1,7 @@
 <?php
-use \Friendica\Core\Config;
+
+use Friendica\App;
+use Friendica\Core\Config;
 
 require_once('include/items.php');
 require_once('include/ostatus.php');
@@ -28,12 +30,13 @@ function handle_pubsubhubbub($id) {
        global $a;
 
        $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
-
-       if (!dbm::is_result($r)) {
+       if (!$r)
                return;
-       }
+       else
+               $rr = $r[0];
 
-       $rr = $r[0];
+       /// @todo Check server status with poco_check_server()
+       // Before this can be done we need a way to safely detect the server url.
 
        logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
@@ -67,10 +70,8 @@ function handle_pubsubhubbub($id) {
                // increment this until some upper limit where we give up
                $new_push = intval($rr['push']) + 1;
 
-               if ($new_push > 30) {
-                       // OK, let's give up
+               if ($new_push > 30) // OK, let's give up
                        $new_push = 0;
-               }
 
                q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
                        $new_push,