aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-15 11:59:38 -0800
committerredmatrix <git@macgirvin.com>2016-01-15 11:59:38 -0800
commitf66c6bfebfd48274c9b29cd62b1fac933c6530e4 (patch)
tree9dcdfd91f93d1b2b5aec00a734a797bd1955c79f /mod
parentfe77ab4d71ed86d8c29a43ae2bc579a0db8b84b1 (diff)
parent2498df68c716ec6ed80b5547c721ca9741a85572 (diff)
downloadvolse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.tar.gz
volse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.tar.bz2
volse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/connections.php17
-rw-r--r--mod/connedit.php4
2 files changed, 10 insertions, 11 deletions
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'),