Merge remote-tracking branch 'upstream/develop' into 1604-cookie

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f0ac87a09f32b4f3e7759cec13acc5c5568137c0..3bf68f764e5597abdfd72fac05c91d1e371fd178 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -88,7 +88,7 @@ function network_to_name($s, $profile = "") {
                NETWORK_PUMPIO   => t('pump.io'),
                NETWORK_TWITTER  => t('Twitter'),
                NETWORK_DIASPORA2 => t('Diaspora Connector'),
-               NETWORK_STATUSNET => t('Statusnet'),
+               NETWORK_STATUSNET => t('GNU Social'),
                NETWORK_APPNET => t('App.net')
        );
 
@@ -99,8 +99,16 @@ function network_to_name($s, $profile = "") {
 
        $networkname = str_replace($search,$replace,$s);
 
-       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora_is_redmatrix($profile))
-               $networkname = t("Redmatrix");
+       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora::is_redmatrix($profile)) {
+               $networkname = t("Hubzilla/Redmatrix");
+
+               $r = q("SELECT `gserver`.`platform` FROM `gcontact`
+                               INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
+                               WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
+                               dbesc(normalise_link($profile)));
+               if ($r)
+                       $networkname = $r[0]["platform"];
+       }
 
        return $networkname;
 }