X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/c68cfb171b4302e594a9438b731f976eb04eae66..ea90b321a4b3768028d841b307c362af97a5e6e1:/users/index.php

diff --git a/users/index.php b/users/index.php
index a520ae9..dae4041 100644
--- a/users/index.php
+++ b/users/index.php
@@ -1,5 +1,6 @@
 <?php
 require_once "../common.php";
+require_once "../connection.php";
 require_once "../header.php";
 
 if (!empty($_GET))
@@ -60,6 +61,13 @@ if (!empty($_POST))
 					if ($bantype == "qline")
 						$rpc->nameban()->add($name, $reason, $duration);
 
+					else if ($bantype == "kill")
+					{
+						if ($rpc->user()->kill($user->id, $reason))
+							Message::Success($user->name . "(*@" . $user->hostname . ") has been killed: $reason");
+						else
+							Message::Fail("Could not kill $user->name: $rpc->error");
+					}
 					else if ($rpc->serverban()->add($user->id, $bantype, $duration, $reason))
 						Message::Success($user->name . " (*@" . $user->hostname . ") has been $bantype" . "d $msg_msg: $reason");
 
@@ -108,11 +116,12 @@ Click on a username to view more information.
 				<th scope="col" colspan="2"><input <?php echo (isset($_POST['servicesonly'])) ? "checked" : ""; ?> name="servicesonly" type="checkbox" value=""> Services Only</th>
 			</tr>
 			<tr>			
-				<th scope="col" colspan="2">Nick <input name="uf_nick" type="text" class="form-control short-form-control">
-				<th scope="col" colspan="2">Host <input name="uf_host" type="text" class="form-control short-form-control"></th>
-				<th scope="col" colspan="2">IP <input name="uf_ip" type="text" class="form-control short-form-control"></th>
-				<th scope="col" colspan="2">Account <input name="uf_account" type="text" class="form-control short-form-control"></th>
-				<th scope="col" colspan="2">Server <input name="uf_server" type="text" class="form-control short-form-control"></th>
+				<th scope="col" colspan="2">Nick: <input name="uf_nick" type="text" class="short-form-control">
+				<th scope="col" colspan="2">Host: <input name="uf_host" type="text" class="short-form-control"></th>
+				<th scope="col" colspan="2">IP: <input name="uf_ip" type="text" class="short-form-control"></th>
+				<th scope="col" colspan="2">Country: <input name="uf_country" type="text" class="short-form-control" placeholder="ca, fr or other"></th>
+				<th scope="col" colspan="2">Account: <input name="uf_account" type="text" class="short-form-control"></th>
+				<th scope="col" colspan="2">Server: <input name="uf_server" type="text" class="short-form-control"></th>
 				
 				<th scope="col"> <input class="btn btn-primary" type="submit" value="Search"></th>
 			</tr>
@@ -123,19 +132,22 @@ Click on a username to view more information.
 	<thead class="table-primary">
 		<th scope="col"><input type="checkbox" label='selectall' onClick="toggle_user(this)" /></th>
 		<th scope="col">Nick</th>
-		<th scope="col">Host / IP</th>
+		<th scope="col">Country</th>
+		<th class="hostname" scope="col">Host / IP</th>
 		<th scope="col"><span data-toggle="tooltip" data-placement="bottom" title="The services account name, if the user identified to services." style="border-bottom: 1px dotted #000000">Account</span></th>
 		<th scope="col">Usermodes <a href="https://www.unrealircd.org/docs/User_modes" target="_blank">ℹ️</a></th>
-		<th scope="col">Oper</th>
-		<th scope="col"><span data-toggle="tooltip" data-placement="bottom" title="This shows [Secure] if the user is using SSL/TLS or is on localhost." style="border-bottom: 1px dotted #000000">Secure</span></th>
-		<th scope="col">Connected to</th>
+		<th class="opercol" scope="col">Oper</th>
+		<th class="securecol" scope="col"><span data-toggle="tooltip" data-placement="bottom" title="This shows [Secure] if the user is using SSL/TLS or is on localhost." style="border-bottom: 1px dotted #000000">Secure</span></th>
+		<th class="uplinkcol" scope="col">Connected to</th>
 		<th scope="col"><span data-toggle="tooltip" data-placement="bottom" title="The reputation score gets higher when someone with this IP address has been connected in the past weeks. A low reputation score (like <10) is an indication of a new IP." style="border-bottom: 1px dotted #000000">Reputation</span> <a href="https://www.unrealircd.org/docs/Reputation_score" target="_blank">ℹ️</a></th>
 	</thead>
 	
 	<tbody>
 	<form method="post">
 	<?php
