X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=0f5f55ab671a19979fd4b1a02659d199a889fb24;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=9c75da3472740c724b8cff9c1c36cf0b52169d91;hpb=6ccf038053431ae55100f061ee96d4549fe8f8ed;p=friendica.git

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 9c75da3472..0f5f55ab67 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -1,17 +1,32 @@
 <?php
-
 /**
- * @file src/Model/GServer.php
- * This file includes the GServer class to handle with servers
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Module\Register;
 use Friendica\Network\CurlResult;
 use Friendica\Util\Network;
@@ -192,7 +207,7 @@ class GServer
 		}
 
 		// When a nodeinfo is present, we don't need to dig further
-		$xrd_timeout = Config::get('system', 'xrd_timeout');
+		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
 		$curlResult = Network::curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
 		if ($curlResult->isTimeout()) {
 			DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => Strings::normaliseLink($url)]);
@@ -424,11 +439,11 @@ class GServer
 		}
 
 		if (!empty($data['network'])) {
-			$serverdata['platform'] = $data['network'];
+			$serverdata['platform'] = strtolower($data['network']);
 
-			if ($serverdata['platform'] == 'Diaspora') {
+			if ($serverdata['platform'] == 'diaspora') {
 				$serverdata['network'] = Protocol::DIASPORA;
-			} elseif ($serverdata['platform'] == 'Friendica') {
+			} elseif ($serverdata['platform'] == 'friendica') {
 				$serverdata['network'] = Protocol::DFRN;
 			} elseif ($serverdata['platform'] == 'hubzilla') {
 				$serverdata['network'] = Protocol::ZOT;
@@ -528,7 +543,7 @@ class GServer
 
 		if (is_array($nodeinfo['software'])) {
 			if (!empty($nodeinfo['software']['name'])) {
-				$server['platform'] = $nodeinfo['software']['name'];
+				$server['platform'] = strtolower($nodeinfo['software']['name']);
 			}
 
 			if (!empty($nodeinfo['software']['version'])) {
@@ -605,7 +620,7 @@ class GServer
 
 		if (is_array($nodeinfo['software'])) {
 			if (!empty($nodeinfo['software']['name'])) {
-				$server['platform'] = $nodeinfo['software']['name'];
+				$server['platform'] = strtolower($nodeinfo['software']['name']);
 			}
 
 			if (!empty($nodeinfo['software']['version'])) {
@@ -673,7 +688,7 @@ class GServer
 		}
 
 		if (!empty($data['url'])) {
-			$serverdata['platform'] = $data['platform'];
+			$serverdata['platform'] = strtolower($data['platform']);
 			$serverdata['version'] = $data['version'];
 		}
 
@@ -726,7 +741,7 @@ class GServer
 	 */
 	private static function validHostMeta(string $url)
 	{
-		$xrd_timeout = Config::get('system', 'xrd_timeout');
+		$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
 		$curlResult = Network::curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
 		if (!$curlResult->isSuccess()) {
 			return false;
@@ -931,6 +946,11 @@ class GServer
 			$serverdata['site_name'] = $data['title'];
 		}
 
+		if (!empty($data['title']) && empty($serverdata['platform']) && empty($serverdata['network'])) {
+			$serverdata['platform'] = 'mastodon';
+			$serverdata['network'] = Protocol::ACTIVITYPUB;
+		}
+
 		if (!empty($data['description'])) {
 			$serverdata['info'] = trim($data['description']);
 		}
@@ -940,13 +960,18 @@ class GServer
 		}
 
 		if (!empty($serverdata['version']) && preg_match('/.*?\(compatible;\s(.*)\s(.*)\)/ism', $serverdata['version'], $matches)) {
-			$serverdata['platform'] = $matches[1];
+			$serverdata['platform'] = strtolower($matches[1]);
 			$serverdata['version'] = $matches[2];
 		}
 
