Degrade priority step by step

[friendica.git] / include / contact_selectors.php

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 6b827baf31b4e7cb6dbaeb9e87538bd278f96f38..27bdb47570918e662cd9025c31c87ec1b8f6d473 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) {
 
        $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",
+       $r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
                        intval($_SESSION['uid']));
 
        if (dbm::is_result($r)) {
                foreach ($r as $rr) {
-                       $selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
+                       $selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
                        $o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
                }
        }
@@ -37,7 +37,7 @@ function contact_reputation($current) {
                5 => t('Reputable, has my trust')
        );
 
-       foreach($rep as $k => $v) {
+       foreach ($rep as $k => $v) {
                $selected = (($k == $current) ? " selected=\"selected\" " : "");
                $o .= "<option value=\"$k\" $selected >$v</option>\r\n";
        }
@@ -61,7 +61,7 @@ function contact_poll_interval($current, $disabled = false) {
                5 => t('Monthly')
        );
 
-       foreach($rep as $k => $v) {
+       foreach ($rep as $k => $v) {
                $selected = (($k == $current) ? " selected=\"selected\" " : "");
                $o .= "<option value=\"$k\" $selected >$v</option>\r\n";
        }
@@ -88,7 +88,8 @@ function network_to_name($s, $profile = "") {
                NETWORK_PUMPIO   => t('pump.io'),
                NETWORK_TWITTER  => t('Twitter'),
                NETWORK_DIASPORA2 => t('Diaspora Connector'),
-               NETWORK_STATUSNET => t('GNU Social'),
+               NETWORK_STATUSNET => t('GNU Social Connector'),
+               NETWORK_PNUT      => t('pnut'),
                NETWORK_APPNET => t('App.net')
        );
 
@@ -97,17 +98,16 @@ function network_to_name($s, $profile = "") {
        $search  = array_keys($nets);
        $replace = array_values($nets);
 
-       $networkname = str_replace($search,$replace,$s);
-
-       if (($s == NETWORK_DIASPORA) AND ($profile != "") AND Diaspora::is_redmatrix($profile)) {
-               $networkname = t("Hubzilla/Redmatrix");
+       $networkname = str_replace($search, $replace, $s);
 
+       if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) {
                $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)
+               if (dbm::is_result($r)) {
                        $networkname = $r[0]["platform"];
+               }
        }
 
        return $networkname;