-
+		$currentNumberUsers=0;
+		$currentNumberUsersIdentified=0;
+		$registrationOfaAllFlags = array();
 		foreach($users as $user)
 		{
 
@@ -146,6 +158,11 @@ Click on a username to view more information.
 			strpos(strtolower($user->name), strtolower($_POST['uf_nick'])) == false)
 				continue;
 
+			/* Some basic filtering for COUNTRY */
+			if (isset($_POST['uf_country']) && strlen($_POST['uf_country']) && 
+			@strtolower($user->geoip->country_code) !== strtolower($_POST['uf_country']))
+				continue;
+
 			/* Some basic filtering for HOST */
 			if (isset($_POST['uf_host']) && strlen($_POST['uf_host']) && 
 			strpos(strtolower($user->hostname), strtolower($_POST['uf_host'])) !== 0 &&
@@ -160,11 +177,10 @@ Click on a username to view more information.
 
 			/* Some basic filtering for ACCOUNT */
 			if (isset($_POST['uf_account']) && strlen($_POST['uf_account']) && 
-			strpos(strtolower($user->user->account), strtolower($_POST['uf_account'])) !== 0 &&
-			strpos(strtolower($user->user->account), strtolower($_POST['uf_account'])) == false)
+			strtolower($user->user->account) !== strtolower($_POST['uf_account']))
 				continue;
 
-			/* Some basic filtering for ACCOUNT */
+			/* Some basic filtering for SERVER */
 			if (isset($_POST['uf_server']) && strlen($_POST['uf_server']) && 
 			strpos(strtolower($user->user->servername), strtolower($_POST['uf_server'])) !== 0 &&
 			strpos(strtolower($user->user->servername), strtolower($_POST['uf_server'])) == false)
@@ -184,26 +200,34 @@ Click on a username to view more information.
 			echo "<th scope=\"row\"><input type=\"checkbox\" value='" . base64_encode($user->id)."' name=\"userch[]\"></th>";
 			$isBot = (strpos($user->user->modes, "B") !== false) ? ' <span class="badge rounded-pill badge-dark">Bot</span>' : "";
 			echo "<td><a href=\"details.php?nick=".$user->id."\">$user->name$isBot</a></td>";
-			echo "<td>".htmlspecialchars($user->hostname)." (".htmlspecialchars($user->ip ?? "None").")</td>";
-			$account = (isset($user->user->account)) ? "<a href=\"".BASE_URL."users/?account=".$user->user->account."\">".htmlspecialchars($user->user->account)."</a>" : '<span class="badge rounded-pill badge-primary">None</span>';
+			echo "<td>".(isset($user->geoip->country_code) ? '<img src="https://flagcdn.com/48x36/'.htmlspecialchars(strtolower($user->geoip->country_code)).'.png" width="20" height="15"> '.$user->geoip->country_code : "")."</td>";
+			echo "<td class=\"hostname\">".htmlspecialchars($user->hostname)." (".($user->hostname == $user->ip ? 'the same' : htmlspecialchars($user->ip ?? "None")).")</td>";
+			$account = (isset($user->user->account)) ? "<a href=\"".get_config("base_url")."users/?account=".$user->user->account."\">".htmlspecialchars($user->user->account)."</a>" : '<span class="badge rounded-pill badge-primary">None</span>';
 			echo "<td>".$account."</td>";
 			$modes = (isset($user->user->modes)) ? "+" . $user->user->modes : "<none>";
 			echo "<td>".$modes."</td>";
 			$oper = (isset($user->user->operlogin)) ? $user->user->operlogin." <span class=\"badge rounded-pill badge-secondary\">".$user->user->operclass."</span>" : "";
 			if (!strlen($oper))
 				$oper = (strpos($user->user->modes, "S") !== false) ? '<span class="badge rounded-pill badge-warning">Services Bot</span>' : "";
