X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=298f2512edf349f5089556f9dfcc1dadc7e9c7ff;hb=61bc9facc8e32cf06834c9406a71ecfc4f7cac71;hp=b5122da808854261786e6d9a94e24248e42e4028;hpb=07d306aa3736aa8a0b46109b15a6c637919c33b1;p=friendica.git

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index b5122da808..298f2512ed 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -6,9 +6,10 @@ namespace Friendica\Content;
 
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Protocol\Diaspora;
-use dba;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\Network;
 
 /**
  * @brief ContactSelector class
@@ -27,10 +28,10 @@ class ContactSelector
 
 		$o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" >\r\n";
 
-		$s = dba::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $$_SESSION['uid']]);
-		$r = dba::inArray($s);
+		$s = DBA::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
 				$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -69,30 +70,29 @@ class ContactSelector
 	}
 
 	/**
-	 * @param string $s       network
+	 * @param string $network network
 	 * @param string $profile optional, default empty
 	 * @return string
 	 */
-	public static function networkToName($s, $profile = "")
+	public static function networkToName($network, $profile = "")
 	{
 		$nets = [
-			NETWORK_DFRN     => L10n::t('Friendica'),
-			NETWORK_OSTATUS  => L10n::t('OStatus'),
-			NETWORK_FEED     => L10n::t('RSS/Atom'),
-			NETWORK_MAIL     => L10n::t('Email'),
-			NETWORK_DIASPORA => L10n::t('Diaspora'),
-			NETWORK_FACEBOOK => L10n::t('Facebook'),
-			NETWORK_ZOT      => L10n::t('Zot!'),
-			NETWORK_LINKEDIN => L10n::t('LinkedIn'),
-			NETWORK_XMPP     => L10n::t('XMPP/IM'),
-			NETWORK_MYSPACE  => L10n::t('MySpace'),
-			NETWORK_GPLUS    => L10n::t('Google+'),
-			NETWORK_PUMPIO   => L10n::t('pump.io'),
-			NETWORK_TWITTER  => L10n::t('Twitter'),
-			NETWORK_DIASPORA2 => L10n::t('Diaspora Connector'),
-			NETWORK_STATUSNET => L10n::t('GNU Social Connector'),
-			NETWORK_PNUT      => L10n::t('pnut'),
-			NETWORK_APPNET => L10n::t('App.net')
+			Protocol::DFRN      =>   L10n::t('Friendica'),
+			Protocol::OSTATUS   =>   L10n::t('OStatus'),
+			Protocol::FEED      =>   L10n::t('RSS/Atom'),
+			Protocol::MAIL      =>   L10n::t('Email'),
+			Protocol::DIASPORA  =>   L10n::t('Diaspora'),
+			Protocol::ZOT       =>   L10n::t('Zot!'),
+			Protocol::LINKEDIN  =>   L10n::t('LinkedIn'),
+			Protocol::XMPP      =>   L10n::t('XMPP/IM'),
+			Protocol::MYSPACE   =>   L10n::t('MySpace'),
+			Protocol::GPLUS     =>   L10n::t('Google+'),
+			Protocol::PUMPIO    =>   L10n::t('pump.io'),
+			Protocol::TWITTER   =>   L10n::t('Twitter'),
+			Protocol::DIASPORA2 =>   L10n::t('Diaspora Connector'),
+			Protocol::STATUSNET =>   L10n::t('GNU Social Connector'),
+			Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
+			Protocol::PNUT      =>   L10n::t('pnut'),
 		];
 
 		Addon::callHooks('network_to_name', $nets);
@@ -100,15 +100,37 @@ class ContactSelector
 		$search  = array_keys($nets);
 		$replace = array_values($nets);
 
-		$networkname = str_replace($search, $replace, $s);
+		$networkname = str_replace($search, $replace, $network);
 
-		if ((in_array($s, [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) && ($profile != "")) {
-			$r = dba::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
-					INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
-					WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+		if ((in_array($network, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
+			// Create the server url out of the profile url
+			$parts = parse_url($profile);
+			unset($parts['path']);
+			$server_url = [normalise_link(Network::unparseURL($parts))];
 
-			if (DBM::is_result($r)) {
-				$networkname = $r['platform'];
+			// Fetch the server url
+			$gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => normalise_link($profile)]);
+			if (!empty($gcontact) && !empty($gcontact['server_url'])) {
+				$server_url[] = normalise_link($gcontact['server_url']);
+			}
+
+			// Now query the GServer for the platform name
+			$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]);
+
+			if (DBA::isResult($gserver)) {
+				if (!empty($gserver['platform'])) {
+					$platform = $gserver['platform'];
+				} elseif (!empty($gserver['network']) && ($gserver['network'] != Protocol::ACTIVITYPUB)) {
+					$platform = self::networkToName($gserver['network']);
+				}
+
+				if (!empty($platform)) {
+					$networkname = $platform;
+
+					if ($network == Protocol::ACTIVITYPUB) {
+						$networkname .= ' (AP)';
+					}
+				}
 			}
 		}
 
@@ -123,9 +145,9 @@ class ContactSelector
 	{
 		$o = '';
 		$select = ['', L10n::t('Male'), L10n::t('Female'), L10n::t('Currently Male'), L10n::t('Currently Female'), L10n::t('Mostly Male'), L10n::t('Mostly Female'), L10n::t('Transgender'), L10n::t('Intersex'), L10n::t('Transsexual'), L10n::t('Hermaphrodite'), L10n::t('Neuter'), L10n::t('Non-specific'), L10n::t('Other'), L10n::t('Undecided')];
-	
+
 		Addon::callHooks('gender_selector', $select);
-	
+
 		$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
 		foreach ($select as $selection) {
 			if ($selection !== 'NOTRANSLATION') {
@@ -136,7 +158,7 @@ class ContactSelector
 		$o .= '</select>';
 		return $o;
 	}
-	
+
 	/**
 	 * @param string $current optional, default empty
 	 * @param string $suffix  optionsl, default empty
@@ -145,10 +167,10 @@ class ContactSelector
 	{
 		$o = '';
 		$select = ['', L10n::t('Males'), L10n::t('Females'), L10n::t('Gay'), L10n::t('Lesbian'), L10n::t('No Preference'), L10n::t('Bisexual'), L10n::t('Autosexual'), L10n::t('Abstinent'), L10n::t('Virgin'), L10n::t('Deviant'), L10n::t('Fetish'), L10n::t('Oodles'), L10n::t('Nonsexual')];
-	
-	
+
+
 		Addon::callHooks('sexpref_selector', $select);
-	
+
 		$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
 		foreach ($select as $selection) {
 			if ($selection !== 'NOTRANSLATION') {
@@ -159,7 +181,7 @@ class ContactSelector
 		$o .= '</select>';
 		return $o;
 	}
-	
+
 	/**
 	 * @param string $current optional, default empty
 	 */
@@ -167,9 +189,9 @@ class ContactSelector
 	{
 		$o = '';
 		$select = ['', L10n::t('Single'), L10n::t('Lonely'), L10n::t('Available'), L10n::t('Unavailable'), L10n::t('Has crush'), L10n::t('Infatuated'), L10n::t('Dating'), L10n::t('Unfaithful'), L10n::t('Sex Addict'), L10n::t('Friends'), L10n::t('Friends/Benefits'), L10n::t('Casual'), L10n::t('Engaged'), L10n::t('Married'), L10n::t('Imaginarily married'), L10n::t('Partners'), L10n::t('Cohabiting'), L10n::t('Common law'), L10n::t('Happy'), L10n::t('Not looking'), L10n::t('Swinger'), L10n::t('Betrayed'), L10n::t('Separated'), L10n::t('Unstable'), L10n::t('Divorced'), L10n::t('Imaginarily divorced'), L10n::t('Widowed'), L10n::t('Uncertain'), L10n::t('It\'s complicated'), L10n::t('Don\'t care'), L10n::t('Ask me')];
-	
+
 		Addon::callHooks('marital_selector', $select);
-	
+
 		$o .= '<select name="marital" id="marital-select" size="1" >';
 		foreach ($select as $selection) {
 			if ($selection !== 'NOTRANSLATION') {