updates

Author: detain

src/ImapAbuseCheck.php

@@ -287,7 +287,7 @@ public function process($type = 'spam', $limit = false)
 							->setPlainmsg($this->plainmsg)
 							->setHtmlmsg($this->htmlmsg)
 							->save();
-						$email_template = file_get_contents(__DIR__.'/templates/abuse.tpl');
+						$email_template = file_get_contents(__DIR__.'/templates/admin/abuse.tpl');
 						$message = str_replace(
 							['{$email}', '{$ip}', '{$type}', '{$count}', '{$id}', '{$key}'],
 							[$email, $ip, 'spam', 1, $id, md5("${id}${ip}${type}")],

src/abuse.php

@@ -84,7 +84,7 @@ function_requirements('abuse_admin');
 					$smarty->assign($db->Record);
 					$smarty->assign('post_location', 'abuse.php?id='.$id . ($logged_in === true || !isset($key) ? '' : '&key='.$key));
 					$smarty->assign('response_status', make_select('response_status', ['resolved','notspam','notabuse','pending'], ['Resolved','Not Spam','Not Abuse','Pending'], $db->Record['abuse_status']));
-					add_output($smarty->fetch('abuse.tpl'));
+					add_output($smarty->fetch('admin/abuse.tpl'));
 				} else {
 					$eparts = explode('@', $server_data['email']);
 					$anonemail = mb_substr($eparts[0], 0, 1);

src/abuse_admin.php

@@ -29,7 +29,7 @@ function_requirements('has_acl');
 	}
 	page_title('Report Abuse');
 	$headers = get_default_mail_headers(['TITLE' => 'Abuse', 'EMAIL_FROM' => 'abuse@interserver.net']);
-	$email_template = file_get_contents(__DIR__.'/templates/abuse.tpl');
+	$email_template = file_get_contents(__DIR__.'/templates/admin/abuse.tpl');
 	/* stats to get
 	biggest abusers (today, 3 day, 7 day, etc..)
 	Optionally limit abuse results to a single username