From 0c63f8aa42d03a793291f3ac55eb883441de6b42 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 15 May 2019 19:30:13 -0400 Subject: [PATCH] Add contact block reason form and display in admin page --- src/Module/Admin/Blocklist/Contact.php | 18 ++++++++++-------- view/templates/admin/blocklist/contact.tpl | 10 ++++++---- .../frio/templates/admin/blocklist/contact.tpl | 11 +++++++---- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index 1ec6e00df..60fe04bf7 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -15,18 +15,19 @@ class Contact extends BaseAdminModule { parent::post(); - $contact_url = defaults($_POST, 'contact_url', ''); - $contacts = defaults($_POST, 'contacts', []); + $contact_url = defaults($_POST, 'contact_url', ''); + $block_reason = defaults($_POST, 'contact_block_reason', ''); + $contacts = defaults($_POST, 'contacts', []); parent::checkFormSecurityTokenRedirectOnError('/admin/blocklist/contact', 'admin_contactblock'); if (!empty($_POST['page_contactblock_block'])) { $contact_id = Model\Contact::getIdForURL($contact_url); if ($contact_id) { - Model\Contact::block($contact_id); + Model\Contact::block($contact_id, $block_reason); notice(L10n::t('The contact has been blocked from the node')); } else { - notice(L10n::t("Could not find any contact entry for this URL \x28%s\x29", $contact_url)); + notice(L10n::t('Could not find any contact entry for this URL (%s)', $contact_url)); } } @@ -34,7 +35,7 @@ class Contact extends BaseAdminModule foreach ($contacts as $uid) { Model\Contact::unblock($uid); } - notice(L10n::tt("%s contact unblocked", "%s contacts unblocked", count($contacts))); + notice(L10n::tt('%s contact unblocked', '%s contacts unblocked', count($contacts))); } self::getApp()->internalRedirect('admin/blocklist/contact'); @@ -69,9 +70,9 @@ class Contact extends BaseAdminModule '$h_contacts' => L10n::t('Blocked Remote Contacts'), '$h_newblock' => L10n::t('Block New Remote Contact'), - '$th_contacts' => [L10n::t('Photo'), L10n::t('Name'), L10n::t('Address'), L10n::t('Profile URL')], + '$th_contacts' => [L10n::t('Photo'), L10n::t('Name'), L10n::t('Reason')], - '$form_security_token' => parent::getFormSecurityToken("admin_contactblock"), + '$form_security_token' => parent::getFormSecurityToken('admin_contactblock'), // values // '$baseurl' => $a->getBaseURL(true), @@ -79,7 +80,8 @@ class Contact extends BaseAdminModule '$contacts' => $contacts, '$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total), '$paginate' => $pager->renderFull($total), - '$contacturl' => ['contact_url', L10n::t("Profile URL"), '', L10n::t("URL of the remote contact to block.")], + '$contacturl' => ['contact_url', L10n::t('Profile URL'), '', L10n::t('URL of the remote contact to block.')], + '$contact_block_reason' => ['contact_block_reason', L10n::t('Block Reason')], ]); return $o; } diff --git a/view/templates/admin/blocklist/contact.tpl b/view/templates/admin/blocklist/contact.tpl index 228ad6903..78b4cd78f 100644 --- a/view/templates/admin/blocklist/contact.tpl +++ b/view/templates/admin/blocklist/contact.tpl @@ -25,7 +25,6 @@ {{$th}} {{/foreach}} - @@ -33,9 +32,11 @@ {{$contact.nickname}} - {{$contact.name}} - {{$contact.addr}} - {{$contact.url}} + + {{$contact.name}}
+ {{$contact.addr}} + + {{if $contact.block_reason}}{{$contact.block_reason}}{{else}}N/A{{/if}} {{/foreach}} @@ -55,6 +56,7 @@ {{include file="field_input.tpl" field=$contacturl}} + {{include file="field_textarea.tpl" field=$contact_block_reason}} diff --git a/view/theme/frio/templates/admin/blocklist/contact.tpl b/view/theme/frio/templates/admin/blocklist/contact.tpl index 53fde9aef..1f43b412b 100644 --- a/view/theme/frio/templates/admin/blocklist/contact.tpl +++ b/view/theme/frio/templates/admin/blocklist/contact.tpl @@ -22,6 +22,7 @@ {{include file="field_input.tpl" field=$contacturl}} + {{include file="field_textarea.tpl" field=$contact_block_reason}}
@@ -55,7 +56,6 @@ {{$th}} {{/foreach}} - @@ -68,8 +68,11 @@
{{$contact.nickname}} - {{$contact.name}} - {{$contact.url}} + + {{$contact.name}}
+ {{$contact.addr}} + + {{if $contact.block_reason}}{{$contact.block_reason}}{{else}}N/A{{/if}} {{/foreach}} @@ -82,7 +85,7 @@ - + {{$total_contacts}}