X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=b911a27e219d9f9fe22cff16eeff4c8e28cf9f4c;hb=e447375cddb847edbc9d4486be3938674ae66b8c;hp=b14c71fb862c27d3315531ef5c53c3a719b57377;hpb=50da89d861dce3b648c8f9e5c1e4c480ee320a43;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index b14c71fb86..b911a27e21 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -14,8 +14,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
 
 function dfrn_notify_post(App $a) {
 	Logger::log(__function__, Logger::TRACE);
@@ -38,16 +37,16 @@ function dfrn_notify_post(App $a) {
 		}
 	}
 
-	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
-	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
-	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
-	$data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
-	$key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
-	$rino_remote  = ((x($_POST,'rino'))         ? intval($_POST['rino'])            :  0);
-	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
-	$perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
-	$ssl_policy   = ((x($_POST,'ssl_policy'))   ? notags(trim($_POST['ssl_policy'])): 'none');
-	$page         = ((x($_POST,'page'))         ? intval($_POST['page'])            :  0);
+	$dfrn_id      = (!empty($_POST['dfrn_id'])      ? Strings::escapeTags(trim($_POST['dfrn_id']))   : '');
+	$dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version']    : 2.0);
+	$challenge    = (!empty($_POST['challenge'])    ? Strings::escapeTags(trim($_POST['challenge'])) : '');
+	$data         = defaults($_POST, 'data', '');
+	$key          = defaults($_POST, 'key', '');
+	$rino_remote  = (!empty($_POST['rino'])         ? intval($_POST['rino'])            :  0);
+	$dissolve     = (!empty($_POST['dissolve'])     ? intval($_POST['dissolve'])        :  0);
+	$perm         = (!empty($_POST['perm'])         ? Strings::escapeTags(trim($_POST['perm']))      : 'r');
+	$ssl_policy   = (!empty($_POST['ssl_policy'])   ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
+	$page         = (!empty($_POST['page'])         ? intval($_POST['page'])            :  0);
 
 	$forum = (($page == 1) ? 1 : 0);
 	$prv   = (($page == 2) ? 1 : 0);
@@ -246,16 +245,16 @@ function dfrn_dispatch_private($user, $postdata)
 
 function dfrn_notify_content(App $a) {
 
-	if (x($_GET,'dfrn_id')) {
+	if (!empty($_GET['dfrn_id'])) {
 
 		/*
 		 * initial communication from external contact, $direction is their direction.
 		 * If this is a duplex communication, ours will be the opposite.
 		 */
 
-		$dfrn_id = notags(trim($_GET['dfrn_id']));
+		$dfrn_id = Strings::escapeTags(trim($_GET['dfrn_id']));
 		$dfrn_version = (float) $_GET['dfrn_version'];
-		$rino_remote = ((x($_GET,'rino')) ? intval($_GET['rino']) : 0);
+		$rino_remote = (!empty($_GET['rino']) ? intval($_GET['rino']) : 0);
 		$type = "";
 		$last_update = "";
 
@@ -267,7 +266,7 @@ function dfrn_notify_content(App $a) {
 			$dfrn_id = substr($dfrn_id,2);
 		}
 
-		$hash = random_string();
+		$hash = Strings::getRandomHex();
 
 		$status = 0;
 
@@ -369,7 +368,7 @@ function dfrn_notify_content(App $a) {
 			. "\t" . '<perm>' . $perm . '</perm>' . "\r\n"
 			. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
 			. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
-			. '</dfrn_notify>' . "\r\n" ;
+			. '</dfrn_notify>' . "\r\n";
 
 		killme();
 	}