X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=64a2b5be9e4f4b92182a1f277a5408c88f27e6b2;hb=8e2910976f126ee7c728ba4716f317ac496f377b;hp=6a701f25f355d11b87db1afe07f5222cb3584236;hpb=35854a0ad1b05704f9b573aab0a142daa2ebc7ec;p=friendica.git

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 6a701f25f3..64a2b5be9e 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -4,41 +4,18 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
 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
-	 */
-	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;
-	}
-
 	/**
 	 * @param string  $current  current
 	 * @param boolean $disabled optional, default false
@@ -51,12 +28,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) {
@@ -68,94 +45,190 @@ class ContactSelector
 	}
 
 	/**
-	 * @param string $s       network
-	 * @param string $profile optional, default empty
+	 * @param string $profile Profile URL
+	 * @return string Server URL
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	private static function getServerURLForProfile($profile)
+	{
+		$server_url = '';
+
+		// Fetch the server url from the contact table
+		$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($profile)]);
+		if (DBA::isResult($contact) && !empty($contact['baseurl'])) {
+			$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);
+			unset($parts['path']);
+			$server_url = Strings::normaliseLink(Network::unparseURL($parts));
+		}
+
+		return $server_url;
+	}
+
+	/**
+	 * @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($s, $profile = "")
+	public static function networkToName($network, $profile = '', $protocol = '')
 	{
 		$nets = [
-			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'),
+			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'),
 		];
 
-		Addon::callHooks('network_to_name', $nets);
+		Hook::callAll('network_to_name', $nets);
 
 		$search  = array_keys($nets);
 		$replace = array_values($nets);
 
-		$networkname = str_replace($search, $replace, $s);
+		$networkname = str_replace($search, $replace, $network);
 
-		if ((in_array($s, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
-			$r = DBA::fetchFirst("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::FEDERATED)) && ($profile != "")) {
+			$server_url = self::getServerURLForProfile($profile);
 
-			if (DBA::isResult($r)) {
-				$networkname = $r['platform'];
+			// Now query the GServer for the platform name
+			$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]);
 
-				if ($s == Protocol::ACTIVITYPUB) {
-					$networkname .= ' (AP)';
+			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)';
+					}
 				}
 			}
 		}
 
+		if (!empty($protocol) && ($protocol != $network)) {
+			$networkname = DI::l10n()->t('%s (via %s)', $networkname, self::networkToName($protocol));
+		}
+
 		return $networkname;
 	}
 
 	/**
-	 * @param string $current optional, default empty
-	 * @param string $suffix  optionsl, default empty
+	 * @param string $network network
+	 * @param string $profile optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function gender($current = "", $suffix = "")
+	public static function networkToIcon($network, $profile = "")
 	{
-		$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')];
+		$nets = [
+			Protocol::DFRN      =>   'friendica',
+			Protocol::OSTATUS   =>   'gnu-social', // There is no generic OStatus icon
+			Protocol::FEED      =>   'rss',
+			Protocol::MAIL      =>   'inbox',
+			Protocol::DIASPORA  =>   'diaspora',
+			Protocol::ZOT       =>   'hubzilla',
+			Protocol::LINKEDIN  =>   'linkedin',
+			Protocol::XMPP      =>   'xmpp',
+			Protocol::MYSPACE   =>   'file-text-o', /// @todo
+			Protocol::GPLUS     =>   'google-plus',
+			Protocol::PUMPIO    =>   'file-text-o', /// @todo
+			Protocol::TWITTER   =>   'twitter',
+			Protocol::DISCOURSE =>   'dot-circle-o', /// @todo
+			Protocol::DIASPORA2 =>   'diaspora',
+			Protocol::STATUSNET =>   'gnu-social',
+			Protocol::ACTIVITYPUB => 'activitypub',
+			Protocol::PNUT      =>   'file-text-o', /// @todo
+		];
 
-		Addon::callHooks('gender_selector', $select);
+		$platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica',
+			'GNU Social' => 'gnu-social', 'gnusocial' => 'gnu-social', 'hubzilla' => 'hubzilla',
+			'mastodon' => 'mastodon', 'peertube' => 'peertube', 'pixelfed' => 'pixelfed',
+			'pleroma' => 'pleroma', 'red' => 'hubzilla', 'redmatrix' => 'hubzilla',
+			'socialhome' => 'social-home', 'wordpress' => 'wordpress'];
 
-		$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
-		foreach ($select as $selection) {
-			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($selection == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$selection\" $selected >$selection</option>";
+		$search  = array_keys($nets);
+		$replace = array_values($nets);
+
+		$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'])) {
+				$network_icon = $platform_icons[strtolower($gserver['platform'])] ?? $network_icon;
 			}
 		}
-		$o .= '</select>';
-		return $o;
+
+		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 sexualPreference($current = "", $suffix = "")
 	{
 		$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')];
-
+		$select = [
+			''              => DI::l10n()->t('No answer'),
+			'Males'         => DI::l10n()->t('Males'),
+			'Females'       => DI::l10n()->t('Females'),
+			'Gay'           => DI::l10n()->t('Gay'),
+			'Lesbian'       => DI::l10n()->t('Lesbian'),
+			'No Preference' => DI::l10n()->t('No Preference'),
+			'Bisexual'      => DI::l10n()->t('Bisexual'),
+			'Autosexual'    => DI::l10n()->t('Autosexual'),
+			'Abstinent'     => DI::l10n()->t('Abstinent'),
+			'Virgin'        => DI::l10n()->t('Virgin'),
+			'Deviant'       => DI::l10n()->t('Deviant'),
+			'Fetish'        => DI::l10n()->t('Fetish'),
+			'Oodles'        => DI::l10n()->t('Oodles'),
+			'Nonsexual'     => DI::l10n()->t('Nonsexual'),
+		];
 
-		Addon::callHooks('sexpref_selector', $select);
+		Hook::callAll('sexpref_selector', $select);
 
 		$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
-		foreach ($select as $selection) {
+		foreach ($select as $neutral => $selection) {
 			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($selection == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$selection\" $selected >$selection</option>";
+				$selected = (($neutral == $current) ? ' selected="selected" ' : '');
+				$o .= "<option value=\"$neutral\" $selected >$selection</option>";
 			}
 		}
 		$o .= '</select>';
@@ -164,19 +237,53 @@ class ContactSelector
 
 	/**
 	 * @param string $current optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function maritalStatus($current = "")
 	{
 		$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')];
+		$select = [
+			''                     => DI::l10n()->t('No answer'),
+			'Single'               => DI::l10n()->t('Single'),
+			'Lonely'               => DI::l10n()->t('Lonely'),
+			'In a relation'        => DI::l10n()->t('In a relation'),
+			'Has crush'            => DI::l10n()->t('Has crush'),
+			'Infatuated'           => DI::l10n()->t('Infatuated'),
+			'Dating'               => DI::l10n()->t('Dating'),
+			'Unfaithful'           => DI::l10n()->t('Unfaithful'),
+			'Sex Addict'           => DI::l10n()->t('Sex Addict'),
+			'Friends'              => DI::l10n()->t('Friends'),
+			'Friends/Benefits'     => DI::l10n()->t('Friends/Benefits'),
+			'Casual'               => DI::l10n()->t('Casual'),
+			'Engaged'              => DI::l10n()->t('Engaged'),
+			'Married'              => DI::l10n()->t('Married'),
+			'Imaginarily married'  => DI::l10n()->t('Imaginarily married'),
+			'Partners'             => DI::l10n()->t('Partners'),
+			'Cohabiting'           => DI::l10n()->t('Cohabiting'),
+			'Common law'           => DI::l10n()->t('Common law'),
+			'Happy'                => DI::l10n()->t('Happy'),
+			'Not looking'          => DI::l10n()->t('Not looking'),
+			'Swinger'              => DI::l10n()->t('Swinger'),
+			'Betrayed'             => DI::l10n()->t('Betrayed'),
+			'Separated'            => DI::l10n()->t('Separated'),
+			'Unstable'             => DI::l10n()->t('Unstable'),
+			'Divorced'             => DI::l10n()->t('Divorced'),
+			'Imaginarily divorced' => DI::l10n()->t('Imaginarily divorced'),
+			'Widowed'              => DI::l10n()->t('Widowed'),
+			'Uncertain'            => DI::l10n()->t('Uncertain'),
+			'It\'s complicated'    => DI::l10n()->t('It\'s complicated'),
+			'Don\'t care'          => DI::l10n()->t('Don\'t care'),
+			'Ask me'               => DI::l10n()->t('Ask me'),
+		];
 
-		Addon::callHooks('marital_selector', $select);
+		Hook::callAll('marital_selector', $select);
 
 		$o .= '<select name="marital" id="marital-select" size="1" >';
-		foreach ($select as $selection) {
+		foreach ($select as $neutral => $selection) {
 			if ($selection !== 'NOTRANSLATION') {
-				$selected = (($selection == $current) ? ' selected="selected" ' : '');
-				$o .= "<option value=\"$selection\" $selected >$selection</option>";
+				$selected = (($neutral == $current) ? ' selected="selected" ' : '');
+				$o .= "<option value=\"$neutral\" $selected >$selection</option>";
 			}
 		}
 		$o .= '</select>';