From 63ee0daac51b8c04123479f2ac91e1762492896f Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 10:42:44 +0100
Subject: provide more contact infos and update some protocol type definitions

---
 boot.php                         |  8 ++++----
 include/contact_selectors.php    |  2 +-
 mod/connections.php              |  5 ++++-
 view/tpl/connection_template.tpl | 10 ++++++++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index fd309451f..da1ba2ac5 100755
--- a/boot.php
+++ b/boot.php
@@ -271,11 +271,11 @@ define ( 'MENU_BOOKMARK',        0x0002 );
  * Network and protocol family types
  */
 
-define ( 'NETWORK_DFRN',             'dfrn');    // Friendica, Mistpark, other DFRN implementations
-define ( 'NETWORK_ZOT',              'zot!');    // Zot!
+define ( 'NETWORK_DFRN',             'friendica-over-diaspora');    // 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_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
-define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
+define ( 'NETWORK_FEED',             'rss');    // RSS/Atom feeds with no known "post/notify" protocol
+define ( 'NETWORK_DIASPORA',         'diaspora');    // Diaspora
 define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_MAIL2',            'mai2');    // extended IMAP/POP
 define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 8671f1bd1..d44bee784 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -79,7 +79,7 @@ function network_to_name($s) {
 		NETWORK_MAIL     => t('Email'),
 		NETWORK_DIASPORA => t('Diaspora'),
 		NETWORK_FACEBOOK => t('Facebook'),
-		NETWORK_ZOT      => t('Zot!'),
+		NETWORK_ZOT      => t('Zot'),
 		NETWORK_LINKEDIN => t('LinkedIn'),
 		NETWORK_XMPP     => t('XMPP/IM'),
 		NETWORK_MYSPACE  => t('MySpace'),
diff --git a/mod/connections.php b/mod/connections.php
index 1635dcee0..08da4a790 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -231,7 +231,7 @@ function connections_content(&$a) {
 
 				$status_str = '';
 				$status = array(
-					((intval($rr['abook_pending'])) ? t('Pending') : ''),
+					((intval($rr['abook_pending'])) ? t('Pending approval') : ''),
 					((intval($rr['abook_archived'])) ? t('Archived') : ''),
 					((intval($rr['abook_hidden'])) ? t('Hidden') : ''),
 					((intval($rr['abook_ignored'])) ? t('Ignored') : ''),
@@ -262,6 +262,9 @@ function connections_content(&$a) {
 					'edit' => t('Edit'),
 					'delete' => t('Delete'),
 					'url' => chanlink_url($rr['xchan_url']),
+					'webbie_label' => t('Channel address'),
+					'webbie' => $rr['xchan_addr'],
+					'network_label' => t('Network'),
 					'network' => network_to_name($rr['xchan_network']),
 					'public_forum' => ((intval($rr['xchan_pubforum'])) ? true : false),
 					'status_label' => t('Status'),
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 9813b83e2..a0bdf33aa 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -21,6 +21,16 @@
 				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
 			</div>
 			{{/if}}
+			{{if $contact.webbie}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
+			</div>
+			{{/if}}
+			{{if $contact.network}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}}
+			</div>
+			{{/if}}
 		</div>
 
 	</div>
-- 
cgit v1.2.3