Revert use statement

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 0924610447fc71fb6f6f499a38506e2f0cbf8a7b..1cee91f4db1ef927fe7c9bea04ffaa2175cd539b 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,8 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Database\DBM;
+
 function hub_return($valid,$body) {
 
-       if ($valid) {
+       if($valid) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
                echo $body;
                killme();
@@ -31,7 +34,7 @@ function pubsub_init(App $a) {
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-       if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+       if($_SERVER['REQUEST_METHOD'] === 'GET') {
 
                $hub_mode      = ((x($_GET,'hub_mode'))          ? notags(trim($_GET['hub_mode']))          : '');
                $hub_topic     = ((x($_GET,'hub_topic'))         ? notags(trim($_GET['hub_topic']))         : '');
@@ -47,7 +50,7 @@ function pubsub_init(App $a) {
                $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($nick)
                );
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        logger('pubsub: local account not found: ' . $nick);
                        hub_return(false, '');
                }
@@ -62,13 +65,13 @@ function pubsub_init(App $a) {
                        intval($contact_id),
                        intval($owner['uid'])
                );
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
 
                if ($hub_topic)
-                       if (! link_compare($hub_topic,$r[0]['poll'])) {
+                       if(! link_compare($hub_topic,$r[0]['poll'])) {
                                logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
                                // should abort but let's humour them.
                        }
@@ -78,8 +81,8 @@ function pubsub_init(App $a) {
                // We must initiate an unsubscribe request with a verify_token.
                // Don't allow outsiders to unsubscribe us.
 
-               if ($hub_mode === 'unsubscribe') {
-                       if (! strlen($hub_verify)) {
+               if($hub_mode === 'unsubscribe') {
+                       if(! strlen($hub_verify)) {
                                logger('pubsub: bogus unsubscribe');
                                hub_return(false, '');
                        }
@@ -106,7 +109,7 @@ function pubsub_post(App $a) {
        logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
        logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
-//     if (! stristr($xml,'<?xml')) {
+//     if(! stristr($xml,'<?xml')) {
 //             logger('pubsub_post: bad xml');
 //             hub_post_return();
 //     }
@@ -117,7 +120,7 @@ function pubsub_post(App $a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                hub_post_return();
        }
 
@@ -132,7 +135,7 @@ function pubsub_post(App $a) {
                dbesc(NETWORK_FEED)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
                hub_post_return();
        }
@@ -142,9 +145,8 @@ function pubsub_post(App $a) {
        // we have no way to match Diaspora guid's with atom post id's and could get duplicates.
        // we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
 
-       if ($r[0]['network'] === NETWORK_DIASPORA) {
+       if($r[0]['network'] === NETWORK_DIASPORA)
                hub_post_return();
-       }
 
        $feedhub = '';
 
@@ -159,6 +161,3 @@ function pubsub_post(App $a) {
        hub_post_return();
 
 }
-
-
-