From 49a7e74f36122f1ba18b2dea60594832145b913b Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Mon, 11 Nov 2013 11:58:47 +0100
Subject: [PATCH] policy removal fix

---
 webui/view/theme/default/templates/policy/removearchiving.tpl | 4 +++-
 webui/view/theme/default/templates/policy/removeretention.tpl | 4 +++-
 webui/view/theme/mobile/templates/policy/removearchiving.tpl  | 4 +++-
 webui/view/theme/mobile/templates/policy/removeretention.tpl  | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/webui/view/theme/default/templates/policy/removearchiving.tpl b/webui/view/theme/default/templates/policy/removearchiving.tpl
index eedbe6da..7d5b6ab6 100644
--- a/webui/view/theme/default/templates/policy/removearchiving.tpl
+++ b/webui/view/theme/default/templates/policy/removearchiving.tpl
@@ -11,11 +11,13 @@
 <p><a href="index.php?route=policy/removearchiving&amp;id=<?php print $id; ?>&amp;confirmed=1"><?php print $text_remove_rule; ?></a>:</p>
 <p>
     <?php
+    if($rule['domain']) { print $text_domain . ': ' . $rule['domain'] . ', '; }
     if($rule['from']) { print $text_from . ': ' . $rule['from'] . ', '; }
     if($rule['to']) { print $text_to . ': ' . $rule['to'] . ', '; }
     if($rule['subject']) { print $text_subject . ': ' . $rule['subject'] . ', '; }
     if($rule['size'] > 0) { print $text_size . ': ' . $rule['_size'] . ' ' . $rule['size'] . ', '; }
-    if($rule['attachment_type'] > 0) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
+    if($rule['attachment_name']) { print $text_attachment_name . ': ' . $rule['attachment_name'] . ', '; }
+    if($rule['attachment_type']) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
     if($rule['attachment_size'] > 0) { print $text_attachment_size . ': ' . $rule['_attachment_size'] . ' ' . $rule['attachment_size'] . ' '; }
     ?>
 </p>
diff --git a/webui/view/theme/default/templates/policy/removeretention.tpl b/webui/view/theme/default/templates/policy/removeretention.tpl
index d3f1c70d..81e3b395 100644
--- a/webui/view/theme/default/templates/policy/removeretention.tpl
+++ b/webui/view/theme/default/templates/policy/removeretention.tpl
@@ -10,11 +10,13 @@
 <p><a href="index.php?route=policy/removeretention&amp;id=<?php print $id; ?>&amp;confirmed=1"><?php print $text_remove_rule; ?></a>:</p>
 <p>
     <?php
+    if($rule['domain']) { print $text_domain . ': ' . $rule['domain'] . ', '; }
     if($rule['from']) { print $text_from . ': ' . $rule['from'] . ', '; }
     if($rule['to']) { print $text_to . ': ' . $rule['to'] . ', '; }
     if($rule['subject']) { print $text_subject . ': ' . $rule['subject'] . ', '; }
     if($rule['size'] > 0) { print $text_size . ': ' . $rule['_size'] . ' ' . $rule['size'] . ', '; }
-    if($rule['attachment_type'] > 0) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
+    if($rule['attachment_name']) { print $text_attachment_name . ': ' . $rule['attachment_name'] . ', '; }
+    if($rule['attachment_type']) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
     if($rule['attachment_size'] > 0) { print $text_attachment_size . ': ' . $rule['_attachment_size'] . ' ' . $rule['attachment_size'] . ' '; }
     ?>
 </p>
diff --git a/webui/view/theme/mobile/templates/policy/removearchiving.tpl b/webui/view/theme/mobile/templates/policy/removearchiving.tpl
index 041df7e7..6c44671a 100644
--- a/webui/view/theme/mobile/templates/policy/removearchiving.tpl
+++ b/webui/view/theme/mobile/templates/policy/removearchiving.tpl
@@ -8,11 +8,13 @@
 <?php } else { ?>
 <a href="index.php?route=policy/removearchiving&amp;id=<?php print $id; ?>&amp;confirmed=1"><?php print $text_remove_rule; ?></a>: <?php
 
+if($rule['domain']) { print $text_domain . ': ' . $rule['domain'] . ', '; }
 if($rule['from']) { print $text_from . ': ' . $rule['from'] . ', '; }
 if($rule['to']) { print $text_to . ': ' . $rule['to'] . ', '; }
 if($rule['subject']) { print $text_subject . ': ' . $rule['subject'] . ', '; }
 if($rule['size'] > 0) { print $text_size . ': ' . $rule['_size'] . ' ' . $rule['size'] . ', '; }
-if($rule['attachment_type'] > 0) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
+if($rule['attachment_name']) { print $text_attachment_name . ': ' . $rule['attachment_name'] . ', '; }
+if($rule['attachment_type']) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
 if($rule['attachment_size'] > 0) { print $text_attachment_size . ': ' . $rule['_attachment_size'] . ' ' . $rule['attachment_size'] . ' '; }
 ?> <a href="index.php?route=policy/archiving"><?php print $text_back; ?></a>
 
diff --git a/webui/view/theme/mobile/templates/policy/removeretention.tpl b/webui/view/theme/mobile/templates/policy/removeretention.tpl
index 644fcbc8..b9371617 100644
--- a/webui/view/theme/mobile/templates/policy/removeretention.tpl
+++ b/webui/view/theme/mobile/templates/policy/removeretention.tpl
@@ -8,11 +8,13 @@
 <?php } else { ?>
 <a href="index.php?route=policy/removeretention&amp;id=<?php print $id; ?>&amp;confirmed=1"><?php print $text_remove_rule; ?></a>: <?php
 
+if($rule['domain']) { print $text_domain . ': ' . $rule['domain'] . ', '; }
 if($rule['from']) { print $text_from . ': ' . $rule['from'] . ', '; }
 if($rule['to']) { print $text_to . ': ' . $rule['to'] . ', '; }
 if($rule['subject']) { print $text_subject . ': ' . $rule['subject'] . ', '; }
 if($rule['size'] > 0) { print $text_size . ': ' . $rule['_size'] . ' ' . $rule['size'] . ', '; }
-if($rule['attachment_type'] > 0) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
+if($rule['attachment_name']) { print $text_attachment_name . ': ' . $rule['attachment_name'] . ', '; }
+if($rule['attachment_type']) { print $text_attachment_type . ': ' . $rule['attachment_type'] . ', '; }
 if($rule['attachment_size'] > 0) { print $text_attachment_size . ': ' . $rule['_attachment_size'] . ' ' . $rule['attachment_size'] . ' '; }
 ?> <a href="index.php?route=policy/retention"><?php print $text_back; ?></a>