X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=5ba6528ed0561b6ebd1bc70759dcbcf4dcb6d3ab;hb=795268eb7ad3f10b08721f5d006f22a91bb5c9b6;hp=fcaafb898c5275a51bd35ce200517cfb82f0809b;hpb=11cf36105ccd359c9d21a006e13b3767712196b6;p=friendica.git diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index fcaafb898c..5ba6528ed0 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -5,9 +5,12 @@ namespace Friendica\Content; use Friendica\Core\Addon; -use Friendica\Database\DBM; -use Friendica\Protocol\Diaspora; -use dba; +use Friendica\Core\L10n; +use Friendica\Core\Protocol; +use Friendica\Core\System; +use Friendica\Database\DBA; +use Friendica\Util\Network; +use Friendica\Util\Strings; /** * @brief ContactSelector class @@ -26,10 +29,10 @@ class ContactSelector $o .= "" . "\r\n"; $rep = [ - 0 => t('Frequently'), - 1 => t('Hourly'), - 2 => t('Twice daily'), - 3 => t('Daily'), - 4 => t('Weekly'), - 5 => t('Monthly') + 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') ]; foreach ($rep as $k => $v) { @@ -68,30 +71,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 => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot!'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), - NETWORK_GPLUS => t('Google+'), - NETWORK_PUMPIO => t('pump.io'), - NETWORK_TWITTER => t('Twitter'), - NETWORK_DIASPORA2 => t('Diaspora Connector'), - NETWORK_STATUSNET => t('GNU Social Connector'), - NETWORK_PNUT => t('pnut'), - NETWORK_APPNET => t('App.net') + 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::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); @@ -99,15 +101,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 = [Strings::normaliseLink(Network::unparseURL($parts))]; - if (DBM::is_result($r)) { - $networkname = $r['platform']; + // 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']); + } + + // 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)'; + } + } } } @@ -121,10 +145,10 @@ class ContactSelector public static function gender($current = "", $suffix = "") { $o = ''; - $select = ['', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided')]; - + $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 .= "'; return $o; } - + /** * @param string $current optional, default empty * @param string $suffix optionsl, default empty @@ -143,11 +167,11 @@ class ContactSelector public static function sexualPreference($current = "", $suffix = "") { $o = ''; - $select = ['', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual')]; - - + $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 .= "'; return $o; } - + /** * @param string $current optional, default empty */ public static function maritalStatus($current = "") { $o = ''; - $select = ['', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me')]; - + $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 .= '