Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index d19ae287c084ecc3cfd810b9f9773416ab281dd5..4ad8e0f499deff5305ff6798b6d32b1bdbf5ffee 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -21,13 +21,12 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -115,7 +114,7 @@ function dfrn_poll_init(App $a)
                );
 
                if (DBA::isResult($r)) {
-                       $s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+                       $s = DI::httpRequest()->fetch($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
                        Logger::log("dfrn_poll: old profile returns " . $s, Logger::DATA);
 
@@ -240,7 +239,6 @@ function dfrn_poll_post(App $a)
 {
        $dfrn_id      =  $_POST['dfrn_id']   ?? '';
        $challenge    =  $_POST['challenge'] ?? '';
-       $url          =  $_POST['url']       ?? '';
        $sec          =  $_POST['sec']       ?? '';
        $ptype        =  $_POST['type']      ?? '';
        $perm         = ($_POST['perm']      ?? '') ?: 'r';
@@ -320,7 +318,6 @@ function dfrn_poll_post(App $a)
                exit();
        }
 
-       $type = $r[0]['type'];
        $last_update = $r[0]['last_update'];
 
        DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
@@ -347,59 +344,29 @@ function dfrn_poll_post(App $a)
        }
 
        $contact = $r[0];
-       $owner_uid = $r[0]['uid'];
        $contact_id = $r[0]['id'];
 
-       if ($type === 'reputation' && strlen($url)) {
-               $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-                       DBA::escape($url),
-                       intval($owner_uid)
-               );
-               $reputation = 0;
-               $text = '';
-
-               if (DBA::isResult($r)) {
-                       $reputation = $r[0]['rating'];
-                       $text = $r[0]['reason'];
-
-                       if ($r[0]['id'] == $contact_id) { // inquiring about own reputation not allowed
-                               $reputation = 0;
-                               $text = '';
-                       }
+       // Update the writable flag if it changed
+       Logger::debug('post request feed', ['post' => $_POST]);
+       if ($dfrn_version >= 2.21) {
+               if ($perm === 'rw') {
+                       $writable = 1;
+               } else {
+                       $writable = 0;
                }
 
-               echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-               <reputation>
-                       <url>$url</url>
-                       <rating>$reputation</rating>
-                       <description>$text</description>
-               </reputation>
-               ";
-               exit();
-               // NOTREACHED
-       } else {
-               // Update the writable flag if it changed
-               Logger::debug('post request feed', ['post' => $_POST]);
-               if ($dfrn_version >= 2.21) {
-                       if ($perm === 'rw') {
-                               $writable = 1;
-                       } else {
-                               $writable = 0;
-                       }
-
-                       if ($writable != $contact['writable']) {
-                               q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
-                                       intval($writable),
-                                       intval($contact_id)
-                               );
-                       }
+               if ($writable != $contact['writable']) {
+                       q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
+                               intval($writable),
+                               intval($contact_id)
+                       );
                }
-
-               header("Content-type: application/atom+xml");
-               $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
-               echo $o;
-               exit();
        }
+
+       header("Content-type: application/atom+xml");
+       $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
+       echo $o;
+       exit();
 }
 
 function dfrn_poll_content(App $a)
@@ -499,20 +466,20 @@ function dfrn_poll_content(App $a)
 
                        // URL reply
                        if ($dfrn_version < 2.2) {
-                               $s = Network::fetchUrl($r[0]['poll']
-                                       . '?dfrn_id=' . $encrypted_id
-                                       . '&type=profile-check'
-                                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
-                                       . '&challenge=' . $challenge
-                                       . '&sec=' . $sec
+                               $s = DI::httpRequest()->fetch($r[0]['poll']
+                                                             . '?dfrn_id=' . $encrypted_id
+                                                             . '&type=profile-check'
+                                                             . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+                                                             . '&challenge=' . $challenge
+                                                             . '&sec=' . $sec
                                );
                        } else {
-                               $s = Network::post($r[0]['poll'], [
-                                       'dfrn_id' => $encrypted_id,
-                                       'type' => 'profile-check',
+                               $s = DI::httpRequest()->post($r[0]['poll'], [
+                                       'dfrn_id'      => $encrypted_id,
+                                       'type'         => 'profile-check',
                                        'dfrn_version' => DFRN_PROTOCOL_VERSION,
-                                       'challenge' => $challenge,
-                                       'sec' => $sec
+                                       'challenge'    => $challenge,
+                                       'sec'          => $sec
                                ])->getBody();
                        }