diff --git a/webui/controller/message/bulkrestore.php b/webui/controller/message/bulkrestore.php
index c3df341f..4bb7170a 100644
--- a/webui/controller/message/bulkrestore.php
+++ b/webui/controller/message/bulkrestore.php
@@ -14,6 +14,7 @@ class ControllerMessageBulkrestore extends Controller {
$db = Registry::get('db');
$imap_ok = 0;
+ $email = '';
$this->load->model('search/search');
$this->load->model('search/message');
@@ -31,6 +32,7 @@ class ControllerMessageBulkrestore extends Controller {
$download = $this->request->post['download'];
+ if(isset($this->request->post['email'])) { $email = $this->request->post['email']; }
if($download == 1) {
$this->model_message_restore->download_files_as_zip($idlist);
@@ -63,7 +65,12 @@ class ControllerMessageBulkrestore extends Controller {
/* send the email to all the recipients of the original email if you are an auditor user */
if(Registry::get('auditor_user') == 1) {
- $rcpt = $this->model_search_search->get_message_recipients($id);
+ if($email) {
+ $rcpt[0] = $email;
+ }
+ else {
+ $rcpt = $this->model_search_search->get_message_recipients($id);
+ }
}
else {
array_push($rcpt, $session->get("email"));
diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php
index f6a4c26b..63b03177 100644
--- a/webui/language/de/messages.php
+++ b/webui/language/de/messages.php
@@ -470,5 +470,6 @@ $_['text_invalid_pin_code'] = "Invalid pin code";
$_['text_qr_code'] = "QR";
$_['text_refresh_qr_code'] = "Refresh QR code";
$_['text_print_message'] = "Print";
+$_['text_forward_selected_emails_to'] = "Forward selected emails to";
?>
diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php
index 6a2ff170..3f9c1c26 100644
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@@ -140,6 +140,7 @@ $_['text_failed_to_update'] = "Failed to update";
$_['text_first'] = "First";
$_['text_folder'] = "Folder";
$_['text_folders'] = "Folders";
+$_['text_forward_selected_emails_to'] = "Forward selected emails to";
$_['text_from'] = "From";
$_['text_from_domain'] = "From domain";
@@ -248,7 +249,7 @@ $_['text_password'] = "Password";
$_['text_password_again'] = "Password again";
$_['text_password_changed'] = "Password changed";
$_['text_password_mismatch'] = "Password mismatch";
-$_['text_page_length'] = "Page length";
+$_['text_page_length'] = "Results per page";
$_['text_periodic_purge'] = "Periodic purge";
$_['text_policy'] = "Policy";
$_['text_policy_group'] = "Policy group";
diff --git a/webui/language/es/messages.php b/webui/language/es/messages.php
index 233160c1..35eeee83 100644
--- a/webui/language/es/messages.php
+++ b/webui/language/es/messages.php
@@ -469,5 +469,6 @@ $_['text_invalid_pin_code'] = "Invalid pin code";
$_['text_qr_code'] = "QR";
$_['text_refresh_qr_code'] = "Refresh QR code";
$_['text_print_message'] = "Print";
+$_['text_forward_selected_emails_to'] = "Forward selected emails to";
?>
diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php
index dba45f6c..52216415 100644
--- a/webui/language/hu/messages.iso-8859-2.php
+++ b/webui/language/hu/messages.iso-8859-2.php
@@ -141,6 +141,7 @@ $_['text_failed_to_update'] = "Nem siker
$_['text_first'] = "Els";
$_['text_folder'] = "Mappa";
$_['text_folders'] = "Mappk";
+$_['text_forward_selected_emails_to'] = "Kijellt levelek tovbbtsa";
$_['text_from'] = "Felad";
$_['text_from_domain'] = "Felad domain";
@@ -249,7 +250,7 @@ $_['text_password'] = "Jelsz
$_['text_password_again'] = "Jelsz ismt";
$_['text_password_changed'] = "Jelsz megvltozott";
$_['text_password_mismatch'] = "A kt jelsz nem egyezik meg";
-$_['text_page_length'] = "Lap mret";
+$_['text_page_length'] = "Oldalanknti tallatok szma";
$_['text_periodic_purge'] = "Peridikus levltrls";
$_['text_policy'] = "Hzirend";
$_['text_policy_group'] = "Hzirend azonost";
diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php
index 1ce98422..c46a5fe9 100644
--- a/webui/language/hu/messages.php
+++ b/webui/language/hu/messages.php
@@ -141,6 +141,7 @@ $_['text_failed_to_update'] = "Nem sikerült módosítani";
$_['text_first'] = "Első";
$_['text_folder'] = "Mappa";
$_['text_folders'] = "Mappák";
+$_['text_forward_selected_emails_to'] = "Kijelölt levelek továbbítása";
$_['text_from'] = "Feladó";
$_['text_from_domain'] = "Feladó domain";
@@ -249,7 +250,7 @@ $_['text_password'] = "Jelszó";
$_['text_password_again'] = "Jelszó ismét";
$_['text_password_changed'] = "Jelszó megváltozott";
$_['text_password_mismatch'] = "A két jelszó nem egyezik meg";
-$_['text_page_length'] = "Lap méret";
+$_['text_page_length'] = "Oldalankénti találatok száma";
$_['text_periodic_purge'] = "Periódikus levéltörlés";
$_['text_policy'] = "Házirend";
$_['text_policy_group'] = "Házirend azonosító";
diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php
index a84d0aeb..1893c9f9 100644
--- a/webui/language/pt/messages.php
+++ b/webui/language/pt/messages.php
@@ -1,466 +1,464 @@
-
+
diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js
index 1cf9b762..dcde62bd 100644
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@@ -310,16 +310,16 @@ var Piler =
},
- bulk_restore_messages:function(msg)
+ bulk_restore_messages:function(msg, email)
{
- Piler.log("[bulk_restore_messages]");
+ Piler.log("[bulk_restore_messages]", email);
var idlist = Piler.get_selected_messages_list();
if(!idlist) return;
jQuery.ajax('/bulkrestore.php', {
- data: { download: '0', idlist: idlist },
+ data: { download: '0', idlist: idlist, email: email },
type: "POST"
})
.done( function( a ) {})
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index 1c5e2d20..a51891d7 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -145,7 +145,7 @@
:
-
+
diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl
index fa3a7b7d..04136a63 100644
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@@ -111,7 +111,7 @@
-
+