X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/blobdiff_plain/5616422143594630a6e83ca3efbcb9b8d0cfbffe..512ddbd1274d017e44bf356e55c39aead9333b5d:/index.php

diff --git a/index.php b/index.php
index c3acf6a..2724687 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@ require_once "common.php";
 require_once "connection.php";
 require_once "header.php";
 
-$stats = $rpc->query("stats.get", []);
+$stats = $rpc->stats()->get();
 ?>
 
 <h2>Network Overview</h2>
@@ -46,7 +46,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Users Online</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>users">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>users">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -70,7 +70,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Channels</h6>
 						</div>
-						<div class="col"><a class="btn btn-primary" href="<?php echo BASE_URL; ?>channels">View</a></div>
+						<div class="col"><a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>channels">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -92,7 +92,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Opers</h6>
 						</div>
-						<div class="col"><a class="btn btn-primary" href="<?php echo BASE_URL."users/?operonly"; ?>">View</a></div>
+						<div class="col"><a class="btn btn-primary" href="<?php echo get_config("base_url")."users/?operonly"; ?>">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -115,7 +115,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Servers</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>servers">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>servers">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -142,7 +142,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Server Bans</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>server-bans">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>server-bans">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -164,7 +164,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Spamfilter</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>spamfilter.php">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>spamfilter.php">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -187,7 +187,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Server Ban Exceptions</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>server-bans/ban-exceptions.php">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>server-bans/ban-exceptions.php">View</a></div>
 					</div>
 				</div>
 			</div>
@@ -195,12 +195,7 @@ $num_of_panel_admins = count($userlist);
 		<?php
 		if ($stats->server->ulined) {
 			$bg = "bg-success";
-
-			/* honestly can't think of a case where there would actually be only one uline... but... well here we are, worrying over the small stuff =] */
-			$user_noun = ($stats->user->ulined == 1) ? "user" : "users"; // use "users" even if 0, sounds better.
-			$is_are = ($stats->user->ulined == 1) ? "is" : "are";
-			$server_noun = ($stats->server->ulined == 1) ? "server" : "servers";
-			$tooltip = "There $is_are " . $stats->user->ulined . " U-Lined $user_noun over " . $stats->server->ulined . " U-Lined $server_noun";
+			$tooltip = "Users / Servers";
 		}
 		else
 			$bg = "bg-warning";
@@ -223,7 +218,7 @@ $num_of_panel_admins = count($userlist);
 						<div class="col">
 							<h6>Services Online</h6>
 						</div>
-						<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL."users/?servicesonly"; ?>">View</a></div>
+						<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url")."users/?servicesonly"; ?>">View</a></div>
 					</div>
 				</div>
 				
@@ -246,7 +241,7 @@ $num_of_panel_admins = count($userlist);
 				document.getElementById("num_server_bans").innerHTML = data.server_ban.server_ban;
 				document.getElementById("num_spamfilter_entries").innerHTML = data.server_ban.spamfilter;
 				document.getElementById("num_ban_exceptions").innerHTML = data.server_ban.server_ban_exception;
-				document.getElementByID("stats_uline_total").innerHTML = data.user.ulined;
+				document.getElementById("stats_uline_total").innerHTML = data.user.ulined + "/" + data.server.ulined;
             }
         };
         xhttp.open("GET", "api/overview.php", true);
@@ -276,7 +271,7 @@ $num_of_panel_admins = count($userlist);
 								<div class="col">
 									<h6>Panel Access</h6>
 								</div>
-								<div class="col"> <a class="btn btn-primary" href="<?php echo BASE_URL; ?>settings">View</a></div>
+								<div class="col"> <a class="btn btn-primary" href="<?php echo get_config("base_url"); ?>settings">View</a></div>
 							</div>
 						</div>
 					</div>