X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcontact_selectors.php;h=05059e3358abcfc92170569b8905979ddf4bb606;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=3bf68f764e5597abdfd72fac05c91d1e371fd178;hpb=e2f8673076165c402782332b42ee744b1ffc7969;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 3bf68f764e..05059e3358 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -7,14 +7,14 @@ function contact_profile_assign($current,$foreign_net) {
$disabled = (($foreign_net) ? ' disabled="true" ' : '');
- $o .= "\r\n";
+ $o .= "\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 .= "\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 .= "\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 .= "\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);
+ $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`
+ 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;