X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/54127577d714095c80015bce8280b4f701828d34..47aad98291fb8ad90cb308ba21fe73c7c7ccd843:/server-bans/ban-exceptions.php

diff --git a/server-bans/ban-exceptions.php b/server-bans/ban-exceptions.php
index ca1046d..6bd265b 100644
--- a/server-bans/ban-exceptions.php
+++ b/server-bans/ban-exceptions.php
@@ -1,7 +1,8 @@
 <?php
-require_once "../common.php";
-
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
+require_once "../inc/connection.php";
+require_once "../misc/ban-exceptions-misc.php";
 if (!empty($_POST))
 {
 
@@ -9,47 +10,63 @@ if (!empty($_POST))
 
 	if (isset($_POST['tklch']) && !empty($_POST['tklch'])) // User has asked to delete these tkls
 	{
-		foreach ($_POST['tklch'] as $key => $value)
-		{
-			$tok = split($value, ",");
-			$iphost = base64_decode($tok[0]);
-			$success = false;
-			$success = $rpc->serverbanexception()->delete($iphost);
+		if (!current_user_can(PERMISSION_BAN_EXCEPTION_DEL))
+			Message::Fail("Could not delete ban exception(s): Permission denied");
+		else
+			foreach ($_POST['tklch'] as $key => $value)
+			{
+				$tok = split($value, ",");
+				$iphost = base64_decode($tok[0]);
+				$success = false;
+				$success = $rpc->serverbanexception()->delete($iphost);
 
 
-			if ($success)
-				Message::Success("Ban Exception has been removed for $iphost");
-			else
-				Message::Fail("Unable to remove Ban Exception on $iphost: $rpc->error");
-		}
+				if ($success)
+					Message::Success("Ban Exception has been removed for $iphost");
+				else
+					Message::Fail("Unable to remove Ban Exception on $iphost: $rpc->error");
+			}
 	}
 	elseif (isset($_POST['tkl_add']) && !empty($_POST['tkl_add']))
 	{
-		if (!($iphost = $_POST['tkl_add']))
-			Message::Fail("No mask was specified");
-		
-		/* duplicate code for now [= */
-		$banlen_w = (isset($_POST['banlen_w'])) ? $_POST['banlen_w'] : NULL;
-		$banlen_d = (isset($_POST['banlen_d'])) ? $_POST['banlen_d'] : NULL;
-		$banlen_h = (isset($_POST['banlen_h'])) ? $_POST['banlen_h'] : NULL;
-		$duration = "";
-		if (!$banlen_d && !$banlen_h && !$banlen_w)
-			$duration .= "0";
-		else {
-			if ($banlen_w)
-				$duration .= $banlen_w;
-			if ($banlen_d)
-				$duration .= $banlen_d;
-			if ($banlen_h)
-				$duration .= $banlen_h;
-		}
-		$msg_msg = ($duration == "0" || $duration == "0w0d0h") ? "permanently" : "for " . rpc_convert_duration_string($duration);
-		$reason = (isset($_POST['ban_reason'])) ? $_POST['ban_reason'] : "No reason";
-	
-		if ($rpc->serverbanexception()->add($iphost, $reason, $duration))
-			Message::Success("Ban Exception set against \"$iphost\": $reason");
+		if (!current_user_can(PERMISSION_BAN_EXCEPTION_ADD))
+			Message::Fail("Could not add ban exception(s): Permission denied");
 		else
-			Message::Fail("Ban Exception could not be set against \"$iphost\": $rpc->error");
+		{
+			if (!($iphost = $_POST['tkl_add']))
+				Message::Fail("No mask was specified");
+
+			$bantypes = isset($_POST['bantype']) ? $_POST['bantype'] : "";
+			$bantypes_dup = "";
+			if (!empty($bantypes))
+				foreach ($bantypes as $bt)
+					$bantypes_dup .= $bt;
+			$bantypes = $bantypes_dup;
+			/* duplicate code for now [= */
+			$banlen_w = (isset($_POST['banlen_w'])) ? $_POST['banlen_w'] : NULL;
+			$banlen_d = (isset($_POST['banlen_d'])) ? $_POST['banlen_d'] : NULL;
+			$banlen_h = (isset($_POST['banlen_h'])) ? $_POST['banlen_h'] : NULL;
+			$duration = "";
+			if (!$banlen_d && !$banlen_h && !$banlen_w)
+				$duration .= "0";
+			else {
+				if ($banlen_w)
+					$duration .= $banlen_w;
+				if ($banlen_d)
+					$duration .= $banlen_d;
+				if ($banlen_h)
+					$duration .= $banlen_h;
+			}
+			$msg_msg = ($duration == "0" || $duration == "0w0d0h") ? "permanently" : "for " . rpc_convert_duration_string($duration);
+			$reason = (isset($_POST['ban_reason'])) ? $_POST['ban_reason'] : "No reason";
+
+			if (isset($_POST['soft']))
+				$iphost = "%$iphost";
+			if ($rpc->serverbanexception()->add($iphost, $bantypes, $reason, (($user = unreal_get_current_user())) ? $user->username : NULL, $duration))
+				Message::Success("Ban Exception set against \"$iphost\": $reason");
+			else
+				Message::Fail("Ban Exception could not be set against \"$iphost\": $rpc->error");
+		}
 		
 	}
 	elseif (isset($_POST['search_types']) && !empty($_POST['search_types']))
@@ -64,11 +81,11 @@ $ban_exceptions = $rpc->serverbanexception()->getAll();
 <h4>Ban Exceptions Overview</h4>
 Here is where you can make an exception to bans, that is, to make it so that the target mask is exempt from the ban types you specify.<br>
 <br>
-<p><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+<p><button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal" <?php echo (current_user_can(PERMISSION_BAN_EXCEPTION_ADD)) ? "" : "disabled"; ?>>
 			Add entry
 	</button></p></table>
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 		<div class="modal-header">
 			<h5 class="modal-title" id="myModalLabel">Add new Ban Exception</h5>
@@ -80,7 +97,7 @@ Here is where you can make an exception to bans, that is, to make it so that the
 		
 		<form  method="post">
 			<div class="align_label">IP / Mask</div> <input class="curvy" type="text" id="tkl_add" name="tkl_add"><br>
-			<div class="align_label">Exception Type: </div> <select multiple name="bantype" id="bantype" data-live-search="true">
+			<div class="align_label">Exception Type: </div> <select multiple name="bantype[]" id="bantype" data-live-search="true">
 				<option value=""></option>
 				
 					<option value="k">Kill Line (KLine)</option>
@@ -142,14 +159,13 @@ Here is where you can make an exception to bans, that is, to make it so that the
 							?>
 					</select>
 					<br><div class="align_label"><label for="ban_reason">Reason: </label></div>
-					<input class="curvy input_text" type="text" id="ban_reason" name="ban_reason"><br>
-					<input class="curvy input_text" type="checkbox" id="soft" name="soft">Don't affect logged-in users (soft)
+					<input class="curvy input_text" type="text" id="ban_reason" name="ban_reason">
 				
 			</div>
 			
 		<div class="modal-footer">
 			<button id="CloseButton" type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-			<button type="submit" action="post" class="btn btn-danger">Add Ban</button>
+			<button type="submit" action="post" class="btn btn-danger">Add Ban Exception</button>
 			</form>
 		</div>
 		</div>
@@ -162,6 +178,8 @@ Here is where you can make an exception to bans, that is, to make it so that the
 	<th scope="col"><input type="checkbox" label='selectall' onClick="toggle_tkl(this)" /></th>
 	<th scope="col">Mask</th>
 	<th scope="col">Duration</th>
+	<th scope="col">Type</th>
+	<th scope="col">Exception Types</th>
 	<th scope="col">Reason</th>
 	<th scope="col">Set By</th>
 	<th scope="col">Set On</th>
@@ -179,6 +197,8 @@ Here is where you can make an exception to bans, that is, to make it so that the
 				echo "<td scope=\"col\"><input type=\"checkbox\" value='" . base64_encode($ban_exceptions->name).",".base64_encode($ban_exceptions->type) . "' name=\"tklch[]\"></td>";
 			echo "<td scope=\"col\">".$ban_exceptions->name."</td>";
 			echo "<td scope=\"col\">".$ban_exceptions->duration_string."</td>";
+			echo "<td scope=\"col\"><span class=\"badge badge-pill badge-primary\">".$ban_exceptions->type."</span></td>";
+			echo "<td scope=\"col\">".convert_exceptiontypes_to_badges($ban_exceptions->exception_types)."</td>";
 			echo "<td scope=\"col\">".$ban_exceptions->reason."</td>";
 			$set_by = $set_in_config ? "<span class=\"badge rounded-pill badge-secondary\">Config</span>" : show_nick_only($ban_exceptions->set_by);
 			echo "<td scope=\"col\">".$set_by."</td>";
@@ -186,7 +206,7 @@ Here is where you can make an exception to bans, that is, to make it so that the
 			echo "<td scope=\"col\">".$ban_exceptions->expire_at_string."</td>";
 			echo "</tr>";
 		}
-	?></tbody></table><p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2">
+	?></tbody></table><p><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal2" <?php echo (current_user_can(PERMISSION_BAN_EXCEPTION_DEL)) ? "" : "disabled"; ?>>
 	Delete selected
 	</button></p>
 	<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
@@ -211,4 +231,4 @@ Here is where you can make an exception to bans, that is, to make it so that the
 	</div>
 	</div></form></div></div>
 
-<?php require_once '../footer.php'; ?>
+<?php require_once '../inc/footer.php'; ?>