X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=d5b0fe243036b3d0dc41484af647371a61ff17da;hb=56c3b3f653bfe2d789470c9bb8434845d3387745;hp=919204a48b2f65fbb4348c0842c480958d42c0fc;hpb=cd12de46f8a63106d5ddde7a4008f7fad11eabad;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 919204a48b..d5b0fe2430 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -5,12 +5,12 @@
 use Friendica\App;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
+use Friendica\Protocol\Salmon;
+use Friendica\Util\Crypto;
 
-require_once 'include/salmon.php';
-require_once 'include/crypto.php';
 require_once 'include/items.php';
-require_once 'include/follow.php';
 
 function salmon_return($val) {
 
@@ -69,7 +69,7 @@ function salmon_post(App $a) {
 	// unpack the  data
 
 	// strip whitespace so our data element will return to one big base64 blob
-	$data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data);
+	$data = str_replace([" ","\t","\r","\n"],["","","",""],$base->data);
 
 	// stash away some other stuff for later
 
@@ -103,7 +103,7 @@ function salmon_post(App $a) {
 
 	logger('mod-salmon: Fetching key for ' . $author_link);
 
-	$key = get_salmon_key($author_link,$keyhash);
+	$key = Salmon::getKey($author_link, $keyhash);
 
 	if(! $key) {
 		logger('mod-salmon: Could not retrieve author key.');
@@ -117,23 +117,23 @@ function salmon_post(App $a) {
 
 	logger('mod-salmon: key details: ' . print_r($key_info,true), LOGGER_DEBUG);
 
-	$pubkey = metopem($m,$e);
+	$pubkey = Crypto::meToPem($m, $e);
 
 	// We should have everything we need now. Let's see if it verifies.
 
 	// Try GNU Social format
-	$verify = rsa_verify($signed_data, $signature, $pubkey);
+	$verify = Crypto::rsaVerify($signed_data, $signature, $pubkey);
 	$mode = 1;
 
 	if (! $verify) {
 		logger('mod-salmon: message did not verify using protocol. Trying compliant format.');
-		$verify = rsa_verify($compliant_format, $signature, $pubkey);
+		$verify = Crypto::rsaVerify($compliant_format, $signature, $pubkey);
 		$mode = 2;
 	}
 
 	if (! $verify) {
 		logger('mod-salmon: message did not verify using padding. Trying old statusnet format.');
-		$verify = rsa_verify($stnet_signed_data, $signature, $pubkey);
+		$verify = Crypto::rsaVerify($stnet_signed_data, $signature, $pubkey);
 		$mode = 3;
 	}
 
@@ -164,7 +164,7 @@ function salmon_post(App $a) {
 	if (! DBM::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
 		if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
-			$result = new_contact($importer['uid'],$author_link);
+			$result = Contact::createFromProbe($importer['uid'], $author_link);
 			if($result['success']) {
 				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
 					AND `uid` = %d LIMIT 1",