X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcontact_selectors.php;h=62d79d877afe3c5446208fbbc3f1a41ebe4cfe48;hb=0afb0c2ea407a9dbde217d2d88edb75f7402a810;hp=4b3ca987a6675276917b22c6d7919897f2c8d4f3;hpb=1872cf2b2d14be5c4b8fbc9e2cf61f9fcd9e2f88;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 4b3ca987a6..62d79d877a 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,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";
 		}
@@ -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'),
@@ -83,6 +83,14 @@ function network_to_name($s) {
 		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'),
+		NETWORK_PNUT      => t('pnut'),
+		NETWORK_APPNET => t('App.net')
 	);
 
 	call_hooks('network_to_name', $nets);
@@ -90,6 +98,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;
 }