 17918b3e21
			
		
	
	
		17918b3e21
		
	
	
	
	
		
			
			If a mail is sent to a domain alias domain and rejected, mailcow does not currently store the mail in quarantine. This commit adds domain alias handling to the reject code and should fix this behavior. Also added displaying of recipient addresses into the quarantine mail dialog to be able to see what mail address was "leaked".
		
			
				
	
	
		
			57 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| <?php
 | ||
| if (!isset($_SESSION['mailcow_cc_role'])) {
 | ||
| 	header('Location: /');
 | ||
| 	exit();
 | ||
| }
 | ||
| ?>
 | ||
| <div class="modal fade" id="qidDetailModal" tabindex="-1" role="dialog" aria-hidden="true">
 | ||
|   <div class="modal-dialog modal-lg">
 | ||
|     <div class="modal-content">
 | ||
|       <div class="modal-header">
 | ||
|         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span></button>
 | ||
|         <h3 class="modal-title"><span class="glyphicon glyphicon-info"></span> <?=$lang['quarantine']['qitem'];?></h3>
 | ||
|       </div>
 | ||
|       <div class="modal-body">
 | ||
|         <div id="qid_error" style="display:none" class="alert alert-danger"></div>
 | ||
|         <div class="form-group">
 | ||
|           <label for="qid_detail_subj"><h4><?=$lang['quarantine']['subj'];?>:</h4></label>
 | ||
|           <p id="qid_detail_subj"></p>
 | ||
|         </div>
 | ||
|         <div class="form-group">
 | ||
|           <label for="qid_detail_recipients"><h4><?=$lang['quarantine']['recipients'];?>:</h4></label>
 | ||
|           <p id="qid_detail_recipients"></p>
 | ||
|         </div>
 | ||
|         <div class="form-group">
 | ||
|           <label for="qid_detail_text"><h4><?=$lang['quarantine']['text_plain_content'];?>:</h4></label>
 | ||
|           <pre id="qid_detail_text"></pre>
 | ||
|         </div>
 | ||
|         <div class="form-group">
 | ||
|           <label for="qid_detail_text_from_html"><h4><?=$lang['quarantine']['text_from_html_content'];?>:</h4></label>
 | ||
|           <pre id="qid_detail_text_from_html"></pre>
 | ||
|         </div>
 | ||
|         <?php
 | ||
|         if ($_SESSION['acl']['quarantine_attachments'] == 1):
 | ||
|         ?>
 | ||
|         <div class="form-group">
 | ||
|           <label for="qid_detail_atts"><h4><?=$lang['quarantine']['atts'];?>:</h4></label>
 | ||
|           <div id="qid_detail_atts">-</div>
 | ||
|         </div>
 | ||
|         <?php
 | ||
|         endif;
 | ||
|         ?>
 | ||
|         <div class="btn-group dropup" data-acl="<?=$_SESSION['acl']['quarantine'];?>">
 | ||
|           <a class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['quarantine']['quick_actions'];?> <span class="caret"></span></a>
 | ||
|           <ul class="dropdown-menu">
 | ||
|             <li><a data-action="edit_selected" data-id="qitems_single" data-item="" data-api-url='edit/qitem' data-api-attr='{"action":"release"}' href="#"><?=$lang['quarantine']['release'];?></a></li>
 | ||
|             <li role="separator" class="divider"></li>
 | ||
|             <li><a data-action="edit_selected" data-id="qitems_single" data-item="" data-api-url='edit/qitem' data-api-attr='{"action":"learnspam"}' href="#"><?=$lang['quarantine']['learn_spam_delete'];?></a></li>
 | ||
|             <li role="separator" class="divider"></li>
 | ||
|             <li><a data-action="delete_selected" data-id="qitems_single" data-item="" data-api-url='delete/qitem' href="#"><?=$lang['quarantine']['remove'];?></a></li>
 | ||
|           </ul>
 | ||
|         </div>
 | ||
|       </div>
 | ||
|     </div>
 | ||
|   </div>
 | ||
| </div>
 | ||
| 
 |