Merge pull request #2758 from annando/1609-sql-charset

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index c04b07fb64e60f70e1735b78aa8a7fb7a00b19c2..35c9d983d72797f49ac49f46da496d93d1bfed48 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) {
 
@@ -7,10 +7,10 @@ function contact_profile_assign($current,$foreign_net) {
 
        $disabled = (($foreign_net) ? ' disabled="true" ' : '');
 
-       $o .= "<select id=\"contact-profile-selector\" $disabled name=\"profile-assign\" />\r\n";
+       $o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" />\r\n";
 
        $r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
-                        intval($_SESSION['uid']));
+                       intval($_SESSION['uid']));
 
        if(count($r)) {
                foreach($r as $rr) {
@@ -70,7 +70,7 @@ function contact_poll_interval($current, $disabled = false) {
 }
 
 
-function network_to_name($s) {
+function network_to_name($s, $profile = "") {
 
        $nets = array(
                NETWORK_DFRN     => t('Friendica'),
@@ -88,7 +88,7 @@ function network_to_name($s) {
                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')
        );
 
@@ -97,6 +97,18 @@ function network_to_name($s) {
        $search  = array_keys($nets);
        $replace = array_values($nets);
 
-       return str_replace($search,$replace,$s);
+       $networkname = str_replace($search,$replace,$s);
+
+       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;
 }