X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=27bdb47570918e662cd9025c31c87ec1b8f6d473;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=bf2523e845fdb8675a2749b89a4fa046c68326ee;hpb=09851331a9dc8601919cd0c9200686b92843d235;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index bf2523e845..27bdb47570 100644
--- 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";
 		}
 	}
@@ -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('GNU Social'),
+		NETWORK_STATUSNET => t('GNU Social Connector'),
 		NETWORK_PNUT      => t('pnut'),
 		NETWORK_APPNET => t('App.net')
 	);
@@ -98,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;