X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=76ab999b2d8d06c9acdc353343ceb6176b08ccba;hb=1e3b4432454f5b12fb67e35c3bb7cd193af48c8f;hp=ee3826d8a8bb37a3c3b734fea775dd12804afeab;hpb=d6cf791677e3c676108f84e64818ba2a272f6d08;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index ee3826d8a8..76ab999b2d 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -6,22 +6,20 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/follow.php');
 
-if(! function_exists('salmon_return')) {
 function salmon_return($val) {
 
-	if($val >= 400)
+	if ($val >= 400)
 		$err = 'Error';
-	if($val >= 200 && $val < 300)
+	if ($val >= 200 && $val < 300)
 		$err = 'OK';
 
 	logger('mod-salmon returns ' . $val);
 	header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
 	killme();
-}
+
 }
 
-if(! function_exists('salmon_post')) {
-function salmon_post(&$a) {
+function salmon_post(App $a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -33,8 +31,9 @@ function salmon_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		http_status_exit(500);
+	}
 
 	$importer = $r[0];
 
@@ -44,14 +43,14 @@ function salmon_post(&$a) {
 
 	// figure out where in the DOM tree our data is hiding
 
-	if($dom->provenance->data)
+	if ($dom->provenance->data)
 		$base = $dom->provenance;
-	elseif($dom->env->data)
+	elseif ($dom->env->data)
 		$base = $dom->env;
-	elseif($dom->data)
+	elseif ($dom->data)
 		$base = $dom;
 
-	if(! $base) {
+	if (! $base) {
 		logger('mod-salmon: unable to locate salmon data in xml ');
 		http_status_exit(400);
 	}
@@ -86,10 +85,10 @@ function salmon_post(&$a) {
 	// decode the data
 	$data = base64url_decode($data);
 
-	$author = ostatus_salmon_author($data,$importer);
+	$author = ostatus::salmon_author($data,$importer);
 	$author_link = $author["author-link"];
 
-	if(! $author_link) {
+	if (! $author_link) {
 		logger('mod-salmon: Could not retrieve author URI.');
 		http_status_exit(400);
 	}
@@ -100,7 +99,7 @@ function salmon_post(&$a) {
 
 	$key = get_salmon_key($author_link,$keyhash);
 
-	if(! $key) {
+	if (! $key) {
 		logger('mod-salmon: Could not retrieve author key.');
 		http_status_exit(400);
 	}
@@ -118,17 +117,17 @@ function salmon_post(&$a) {
 
 	$verify = rsa_verify($compliant_format,$signature,$pubkey);
 
-	if(! $verify) {
+	if (! $verify) {
 		logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
 	    $verify = rsa_verify($signed_data,$signature,$pubkey);
 	}
 
-	if(! $verify) {
+	if (! $verify) {
 		logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
 	    $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
 	}
 
-	if(! $verify) {
+	if (! $verify) {
 		logger('mod-salmon: Message did not verify. Discarding.');
 		http_status_exit(400);
 	}
@@ -152,11 +151,11 @@ function salmon_post(&$a) {
 		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
-		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+		if (get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
 			$result = new_contact($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",
 					dbesc(NETWORK_OSTATUS),
@@ -171,8 +170,8 @@ function salmon_post(&$a) {
 	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	//if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-	if(count($r) && $r[0]['blocked']) {
+	//if ((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if (dbm::is_result($r) && $r[0]['blocked']) {
 		logger('mod-salmon: Ignoring this author.');
 		http_status_exit(202);
 		// NOTREACHED
@@ -181,10 +180,9 @@ function salmon_post(&$a) {
 	// Placeholder for hub discovery.
 	$hub = '';
 
-	$contact_rec = ((count($r)) ? $r[0] : null);
+	$contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
 
-	ostatus_import($data,$importer,$contact_rec, $hub);
+	ostatus::import($data,$importer,$contact_rec, $hub);
 
 	http_status_exit(200);
 }
-}