Improved redirect for contact actions

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 1455bd5e4f06769b46d4636ff1d530d233952719..aabe0badc03fb4f5b97d297b76df11e865bb2be0 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -58,7 +58,13 @@ class Contact extends BaseModule
                        return;
                }
 
-               $redirectUrl = $_POST['redirect_url'] ?? 'contact';
+               $redirectUrl = $_POST['command'] ?? '';
+               if (substr($redirectUrl, 0, 7) != 'contact') {
+                       $redirectUrl = 'contact';
+               }
+               if (!empty($_POST['parameter'])) {
+                       $redirectUrl .= '?' . $_POST['parameter'];
+               }
 
                self::checkFormSecurityTokenRedirectOnError($redirectUrl, 'contact_batch_actions');
 
@@ -459,6 +465,7 @@ class Contact extends BaseModule
                        '$finding'    => $searching ? DI::l10n()->t('Results for: %s', $search) : '',
                        '$submit'     => DI::l10n()->t('Find'),
                        '$cmd'        => DI::args()->getCommand(),
+                       '$parameter'  => http_build_query($request),
                        '$contacts'   => $contacts,
                        '$form_security_token'  => BaseModule::getFormSecurityToken('contact_batch_actions'),
                        'multiselect' => 1,

diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
index 680c84f567a8db0a001748fe1af8b05caa1e3b90..166ff31f7784b9f648a1ab35202129c108622d77 100644 (file)
--- a/view/templates/contacts-template.tpl
+++ b/view/templates/contacts-template.tpl
@@ -15,7 +15,8 @@
 {{$tabs nofilter}}
 
 <form action="{{$baseurl}}/contact/batch/" method="POST">
-       <input type="hidden" name="redirect_url" value="{{$cmd}}" />
+  <input type="hidden" name="command" value="{{$cmd}}" />
+  <input type="hidden" name="parameter" value="{{$parameter}}" />
        <input type="hidden" name="form_security_token" value="{{$form_security_token}}" />
 {{foreach $contacts as $contact}}
        {{include file="contact/entry.tpl"}}

diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index da9bed90c72930394e9662aef142efc2ddceeed7..f560e12d450752826d1131e08c7acad7bc28adb9 100644 (file)
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -25,7 +25,8 @@
 
        {{* we need the form container to make batch actions work *}}
        <form name="batch_actions_submit" action="{{$baseurl}}/contact/batch/" method="POST">
-               <input type="hidden" name="redirect_url" value="{{$cmd}}" />
+               <input type="hidden" name="command" value="{{$cmd}}" />
+               <input type="hidden" name="parameter" value="{{$parameter}}" />
                <input type="hidden" name="form_security_token" value="{{$form_security_token}}" />
 
                {{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}}