X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=35c9d983d72797f49ac49f46da496d93d1bfed48;hb=acf2e42e24b7a05b67ff1adcedac3abd0e99acd4;hp=f104866232d4326f36cc3669636986682770b67f;hpb=12d9c46ec5ba0b0d13f62058e8db4f3d4910ce27;p=friendica.git diff --git a/include/contact_selectors.php b/include/contact_selectors.php index f104866232..35c9d983d7 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -7,10 +7,10 @@ function contact_profile_assign($current,$foreign_net) { $disabled = (($foreign_net) ? ' disabled="true" ' : ''); - $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) { @@ -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; }