X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=6b827baf31b4e7cb6dbaeb9e87538bd278f96f38;hb=4f25396faeaa501907e93b24ee51ebdd08f84993;hp=3211a0e584b7dbe88293bc2de523363cfbe9cfe3;hpb=358b2a46f5b48e5b95b75ed87752a87dccde8d8e;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 3211a0e584..6b827baf31 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,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'),
+		NETWORK_APPNET => t('App.net')
+	);
+
+	call_hooks('network_to_name', $nets);
+
+	$search  = array_keys($nets);
+	$replace = array_values($nets);
+
+	$networkname = str_replace($search,$replace,$s);
 
-	call_hooks('network_to_name', $s);
+	if (($s == NETWORK_DIASPORA) AND ($profile != "") AND Diaspora::is_redmatrix($profile)) {
+		$networkname = t("Hubzilla/Redmatrix");
 
-	return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT,NETWORK_LINKEDIN,NETWORK_XMPP,NETWORK_MYSPACE),
-		array( t('Friendica'), t('OStatus'), t('RSS/Atom'), t('Email'), t('Diaspora'), t('Facebook'), t('Zot!'), t('LinkedIn'), t('XMPP/IM'), t('MySpace')),$s);
+		$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;
 }