X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=62d79d877afe3c5446208fbbc3f1a41ebe4cfe48;hb=2ff494d899f239e6005a073b503d5c24b77119eb;hp=f0ac87a09f32b4f3e7759cec13acc5c5568137c0;hpb=8b276e53c3990412134a180a78aa6251e7c05cb2;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f0ac87a09f..62d79d877a 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -7,13 +7,13 @@ 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']));
+ 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 .= "\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('Statusnet'),
+ NETWORK_STATUSNET => t('GNU Social'),
+ NETWORK_PNUT => t('pnut'),
NETWORK_APPNET => t('App.net')
);
@@ -99,8 +100,16 @@ function network_to_name($s, $profile = "") {
$networkname = str_replace($search,$replace,$s);
- if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora_is_redmatrix($profile))
- $networkname = t("Redmatrix");
+ 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;
}