X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=c834f8c514c4ccfcec0e63161a3596ca2178ca68;hb=6749b2c887552feef3a671c4063425b11a92014a;hp=478cfdbbe8da6c5e623d40263cde2b6b2c0bf64f;hpb=1c4b96ae2649230386bd9c4d190ea053aaad2fc0;p=friendica.git
diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 478cfdbbe8..c834f8c514 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -1,52 +1,42 @@
.
+ *
*/
+
namespace Friendica\Content;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
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
- * @return string
- * @throws \Exception
- */
- public static function profileAssign($current, $foreign_net)
- {
- $o = '';
-
- $disabled = (($foreign_net) ? ' disabled="true" ' : '');
-
- $o .= "\r\n";
- return $o;
- }
-
/**
* @param string $current current
* @param boolean $disabled optional, default false
- * @return object
+ * @return string
*/
public static function pollInterval($current, $disabled = false)
{
@@ -55,12 +45,12 @@ class ContactSelector
$o .= "" . "\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) {
@@ -74,7 +64,7 @@ class ContactSelector
/**
* @param string $profile Profile URL
* @return string Server URL
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
private static function getServerURLForProfile($profile)
{
@@ -105,30 +95,32 @@ class ContactSelector
}
/**
- * @param string $network network
- * @param string $profile optional, default empty
+ * @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'),
- 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'),
];
Hook::callAll('network_to_name', $nets);
@@ -161,6 +153,10 @@ class ContactSelector
}
}
+ if (!empty($protocol) && ($protocol != $network)) {
+ $networkname = DI::l10n()->t('%s (via %s)', $networkname, self::networkToName($protocol));
+ }
+
return $networkname;
}
@@ -168,7 +164,7 @@ class ContactSelector
* @param string $network network
* @param string $profile optional, default empty
* @return string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
public static function networkToIcon($network, $profile = "")
{
@@ -176,7 +172,7 @@ class ContactSelector
Protocol::DFRN => 'friendica',
Protocol::OSTATUS => 'gnu-social', // There is no generic OStatus icon
Protocol::FEED => 'rss',
- Protocol::MAIL => 'file-text-o', /// @todo
+ Protocol::MAIL => 'inbox',
Protocol::DIASPORA => 'diaspora',
Protocol::ZOT => 'hubzilla',
Protocol::LINKEDIN => 'linkedin',
@@ -185,6 +181,7 @@ class ContactSelector
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',
@@ -215,138 +212,4 @@ class ContactSelector
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 = [
- '' => 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;
- }
-
- /**
- * @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('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;
- }
-
- /**
- * @param string $current optional, default empty
- * @return string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
- public static function maritalStatus($current = "")
- {
- $o = '';
- $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 .= '';
- return $o;
- }
}