X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=4ad8e0f499deff5305ff6798b6d32b1bdbf5ffee;hb=60a6dfa23c7a501143ce89d309a44473572dfd79;hp=bc0100bfa4756613cbbd7810345765073e573135;hpb=42775d53b2c5177cae2e0e1dacb0a32f92e4a83b;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index bc0100bfa4..4ad8e0f499 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,18 +1,32 @@
 <?php
-
 /**
- * @file mod/dfrn_poll.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 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;
 
@@ -100,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);
 
@@ -118,7 +132,7 @@ function dfrn_poll_init(App $a)
 					Session::setVisitorsContacts();
 
 					if (!$quiet) {
-						info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+						info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
 					}
 
 					// Visitors get 1 day session.
@@ -225,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';
@@ -305,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]);
@@ -332,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::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA);
-		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)
@@ -484,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();
 			}
 
@@ -506,7 +488,7 @@ function dfrn_poll_content(App $a)
 			if (strlen($s) && strstr($s, '<?xml')) {
 				$xml = XML::parseString($s);
 
-				Logger::log('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), Logger::DATA);
+				Logger::debug(' profile: parsed', ['xml' => $xml]);
 
 				Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
 				Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
@@ -521,7 +503,7 @@ function dfrn_poll_content(App $a)
 					Session::setVisitorsContacts();
 
 					if (!$quiet) {
-						info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+						info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
 					}
 
 					// Visitors get 1 day session.