X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/c9bbb0e60dd6b088120aa80cdccb3bffe4e465bb..75c101fdf81cf76433e974b2dd9194aadbd75549:/spamfilter.php

diff --git a/spamfilter.php b/spamfilter.php
index 1a25afa..4f28dd0 100644
--- a/spamfilter.php
+++ b/spamfilter.php
@@ -1,8 +1,79 @@
 <?php
 require_once "common.php";
-
 require_once "header.php";
 
+$spamfilter_target_info = Array(
+	"p"=>Array("short_text" => "usermsg", "long_text" => "User message"),
+	"n"=>Array("short_text" => "usernotice", "long_text" => "User notice"),
+	"c"=>Array("short_text" => "chanmsg", "long_text" => "Channel message"),
+	"N"=>Array("short_text" => "channotice", "long_text" => "Channel notice"),
+	"P"=>Array("short_text" => "part", "long_text" => "Part message"),
+	"q"=>Array("short_text" => "quit", "long_text" => "Quit message"),
+	"d"=>Array("short_text" => "dcc", "long_text" => "DCC Filename"),
+	"a"=>Array("short_text" => "away", "long_text" => "Away message"),
+	"t"=>Array("short_text" => "topic", "long_text" => "Channel topic"),
+	"T"=>Array("short_text" => "message-tag", "long_text" => "Message tag"),
+	"u"=>Array("short_text" => "usermask", "long_text" => "User mask (nick!user@host:realname)"),
+);
+
+function spamfilter_targets_to_string($targets)
+{
+	GLOBAL $spamfilter_target_info;
+
+	$ret = '';
+	for ($i = 0, $targs = ""; $i < strlen($targets); $i++)
+	{
+		$c = $targets[$i];
+		if (isset($spamfilter_target_info[$c]))
+			$ret .= $spamfilter_target_info[$c]["short_text"].", ";
+		else
+			$ret .= "??, ";
+	}
+	$ret = rtrim($ret,", ");
+	return $ret;
+}
+
+function spamfilter_targets_to_string_with_info($targets)
+{
+	GLOBAL $spamfilter_target_info;
+
+	$ret = '';
+	for ($i = 0, $targs = ""; $i < strlen($targets); $i++)
+	{
+		$c = $targets[$i];
+		if (isset($spamfilter_target_info[$c]))
+			$ret .= "<span data-toggle=\"tooltip\" data-placement=\"bottom\" title=\"".$spamfilter_target_info[$c]["long_text"]."\" style=\"border-bottom: 1px dotted #000000\">".$spamfilter_target_info[$c]["short_text"]."</span>, ";
+		else
+			$ret .= "??, ";
+	}
+	$ret = rtrim($ret,", ");
+	return $ret;
+}
+
+function spamfilter_target_name_to_char($name)
+{
+	GLOBAL $spamfilter_target_info;
+
+	foreach ($spamfilter_target_info as $char=>$e)
+	{
+		if ($e["short_text"] == $name)
+			return $char;
+	}
+	return false;
+}
+
+function spamfilter_targets_from_array_to_chars($ar)
+{
+	$ret = '';
+	foreach ($ar as $name)
+	{
+		$c = spamfilter_target_name_to_char($name);
+		if ($c !== false)
+			$ret .= $c;
+	}
+	return $ret;
+}
+
 if (!empty($_POST))
 {
 
@@ -27,45 +98,7 @@ if (!empty($_POST))
 		{
 
 			$bantype = $_POST['sf_bantype'];
-			$targ_chars = "";
-			foreach($targets as $targ)
-			{
-				switch ($targ) {
-					case "channel":
-						$targ_chars .= "c";
-						break;
-					case "private":
-						$targ_chars .= "p";
-						break;
-					case "channel-notice":
-						$targ_chars .= "N";
-						break;
-					case "private-notice":
-						$targ_chars .= "n";
-						break;
-					case "part":
-						$targ_chars .= "P";
-						break;
-					case "quit":
-						$targ_chars .= "q";
-						break;
-					case "dcc":
-						$targ_chars .= "d";
-						break;
-					case "away":
-						$targ_chars .= "a";
-						break;
-					case "topic":
-						$targ_chars .= "t";
-						break;
-					case "messagetag":
-						$targ_chars .= "T";
-						break;
-					case "user":
-						$targ_chars .= "u";
-						break;
-				}
-			}
+			$targ_chars = spamfilter_targets_from_array_to_chars($targets);
 			/* duplicate code for now [= */
 			$banlen_w = (isset($_POST['banlen_w'])) ? $_POST['banlen_w'] : NULL;
 			$banlen_d = (isset($_POST['banlen_d'])) ? $_POST['banlen_d'] : NULL;
@@ -130,11 +163,25 @@ $spamfilter = $rpc->spamfilter()->getAll();
 		<div class="modal-body">
 		
 		<form action="spamfilter.php" method="post">
-			<div class="align_label curvy">Entry: </div> <input class="curvy" type="text" id="sf_add" name="sf_add"><br>
-			<div class="align_label curvy">MatchType: </div> <select name="matchtype" id="matchtype">
+			<div class="align_label curvy">Match&nbsp;type: </div> <select name="matchtype" id="matchtype">
 				<option value="simple">Simple</option>
 				<option value="regex">Regular Expression</option>
 			</select><br>
+			<div class="align_label curvy">Entry: </div> <input class="curvy" type="text" id="sf_add" name="sf_add"><br>
+			
+			<div class="align_label curvy"><label for="banlen_w">Targets: </label></div>
+<?php
+			$first = true;
+			foreach ($spamfilter_target_info as $letter=>$e)
+			{
+				$shortname = $e['short_text'];
+				$longname = $e['long_text'];
+				if (!$first)
+					echo "<div class=\"align_label curvy\"><label></label></div>";
+				$first = false;
+				echo "<input type=\"checkbox\" class=\"curvy\" id=\"target_$shortname\" name=\"target_$shortname\">$longname<br>\n";
+			}
+?>
 			<div class="align_label curvy">Action: </div> <select name="sf_bantype" id="sf_bantype">
 				<option value=""></option>
 				<optgroup label="Bans">
@@ -155,19 +202,6 @@ $spamfilter = $rpc->spamfilter()->getAll();
 					<option value="warn">Warn the user</option>
 				</optgroup>
 			</select><br>
-			
-			<div class="align_label curvy"><label for="banlen_w">Targets: </label></div>
-			
-			<input type="checkbox" class="curvy" id="target_channel" name="target_channel">Channel messages<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_private" name="target_private">Private messages<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_channel_notice" name="target_channel_notice">Channel notices<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_private_notice" name="target_private_notice">Private notices<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_part" name="target_part">Part reason<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_dcc" name="target_dcc">DCC Filename<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_away" name="target_away">Away messages<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_topic" name="target_topic">Channel topic<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_messagetag" name="target_messagetag">MessageTags<br>
-			<div class="align_label curvy"><label></label></div><input type="checkbox" class="curvy" id="target_user" name="target_user">Userhost (nick!user@host:realname)<br>
 			<div class="align_label curvy"><label for="banlen_w">Duration: </label></div>
 			<select name="banlen_w" id="banlen_w">
 					<?php
@@ -210,10 +244,10 @@ $spamfilter = $rpc->spamfilter()->getAll();
 						}
 					}
 					?>
