Merge remote-tracking branch 'friendica/develop' into develop

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f0ac87a09f32b4f3e7759cec13acc5c5568137c0..6b827baf31b4e7cb6dbaeb9e87538bd278f96f38 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -7,13 +7,13 @@ 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) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
                        $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
                }
@@ -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;
 }