X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=7d5418c364533b4f27c073b9e3dfe0822453bca7;hb=5b4fb945a2f8e950d3f3da8ae1fc8127ff887568;hp=575343bc19d95ba4c673994241c1fc185d2b34a2;hpb=19878a63977aa484300d5b3d0c027df52cc9c085;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 575343bc19..7d5418c364 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -5,31 +5,36 @@
  */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 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']              : '';
-	$type            = x($_GET,'type')            ? $_GET['type']                 : 'data';
-	$last_update     = x($_GET,'last_update')     ? $_GET['last_update']          : '';
-	$destination_url = x($_GET,'destination_url') ? $_GET['destination_url']      : '';
-	$challenge       = x($_GET,'challenge')       ? $_GET['challenge']            : '';
-	$sec             = x($_GET,'sec')             ? $_GET['sec']                  : '';
-	$dfrn_version    = x($_GET,'dfrn_version')    ? (float) $_GET['dfrn_version'] : 2.0;
-	$perm            = x($_GET,'perm')            ? $_GET['perm']                 : 'r';
-	$quiet           = x($_GET,'quiet')           ? true                          : false;
+	Login::sessionAuth();
+
+	$dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
+	$type            = defaults($_GET, 'type'           , 'data');
+	$last_update     = defaults($_GET, 'last_update'    , '');
+	$destination_url = defaults($_GET, 'destination_url', '');
+	$challenge       = defaults($_GET, 'challenge'      , '');
+	$sec             = defaults($_GET, 'sec'            , '');
+	$dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
+	$perm            = defaults($_GET, 'perm'           , 'r');
+	$quiet			 = x($_GET, 'quiet');
 
 	// Possibly it is an OStatus compatible server that requests a user feed
 	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($nickname, $last_update, 10);
 		killme();
 	}
 
@@ -44,7 +49,7 @@ function dfrn_poll_init(App $a)
 
 	if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
 		if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
-			http_status_exit(403);
+			System::httpExit(403);
 		}
 
 		$user = '';
@@ -53,7 +58,7 @@ function dfrn_poll_init(App $a)
 				dbesc($a->argv[1])
 			);
 			if (!$r) {
-				http_status_exit(404);
+				System::httpExit(404);
 			}
 
 			$hidewall = ($r[0]['hidewall'] && !local_user());
@@ -95,27 +100,27 @@ function dfrn_poll_init(App $a)
 		);
 
 		if (DBM::is_result($r)) {
-			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+			$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
 			if (strlen($s)) {
-				$xml = parse_xml_string($s);
+				$xml = XML::parseString($s);
 
 				if ((int) $xml->status === 1) {
 					$_SESSION['authenticated'] = 1;
 					if (!x($_SESSION, 'remote')) {
-						$_SESSION['remote'] = array();
+						$_SESSION['remote'] = [];
 					}
 
-					$_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
+					$_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']];
 
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_handle'] = $r[0]['addr'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
 					if (!$quiet) {
-						info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
+						info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
 					}
 
 					// Visitors get 1 day session.
@@ -140,7 +145,7 @@ function dfrn_poll_init(App $a)
 				dbesc($sec)
 			);
 			if (!DBM::is_result($r)) {
-				xml_status(3, 'No ticket');
+				System::xmlExit(3, 'No ticket');
 				// NOTREACHED
 			}
 
@@ -153,7 +158,7 @@ function dfrn_poll_init(App $a)
 				intval($r[0]['cid'])
 			);
 			if (!DBM::is_result($c)) {
-				xml_status(3, 'No profile');
+				System::xmlExit(3, 'No profile');
 			}
 
 			$contact = $c[0];
@@ -180,7 +185,7 @@ function dfrn_poll_init(App $a)
 			if ($final_dfrn_id != $orig_id) {
 				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
 				// did not decode properly - cannot trust this site
-				xml_status(3, 'Bad decryption');
+				System::xmlExit(3, 'Bad decryption');
 			}
 
 			header("Content-type: text/xml");
@@ -204,10 +209,10 @@ function dfrn_poll_init(App $a)
 			$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
 				dbesc($dfrn_id));
 			if (DBM::is_result($r)) {
-				xml_status(1);
+				System::xmlExit(1);
 				return; // NOTREACHED
 			}
-			xml_status(0);
+			System::xmlExit(0);
 			return; // NOTREACHED
 		}
 	}
@@ -232,7 +237,7 @@ function dfrn_poll_post(App $a)
 				dbesc($sec)
 			);
 			if (!DBM::is_result($r)) {
-				xml_status(3, 'No ticket');
+				System::xmlExit(3, 'No ticket');
 				// NOTREACHED
 			}
 
@@ -245,7 +250,7 @@ function dfrn_poll_post(App $a)
 				intval($r[0]['cid'])
 			);
 			if (!DBM::is_result($c)) {
-				xml_status(3, 'No profile');
+				System::xmlExit(3, 'No profile');
 			}
 
 			$contact = $c[0];
@@ -272,7 +277,7 @@ function dfrn_poll_post(App $a)
 			if ($final_dfrn_id != $orig_id) {
 				logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
 				// did not decode properly - cannot trust this site
-				xml_status(3, 'Bad decryption');
+				System::xmlExit(3, 'Bad decryption');
 			}
 
 			header("Content-type: text/xml");
@@ -478,7 +483,7 @@ function dfrn_poll_content(App $a)
 		if (($type === 'profile') && (strlen($sec))) {
 			// URL reply
 			if ($dfrn_version < 2.2) {
-				$s = fetch_url($r[0]['poll']
+				$s = Network::fetchUrl($r[0]['poll']
 					. '?dfrn_id=' . $encrypted_id
 					. '&type=profile-check'
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
@@ -486,13 +491,13 @@ function dfrn_poll_content(App $a)
 					. '&sec=' . $sec
 				);
 			} else {
-				$s = post_url($r[0]['poll'], array(
+				$s = Network::post($r[0]['poll'], [
 					'dfrn_id' => $encrypted_id,
 					'type' => 'profile-check',
 					'dfrn_version' => DFRN_PROTOCOL_VERSION,
 					'challenge' => $challenge,
 					'sec' => $sec
-				));
+				]);
 			}
 
 			$profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
@@ -517,7 +522,7 @@ function dfrn_poll_content(App $a)
 			logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
 
 			if (strlen($s) && strstr($s, '<?xml')) {
-				$xml = parse_xml_string($s);
+				$xml = XML::parseString($s);
 
 				logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
 
@@ -527,15 +532,15 @@ function dfrn_poll_content(App $a)
 				if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
 					$_SESSION['authenticated'] = 1;
 					if (!x($_SESSION, 'remote')) {
-						$_SESSION['remote'] = array();
+						$_SESSION['remote'] = [];
 					}
 
-					$_SESSION['remote'][] = array('cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']);
+					$_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']];
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
 					if (!$quiet) {
-						info(sprintf(t('%1$s welcomes %2$s'), $r[0]['username'], $r[0]['name']) . EOL);
+						info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
 					}
 
 					// Visitors get 1 day session.