X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=23e4e88846e287867d6ed5f77a147e561096ecb6;hb=50ba02809425b9cc166909bc30100ec2c4e338e1;hp=d1f9cf9a31e6934e4f7440c81b9cf89f26f9c9ca;hpb=37253656e3f1403b25c5f0fee6c9631140c4507a;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index d1f9cf9a31..23e4e88846 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -3,7 +3,9 @@
  * @file mod/salmon.php
  */
 use Friendica\App;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -19,7 +21,7 @@ function salmon_post(App $a, $xml = '') {
 		$xml = file_get_contents('php://input');
 	}
 
-	logger('new salmon ' . $xml, LOGGER_DATA);
+	Logger::log('new salmon ' . $xml, Logger::DATA);
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
@@ -40,15 +42,15 @@ function salmon_post(App $a, $xml = '') {
 	$base = null;
 
 	// figure out where in the DOM tree our data is hiding
-	if($dom->provenance->data)
+	if (!empty($dom->provenance->data))
 		$base = $dom->provenance;
-	elseif($dom->env->data)
+	elseif (!empty($dom->env->data))
 		$base = $dom->env;
-	elseif($dom->data)
+	elseif (!empty($dom->data))
 		$base = $dom;
 
-	if(! $base) {
-		logger('unable to locate salmon data in xml ');
+	if (empty($base)) {
+		Logger::log('unable to locate salmon data in xml ');
 		System::httpExit(400);
 	}
 
@@ -86,18 +88,18 @@ function salmon_post(App $a, $xml = '') {
 	$author_link = $author["author-link"];
 
 	if(! $author_link) {
-		logger('Could not retrieve author URI.');
+		Logger::log('Could not retrieve author URI.');
 		System::httpExit(400);
 	}
 
 	// Once we have the author URI, go to the web and try to find their public key
 
-	logger('Fetching key for ' . $author_link);
+	Logger::log('Fetching key for ' . $author_link);
 
 	$key = Salmon::getKey($author_link, $keyhash);
 
 	if(! $key) {
-		logger('Could not retrieve author key.');
+		Logger::log('Could not retrieve author key.');
 		System::httpExit(400);
 	}
 
@@ -106,7 +108,7 @@ function salmon_post(App $a, $xml = '') {
 	$m = base64url_decode($key_info[1]);
 	$e = base64url_decode($key_info[2]);
 
-	logger('key details: ' . print_r($key_info,true), LOGGER_DEBUG);
+	Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG);
 
 	$pubkey = Crypto::meToPem($m, $e);
 
@@ -117,23 +119,23 @@ function salmon_post(App $a, $xml = '') {
 	$mode = 1;
 
 	if (! $verify) {
-		logger('message did not verify using protocol. Trying compliant format.');
+		Logger::log('message did not verify using protocol. Trying compliant format.');
 		$verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
 		$mode = 2;
 	}
 
 	if (! $verify) {
-		logger('message did not verify using padding. Trying old statusnet format.');
+		Logger::log('message did not verify using padding. Trying old statusnet format.');
 		$verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
 		$mode = 3;
 	}
 
 	if (! $verify) {
-		logger('Message did not verify. Discarding.');
+		Logger::log('Message did not verify. Discarding.');
 		System::httpExit(400);
 	}
 
-	logger('Message verified with mode '.$mode);
+	Logger::log('Message verified with mode '.$mode);
 
 
 	/*
@@ -145,21 +147,24 @@ function salmon_post(App $a, $xml = '') {
 	$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
 						AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
 						AND `uid` = %d LIMIT 1",
-		DBA::escape(NETWORK_OSTATUS),
-		DBA::escape(NETWORK_DFRN),
+		DBA::escape(Protocol::OSTATUS),
+		DBA::escape(Protocol::DFRN),
 		DBA::escape(normalise_link($author_link)),
 		DBA::escape($author_link),
 		DBA::escape(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if (! DBA::isResult($r)) {
-		logger('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
-		if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
+
+	if (!DBA::isResult($r)) {
+		Logger::log('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
+
+		if (PConfig::get($importer['uid'], 'system', 'ostatus_autofriend')) {
 			$result = Contact::createFromProbe($importer['uid'], $author_link);
-			if($result['success']) {
+
+			if ($result['success']) {
 				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
 					AND `uid` = %d LIMIT 1",
-					DBA::escape(NETWORK_OSTATUS),
+					DBA::escape(Protocol::OSTATUS),
 					DBA::escape($author_link),
 					DBA::escape($author_link),
 					intval($importer['uid'])
@@ -173,7 +178,7 @@ function salmon_post(App $a, $xml = '') {
 
 	//if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
 	if (DBA::isResult($r) && $r[0]['blocked']) {
-		logger('Ignoring this author.');
+		Logger::log('Ignoring this author.');
 		System::httpExit(202);
 		// NOTREACHED
 	}