X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcontact_selectors.php;h=f5dfdc12d7a5f0df1c234dc38ffc82574220d752;hb=5432af341423b8794bab9c00647d79507e1e985a;hp=35c9d983d72797f49ac49f46da496d93d1bfed48;hpb=0deea97cf296481d792429ae9d4042c66887230d;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 35c9d983d7..f5dfdc12d7 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -9,12 +9,12 @@ function contact_profile_assign($current,$foreign_net) {
$o .= "\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(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 .= "\r\n";
}
}
@@ -88,7 +88,8 @@ 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')
);
@@ -97,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))) AND ($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;