clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3282 from annando/1704-platform-name 

Show real platform names
This commit is contained in:
Tobias Diekershoff 2017-04-02 10:03:57 +02:00 committed by GitHub
parent 2952e2b3e4 54f49169d4
commit ed3aa9fa73
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/contact_selectors.php
View File

@ -88,7 +88,7 @@ function network_to_name($s, $profile = "") {
NETWORK_PUMPIO => t('pump.io'), NETWORK_PUMPIO => t('pump.io'),
NETWORK_TWITTER => t('Twitter'), NETWORK_TWITTER => t('Twitter'),
NETWORK_DIASPORA2 => t('Diaspora Connector'), NETWORK_DIASPORA2 => t('Diaspora Connector'),
NETWORK_STATUSNET => t('GNU Social'), NETWORK_STATUSNET => t('GNU Social Connector'),
NETWORK_PNUT => t('pnut'), NETWORK_PNUT => t('pnut'),
NETWORK_APPNET => t('App.net') NETWORK_APPNET => t('App.net')
); );
@ -98,18 +98,17 @@ function network_to_name($s, $profile = "") {
$search = array_keys($nets); $search = array_keys($nets);
$replace = array_values($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");
if ((in_array($s, array(NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) {
$r = q("SELECT `gserver`.`platform` FROM `gcontact` $r = q("SELECT `gserver`.`platform` FROM `gcontact`
INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url` INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''", WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''",
dbesc(normalise_link($profile))); dbesc(normalise_link($profile)));
if ($r) if (dbm::is_result($r)) {
$networkname = $r[0]["platform"]; $networkname = $r[0]["platform"];
} }
}
return $networkname; return $networkname;
} }