-		if (!empty($serverdata['version']) && strstr($serverdata['version'], 'Pleroma')) {
+		if (!empty($serverdata['version']) && strstr(strtolower($serverdata['version']), 'pleroma')) {
+			$serverdata['platform'] = 'pleroma';
+			$serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version']));
+		}
+
+		if (!empty($serverdata['platform']) && strstr($serverdata['platform'], 'pleroma')) {
+			$serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform']));
 			$serverdata['platform'] = 'pleroma';
-			$serverdata['version'] = trim(str_replace('Pleroma', '', $serverdata['version']));
 		}
 
 		return $serverdata;
@@ -977,22 +1002,22 @@ class GServer
 		}
 
 		if (!empty($data['site']['platform'])) {
-			$serverdata['platform'] = $data['site']['platform']['PLATFORM_NAME'];
+			$serverdata['platform'] = strtolower($data['site']['platform']['PLATFORM_NAME']);
 			$serverdata['version'] = $data['site']['platform']['STD_VERSION'];
 			$serverdata['network'] = Protocol::ZOT;
 		}
 
 		if (!empty($data['site']['hubzilla'])) {
-			$serverdata['platform'] = $data['site']['hubzilla']['PLATFORM_NAME'];
+			$serverdata['platform'] = strtolower($data['site']['hubzilla']['PLATFORM_NAME']);
 			$serverdata['version'] = $data['site']['hubzilla']['RED_VERSION'];
 			$serverdata['network'] = Protocol::ZOT;
 		}
 
 		if (!empty($data['site']['redmatrix'])) {
 			if (!empty($data['site']['redmatrix']['PLATFORM_NAME'])) {
-				$serverdata['platform'] = $data['site']['redmatrix']['PLATFORM_NAME'];
+				$serverdata['platform'] = strtolower($data['site']['redmatrix']['PLATFORM_NAME']);
 			} elseif (!empty($data['site']['redmatrix']['RED_PLATFORM'])) {
-				$serverdata['platform'] = $data['site']['redmatrix']['RED_PLATFORM'];
+				$serverdata['platform'] = strtolower($data['site']['redmatrix']['RED_PLATFORM']);
 			}
 
 			$serverdata['version'] = $data['site']['redmatrix']['RED_VERSION'];
@@ -1149,7 +1174,7 @@ class GServer
 				break;
 		}
 
-		$serverdata['platform'] = $data['platform'] ?? '';
+		$serverdata['platform'] = strtolower($data['platform'] ?? '');
 
 		return $serverdata;
 	}
@@ -1198,20 +1223,18 @@ class GServer
 			}
 
 			if ($attr['name'] == 'application-name') {
-				$serverdata['platform'] = $attr['content'];
+				$serverdata['platform'] = strtolower($attr['content']);
  				if (in_array($attr['content'], ['Misskey', 'Write.as'])) {
 					$serverdata['network'] = Protocol::ACTIVITYPUB;
 				}
 			}
-
-			if ($attr['name'] == 'generator') {
-				$serverdata['platform'] = $attr['content'];
-
+			if (($attr['name'] == 'generator') && (empty($serverdata['platform']) || (substr(strtolower($attr['content']), 0, 9) == 'wordpress'))) {
+				$serverdata['platform'] = strtolower($attr['content']);
 				$version_part = explode(' ', $attr['content']);
 
 				if (count($version_part) == 2) {
 					if (in_array($version_part[0], ['WordPress'])) {
-						$serverdata['platform'] = $version_part[0];
+						$serverdata['platform'] = strtolower($version_part[0]);
 						$serverdata['version'] = $version_part[1];
 
 						// We still do need a reliable test if some AP plugin is activated
@@ -1222,7 +1245,7 @@ class GServer
 						}
 					}
 					if (in_array($version_part[0], ['Friendika', 'Friendica'])) {
-						$serverdata['platform'] = $version_part[0];
+						$serverdata['platform'] = strtolower($version_part[0]);
 						$serverdata['version'] = $version_part[1];
 						$serverdata['network'] = Protocol::DFRN;
 					}
@@ -1258,7 +1281,7 @@ class GServer
 			}
 
 			if ($attr['property'] == 'og:platform') {
-				$serverdata['platform'] = $attr['content'];
+				$serverdata['platform'] = strtolower($attr['content']);
 
 				if (in_array($attr['content'], ['PeerTube'])) {
 					$serverdata['network'] = Protocol::ACTIVITYPUB;
@@ -1266,7 +1289,7 @@ class GServer
 			}
 
 			if ($attr['property'] == 'generator') {
-				$serverdata['platform'] = $attr['content'];
+				$serverdata['platform'] = strtolower($attr['content']);
 
 				if (in_array($attr['content'], ['hubzilla'])) {
 					// We later check which compatible protocol modules are loaded.
@@ -1340,7 +1363,7 @@ class GServer
 
 		$no_of_queries = 5;
 
-		$requery_days = intval(Config::get('system', 'poco_requery_days'));
+		$requery_days = intval(DI::config()->get('system', 'poco_requery_days'));
 
 		if ($requery_days == 0) {
 			$requery_days = 7;
@@ -1380,7 +1403,7 @@ class GServer
 	 */
 	private static function discoverFederation()
 	{
-		$last = Config::get('poco', 'last_federation_discovery');
+		$last = DI::config()->get('poco', 'last_federation_discovery');
 
 		if ($last) {
 			$next = $last + (24 * 60 * 60);
@@ -1404,7 +1427,7 @@ class GServer
 		}
 
 		// Disvover Mastodon servers
-		$accesstoken = Config::get('system', 'instances_social_key');
+		$accesstoken = DI::config()->get('system', 'instances_social_key');
 
 		if (!empty($accesstoken)) {
 			$api = 'https://instances.social/api/1.0/instances/list?count=0';
@@ -1421,6 +1444,6 @@ class GServer
 			}
 		}
 
-		Config::set('poco', 'last_federation_discovery', time());
+		DI::config()->set('poco', 'last_federation_discovery', time());
 	}
 }