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 cb5fcd8b278779da684495aec3e6b2a365052387..539803b6e4d93acfc56ea918f5c2bc59f3ff75f4 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -14,15 +14,17 @@ use Friendica\Core\System;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-use Friendica\Object\Profile;
+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/email.php';
+require_once 'include/dba.php';
 require_once 'include/network.php';
 
 /**
@@ -127,7 +129,7 @@ class Probe
                        return array();
                }
 
-               $links = XML::element_to_array($xrd);
+               $links = XML::elementToArray($xrd);
                if (!isset($links["xrd"]["link"])) {
                        logger("No xrd data found for ".$host, LOGGER_DEBUG);
                        return array();
@@ -712,7 +714,7 @@ class Probe
                        return false;
                }
 
-               $xrd_arr = XML::element_to_array($xrd);
+               $xrd_arr = XML::elementToArray($xrd);
                if (!isset($xrd_arr["xrd"]["link"])) {
                        logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
                        return false;
@@ -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) {
@@ -1517,16 +1519,16 @@ class Probe
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
                        if (DBM::is_result($x) && DBM::is_result($r)) {
-                               $mailbox = construct_mailbox_name($r[0]);
+                               $mailbox = Email::constructMailboxName($r[0]);
                                $password = '';
                                openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
-                               $mbox = email_connect($mailbox, $r[0]['user'], $password);
+                               $mbox = Email::connect($mailbox, $r[0]['user'], $password);
                                if (!mbox) {
                                        return false;
                                }
                        }
 
-                       $msgs = email_poll($mbox, $uri);
+                       $msgs = Email::poll($mbox, $uri);
                        logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
 
                        if (!count($msgs)) {
@@ -1546,7 +1548,7 @@ class Probe
                $data["notify"]  = 'smtp '.random_string();
                $data["poll"]    = 'email '.random_string();
 
-               $x = email_msg_meta($mbox, $msgs[0]);
+               $x = Email::messageMeta($mbox, $msgs[0]);
                if (stristr($x[0]->from, $uri)) {
                        $adr = imap_rfc822_parse_adrlist($x[0]->from, '');
                } elseif (stristr($x[0]->to, $uri)) {