diff --git a/index.php b/index.php index 63d568c..11f27de 100644 --- a/index.php +++ b/index.php @@ -25,13 +25,13 @@ $database = $config['mysqldb']; $page = htmlspecialchars($_GET["page"]); $orderby = htmlspecialchars($_GET["orderby"]); // Connect to MySQL - if (!$db = mysqli_connect($db_host, $db_user, $db_pwd)) { - die("Can't connect to database"); - } - if (!mysqli_select_db($db,$database)) { - mysqli_close($db); - die("Can't select database"); - } +if (!$db = mysqli_connect($db_host, $db_user, $db_pwd)) { + die("Can't connect to database"); +} +if (!mysqli_select_db($db, $database)) { + mysqli_close($db); + die("Can't select database"); +} // Get some information from the database // Find IPs banned more than once $multiplebans = mysqli_query($db, "SELECT ip,COUNT(*) count,country FROM bans GROUP BY ip HAVING count > 1 ORDER BY count DESC"); @@ -71,22 +71,27 @@ if (!$multiplebans) { die("Query failed."); } // Order by IP -$allbans_ip = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ip"); +$allbans_ip = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ip, id"); if (!$multiplebans) { die("Query failed."); } // Order by Date -$allbans_date = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ban_date"); +$allbans_date = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ban_date, id"); if (!$multiplebans) { die("Query failed."); } // Order by Time -$allbans_time = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ban_time"); +$allbans_time = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY ban_time, id"); if (!$multiplebans) { die("Query failed."); } // Order by Country -$allbans_country = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY country"); +$allbans_country = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY country, id"); +if (!$multiplebans) { + die("Query failed."); +} +// Order by Service +$allbans_service = mysqli_query($db, "SELECT id,service,ip,ban_date,ban_time,country FROM bans ORDER BY service, id"); if (!$multiplebans) { die("Query failed."); } @@ -182,7 +187,7 @@ switch ($page) { echo "\t