X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=6c849cb807fa6b28059991e51e6207cb9a85aa84;hb=5f2028b657332c7dceb1e14dc0e1cd175fc61a7c;hp=acc279be264d77bb4710f2a84674fc6f66f67936;hpb=a939581cf8a07fe06f203582e0b3325076ea9703;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index acc279be26..6c849cb807 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,8 +17,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function dfrn_poll_init(App $a)
 {
 	Login::sessionAuth();
@@ -30,7 +28,6 @@ function dfrn_poll_init(App $a)
 	$challenge       = defaults($_GET, 'challenge'      , '');
 	$sec             = defaults($_GET, 'sec'            , '');
 	$dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
-	$perm            = defaults($_GET, 'perm'           , 'r');
 	$quiet			 = !empty($_GET['quiet']);
 
 	// Possibly it is an OStatus compatible server that requests a user feed
@@ -39,7 +36,7 @@ function dfrn_poll_init(App $a)
 		$nickname = $a->argv[1];
 		header("Content-type: application/atom+xml");
 		echo OStatus::feed($nickname, $last_update, 10);
-		killme();
+		exit();
 	}
 
 	$direction = -1;
@@ -53,7 +50,7 @@ function dfrn_poll_init(App $a)
 
 	if (($dfrn_id === '') && empty($_POST['dfrn_id'])) {
 		if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
-			System::httpExit(403);
+			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}
 
 		$user = '';
@@ -62,7 +59,7 @@ function dfrn_poll_init(App $a)
 				DBA::escape($a->argv[1])
 			);
 			if (!$r) {
-				System::httpExit(404);
+				throw new \Friendica\Network\HTTPException\NotFoundException();
 			}
 
 			$hidewall = ($r[0]['hidewall'] && !local_user());
@@ -73,7 +70,7 @@ function dfrn_poll_init(App $a)
 		Logger::log('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);
-		killme();
+		exit();
 	}
 
 	if (($type === 'profile') && (!strlen($sec))) {
@@ -200,7 +197,7 @@ function dfrn_poll_init(App $a)
 
 			header("Content-type: text/xml");
 			echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-			killme();
+			exit();
 			// NOTREACHED
 		} else {
 			// old protocol
@@ -292,7 +289,7 @@ function dfrn_poll_post(App $a)
 
 			header("Content-type: text/xml");
 			echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-			killme();
+			exit();
 			// NOTREACHED
 		}
 	}
@@ -309,7 +306,7 @@ function dfrn_poll_post(App $a)
 	);
 
 	if (!DBA::isResult($r)) {
-		killme();
+		exit();
 	}
 
 	$type = $r[0]['type'];
@@ -321,15 +318,12 @@ function dfrn_poll_post(App $a)
 	switch ($direction) {
 		case -1:
 			$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
-			$my_id = $dfrn_id;
 			break;
 		case 0:
 			$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-			$my_id = '1:' . $dfrn_id;
 			break;
 		case 1:
 			$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-			$my_id = '0:' . $dfrn_id;
 			break;
 		default:
 			$a->internalRedirect();
@@ -338,7 +332,7 @@ function dfrn_poll_post(App $a)
 
 	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
 	if (!DBA::isResult($r)) {
-		killme();
+		exit();
 	}
 
 	$contact = $r[0];
@@ -370,7 +364,7 @@ function dfrn_poll_post(App $a)
 			<description>$text</description>
 		</reputation>
 		";
-		killme();
+		exit();
 		// NOTREACHED
 	} else {
 		// Update the writable flag if it changed
@@ -393,7 +387,7 @@ function dfrn_poll_post(App $a)
 		header("Content-type: application/atom+xml");
 		$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
-		killme();
+		exit();
 	}
 }
 
@@ -422,7 +416,7 @@ function dfrn_poll_content(App $a)
 		DBA::delete('challenge', ["`expire` < ?", time()]);
 
 		if ($type !== 'profile') {
-			$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+			q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
 				VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
 				DBA::escape($hash),
 				DBA::escape($dfrn_id),
@@ -489,7 +483,7 @@ function dfrn_poll_content(App $a)
 			// heluecht: I don't know why we don't fail immediately when the user or contact hadn't been found.
 			// Since it doesn't make sense to continue from this point on, we now fail here. This should be safe.
 			if (!DBA::isResult($r)) {
-				System::httpExit(404, ["title" => L10n::t('Page not found.')]);
+				throw new \Friendica\Network\HTTPException\NotFoundException();
 			}
 
 			// URL reply
@@ -575,7 +569,7 @@ function dfrn_poll_content(App $a)
 				. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
 				. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
 				. '</dfrn_poll>' . "\r\n";
-			killme();
+			exit();
 			// NOTREACHED
 		}
 	}