X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcontact_selectors.php;h=0790e503ea3d24cef132442f8e949dac98e5333d;hb=51716957b24d97c20f078d1f880a6ca112cae792;hp=4749027046627e857c1c06ad91044e15ff583383;hpb=20ca93191fda9f25f387e354a8ac4edd9582ded5;p=friendica.git
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 4749027046..0790e503ea 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)) {
+ if (dbm::is_result($r)) {
foreach($r as $rr) {
$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
$o .= "\r\n";
@@ -70,11 +70,45 @@ function contact_poll_interval($current, $disabled = false) {
}
-function network_to_name($s) {
+function network_to_name($s, $profile = "") {
+
+ $nets = array(
+ NETWORK_DFRN => t('Friendica'),
+ NETWORK_OSTATUS => t('OStatus'),
+ NETWORK_FEED => t('RSS/Atom'),
+ NETWORK_MAIL => t('Email'),
+ NETWORK_DIASPORA => t('Diaspora'),
+ NETWORK_FACEBOOK => t('Facebook'),
+ NETWORK_ZOT => t('Zot!'),
+ NETWORK_LINKEDIN => t('LinkedIn'),
+ NETWORK_XMPP => t('XMPP/IM'),
+ NETWORK_MYSPACE => t('MySpace'),
+ NETWORK_MAIL2 => t('Email'),
+ NETWORK_GPLUS => t('Google+'),
+ NETWORK_PUMPIO => t('pump.io'),
+ NETWORK_TWITTER => t('Twitter'),
+ NETWORK_DIASPORA2 => t('Diaspora Connector'),
+ NETWORK_STATUSNET => t('GNU Social'),
+ NETWORK_APPNET => t('App.net')
+ );
+
+ call_hooks('network_to_name', $nets);
+
+ $search = array_keys($nets);
+ $replace = array_values($nets);
+
+ $networkname = str_replace($search,$replace,$s);
- call_hooks('network_to_name', $s);
+ if (($s == NETWORK_DIASPORA) AND ($profile != "") AND diaspora::is_redmatrix($profile)) {
+ $networkname = t("Hubzilla/Redmatrix");
- return str_replace(array(NETWORK_DFRN,NETWORK_OSTATUS,NETWORK_FEED,NETWORK_MAIL,NETWORK_DIASPORA,NETWORK_FACEBOOK,NETWORK_ZOT),
- array(t('Friendica'),t('OStatus'),t('RSS/Atom'),t('Email'),t('Diaspora'),t('Facebook'),t('Zot!')),$s);
+ $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;
}