diff options
author | redmatrix <git@macgirvin.com> | 2016-03-21 22:02:18 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-03-21 22:02:18 -0700 |
commit | 51a840f46a71800c5ce8111dacc2c4e1bbbe0b1a (patch) | |
tree | d5f349bc1f1039491cf970ad517a25a2b0a373ed | |
parent | b081c3e94b9d02b5df024f18e8940ab59ac5bae9 (diff) | |
download | volse-hubzilla-51a840f46a71800c5ce8111dacc2c4e1bbbe0b1a.tar.gz volse-hubzilla-51a840f46a71800c5ce8111dacc2c4e1bbbe0b1a.tar.bz2 volse-hubzilla-51a840f46a71800c5ce8111dacc2c4e1bbbe0b1a.zip |
update network_to_name (reserve DFRN for future use)
-rwxr-xr-x | boot.php | 4 | ||||
-rw-r--r-- | include/contact_selectors.php | 22 |
2 files changed, 15 insertions, 11 deletions
@@ -271,9 +271,11 @@ define ( 'MENU_BOOKMARK', 0x0002 ); * Network and protocol family types */ -define ( 'NETWORK_DFRN', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations +define ( 'NETWORK_FRND', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations +define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations define ( 'NETWORK_ZOT', 'zot'); // Zot! define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations +define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP diff --git a/include/contact_selectors.php b/include/contact_selectors.php index d44bee784..0de4ece00 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -73,16 +73,18 @@ function contact_poll_interval($current, $disabled = false) { function network_to_name($s) { $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_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + 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'), ); call_hooks('network_to_name', $nets); |