Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 6f3d843810cf6a97e6d8265ddf3f0922cd85e9dd..1e07242875086506355f90822dd338d5122f4fd1 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,13 +1,16 @@
 <?php
-
+/**
+ * @file mod/dfrn_poll.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
+use Friendica\Protocol\OStatus;
 
-require_once('include/items.php');
-require_once('include/auth.php');
-require_once('include/ostatus.php');
+require_once 'include/items.php';
+require_once 'include/auth.php';
 
 function dfrn_poll_init(App $a) {
        $dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
@@ -24,7 +27,7 @@ function dfrn_poll_init(App $a) {
        if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
-               echo ostatus::feed($a, $nickname, $last_update, 10);
+               echo OStatus::feed($a, $nickname, $last_update, 10);
                killme();
        }
 
@@ -58,7 +61,7 @@ function dfrn_poll_init(App $a) {
 
                logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
                header("Content-type: application/atom+xml");
-               echo Dfrn::feed('', $user,$last_update, 0, $hidewall);
+               echo DFRN::feed('', $user,$last_update, 0, $hidewall);
                killme();
        }
 
@@ -90,7 +93,7 @@ function dfrn_poll_init(App $a) {
                        dbesc($a->argv[1])
                );
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
 
                        $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
@@ -137,7 +140,7 @@ function dfrn_poll_init(App $a) {
                        $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
                                dbesc($sec)
                        );
-                       if (! dbm::is_result($r)) {
+                       if (! DBM::is_result($r)) {
                                xml_status(3, 'No ticket');
                                // NOTREACHED
                        }
@@ -148,7 +151,7 @@ function dfrn_poll_init(App $a) {
                        $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                                intval($r[0]['cid'])
                        );
-                       if (! dbm::is_result($c)) {
+                       if (! DBM::is_result($c)) {
                                xml_status(3, 'No profile');
                        }
                        $contact = $c[0];
@@ -201,7 +204,7 @@ function dfrn_poll_init(App $a) {
                        q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
                        $r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
                                dbesc($dfrn_id));
-                       if (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                xml_status(1);
                                return; // NOTREACHED
                        }
@@ -234,7 +237,7 @@ function dfrn_poll_post(App $a) {
                        $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
                                dbesc($sec)
                        );
-                       if (! dbm::is_result($r)) {
+                       if (! DBM::is_result($r)) {
                                xml_status(3, 'No ticket');
                                // NOTREACHED
                        }
@@ -245,7 +248,7 @@ function dfrn_poll_post(App $a) {
                        $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                                intval($r[0]['cid'])
                        );
-                       if (! dbm::is_result($c)) {
+                       if (! DBM::is_result($c)) {
                                xml_status(3, 'No profile');
                        }
                        $contact = $c[0];
@@ -295,7 +298,7 @@ function dfrn_poll_post(App $a) {
                dbesc($challenge)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                killme();
        }
 
@@ -331,7 +334,7 @@ function dfrn_poll_post(App $a) {
        $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
 
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                killme();
        }
 
@@ -348,7 +351,7 @@ function dfrn_poll_post(App $a) {
                $reputation = 0;
                $text = '';
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $reputation = $r[0]['rating'];
                        $text = $r[0]['reason'];
 
@@ -387,7 +390,7 @@ function dfrn_poll_post(App $a) {
                }
 
                header("Content-type: application/atom+xml");
-               $o = Dfrn::feed($dfrn_id, $a->argv[1], $last_update, $direction);
+               $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
                echo $o;
                killme();
 
@@ -461,7 +464,7 @@ function dfrn_poll_content(App $a) {
                        dbesc($nickname)
                );
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
 
                        $challenge = '';
                        $encrypted_id = '';
@@ -508,7 +511,7 @@ function dfrn_poll_content(App $a) {
                                ));
                        }
 
-                       $profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+                       $profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
                        switch($destination_url) {
                                case 'profile':