mirror of
https://bitbucket.org/jsuto/piler.git
synced 2024-11-07 23:31:58 +01:00
display archiving and retention rules correctly if they contain HTML entities (e.g. angle brackets in the mail address)
This commit is contained in:
parent
ab001f985f
commit
8451bed2e8
@ -106,14 +106,14 @@
|
||||
|
||||
<?php foreach($rules as $rule) { ?>
|
||||
<tr class="domainrow">
|
||||
<td><?php print $rule['from']; ?></td>
|
||||
<td><?php print $rule['to']; ?></td>
|
||||
<td><?php print $rule['subject']; ?></td>
|
||||
<td><?php print $rule['body']; ?></td>
|
||||
<td><?php print htmlentities($rule['from']); ?></td>
|
||||
<td><?php print htmlentities($rule['to']); ?></td>
|
||||
<td><?php print htmlentities($rule['subject']); ?></td>
|
||||
<td><?php print htmlentities($rule['body']); ?></td>
|
||||
<td><?php if($rule['spam'] == -1) { print "-"; } else if($rule['spam'] == 0) { print $text_not_spam; } else { print $text_spam; } ?></td>
|
||||
<td><?php if($rule['size'] > 0) { print $rule['_size']; ?> <?php print $rule['size']; } ?></td>
|
||||
<td><?php print $rule['attachment_name']; ?></td>
|
||||
<td><?php print $rule['attachment_type']; ?></td>
|
||||
<td><?php print htmlentities($rule['attachment_name']); ?></td>
|
||||
<td><?php print htmlentities($rule['attachment_type']); ?></td>
|
||||
<td><?php if($rule['attachment_size'] > 0) { print $rule['_attachment_size']; ?> <?php print $rule['attachment_size']; } ?></td>
|
||||
<td><a href="index.php?route=policy/removearchiving&id=<?php print $rule['id']; ?>"><?php print $text_remove; ?></a></td>
|
||||
</tr>
|
||||
|
@ -128,14 +128,14 @@
|
||||
<?php if(ENABLE_SAAS == 1) { ?>
|
||||
<td><?php print $rule['domain']; ?></td>
|
||||
<?php } ?>
|
||||
<td><?php print $rule['from']; ?></td>
|
||||
<td><?php print $rule['to']; ?></td>
|
||||
<td><?php print $rule['subject']; ?></td>
|
||||
<td><?php print $rule['body']; ?></td>
|
||||
<td><?php print htmlentities($rule['from']); ?></td>
|
||||
<td><?php print htmlentities($rule['to']); ?></td>
|
||||
<td><?php print htmlentities($rule['subject']); ?></td>
|
||||
<td><?php print htmlentities($rule['body']); ?></td>
|
||||
<td><?php if($rule['spam'] == -1) { print "-"; } else if($rule['spam'] == 0) { print $text_not_spam; } else { print $text_spam; } ?></td>
|
||||
<td><?php if($rule['size'] > 0) { print $rule['_size']; ?> <?php print $rule['size']; } ?></td>
|
||||
<td><?php print $rule['attachment_name']; ?></td>
|
||||
<td><?php print $rule['attachment_type']; ?></td>
|
||||
<td><?php print htmlentities($rule['attachment_name']); ?></td>
|
||||
<td><?php print htmlentities($rule['attachment_type']); ?></td>
|
||||
<td><?php if($rule['attachment_size'] > 0) { print $rule['_attachment_size']; ?> <?php print $rule['attachment_size']; } ?></td>
|
||||
<td><?php print $rule['days']; ?></td>
|
||||
<td><a href="index.php?route=policy/removeretention&id=<?php print $rule['id']; ?>"><?php print $text_remove; ?></a></td>
|
||||
|
@ -102,14 +102,14 @@
|
||||
|
||||
<?php foreach($rules as $rule) { ?>
|
||||
<div class="domainrow">
|
||||
<div class="domaincell"><?php print $rule['from']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['to']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['subject']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['body']; ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['from']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['to']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['subject']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['body']); ?></div>
|
||||
<div class="domaincell"><?php if($rule['spam'] == -1) { print "-"; } else if($rule['spam'] == 0) { print $text_not_spam; } else { print $text_spam; } ?></div>
|
||||
<div class="domaincell"><?php if($rule['size'] > 0) { print $rule['_size']; ?> <?php print $rule['size']; } ?></div>
|
||||
<div class="domaincell"><?php print $rule['attachment_name']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['attachment_type']; ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['attachment_name']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['attachment_type']); ?></div>
|
||||
<div class="domaincell"><?php if($rule['attachment_size'] > 0) { print $rule['_attachment_size']; ?> <?php print $rule['attachment_size']; } ?></div>
|
||||
<div class="domaincell"><a href="index.php?route=policy/removearchiving&confirmed=1&id=<?php print $rule['id']; ?>" onclick="if(confirm('<?php print $text_remove_rule; ?>: ' + '#<?php print $rule['id']; ?>')) return true; return false;"><?php print $text_remove; ?></a></div>
|
||||
</div>
|
||||
|
@ -122,14 +122,14 @@
|
||||
<?php if(ENABLE_SAAS == 1) { ?>
|
||||
<div class="domaincell"><?php print $rule['domain']; ?></div>
|
||||
<?php } ?>
|
||||
<div class="domaincell"><?php print $rule['from']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['to']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['subject']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['body']; ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['from']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['to']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['subject']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['body']); ?></div>
|
||||
<div class="domaincell"><?php if($rule['spam'] == -1) { print "-"; } else if($rule['spam'] == 0) { print $text_not_spam; } else { print $text_spam; } ?></div>
|
||||
<div class="domaincell"><?php if($rule['size'] > 0) { print $rule['_size']; ?> <?php print $rule['size']; } ?></div>
|
||||
<div class="domaincell"><?php print $rule['attachment_name']; ?></div>
|
||||
<div class="domaincell"><?php print $rule['attachment_type']; ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['attachment_name']); ?></div>
|
||||
<div class="domaincell"><?php print htmlentities($rule['attachment_type']); ?></div>
|
||||
<div class="domaincell"><?php if($rule['attachment_size'] > 0) { print $rule['_attachment_size']; ?> <?php print $rule['attachment_size']; } ?></div>
|
||||
<div class="domaincell"><?php print $rule['days']; ?></div>
|
||||
<div class="domaincell"><a href="index.php?route=policy/removeretention&confirmed=1&id=<?php print $rule['id']; ?>" onclick="if(confirm('<?php print $text_remove_rule; ?>: ' + '#<?php print $rule['id']; ?>')) return true; return false;"><?php print $text_remove; ?></a></div>
|
||||
|
Loading…
Reference in New Issue
Block a user