X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=67d05f307bebade9f07a111ae78c3a3b21a9a674;hb=27646cc4ad8d715317a2ca055b6c3318ddf555a9;hp=0790e503ea3d24cef132442f8e949dac98e5333d;hpb=a905522eb58612dfc9e4479998de2bd6477b3868;p=friendica.git

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 0790e503ea..67d05f307b 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,7 @@
 <?php
-require_once('include/diaspora.php');
+
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function contact_profile_assign($current,$foreign_net) {
 
@@ -7,14 +9,14 @@ function contact_profile_assign($current,$foreign_net) {
 
 	$disabled = (($foreign_net) ? ' disabled="true" ' : '');
 
-	$o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $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",
+	$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\" " : "");
+	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 +39,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 +63,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";
 	}
@@ -83,12 +85,12 @@ function network_to_name($s, $profile = "") {
 		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_STATUSNET => t('GNU Social Connector'),
+		NETWORK_PNUT      => t('pnut'),
 		NETWORK_APPNET => t('App.net')
 	);
 
@@ -97,17 +99,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);
 
-		$r = q("SELECT `gserver`.`platform` FROM `gcontact`
+	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` = '%s' AND `platform` != ''",
-				dbesc(normalise_link($profile)));
-		if ($r)
-			$networkname = $r[0]["platform"];
+				WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
+
+		if (DBM::is_result($r)) {
+			$networkname = $r['platform'];
+		}
 	}
 
 	return $networkname;