X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=770c7070b44fea2ad68df07da10f1e568783ee3c;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=8c897c76d643ffd626ee612f8750cc93385d7ebb;hpb=14fde5dc9b1915392601fb94efc6224c01f2b216;p=friendica.git

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 8c897c76d6..770c7070b4 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -33,11 +33,9 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/enotify.php';
-require_once 'include/items.php';
-
 function dfrn_confirm_post(App $a, $handsfree = null)
 {
 	$node = null;
@@ -62,7 +60,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 	 * this being a page type which supports automatic friend acceptance. That is also Scenario 1
 	 * since we are operating on behalf of our registered user to approve a friendship.
 	 */
-	if (!x($_POST, 'source_url')) {
+	if (empty($_POST['source_url'])) {
 		$uid = defaults($handsfree, 'uid', local_user());
 		if (!$uid) {
 			notice(L10n::t('Permission denied.') . EOL);
@@ -84,7 +82,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			$cid      = 0;
 			$hidden   = intval(defaults($handsfree, 'hidden'  , 0));
 		} else {
-			$dfrn_id  = notags(trim(defaults($_POST, 'dfrn_id'   , '')));
+			$dfrn_id  = Strings::escapeTags(trim(defaults($_POST, 'dfrn_id'   , '')));
 			$intro_id =      intval(defaults($_POST, 'intro_id'  , 0));
 			$duplex   =      intval(defaults($_POST, 'duplex'    , 0));
 			$cid      =      intval(defaults($_POST, 'contact_id', 0));
@@ -204,15 +202,15 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				$params['duplex'] = 1;
 			}
 
-			if ($user['page-flags'] == Contact::PAGE_COMMUNITY) {
+			if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
 				$params['page'] = 1;
 			}
 
-			if ($user['page-flags'] == Contact::PAGE_PRVGROUP) {
+			if ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
 				$params['page'] = 2;
 			}
 
-			Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA);
+			Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA);
 
 			/*
 			 *
@@ -224,7 +222,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 			$res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody();
 
-			Logger::log(' Confirm: received data: ' . $res, LOGGER_DATA);
+			Logger::log(' Confirm: received data: ' . $res, Logger::DATA);
 
 			// Now figure out what they responded. Try to be robust if the remote site is
 			// having difficulty and throwing up errors of some kind.
@@ -256,14 +254,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 			$xml = XML::parseString($res);
 			$status = (int) $xml->status;
-			$message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
+			$message = XML::unescape($xml->message);   // human readable text of what may have gone wrong.
 			switch ($status) {
 				case 0:
 					info(L10n::t("Confirmation completed successfully.") . EOL);
 					break;
 				case 1:
 					// birthday paradox - generate new dfrn-id and fall through.
-					$new_dfrn_id = random_string();
+					$new_dfrn_id = Strings::getRandomHex();
 					q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
 						DBA::escape($new_dfrn_id),
 						intval($contact_id),
@@ -339,7 +337,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		} else {
 			if ($network == Protocol::ACTIVITYPUB) {
 				ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
-				$pending = true;
+				// Setting "pending" to true on a bidirectional contact request could create a problem when it isn't accepted on the other side
+				// Then we have got a situation where - although one direction is accepted - the contact still appears as pending.
+				// Possibly we need two different "pending" fields, one for incoming, one for outgoing?
+				// This has to be thought over, but for now this here is a better solution.
+				// $pending = $duplex;
+				$pending = false;
 			} else {
 				$pending = false;
 			}
@@ -416,7 +419,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 	 * In the section above where the confirming party makes a POST and
 	 * retrieves xml status information, they are communicating with the following code.
 	 */
-	if (x($_POST, 'source_url')) {
+	if (!empty($_POST['source_url'])) {
 		// We are processing an external confirmation to an introduction created by our user.
 		$public_key =         defaults($_POST, 'public_key', '');
 		$dfrn_id    = hex2bin(defaults($_POST, 'dfrn_id'   , ''));
@@ -430,11 +433,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 		Logger::log('dfrn_confirm: requestee contacted: ' . $node);
 
-		Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), LOGGER_DATA);
+		Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA);
 
 		// If $aes_key is set, both of these items require unpacking from the hex transport encoding.
 
-		if (x($aes_key)) {
+		if (!empty($aes_key)) {
 			$aes_key = hex2bin($aes_key);
 			$public_key = hex2bin($public_key);
 		}