X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=1a0607bf1223877dbbdfc0d5a07b047ed29a0a51;hb=30e97b4cc1f9dc707a916f5aece2188608a1d32b;hp=5d392a2af88b93ef8db25bdf526788d2c949546a;hpb=5a3991d4f7bc929c1087d9275716fc1c8cc299a6;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 5d392a2af8..1a0607bf12 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -28,8 +28,6 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use DomXPath;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class contain functions for probing URL
  *
@@ -76,7 +74,7 @@ class Probe
 	 */
 	private static function ownHost($host)
 	{
-		$own_host = get_app()->getHostName();
+		$own_host = \get_app()->getHostName();
 
 		$parts = parse_url($host);
 
@@ -99,6 +97,7 @@ class Probe
 	 * @param string $host The host part of an url
 	 *
 	 * @return array with template and type of the webfinger template for JSON or XML
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function hostMeta($host)
 	{
@@ -164,7 +163,7 @@ class Probe
 			}
 		}
 
-		self::$baseurl = "http://".$host;
+		self::$baseurl = $host_url;
 
 		Logger::log("Probing successful for ".$host, Logger::DEBUG);
 
@@ -190,6 +189,7 @@ class Probe
 	 * @param string $hcard_url Link to the hcard - is returned by reference
 	 *
 	 * @return string profile link
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public static function webfingerDfrn($webbie, &$hcard_url)
 	{
@@ -223,6 +223,7 @@ class Probe
 	 * @param string $uri Address that should be probed
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	public static function lrdd($uri)
 	{
@@ -317,6 +318,8 @@ class Probe
 	 * @param boolean $cache   Use cached values?
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function uri($uri, $network = '', $uid = -1, $cache = true)
 	{
@@ -414,7 +417,7 @@ class Probe
 				// This doesn't cover the case when a community isn't a community anymore
 				if (!empty($data['community']) && $data['community']) {
 					$fields['community'] = $data['community'];
-					$fields['contact-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
+					$fields['contact-type'] = Contact::TYPE_COMMUNITY;
 				}
 
 				$fieldnames = [];
@@ -529,6 +532,7 @@ class Probe
 	 * @param string $type      type
 	 *
 	 * @return array fixed webfinger data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function fixOStatus($webfinger, $lrdd, $type)
 	{
@@ -574,6 +578,7 @@ class Probe
 	 * @param integer $uid     User ID for the probe (only used for mails)
 	 *
 	 * @return array uri data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function detect($uri, $network, $uid)
 	{
@@ -742,6 +747,7 @@ class Probe
 	 * @param string $type type
 	 *
 	 * @return array webfinger data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function webfinger($url, $type)
 	{
@@ -812,6 +818,7 @@ class Probe
 	 * @param array  $data         The already fetched data
 	 *
 	 * @return array noscrape data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function pollNoscrape($noscrape_url, $data)
 	{
@@ -928,6 +935,8 @@ class Probe
 	 * @param string $profile_link Link to the profile page
 	 *
 	 * @return array profile data
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function profile($profile_link)
 	{
@@ -978,6 +987,7 @@ class Probe
 	 * @param array $webfinger Webfinger data
 	 *
 	 * @return array DFRN data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function dfrn($webfinger)
 	{
@@ -1059,6 +1069,7 @@ class Probe
 	 * @param boolean $dfrn      Poll DFRN specific data
 	 *
 	 * @return array hcard data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
@@ -1183,6 +1194,7 @@ class Probe
 	 * @param array $webfinger Webfinger data
 	 *
 	 * @return array Diaspora data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function diaspora($webfinger)
 	{
@@ -1270,6 +1282,7 @@ class Probe
 	 * @param bool  $short     Short detection mode
 	 *
 	 * @return array|bool OStatus data or "false" on error or "true" on short mode
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function ostatus($webfinger, $short = false)
 	{
@@ -1289,7 +1302,6 @@ class Probe
 			$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
 		}
 
-		$pubkey = "";
 		if (is_array($webfinger["links"])) {
 			// The array is reversed to take into account the order of preference for same-rel links
 			// See: https://tools.ietf.org/html/rfc7033#section-4.4.4
@@ -1317,7 +1329,7 @@ class Probe
 						if ($curlResult->isTimeout()) {
 							return false;
 						}
-						$pubkey = $curlResult['body'];
+						$pubkey = $curlResult->getBody();
 					}
 
 					$key = explode(".", $pubkey);
@@ -1452,6 +1464,7 @@ class Probe
 	 *
 	 * @param array $webfinger Webfinger data
 	 *
+	 * @param       $addr
 	 * @return array pump.io data
 	 */
 	private static function pumpio($webfinger, $addr)
@@ -1554,6 +1567,7 @@ class Probe
 	 * @param boolean $probe Do a probe if the page contains a feed link
 	 *
 	 * @return array feed data
+	 * @throws HTTPException\InternalServerErrorException
 	 */
 	private static function feed($url, $probe = true)
 	{
@@ -1616,6 +1630,7 @@ class Probe
 	 * @param integer $uid User ID
 	 *
 	 * @return array mail data
+	 * @throws \Exception
 	 */
 	private static function mail($uri, $uid)
 	{
@@ -1703,6 +1718,7 @@ class Probe
 	 * @param string $base   Another path that is hopefully complete
 	 *
 	 * @return string fixed avatar path
+	 * @throws \Exception
 	 */
 	public static function fixAvatar($avatar, $base)
 	{