Merge pull request #4152 from MrPetovan/task/4137-add-posts-only-feed

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 1393237c8ead9055ee784fc5fdbcb98dce090bad..539803b6e4d93acfc56ea918f5c2bc59f3ff75f4 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -17,12 +17,14 @@ use Friendica\Database\DBM;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Util\Crypto;
 use Friendica\Util\XML;
 
 use dba;
-use DomXPath;
+use DOMXPath;
 use DOMDocument;
 
+require_once 'include/dba.php';
 require_once 'include/network.php';
 
 /**
@@ -942,7 +944,7 @@ class Probe
 
                                //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
                                if (strstr($data["pubkey"], 'RSA ')) {
-                                       $data["pubkey"] = rsatopem($data["pubkey"]);
+                                       $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
                                }
                        }
                }
@@ -1041,7 +1043,7 @@ class Probe
                        if ($search->length > 0) {
                                $data["pubkey"] = $search->item(0)->nodeValue;
                                if (strstr($data["pubkey"], 'RSA ')) {
-                                       $data["pubkey"] = rsatopem($data["pubkey"]);
+                                       $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
                                }
                        }
 
@@ -1131,7 +1133,7 @@ class Probe
 
                                //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
                                if (strstr($data["pubkey"], 'RSA ')) {
-                                       $data["pubkey"] = rsatopem($data["pubkey"]);
+                                       $data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
                                }
                        }
                }
@@ -1242,7 +1244,7 @@ class Probe
                                        if (sizeof($key) >= 3) {
                                                $m = base64url_decode($key[1]);
                                                $e = base64url_decode($key[2]);
-                                               $data["pubkey"] = metopem($m, $e);
+                                               $data["pubkey"] = Crypto::meToPem($m, $e);
                                        }
                                }
                        }