Bugfix for pull request #2147 (Fix for issue #2122)

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 1303acf74a13a1788930997dd8953c61e8752a79..f104866232d4326f36cc3669636986682770b67f 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once('include/diaspora.php');
 
 function contact_profile_assign($current,$foreign_net) {
 
@@ -70,11 +70,37 @@ function contact_poll_interval($current, $disabled = false) {
 }
 
 
-function network_to_name($s) {
+function network_to_name($s, $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_MAIL2    => t('Email'),
+               NETWORK_GPLUS    => t('Google+'),
+               NETWORK_PUMPIO   => t('pump.io'),
+               NETWORK_TWITTER  => t('Twitter'),
+               NETWORK_DIASPORA2 => t('Diaspora Connector'),
+               NETWORK_STATUSNET => t('GNU Social'),
+               NETWORK_APPNET => t('App.net')
+       );
+
+       call_hooks('network_to_name', $nets);
+
+       $search  = array_keys($nets);
+       $replace = array_values($nets);
 
-       call_hooks('network_to_name', $s);
+       $networkname = str_replace($search,$replace,$s);
 
-       return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT),
-               array(t('Friendika'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s);
+       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora_is_redmatrix($profile))
+               $networkname = t("Redmatrix");
 
+       return $networkname;
 }