X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=539803b6e4d93acfc56ea918f5c2bc59f3ff75f4;hb=a86ffd878dc3ca8638345781bda0f18071d439e5;hp=320bb43cc1c76fa4f3db62aa9c4cac67b913a76d;hpb=d4ca30a6dba186a297a0c4a7e79f3d2ec72c0522;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 320bb43cc1..539803b6e4 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -16,13 +16,15 @@ use Friendica\Core\Config;
 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/feed.php';
+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);
 					}
 				}
 			}
@@ -1267,7 +1269,7 @@ class Probe
 			return false;
 		}
 		$feed = $ret['body'];
-		$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 		if (!$feed_data) {
 			return false;
 		}
@@ -1451,7 +1453,7 @@ class Probe
 			return false;
 		}
 		$feed = $ret['body'];
-		$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 
 		if (!$feed_data) {
 			if (!$probe) {