X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=05059e3358abcfc92170569b8905979ddf4bb606;hb=96501bda816bb3db29ea19d89e6ffc0e83f350b3;hp=1303acf74a13a1788930997dd8953c61e8752a79;hpb=5ec4a4e6deb5d28cbfab54093f8b4180912738d4;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 1303acf74a..05059e3358 100644
--- 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,14 +7,14 @@ 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']));
+	$r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
+			intval($_SESSION['uid']));
 
-	if(count($r)) {
-		foreach($r as $rr) {
-			$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
+	if (dbm::is_result($r)) {
+		foreach ($r as $rr) {
+			$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";
 	}
@@ -70,11 +70,45 @@ function contact_poll_interval($current, $disabled = false) {
 }
 
 
-function network_to_name($s) {
+function network_to_name($s, $profile = "") {
+
+	$nets = array(
+		NETWORK_DFRN     => t('Friendica'),
+		NETWORK_OSTATUS  => t('OStatus'),
+		NETWORK_FEED     => t('RSS/Atom'),
+		NETWORK_MAIL     => t('Email'),
+		NETWORK_DIASPORA => t('Diaspora'),
+		NETWORK_FACEBOOK => t('Facebook'),
+		NETWORK_ZOT      => t('Zot!'),
+		NETWORK_LINKEDIN => t('LinkedIn'),
+		NETWORK_XMPP     => t('XMPP/IM'),
+		NETWORK_MYSPACE  => t('MySpace'),
+		NETWORK_MAIL2    => t('Email'),
+		NETWORK_GPLUS    => t('Google+'),
+		NETWORK_PUMPIO   => t('pump.io'),
+		NETWORK_TWITTER  => t('Twitter'),
+		NETWORK_DIASPORA2 => t('Diaspora Connector'),
+		NETWORK_STATUSNET => t('GNU Social Connector'),
+		NETWORK_PNUT      => t('pnut'),
+		NETWORK_APPNET => t('App.net')
+	);
+
+	call_hooks('network_to_name', $nets);
+
+	$search  = array_keys($nets);
+	$replace = array_values($nets);
 
-	call_hooks('network_to_name', $s);
+	$networkname = str_replace($search, $replace, $s);
 
-	return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT),
-		array(t('Friendika'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s);
+	if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) {
+		$r = dba::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
+				INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
+				WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+
+		if (dbm::is_result($r)) {
+			$networkname = $r['platform'];
+		}
+	}
 
+	return $networkname;
 }