X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FContactSelector.php;h=470590388447bf3634a37ab76dad849da0761059;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=18854128c6fb509098f9b032e4ee7bab702183cd;hpb=0ec44f3e8a73229c3aadea86f61b5571a701c6b7;p=friendica.git diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 18854128c6..4705903884 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -4,9 +4,12 @@ */ namespace Friendica\Content; -use Friendica\Core\Addon; +use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\Util\Network; +use Friendica\Util\Strings; /** * @brief ContactSelector class @@ -16,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) { @@ -28,7 +33,7 @@ class ContactSelector $s = DBA::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]); $r = DBA::toArray($s); - if (DBA::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : ""); $o .= "\r\n"; @@ -67,46 +72,68 @@ class ContactSelector } /** - * @param string $s network + * @param string $network network * @param string $profile optional, default empty * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - 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('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); + 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, [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_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::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 (DBA::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)'; + } + } } } @@ -116,19 +143,37 @@ class ContactSelector /** * @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('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')]; + $select = [ + 'EMPTY' => '', + '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'), + ]; - Addon::callHooks('gender_selector', $select); + Hook::callAll('gender_selector', $select); $o .= "'; @@ -138,20 +183,36 @@ class ContactSelector /** * @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 = [ + 'EMPTY' => '', + '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'), + ]; - Addon::callHooks('sexpref_selector', $select); + Hook::callAll('sexpref_selector', $select); $o .= "'; @@ -160,19 +221,54 @@ 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 = [ + 'EMPTY' => '', + 'Single' => L10n::t('Single'), + 'Lonely' => L10n::t('Lonely'), + 'Available' => L10n::t('Available'), + 'Unavailable' => L10n::t('Unavailable'), + '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'), + ]; - Addon::callHooks('marital_selector', $select); + Hook::callAll('marital_selector', $select); $o .= '';