X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=2b86a6e75df663291b5f6bbd1fdaa7fac437928f;hb=6b7dfd0c712bc89de955a735fcbca60dc973d71d;hp=7b7cff4c9860e5b8614a4b9a7f3e05ea3c536595;hpb=700eca70a9e8ac866419eeac4a1a661cdb62caa3;p=friendica.git diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 7b7cff4c98..2b86a6e75d 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -4,9 +4,12 @@ */ namespace Friendica\Content; -use Friendica\Database\DBM; -use Friendica\Protocol\Diaspora; -use dba; +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) { @@ -25,10 +30,10 @@ class ContactSelector $o .= "" . "\r\n"; - $rep = array( - 0 => t('Frequently'), - 1 => t('Hourly'), - 2 => t('Twice daily'), - 3 => t('Daily'), - 4 => t('Weekly'), - 5 => t('Monthly') - ); + $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') + ]; foreach ($rep as $k => $v) { $selected = (($k == $current) ? " selected=\"selected\" " : ""); @@ -67,100 +72,202 @@ 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 = array( - 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') - ); - - call_hooks('network_to_name', $nets); + $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::DIASPORA2 => L10n::t('Diaspora Connector'), + Protocol::STATUSNET => L10n::t('GNU Social Connector'), + Protocol::ACTIVITYPUB => L10n::t('ActivityPub'), + Protocol::PNUT => L10n::t('pnut'), + ]; + + 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($network, Protocol::FEDERATED)) && ($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']); + } + + // 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 ((in_array($s, array(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 (!empty($platform)) { + $networkname = $platform; - if (DBM::is_result($r)) { - $networkname = $r['platform']; + if ($network == Protocol::ACTIVITYPUB) { + $networkname .= ' (AP)'; + } + } } } return $networkname; } - function gender_selector($current="",$suffix="") { + /** + * @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 = array('', 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')); - - call_hooks('gender_selector', $select); - + $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 .= "'; return $o; } - - function sexpref_selector($current="",$suffix="") { + + /** + * @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 = array('', 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')); - - - call_hooks('sexpref_selector', $select); - + $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 .= "'; return $o; } - - - function marital_selector($current = "") + + /** + * @param string $current optional, default empty + * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public static function maritalStatus($current = "") { $o = ''; - $select = array('', 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')); - - call_hooks('marital_selector', $select); - + $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 .= '';