Merge https://github.com/redmatrix/hubzilla into pending_merge

8 files changed, 43 insertions, 43 deletions

diff --git a/boot.php b/boot.php
index dd83ed6e2..b5a68b149 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..f43dec73e 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') : ''),
@@ -251,23 +251,26 @@ function connections_content(&$a) {
 					'edit_hover' => t('Edit connection'),
 					'delete_hover' => t('Delete connection'),
 					'id' => $rr['abook_id'],
-					'alt_text' => $alt_text,
-					'dir_icon' => $dir_icon,
 					'thumb' => $rr['xchan_photo_m'], 
 					'name' => $rr['xchan_name'],
-					'username' => $rr['xchan_name'],
 					'classes' => (intval($rr['abook_archived']) ? 'archived' : ''),
 					'link' => z_root() . '/connedit/' . $rr['abook_id'],
-					'deletelink' => z_root() . '/connedit/' . $rr['abook_id'] . '/drop',
-					'edit' => t('Edit'),
+					'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop',
 					'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'),
 					'status' => $status_str,
 					'connected_label' => t('Connected'),
-					'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c')
+					'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'),
+					'approve_hover' => t('Approve connection'),
+					'approve' => (($rr['abook_pending']) ? t('Approve') : false),
+					'recent_label' => t('Recent activity'),
+					'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id'])
 				);
 			}
 		}
diff --git a/mod/connedit.php b/mod/connedit.php
index bcf2d744b..cb785fc31 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -714,10 +714,6 @@ function connedit_content(&$a) {
 			'$slide'          => $slide,
 			'$affinity'       => $affinity,
 			'$pending_label'  => t('Connection Pending Approval'),
-			'$pending_modal_title' => t('Connection Request'),
-			'$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']),
-			'$pending_modal_approve' => t('Approve'),
-			'$pending_modal_dismiss' => t('Approve Later'),
 			'$is_pending'     => (intval($contact['abook_pending']) ? 1 : ''),
 			'$unapproved'     => $unapproved,
 			'$inherited'      => t('inherited'),
diff --git a/util/hz b/util/hz
index baa5bfb55..cb6ccf419 100755
--- a/util/hz
+++ b/util/hz
@@ -12,7 +12,7 @@ echo " USER=youruserame "
 echo " PASS=yourpass"
 echo " HUB=your.hub.domain.org"
 echo
-echo "Type \"hz\" (with or without a conf file as an arg), then enter your message. Hit ENTER to send."
+echo "Type \"hz\" (with or without a conf file as an arg), then enter your message. Use ctrl-D to send.."
 
 }
 
@@ -29,8 +29,10 @@ CUR=`which curl`
 [ "$PASS" ] || { echo "no PASS"; usage; exit 1; }
 [ "$HUB" ] || { echo "no HUB"; usage; exit 1; }
 
-echo "enter your message to be posted as $USER @ $HUB, then hit ENTER to send:"
+echo "enter your message to be posted as $USER @ $HUB, then hit Ctrl-D to send."
 
-(read MSG; curl -ssl -u${USER}:${PASS} --data-urlencode "status=${MSG}" https://${HUB}/api/statuses/update )
+MSG=$(cat)
+
+curl -ssl -u${USER}:${PASS} --data-urlencode "status=${MSG}" https://${HUB}/api/statuses/update
 
 
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 255ed9cfa..4fa810cb4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -73,25 +73,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog">
-				<div class="modal-dialog" role="document">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-							<h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4>
-						</div>
-						<div class="modal-body">
-							<strong>{{$name}}</strong> {{$pending_modal_body}}
-						</div>
-						<div class="modal-footer">
-							<button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button>
-							<button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button>
-							<button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<script>$('#abook-pending-modal').modal('show');</script>
 			{{/if}}
 
 			{{if $affinity }}
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 9813b83e2..143989971 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,8 +1,15 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
+			{{if $contact.approve}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+			{{/if}}
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
+			<a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
 		</div>
 		<h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
 	</div>
@@ -21,6 +28,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}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+			</div>
+			{{/if}}
 		</div>
 
 	</div>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index ecc38beb9..57e6e1555 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,16 +1,17 @@
 <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
-			{{if $entry.viewrate}}
-				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
-				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
-			{{/if}}
 			{{if $entry.ignlink}}
 			<a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
 			{{/if}}
 			{{if $entry.connect}}
 			<a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a>
 			{{/if}}
+			{{if $entry.viewrate}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
+				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+
+			{{/if}}
 		</div>
 		<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
 	</div>