Move some PHP files from ./ to ./inc: common, connection, header, footer

[irc/unrealircd/unrealircd-webpanel.git] / servers / details.php

diff --git a/servers/details.php b/servers/details.php
index cf28debdcaeb766949ba552f44fcd41e3a967a67..afed86081f6cfcb72ce1afbdfb9d53b3f3d2cd17 100644 (file)
--- 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>
@@ -117,33 +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="row">
-       <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">
@@ -227,4 +201,47 @@ if (!empty($rehash_success)) {
                </div>
                </div>
        </div>
-</div>
\ No newline at end of file
+</div>
+
+<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'; ?>