Remove util/docblox_errorchecker

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index af7172cee29bc376130c52b75fd22afeb0033d87..051ae2e84264d74e6678869f02f0620aaef26902 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -2,7 +2,9 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 
 function post_var($name) {
@@ -13,7 +15,7 @@ function pubsubhubbub_init(App $a) {
        // PuSH subscription must be considered "public" so just block it
        // if public access isn't enabled.
        if (Config::get('system', 'block_public')) {
-               Network::httpStatusExit(403);
+               System::httpExit(403);
        }
 
        // Subscription request from subscriber
@@ -41,7 +43,7 @@ function pubsubhubbub_init(App $a) {
                        $subscribe = 0;
                } else {
                        logger("pubsubhubbub: invalid hub_mode=$hub_mode, ignoring.");
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                logger("pubsubhubbub: $hub_mode request from " .
@@ -57,7 +59,7 @@ function pubsubhubbub_init(App $a) {
 
                if (!$nick) {
                        logger('pubsubhubbub: bad hub_topic=$hub_topic, ignoring.');
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                // fetch user from database given the nickname
@@ -67,7 +69,7 @@ function pubsubhubbub_init(App $a) {
 
                if (!DBM::is_result($r)) {
                        logger('pubsubhubbub: local account not found: ' . $nick);
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                $owner = $r[0];
@@ -76,7 +78,7 @@ function pubsubhubbub_init(App $a) {
                if ($r[0]['hidewall']) {
                        logger('pubsubhubbub: local user ' . $nick .
                                   'has chosen to hide wall, ignoring.');
-                       Network::httpStatusExit(403);
+                       System::httpExit(403);
                }
 
                // get corresponding row from contact table
@@ -85,7 +87,7 @@ function pubsubhubbub_init(App $a) {
                           intval($owner['uid']));
                if (!DBM::is_result($r)) {
                        logger('pubsubhubbub: contact not found.');
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                $contact = $r[0];
@@ -94,7 +96,7 @@ function pubsubhubbub_init(App $a) {
                if (!link_compare($hub_topic, $contact['poll'])) {
                        logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' .
                                   $contact['poll']);
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                // do subscriber verification according to the PuSH protocol
@@ -110,14 +112,14 @@ function pubsubhubbub_init(App $a) {
                // we don't actually enforce the lease time because GNU
                // Social/StatusNet doesn't honour it (yet)
 
-               $body = Network::fetchURL($hub_callback . "?" . $params);
+               $body = Network::fetchUrl($hub_callback . "?" . $params);
                $ret = $a->get_curl_code();
 
                // give up if the HTTP return code wasn't a success (2xx)
                if ($ret < 200 || $ret > 299) {
                        logger("pubsubhubbub: subscriber verification at $hub_callback ".
                                   "returned $ret, ignoring.");
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                // check that the correct hub_challenge code was echoed back
@@ -125,7 +127,7 @@ function pubsubhubbub_init(App $a) {
                        logger("pubsubhubbub: subscriber did not echo back ".
                                   "hub.challenge, ignoring.");
                        logger("\"$hub_challenge\" != \"".trim($body)."\"");
-                       Network::httpStatusExit(404);
+                       System::httpExit(404);
                }
 
                // fetch the old subscription if it exists
@@ -137,7 +139,7 @@ function pubsubhubbub_init(App $a) {
                  dbesc($hub_callback));
 
                if ($subscribe) {
-                       $last_update = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+                       $last_update = DateTimeFormat::utcNow();
                        $push_flag = 0;
 
                        // if we are just updating an old subscription, keep the
@@ -163,7 +165,7 @@ function pubsubhubbub_init(App $a) {
                        logger("pubsubhubbub: successfully unsubscribed [$hub_callback].");
                        // we do nothing here, since the row was already deleted
                }
-               Network::httpStatusExit(202);
+               System::httpExit(202);
        }
 
        killme();