-			echo "<td>".$oper."</td>";
+			echo "<td class=\"opercol\">".$oper."</td>";
 
 			$secure = (isset($user->tls) || $user->hostname !== "localhost") ? "<span class=\"badge rounded-pill badge-success\">Secure</span>" : "<span class=\"badge rounded-pill badge-danger\">Insecure</span>";
 			if (strpos($user->user->modes, "S") !== false)
 				$secure = "";
-			echo "<td>".$secure."</td>";
-			echo "<td><a href=\"".BASE_URL."servers/details.php?server=".substr($user->id, 0, 3)."\">".$user->user->servername."</a></td>";
+			echo "<td class=\"securecol\">".$secure."</td>";
+			echo "<td class=\"uplinkcol\"><a href=\"".get_config("base_url")."servers/details.php?server=".substr($user->id, 0, 3)."\">".$user->user->servername."</a></td>";
 			echo "<td>".$user->user->reputation."</td>";
 			echo "</tr>";
+			$currentNumberUsers++;
+			if (isset($user->user->account))
+			$currentNumberUsersIdentified++;
+			if (isset($user->geoip->country_code))
+			array_push($registrationOfaAllFlags, $user->geoip->country_code);
 		}
+		$registrationOfaAllFlags = array_count_values($registrationOfaAllFlags);
 	?>
 	</tbody></table>
+	<div id="currentNumberUsers"><?=$currentNumberUsers?> connected users including <?=$currentNumberUsersIdentified?> identified and <?=($currentNumberUsers-$currentNumberUsersIdentified)?> not identified.</div>
 	<table class="table table-responsive table-light">
 	<tr>
 	<td colspan="2">
@@ -213,6 +237,7 @@ Click on a username to view more information.
 		<optgroup label="Bans">
 			<option value="gline">GLine</option>
 			<option value="gzline">GZLine</option>
+			<option value="kill">Kill</option>
 		</optgroup>
 	</select></td><td colspan="2">
 	<label for="banlen_w">Duration: </label>
@@ -258,12 +283,14 @@ Click on a username to view more information.
 			}
 			
 			?>
-	</select><br></td><tr><td colspan="3">
+	</select>
+	
+	<br></td><tr><td colspan="3">
 	
 	<label for="ban_reason">Reason: </label>
-	<input class="form-control short-form-control" type="text" name="ban_reason" id="ban_reason" value="No reason">
+	<input class="form-control" type="text" name="ban_reason" id="ban_reason" value="No reason">
 	<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
-			Apply ban
+			Apply
 	</button></td></table>
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
@@ -280,7 +307,7 @@ Click on a username to view more information.
 		</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">Ban</button>
+			<button type="submit" action="post" class="btn btn-danger">Apply</button>
 			
 		</div>
 		</div>
@@ -288,14 +315,50 @@ Click on a username to view more information.
 	</div>
 	
 	</form>
-	
-		</div>
+
+<?php /* ?>
+	<h3>Top country</h3>
+	<div id="top-country">
+		<ul>
+		<?php
+			arsort($registrationOfaAllFlags);
+			foreach($registrationOfaAllFlags as $country_code => $count){
+				echo '<li>
+				<div class="drag"><img src="https://flagcdn.com/108x81/'.htmlspecialchars(strtolower($country_code)).'.png" width="108" height="81"><br />
+				'.$country_code . '
+				</div>
+				<div class="count">' . $count . ' <span>connected</span></div>
+				</li>';
+			}
+		?>
+		</ul>
+	</div>
+<?php */ ?>
+
+</div>
 
 <script>
     
     $("#myModal").on('shown.bs.modal', function(){
         $("#CloseButton").focus();
     });
+
+	function resize_check()
+	{
+		var width = window.innerWidth;
+		var elements = document.querySelectorAll('.hostname, .opercol, .uplinkcol, .securecol');
+		var show = '';
+		if (width < 900 || alert(typeof screen.orientation) !== 'undefined')
+			show = 'none';
+
+		for (let i = 0; i < elements.length; i++)
+			elements[i].style.display = show;
+
+	}
+	resize_check();
+	window.addEventListener('resize', function() {
+		resize_check();
+	});
 </script>
 
 <?php require_once UPATH.'/footer.php'; ?>