From 51a840f46a71800c5ce8111dacc2c4e1bbbe0b1a Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 21 Mar 2016 22:02:18 -0700
Subject: update network_to_name (reserve DFRN for future use)

---
 boot.php                      |  4 +++-
 include/contact_selectors.php | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/boot.php b/boot.php
index 4aba36400..4dcd4bc15 100755
--- a/boot.php
+++ b/boot.php
@@ -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);
-- 
cgit v1.2.3