X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/4fa72795052bb1f61a7723a914e95441c8ccd085..c06c1713af2db485d55a91073bbc5b63b6aa8c0b:/users/index.php

diff --git a/users/index.php b/users/index.php
index bd45a14..2e8cf75 100644
--- a/users/index.php
+++ b/users/index.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if (!empty($_GET))
 {
@@ -132,14 +132,14 @@ 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">Country</th>
+		<th class="countrycol" 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 class="accountcol" 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 class="umodescol" scope="col">Usermodes <a href="https://www.unrealircd.org/docs/User_modes" target="_blank">ℹ️</a></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>
+		<th class="reputationcol" scope="col"><span id="reputationheader" 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">Rep.</span> <a href="https://www.unrealircd.org/docs/Reputation_score" target="_blank">ℹ️</a></th>
 	</thead>
 	
 	<tbody>
@@ -200,12 +200,18 @@ 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>".(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>";
+			echo "<td class=\"countrycol\">".(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>";
+			if ($user->hostname == $user->ip)
+				$hostip = $user->ip;
+			else if ($user->ip == null)
+				$hostip = $user->hostname;
+			else
+				$hostip = $user->hostname . " (".$user->ip.")";
+			echo "<td class=\"hostname\">".htmlspecialchars($hostip)."</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>";
+			echo "<td class=\"accountcol\">".$account."</td>";
 			$modes = (isset($user->user->modes)) ? "+" . $user->user->modes : "<none>";
-			echo "<td>".$modes."</td>";
+			echo "<td class=\"umodescol\">".$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>' : "";
@@ -216,7 +222,7 @@ Click on a username to view more information.
 				$secure = "";
 			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 "<td class=\"reputationcol\">".$user->user->reputation."</td>";
 			echo "</tr>";
 			$currentNumberUsers++;
 			if (isset($user->user->account))
@@ -323,9 +329,12 @@ Click on a username to view more information.
 			width: 250px;
 			background: #1b1a1a;
 			border-radius: 5px;
+			transform: scale(0);
+			transform-origin: top left;
 		}
 		#rclickmenu.visible {
-			display: block;
+			transform: scale(1);
+			transition: transform 120ms ease-in-out;
 		}
 		#rclickmenu .item {
 			padding: 8px 10px;
@@ -340,9 +349,10 @@ Click on a username to view more information.
 		}
 	</style>
 
-	<div id='rclickmenu'>
+	<div id='rclickmenu' class="nav-item list-group">
 		<div id="rclick_opt1" class="item list-group-item-action">View details</div>
 		<div id="rclick_opt2" class="item list-group-item-action">Kill</div>
+		<div id="rclick_opt3" class="item list-group-item-action">Copy
 	</div>
 
 <?php /* ?>
@@ -367,22 +377,70 @@ Click on a username to view more information.
 </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)
-			show = 'none';
+		var show_elements = '';
+		var hide_elements = '';
+		if (width < 500)
+		{
+			show_elements = '';
+			hide_elements = '.hostname, .opercol, .uplinkcol, .securecol, .umodescol, .countrycol';
+		} else
+		if (width < 600)
+		{
+			show_elements = '.countrycol';
+			hide_elements = '.hostname, .opercol, .uplinkcol, .securecol, .umodescol';
+		} else
+		if (width < 700)
+		{
+			show_elements = '.umodescol, .countrycol';
+			hide_elements = '.hostname, .opercol, .uplinkcol, .securecol';
+		} else
+		if (width < 768)
+		{
+			show_elements = '.securecol, .umodescol, .countrycol';
+			hide_elements = '.hostname, .opercol, .uplinkcol';
+		} else
+		if (width < 875)
+		{
+			// left nav kicks in at 768+ so need to drop one column between 768..875
+			show_elements = '.umodescol, .countrycol';
+			hide_elements = '.hostname, .opercol, .uplinkcol, .securecol';
+		} else if (width < 1000)
+		{
+			show_elements = '.securecol, .umodescol, .countrycol';
+			hide_elements = '.hostname, .uplinkcol, .opercol';
+		} else if (width < 1200)
+		{
+			show_elements = '.opercol, .securecol, .umodescol, .countrycol';
+			hide_elements = '.hostname, .uplinkcol';
+		} else if (width < 1550)
+		{
+			show_elements = '.opercol, .uplinkcol, .securecol, .umodescol, .countrycol';
+			hide_elements = '.hostname';
+		} else if (width < 1750)
+		{
+			show_elements = '.hostname, .opercol, .securecol, .umodescol, .countrycol';
+			hide_elements = '.uplinkcol';
+		} else {
+			show_elements = '.hostname, .opercol, .uplinkcol, .securecol, .umodescol, .countrycol';
+			hide_elements = '';
+		}
 
-		for (let i = 0; i < elements.length; i++)
-			elements[i].style.display = show;
+		if (show_elements != '')
+		{
+			show_elements=document.querySelectorAll(show_elements);
+			for (let i = 0; i < show_elements.length; i++)
+				show_elements[i].style.display = '';
+		}
 
+		if (hide_elements != '')
+		{
+			hide_elements=document.querySelectorAll(hide_elements);
+			for (let i = 0; i < hide_elements.length; i++)
+				hide_elements[i].style.display = 'none';
+		}
 	}
 	resize_check();
 	window.addEventListener('resize', function() {
@@ -390,11 +448,12 @@ Click on a username to view more information.
 	});
 	var rclickmenu = document.getElementById('rclickmenu');
 	var scopes = document.querySelectorAll('.userselector');
-	var usertable = document.querySelector('body');
-	usertable.addEventListener("click", (e) =>
+	document.addEventListener("click", (e) =>
 	{
-		rclickmenu.classList.remove("visible");
-		rclickmenu.style.display = 'none';
+		if (e.target.offsetParent != rclickmenu)
+		{
+			rclickmenu.classList.remove("visible");
+		}
 	});
 	scopes.forEach((scope) => {
 		scope.addEventListener("contextmenu", (event) =>
@@ -402,14 +461,19 @@ Click on a username to view more information.
 			event.preventDefault();
 			var { clientX: mouseX, clientY: mouseY } = event;
 			var name = $('#' + scope.id).attr('value')
-			document.getElementById("rclick_opt1").innerHTML = '<a style="text-decoration: none" href="<?php echo get_config("base_url"); ?>users/details.php?nick=' + scope.id + '">View details for ' + name + '</a>';
+			document.getElementById("rclick_opt1").innerHTML = 'View details for ' + name;
 			rclickmenu.style.top = `${mouseY}px`;
 			rclickmenu.style.left = `${mouseX}px`;
-			rclickmenu.classList.add("visible");
-			rclickmenu.style.display = '';
+			rclickmenu.classList.remove("visible");
+			setTimeout(() => { rclickmenu.classList.add("visible"); });
 		});
-		
 	});
+	document.addEventListener('keydown', (event) => {
+	if (event.key === 'Escape')
+	{
+		rclickmenu.classList.remove("visible");
+	}
+});
 </script>
 
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>