X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/1de2e0e5a06e54d5b314b8622ae09f9521ee6d6a..39330628e8c0719660d6adaf6171b855f69513e7:/servers/details.php

diff --git a/servers/details.php b/servers/details.php
index 83519bd..5077f69 100644
--- a/servers/details.php
+++ b/servers/details.php
@@ -1,6 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 $title = "Server Lookup";
 $servername = "";
@@ -44,7 +45,7 @@ if (isset($_POST))
 		if ($rpc->server()->disconnect($_POST['disconnect'], $_POST['reason']))
 			Message::Success("Server \"".$_POST['disconnect']."\" has been successfully disconnected from the network.");
 		else
-			Message::Fail($rpc->error);
+			Message::Fail((isset($rpc->error)) ? $rpc->error : "No error");
 	}
 	
 }
@@ -57,8 +58,8 @@ if (isset($_GET['server']))
 	{
 		Message::Fail("Could not find server: \"$servername\"");
 	}
-	
 	else {
+		do_log($srv);
 		$servername = $srv->name;
 		$title .= " for \"" . $servername . "\"";
 	}
@@ -105,8 +106,8 @@ if (!empty($rehash_success)) {
 <h4><?php echo $title; ?></h4>
 <br>
 <form method="get" action="details.php">
-<div class="input-group short-form-control justify-content-center align-items-center">
-	<input style="margin: 0%; height: 24px;" class="left-pan form-control" id="server" name="server" type="text" value=<?php echo $servername; ?>>
+<div class="input-group short-form-control">
+	<input class="short-form-control" id="server" name="server" type="text" value=<?php echo $servername; ?>>
 	<div class="input-group-append">
 		<br><button type="submit" class="btn btn-primary">Go</button>
 	</div>
@@ -114,35 +115,19 @@ if (!empty($rehash_success)) {
 </form>
 
 <?php if (!$srv)
+{
+	require_once UPATH.'/inc/footer.php';
 	return;
+}
 ?>
 <br>
 <div class="row">
 	<div class="col-sm-3">
-		<div class="btn btn-sm btn-info" data-toggle="modal" data-target="#module_modal">Modules</div>	
 		<div class="btn btn-sm btn-warning" data-toggle="modal" data-target="#rehash_modal">Rehash</div>
 		<div class="btn btn-sm btn-danger" data-toggle="modal" data-target="#disconnect_modal">Disconnect</div>
 	</div>
 </div>
 <br>
-	<div class="col-sm-3">
-		<div class="card">
-			<div class="card-body">
-				<h5 class="card-title">Basic Information</h5>
-				<p class="card-text"><?php generate_html_serverinfo($srv); ?></p>
-			</div>
-		</div>
-	</div>
-	<div class="col-sm-4">
-		<div class="card">
-			<div class="card-body">
-				<h5 class="card-title">Channel Modes</h5>
-				<p class="card-text"><?php generate_html_servermodes($srv); ?></p>
-			</div>
-		</div>
-	</div>
-</div>
-
 <div class="modal fade" id="disconnect_modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
@@ -190,42 +175,62 @@ if (!empty($rehash_success)) {
 	</div>
 </div>
 
-<div class="modal fade" id="module_modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
-	<div class="modal-dialog modal-lg modal-dialog-scrollable modal-dialog-centered container-fluid" role="document">
-		<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" id="myModalLabel">Server Modules</h5>
-			<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-			</button>
-		</div>
-		<div class="modal-body">
-			<?php generate_html_modlist($srv); ?>
-		</div>
-		<div class="modal-footer">
-				<button id="CloseButton" action="post" type="submit" class="btn btn-secondary" data-dismiss="modal">Close</button>
-		</div>
-		</div>
+<div class="container-xxl">
+  <div class="row">
+    
+    <div class="col-sm-8">
+      <div class="card">
+        <div class="card-body">
+        	<h6 class="card-title">Server Settings</h6>
+			<ul class="nav nav-tabs" role="tablist">
+				<li class="nav-item" role="presentation"><a class="nav-link" href="#servermodes" aria-controls="servermodes" role="tab" data-toggle="tab">Info</a></li>
+				<li class="nav-item" role="presentation"><a class="nav-link" href="#serverinv" aria-controls="serverinv" role="tab" data-toggle="tab">Channel Modes</a></li>
+				<li class="nav-item" role="presentation"><a class="nav-link" href="#serverex" aria-controls="serverex" role="tab" data-toggle="tab">User Modes</a></li>
+				<li class="nav-item" role="presentation"><a class="nav-link" href="#serverbans" aria-controls="serverbans" role="tab" data-toggle="tab">Modules</a></li>
+			</ul>
+		
+<div class="tab-content">
+	<br>
+	<div class="tab-pane fade in" id="servermodes">
+		
+		<p class="card-text row">
+			<div class="row" style="margin-left:5px">
+				<h4>Server information</h4>
+				<?php generate_html_serverinfo($srv); ?>
+				<h4>Extra information</h4>
+				<?php generate_html_extserverinfo($srv); ?>
+			</div>
+		</p>
+	</div><form id="editservermodes" method="post" name="editservermodes">
+	<div class="tab-pane" style="display: none" id="servermodes_edit">
+		
+			<div class="btn btn-sm btn-secondary" id="editchmodesbk">Go back</div>
+			<button type="submit" class="btn btn-sm btn-primary">Save Settings</button>
+			<p class="card-text"><div></div></p>
+		</form>
+	</div>
+	
+	<div class="tab-pane fade in" id="serverbans">
+		<p class="card-text"><?php generate_html_modlist($srv); ?></p>
+	</div>
+	<div class="tab-pane fade in" id="serverinv">
+		<p class="card-text"><?php generate_html_servermodes($srv); ?></p>
+	</div>
+	<div class="tab-pane fade in" id="serverex">
+		<p class="card-text"><?php generate_html_usermodes($srv); ?></p>
 	</div>
+	<div class="tab-pane fade in" id="servermodes_edit">
+		<p class="card-text"><?php /* insert hacks here */ ?></p>
+	</div>
+
+</div>
+</div>
 </div>
 
-<div class="modal fade" id="module_modal" tabindex="-1" role="dialog" aria-labelledby="confirmModalCenterTitle" aria-hidden="true">
-	<div class="modal-dialog modal-lg modal-dialog-scrollable modal-dialog-centered container-fluid" role="document">
-		<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" id="myModalLabel">Rehash Server"</h5>
-			<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-			</button>
-		</div>
-		<div class="modal-body">
-			<?php generate_html_modlist($srv); ?>
-		</div>
-		<div class="modal-footer">
-				<button id="CloseButton" action="post" type="submit" class="btn btn-secondary" data-dismiss="modal">Close</button>
-		</div>
-		</div>
 	</div>
 </div>
-
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>
+<script>
+    // show dat first tab
+$('.nav-tabs a[href="#servermodes"]').tab('show')
+</script>
\ No newline at end of file