X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/f61c309ed942552608784e1c0d0f1ce405af6ce7..53c3262154b4828643ec075a42c30b6decb01377:/servers/details.php

diff --git a/servers/details.php b/servers/details.php
index 24302cb..afed860 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");
 	}
 	
 }
@@ -117,32 +118,6 @@ if (!empty($rehash_success)) {
 	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">
@@ -228,4 +203,45 @@ if (!empty($rehash_success)) {
 	</div>
 </div>
 
-<?php require_once UPATH.'/footer.php'; ?>
+<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="row">
+	<div class="col-sm-3">
+		<div class="card mb-4">
+			<div class="card-body">
+				<h5 class="card-title">Basic Information</h5>
+				<p class="card-text"><?php generate_html_serverinfo($srv); ?></p>
+			</div>
+		</div>
+		<div class="card mb-4">
+			<div class="card-body">
+				<h5 class="card-title">Extra Information</h5>
+				<p class="card-text"><?php generate_html_extserverinfo($srv); ?></p>
+			</div>
+		</div>
+	</div>
+	
+	<div class="col">
+		<div class="card mb-4">
+			<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 class="col">
+		<div class="card mb-4">
+			<div class="card-body">
+				<h5 class="card-title">User Modes</h5>
+				<p class="card-text"><?php generate_html_usermodes($srv); ?></p>
+			</div>
+		</div>
+	</div>
+</div>
+<?php require_once UPATH.'/inc/footer.php'; ?>