Crypto to src

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 10b1046b02d1924e9b65d956bcb7191e8e4934d0..bd08431a4cfeea8f5a878c5845b6656647f6ad32 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,10 +1,16 @@
 <?php
-
-require_once('include/salmon.php');
-require_once('include/ostatus.php');
-require_once('include/crypto.php');
-require_once('include/items.php');
-require_once('include/follow.php');
+/**
+ * @file mod/salmon.php
+ */
+use Friendica\App;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Protocol\OStatus;
+use Friendica\Protocol\Salmon;
+use Friendica\Util\Crypto;
+
+require_once 'include/items.php';
+require_once 'include/follow.php';
 
 function salmon_return($val) {
 
@@ -31,7 +37,7 @@ function salmon_post(App $a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                dbesc($nick)
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                http_status_exit(500);
        }
 
@@ -85,7 +91,7 @@ function salmon_post(App $a) {
        // decode the data
        $data = base64url_decode($data);
 
-       $author = ostatus::salmon_author($data,$importer);
+       $author = OStatus::salmonAuthor($data, $importer);
        $author_link = $author["author-link"];
 
        if(! $author_link) {
@@ -97,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.');
@@ -111,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;
        }
 
@@ -155,9 +161,9 @@ function salmon_post(App $a) {
                dbesc(normalise_link($author_link)),
                intval($importer['uid'])
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('mod-salmon: Author unknown to us.');
-               if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+               if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
                        if($result['success']) {
                                $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
@@ -174,8 +180,8 @@ function salmon_post(App $a) {
        // Have we ignored the person?
        // If so we can not accept this post.
 
-       //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']) {
+       //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
@@ -184,9 +190,9 @@ function salmon_post(App $a) {
        // Placeholder for hub discovery.
        $hub = '';
 
-       $contact_rec = ((dbm::is_result($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);
 }