X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=7a36ea8c681be56a7ad77e9755402e2d96f76fce;hb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;hp=6a5ee9112b8ad179246a31c4230284619fc1d8b7;hpb=5db9d2fe66630f63973817a824c8b4f767285fca;p=friendica.git diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 6a5ee9112b..7a36ea8c68 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -4,10 +4,9 @@ */ namespace Friendica\Content; -use Friendica\Core\Addon; +use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -20,6 +19,8 @@ class ContactSelector /** * @param string $current current * @param string $foreign_net network + * @return string + * @throws \Exception */ public static function profileAssign($current, $foreign_net) { @@ -71,11 +72,46 @@ class ContactSelector } /** - * @param string $network 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($network, $profile = "") + public static function networkToName($network, $profile = '', $protocol = '') { $nets = [ Protocol::DFRN => L10n::t('DFRN'), @@ -90,30 +126,22 @@ class ContactSelector 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'), ]; - 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, $network); - 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 = [Strings::normaliseLink(Network::unparseURL($parts))]; - - // Fetch the server url - $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 ((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]); @@ -135,18 +163,77 @@ class ContactSelector } } + if (!empty($protocol) && ($protocol != $network)) { + $networkname = L10n::t('%s (via %s)', $networkname, self::networkToName($protocol)); + } + return $networkname; } + /** + * @param string $network network + * @param string $profile optional, default empty + * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public static function networkToIcon($network, $profile = "") + { + $nets = [ + Protocol::DFRN => 'friendica', + Protocol::OSTATUS => 'gnu-social', // There is no generic OStatus icon + Protocol::FEED => 'rss', + Protocol::MAIL => 'file-text-o', /// @todo + 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 + ]; + + $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']; + + $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; + } + } + + 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 = [ - 'EMPTY' => '', + '' => L10n::t('No answer'), 'Male' => L10n::t('Male'), 'Female' => L10n::t('Female'), 'Currently Male' => L10n::t('Currently Male'), @@ -163,7 +250,7 @@ class ContactSelector 'Undecided' => L10n::t('Undecided'), ]; - Addon::callHooks('gender_selector', $select); + Hook::callAll('gender_selector', $select); $o .= ""; foreach ($select as $neutral => $selection) { @@ -215,16 +304,17 @@ class ContactSelector /** * @param string $current optional, default empty + * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function maritalStatus($current = "") { $o = ''; $select = [ - 'EMPTY' => '', + '' => L10n::t('No answer'), 'Single' => L10n::t('Single'), 'Lonely' => L10n::t('Lonely'), - 'Available' => L10n::t('Available'), - 'Unavailable' => L10n::t('Unavailable'), + 'In a relation' => L10n::t('In a relation'), 'Has crush' => L10n::t('Has crush'), 'Infatuated' => L10n::t('Infatuated'), 'Dating' => L10n::t('Dating'), @@ -254,7 +344,7 @@ class ContactSelector 'Ask me' => L10n::t('Ask me'), ]; - Addon::callHooks('marital_selector', $select); + Hook::callAll('marital_selector', $select); $o .= '