-			</select>
+			</select><br>
+			<input class="curvy" type="checkbox" id="soft" name="soft">Don't affect logged-in users (soft)
 			<br><div class="align_label curvy"><label for="ban_reason">Reason: </label></div>
 			<input class="curvy" type="text" id="ban_reason" name="ban_reason"><br>
-			<input class="curvy" type="checkbox" id="soft" name="soft">Don't affect logged-in users (soft)
 				</div>
 			
 		<div class="modal-footer">
@@ -223,20 +257,17 @@ $spamfilter = $rpc->spamfilter()->getAll();
 		</div></div></div></div>
 
 	
-	<table class="table table-responsive caption-top table-striped">
+	<table class="container-xxl table table-responsive caption-top table-striped">
 	<thead class="table-primary"><form action="spamfilter.php" method="post">
-	<th><input type="checkbox" label='selectall' onClick="toggle_sf(this)" />Select all</th>
-	<th>Mask</th>
-	<th>Type</th>
-	<th>Set By</th>
-	<th>Set On</th>
-	<th>Expires</th>
-	<th>Duration</th>
+	<th><input type="checkbox" label='selectall' onClick="toggle_sf(this)" /></th>
 	<th>Match Type</th>
+	<th>Mask</th>
+	<th>Target</th>
 	<th>Action</th>
 	<th>Action Duration</th>
