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 @@ - - {{/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 @@
+ {{if $contact.approve}} +
+ + {{/if}} {{$contact.delete}} - {{$contact.edit}} + + {{if $contact.approve}} +
+ {{/if}}

{{if $contact.public_forum}} {{/if}}{{$contact.name}}

@@ -21,6 +28,16 @@ {{$contact.connected_label}}:
{{/if}} + {{if $contact.webbie}} +
+ {{$contact.webbie_label}}: {{$contact.webbie}} +
+ {{/if}} + {{if $contact.network}} +
+ {{$contact.network_label}}: {{$contact.network}} - {{$contact.recent_label}} +
+ {{/if}} 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 @@
- {{if $entry.viewrate}} - {{if $entry.canrate}}{{/if}} - {{if $entry.total_ratings}}{{$entry.total_ratings}}{{/if}} - {{/if}} {{if $entry.ignlink}} {{$entry.ignore_label}} {{/if}} {{if $entry.connect}} {{$entry.conn_label}} {{/if}} + {{if $entry.viewrate}} + {{if $entry.total_ratings}}{{$entry.total_ratings}}{{/if}} + {{if $entry.canrate}}{{/if}} + + {{/if}}

{{if $entry.public_forum}} {{/if}}{{$entry.name}}{{if $entry.online}} {{/if}}