diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-26 16:57:36 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-26 16:57:36 -0800 |
| commit | 9b08051703ff6695ba989f1cb968200ca59daeb1 (patch) | |
| tree | 745af4986ad5d93c17d459c857ab21ac898197cb | |
| parent | 9c71b74d373001ac47add095fc204bddb25ee91d (diff) | |
| download | volse-hubzilla-9b08051703ff6695ba989f1cb968200ca59daeb1.tar.gz volse-hubzilla-9b08051703ff6695ba989f1cb968200ca59daeb1.tar.bz2 volse-hubzilla-9b08051703ff6695ba989f1cb968200ca59daeb1.zip | |
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
| -rw-r--r-- | include/import.php | 2 | ||||
| -rw-r--r-- | mod/connections.php | 2 | ||||
| -rw-r--r-- | mod/import.php | 2 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/include/import.php b/include/import.php index e208c3b00..b7ec1c565 100644 --- a/include/import.php +++ b/include/import.php @@ -2,7 +2,7 @@ require_once('include/menu.php'); -function import_channel($channel, $account_id) { +function import_channel($channel, $account_id, $seize) { if(! array_key_exists('channel_system',$channel)) { $channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0); diff --git a/mod/connections.php b/mod/connections.php index f43dec73e..1de8279c4 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -269,6 +269,8 @@ function connections_content(&$a) { 'connected' => datetime_convert('UTC',date_default_timezone_get(),$rr['abook_created'], 'c'), 'approve_hover' => t('Approve connection'), 'approve' => (($rr['abook_pending']) ? t('Approve') : false), + 'ignore_hover' => t('Ignore connection'), + 'ignore' => ((! $rr['abook_ignored']) ? t('Ignore') : false), 'recent_label' => t('Recent activity'), 'recentlink' => z_root() . '/network/?f=&cid=' . intval($rr['abook_id']) ); diff --git a/mod/import.php b/mod/import.php index 02e71233a..b6091d944 100644 --- a/mod/import.php +++ b/mod/import.php @@ -123,7 +123,7 @@ function import_account(&$a, $account_id) { if(array_key_exists('channel',$data)) { if($completed < 1) { - $channel = import_channel($data['channel'], $account_id); + $channel = import_channel($data['channel'], $account_id, $seize); } else { diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 143989971..b2107306e 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,9 +1,12 @@ <div id="contact-entry-wrapper-{{$contact.id}}"> <div class="section-subtitle-wrapper"> <div class="pull-right"> - {{if $contact.approve}} + {{if $contact.approve && $contact.ignore}} <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> + + <a href="connedit/{{$contact.id}}/ignore" class="btn btn-danger btn-xs" title={{$contact.ignore_hover}}><i class="icon-ban-circle"></i> {{$contact.ignore}}</a> + {{/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-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a> |