Docs: add a note on adding `use` on theme.php

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index f3134308fb9fff24c1783fc0774df09a9a8e9168..7f06f9db77d5fc3fdc32641a842a5659d915bd89 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -2,7 +2,10 @@
 
 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) {
        return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -12,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')) {
-               http_status_exit(403);
+               System::httpExit(403);
        }
 
        // Subscription request from subscriber
@@ -40,7 +43,7 @@ function pubsubhubbub_init(App $a) {
                        $subscribe = 0;
                } else {
                        logger("pubsubhubbub: invalid hub_mode=$hub_mode, ignoring.");
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                logger("pubsubhubbub: $hub_mode request from " .
@@ -56,7 +59,7 @@ function pubsubhubbub_init(App $a) {
 
                if (!$nick) {
                        logger('pubsubhubbub: bad hub_topic=$hub_topic, ignoring.');
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                // fetch user from database given the nickname
@@ -66,7 +69,7 @@ function pubsubhubbub_init(App $a) {
 
                if (!DBM::is_result($r)) {
                        logger('pubsubhubbub: local account not found: ' . $nick);
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                $owner = $r[0];
@@ -75,7 +78,7 @@ function pubsubhubbub_init(App $a) {
                if ($r[0]['hidewall']) {
                        logger('pubsubhubbub: local user ' . $nick .
                                   'has chosen to hide wall, ignoring.');
-                       http_status_exit(403);
+                       System::httpExit(403);
                }
 
                // get corresponding row from contact table
@@ -84,7 +87,7 @@ function pubsubhubbub_init(App $a) {
                           intval($owner['uid']));
                if (!DBM::is_result($r)) {
                        logger('pubsubhubbub: contact not found.');
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                $contact = $r[0];
@@ -93,7 +96,7 @@ function pubsubhubbub_init(App $a) {
                if (!link_compare($hub_topic, $contact['poll'])) {
                        logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' .
                                   $contact['poll']);
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                // do subscriber verification according to the PuSH protocol
@@ -109,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 = fetch_url($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.");
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                // check that the correct hub_challenge code was echoed back
@@ -124,7 +127,7 @@ function pubsubhubbub_init(App $a) {
                        logger("pubsubhubbub: subscriber did not echo back ".
                                   "hub.challenge, ignoring.");
                        logger("\"$hub_challenge\" != \"".trim($body)."\"");
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                // fetch the old subscription if it exists
@@ -132,11 +135,10 @@ function pubsubhubbub_init(App $a) {
                  dbesc($hub_callback));
 
                // delete old subscription if it exists
-               q("DELETE FROM `push_subscriber` WHERE `callback_url` = '%s'",
-                 dbesc($hub_callback));
+               dba::delete('push_subscriber', ['callback_url' => $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
@@ -162,7 +164,7 @@ function pubsubhubbub_init(App $a) {
                        logger("pubsubhubbub: successfully unsubscribed [$hub_callback].");
                        // we do nothing here, since the row was already deleted
                }
-               http_status_exit(202);
+               System::httpExit(202);
        }
 
        killme();