-	<th>Target</th>
 	<th>Reason</th>
+	<th>Set By</th>
+	<th>Set On</th>
 				</thead>
 	
 	<?php
@@ -244,44 +275,14 @@ $spamfilter = $rpc->spamfilter()->getAll();
 		{
 			echo "<tr>";
 			echo "<td><input type=\"checkbox\" value='" . base64_encode($sf->name).",".base64_encode($sf->match_type).",".base64_encode($sf->spamfilter_targets).",".base64_encode($sf->ban_action) . "' name=\"sf[]\"></td>";
-			echo "<td>".$sf->name."</td>";
-			echo "<td>".$sf->type_string."</td>";
-			echo "<td>".$sf->set_by."</td>";
-			echo "<td>".$sf->set_at_string."</td>";
-			echo "<td>".$sf->expire_at_string."</td>";
-			echo "<td>".$sf->duration_string."</td>";
 			echo "<td>".$sf->match_type."</td>";
+			echo "<td>".$sf->name."</td>";
+			echo "<td>".spamfilter_targets_to_string_with_info($sf->spamfilter_targets)."</td>";
 			echo "<td>".$sf->ban_action."</td>";
 			echo "<td>".$sf->ban_duration_string."</td>";
-			for ($i = 0, $targs = ""; $i < strlen($sf->spamfilter_targets); $i++)
-			{
-				$c = $sf->spamfilter_targets[$i];
-				if ($c == "c")
-					$targs .= "Channel, ";
-				else if ($c == "p")
-					$targs .= "Private,";
-				else if ($c == "n")
-					$targs .= "Notice, ";
-				else if ($c == "N")
-					$targs .= "Channel notice, ";
-				else if ($c == "P")
-					$targs .= "Part message, ";
-				else if ($c == "q")
-					$targs .= "Quit message, ";
-				else if ($c == "d")
-					$targs .= "DCC filename, ";
-				else if ($c == "a")
-					$targs .= "Away message, ";
-				else if ($c == "t")
-					$targs .= "Channel topic, ";
-				else if ($c == "T")
-					$targs .= "MessageTag, ";
-				else if ($c == "u")
-					$targs .= "Usermask, ";
-			}
-			$targs = rtrim($targs,", ");
-			echo "<td>".$targs."</td>";
 			echo "<td>".$sf->reason."</td>";
+			echo "<td>".show_nick_only($sf->set_by)."</td>";
+			echo "<td>".$sf->set_at_string."</td>";
 			
 		}
 	?></table><p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2">
@@ -291,7 +292,7 @@ $spamfilter = $rpc->spamfilter()->getAll();
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 		<div class="modal-header">
-			<h5 class="modal-title" id="myModalLabel">Delete</h5>
+			<h5 class="modal-title" id="myModalLabel">Confirm deletion</h5>
 			<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 			<span aria-hidden="true">&times;</span>
 			</button>