X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=9035d37e73c01d3c838e35c30bbc662e1507acc0;hb=e0295abdabe23476f326621e0321ef826756f53e;hp=817602f1eb86ed653d780c17cc193ca3988f9c96;hpb=fdaac8a681b683f35ca1f7fd407bf2f28be6f7b8;p=friendica.git

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 817602f1eb..9035d37e73 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -1,52 +1,45 @@
 <?php
 /**
- * @file src/Content/ContactSelector.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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\Content;
 
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
- * @brief ContactSelector class
+ * ContactSelector class
  */
 class ContactSelector
 {
-	/**
-	 * @param string $current     current
-	 * @param string $foreign_net network
-	 * @return string
-	 * @throws \Exception
-	 */
-	public static function profileAssign($current, $foreign_net)
-	{
-		$o = '';
-
-		$disabled = (($foreign_net) ? ' disabled="true" ' : '');
-
-		$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::toArray($s);
-
-		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";
-			}
-		}
-		$o .= "</select>\r\n";
-		return $o;
-	}
+	static $serverdata = [];
+	static $server_url = [];
 
 	/**
 	 * @param string  $current  current
 	 * @param boolean $disabled optional, default false
-	 * @return object
+	 * @return string
 	 */
 	public static function pollInterval($current, $disabled = false)
 	{
@@ -55,12 +48,12 @@ class ContactSelector
 		$o .= "<select id=\"contact-poll-interval\" name=\"poll\" $dis />" . "\r\n";
 
 		$rep = [
-			0 => L10n::t('Frequently'),
-			1 => L10n::t('Hourly'),
-			2 => L10n::t('Twice daily'),
-			3 => L10n::t('Daily'),
-			4 => L10n::t('Weekly'),
-			5 => L10n::t('Monthly')
+			0 => DI::l10n()->t('Frequently'),
+			1 => DI::l10n()->t('Hourly'),
+			2 => DI::l10n()->t('Twice daily'),
+			3 => DI::l10n()->t('Daily'),
+			4 => DI::l10n()->t('Weekly'),
+			5 => DI::l10n()->t('Monthly')
 		];
 
 		foreach ($rep as $k => $v) {
@@ -71,13 +64,32 @@ class ContactSelector
 		return $o;
 	}
 
+	private static function getServerForProfile(string $profile)
+	{
+		$server_url = self::getServerURLForProfile($profile);
+
+		if (!empty(self::$serverdata[$server_url])) {
+			return self::$serverdata[$server_url];
+		}
+
+		// Now query the GServer for the platform name
+		$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]);
+
+		self::$serverdata[$server_url] = $gserver;
+		return $gserver;
+	}
+
 	/**
 	 * @param string $profile Profile URL
 	 * @return string Server URL
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
 	private static function getServerURLForProfile($profile)
 	{
+		if (!empty(self::$server_url[$profile])) {
+			return self::$server_url[$profile];
+		}
+
 		$server_url = '';
 
 		// Fetch the server url from the contact table
@@ -86,14 +98,6 @@ class ContactSelector
 			$server_url = Strings::normaliseLink($contact['baseurl']);
 		}
 
-		if (empty($server_url)) {
-			// Fetch the server url from the gcontact table
-			$gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]);
-			if (!empty($gcontact) && !empty($gcontact['server_url'])) {
-				$server_url = Strings::normaliseLink($gcontact['server_url']);
-			}
-		}
-
 		if (empty($server_url)) {
 			// Create the server url out of the profile url
 			$parts = parse_url($profile);
@@ -101,35 +105,38 @@ class ContactSelector
 			$server_url = Strings::normaliseLink(Network::unparseURL($parts));
 		}
 
+		self::$server_url[$profile] = $server_url;
+
 		return $server_url;
 	}
 
 	/**
-	 * @param string $network network
-	 * @param string $profile optional, default empty
+	 * @param string $network  network of the contact
+	 * @param string $profile  optional, default empty
+	 * @param string $protocol (Optional) Protocol that is used for the transmission
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function networkToName($network, $profile = "")
+	public static function networkToName($network, $profile = '', $protocol = '', $gsid = 0)
 	{
 		$nets = [
-			Protocol::DFRN      =>   L10n::t('DFRN'),
-			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::DISCOURSE =>   L10n::t('Discourse'),
-			Protocol::DIASPORA2 =>   L10n::t('Diaspora Connector'),
-			Protocol::STATUSNET =>   L10n::t('GNU Social Connector'),
-			Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
-			Protocol::PNUT      =>   L10n::t('pnut'),
+			Protocol::DFRN      =>   DI::l10n()->t('DFRN'),
+			Protocol::OSTATUS   =>   DI::l10n()->t('OStatus'),
+			Protocol::FEED      =>   DI::l10n()->t('RSS/Atom'),
+			Protocol::MAIL      =>   DI::l10n()->t('Email'),
+			Protocol::DIASPORA  =>   DI::l10n()->t('Diaspora'),
+			Protocol::ZOT       =>   DI::l10n()->t('Zot!'),
+			Protocol::LINKEDIN  =>   DI::l10n()->t('LinkedIn'),
+			Protocol::XMPP      =>   DI::l10n()->t('XMPP/IM'),
+			Protocol::MYSPACE   =>   DI::l10n()->t('MySpace'),
+			Protocol::GPLUS     =>   DI::l10n()->t('Google+'),
+			Protocol::PUMPIO    =>   DI::l10n()->t('pump.io'),
+			Protocol::TWITTER   =>   DI::l10n()->t('Twitter'),
+			Protocol::DISCOURSE =>   DI::l10n()->t('Discourse'),
+			Protocol::DIASPORA2 =>   DI::l10n()->t('Diaspora Connector'),
+			Protocol::STATUSNET =>   DI::l10n()->t('GNU Social Connector'),
+			Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'),
+			Protocol::PNUT      =>   DI::l10n()->t('pnut'),
 		];
 
 		Hook::callAll('network_to_name', $nets);
@@ -140,28 +147,34 @@ class ContactSelector
 		$networkname = str_replace($search, $replace, $network);
 
 		if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) {
-			$server_url = self::getServerURLForProfile($profile);
-
-			// Now query the GServer for the platform name
-			$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]);
+			if (!empty($gsid) && !empty(self::$serverdata[$gsid])) {
+				$gserver = self::$serverdata[$gsid];
+			} elseif (!empty($gsid)) {
+				$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]);
+				self::$serverdata[$gsid] = $gserver;
+			} else {
+				$gserver = self::getServerForProfile($profile);
+			}
 
-			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($gserver['platform'])) {
+				$platform = $gserver['platform'];
+			} elseif (!empty($gserver['network']) && ($gserver['network'] != Protocol::ACTIVITYPUB)) {
+				$platform = self::networkToName($gserver['network']);
+			}
 
-				if (!empty($platform)) {
-					$networkname = $platform;
+			if (!empty($platform)) {
+				$networkname = $platform;
 
-					if ($network == Protocol::ACTIVITYPUB) {
-						$networkname .= ' (AP)';
-					}
+				if ($network == Protocol::ACTIVITYPUB) {
+					$networkname .= ' (AP)';
 				}
 			}
 		}
 
+		if (!empty($protocol) && ($protocol != $network)) {
+			$networkname = DI::l10n()->t('%s (via %s)', $networkname, self::networkToName($protocol));
+		}
+
 		return $networkname;
 	}
 
@@ -169,7 +182,7 @@ class ContactSelector
 	 * @param string $network network
 	 * @param string $profile optional, default empty
 	 * @return string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
 	public static function networkToIcon($network, $profile = "")
 	{
@@ -177,7 +190,7 @@ class ContactSelector
 			Protocol::DFRN      =>   'friendica',
 			Protocol::OSTATUS   =>   'gnu-social', // There is no generic OStatus icon
 			Protocol::FEED      =>   'rss',
-			Protocol::MAIL      =>   'file-text-o', /// @todo
+			Protocol::MAIL      =>   'inbox',
 			Protocol::DIASPORA  =>   'diaspora',
 			Protocol::ZOT       =>   'hubzilla',
 			Protocol::LINKEDIN  =>   'linkedin',
@@ -205,150 +218,12 @@ class ContactSelector
 		$network_icon = str_replace($search, $replace, $network);
 
 		if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) {
-			$server_url = self::getServerURLForProfile($profile);
-
-			// Now query the GServer for the platform name
-			$gserver = DBA::selectFirst('gserver', ['platform'], ['nurl' => $server_url]);
-
-			if (DBA::isResult($gserver) && !empty($gserver['platform'])) {
+			$gserver = self::getServerForProfile($profile);
+			if (!empty($gserver['platform'])) {
 				$network_icon = $platform_icons[strtolower($gserver['platform'])] ?? $network_icon;
 			}
 		}
 
 		return $network_icon;
 	}
-
-	/**
-	 * @param string $current optional, default empty
-	 * @param string $suffix  optionsl, default empty
-	 * @return string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function gender($current = "", $suffix = "")
-	{
-		$o = '';
-		$select = [
-			''                 => L10n::t('No answer'),
-			'Male'             => L10n::t('Male'),
-			'Female'           => L10n::t('Female'),
-			'Currently Male'   => L10n::t('Currently Male'),
-			'Currently Female' => L10n::t('Currently Female'),
-			'Mostly Male'      => L10n::t('Mostly Male'),
-			'Mostly Female'    => L10n::t('Mostly Female'),
-			'Transgender'      => L10n::t('Transgender'),
-			'Intersex'         => L10n::t('Intersex'),
-			'Transsexual'      => L10n::t('Transsexual'),
-			'Hermaphrodite'    => L10n::t('Hermaphrodite'),
-			'Neuter'           => L10n::t('Neuter'),
-			'Non-specific'     => L10n::t('Non-specific'),
-			'Other'            => L10n::t('Other'),
-			'Undecided'        => L10n::t('Undecided'),
-		];
-
-		Hook::callAll('gender_selector', $select);
-
-		$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
-		foreach ($select as $neutral => $selection) {
-			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($neutral == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$neutral\" $selected >$selection</option>";
-			}
-		}
-		$o .= '</select>';
-		return $o;
-	}
-
-	/**
-	 * @param string $current optional, default empty
-	 * @param string $suffix  optionsl, default empty
-	 * @return string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function sexualPreference($current = "", $suffix = "")
-	{
-		$o = '';
-		$select = [
-			''              => L10n::t('No answer'),
-			'Males'         => L10n::t('Males'),
-			'Females'       => L10n::t('Females'),
-			'Gay'           => L10n::t('Gay'),
-			'Lesbian'       => L10n::t('Lesbian'),
-			'No Preference' => L10n::t('No Preference'),
-			'Bisexual'      => L10n::t('Bisexual'),
-			'Autosexual'    => L10n::t('Autosexual'),
-			'Abstinent'     => L10n::t('Abstinent'),
-			'Virgin'        => L10n::t('Virgin'),
-			'Deviant'       => L10n::t('Deviant'),
-			'Fetish'        => L10n::t('Fetish'),
-			'Oodles'        => L10n::t('Oodles'),
-			'Nonsexual'     => L10n::t('Nonsexual'),
-		];
-
-		Hook::callAll('sexpref_selector', $select);
-
-		$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
-		foreach ($select as $neutral => $selection) {
-			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($neutral == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$neutral\" $selected >$selection</option>";
-			}
-		}
-		$o .= '</select>';
-		return $o;
-	}
-
-	/**
-	 * @param string $current optional, default empty
-	 * @return string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 */
-	public static function maritalStatus($current = "")
-	{
-		$o = '';
-		$select = [
-			''                     => L10n::t('No answer'),
-			'Single'               => L10n::t('Single'),
-			'Lonely'               => L10n::t('Lonely'),
-			'In a relation'        => L10n::t('In a relation'),
-			'Has crush'            => L10n::t('Has crush'),
-			'Infatuated'           => L10n::t('Infatuated'),
-			'Dating'               => L10n::t('Dating'),
-			'Unfaithful'           => L10n::t('Unfaithful'),
-			'Sex Addict'           => L10n::t('Sex Addict'),
-			'Friends'              => L10n::t('Friends'),
-			'Friends/Benefits'     => L10n::t('Friends/Benefits'),
-			'Casual'               => L10n::t('Casual'),
-			'Engaged'              => L10n::t('Engaged'),
-			'Married'              => L10n::t('Married'),
-			'Imaginarily married'  => L10n::t('Imaginarily married'),
-			'Partners'             => L10n::t('Partners'),
-			'Cohabiting'           => L10n::t('Cohabiting'),
-			'Common law'           => L10n::t('Common law'),
-			'Happy'                => L10n::t('Happy'),
-			'Not looking'          => L10n::t('Not looking'),
-			'Swinger'              => L10n::t('Swinger'),
-			'Betrayed'             => L10n::t('Betrayed'),
-			'Separated'            => L10n::t('Separated'),
-			'Unstable'             => L10n::t('Unstable'),
-			'Divorced'             => L10n::t('Divorced'),
-			'Imaginarily divorced' => L10n::t('Imaginarily divorced'),
-			'Widowed'              => L10n::t('Widowed'),
-			'Uncertain'            => L10n::t('Uncertain'),
-			'It\'s complicated'    => L10n::t('It\'s complicated'),
-			'Don\'t care'          => L10n::t('Don\'t care'),
-			'Ask me'               => L10n::t('Ask me'),
-		];
-
-		Hook::callAll('marital_selector', $select);
-
-		$o .= '<select name="marital" id="marital-select" size="1" >';
-		foreach ($select as $neutral => $selection) {
-			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($neutral == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$neutral\" $selected >$selection</option>";
-			}
-		}
-		$o .= '</select>';
-		return $o;
-	}
 }