X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_selectors.php;h=62d79d877afe3c5446208fbbc3f1a41ebe4cfe48;hb=2ff494d899f239e6005a073b503d5c24b77119eb;hp=7e2f81dffe4985d40e436b9aac110880cb91c35b;hpb=5635fe250ca4ef8e1dcf12cfe0f49b2a23c86b16;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 7e2f81dffe..62d79d877a 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,5 @@
\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";
}
@@ -70,7 +70,7 @@ function contact_poll_interval($current, $disabled = false) {
}
-function network_to_name($s) {
+function network_to_name($s, $profile = "") {
$nets = array(
NETWORK_DFRN => t('Friendica'),
@@ -84,7 +84,13 @@ function network_to_name($s) {
NETWORK_XMPP => t('XMPP/IM'),
NETWORK_MYSPACE => t('MySpace'),
NETWORK_MAIL2 => t('Email'),
- NETWORK_GPLUS => t('Google+')
+ NETWORK_GPLUS => t('Google+'),
+ NETWORK_PUMPIO => t('pump.io'),
+ NETWORK_TWITTER => t('Twitter'),
+ NETWORK_DIASPORA2 => t('Diaspora Connector'),
+ NETWORK_STATUSNET => t('GNU Social'),
+ NETWORK_PNUT => t('pnut'),
+ NETWORK_APPNET => t('App.net')
);
call_hooks('network_to_name', $nets);
@@ -92,6 +98,18 @@ function network_to_name($s) {
$search = array_keys($nets);
$replace = array_values($nets);
- return 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`
+ 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;
}