X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcontact_selectors.php;h=0790e503ea3d24cef132442f8e949dac98e5333d;hb=51716957b24d97c20f078d1f880a6ca112cae792;hp=f104866232d4326f36cc3669636986682770b67f;hpb=4c263aa4ac89aa935d7305856c8a919c7fefcf71;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index f104866232..0790e503ea 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -7,12 +7,12 @@ 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)) {
+ if (dbm::is_result($r)) {
foreach($r as $rr) {
$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
$o .= "\r\n";
@@ -99,8 +99,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;
}