From 6167f1f4006da26faf92988b747196e0b6c203d2 Mon Sep 17 00:00:00 2001 From: Ruan Date: Wed, 18 Feb 2015 19:59:29 +0200 Subject: [PATCH] Fix mutes.php and warnings.php --- mutes.php | 10 +++++----- warnings.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mutes.php b/mutes.php index 3f8c07e..0eb8208 100644 --- a/mutes.php +++ b/mutes.php @@ -7,7 +7,7 @@ // <<-----------------mysql Database Connection------------>> // require 'includes/data/database.php'; -$sql = 'SELECT name, reason, muter, time, expires FROM mutes ORDER BY time DESC LIMIT 20'; +$sql = 'SELECT time,until,reason,name,banned_by_name FROM mutes INNER JOIN history on mutes.uuid=history.uuid WHERE active=1 GROUP BY name ORDER BY time DESC LIMIT 20'; $retval = mysql_query($sql, $conn); if (!$retval) { @@ -22,7 +22,7 @@ if (!$retval) {

Mutes

    -
  1. Home
    2. +
  2. Home
  3. Mutes
@@ -47,16 +47,16 @@ if (!$retval) { $timeConvert = $timeEpoch / 1000; $timeResult = date('F j, Y, g:i a', $timeConvert); // <<-----------------Expiration Time Converter------------>> // - $expiresEpoch = $row['expires']; + $expiresEpoch = $row['until']; $expiresConvert = $expiresEpoch / 1000; $expiresResult = date('F j, Y, g:i a', $expiresConvert); ?> " . $row['name']; ?> - " . $row['banner']; ?> + " . $row['banned_by_name']; ?> - > // require 'includes/data/database.php'; -$sql = 'SELECT name, reason, banner, expires FROM warnings ORDER BY expires DESC LIMIT 20'; +$sql = 'SELECT time,until,reason,name,banned_by_name FROM warnings INNER JOIN history on warnings.uuid=history.uuid WHERE active=1 GROUP BY name ORDER BY time DESC LIMIT 20'; $retval = mysql_query($sql, $conn); if (!$retval) { - die('Could not get data: ' . mysql_error()); + die('Could not get data: ' . mysql_error($conn)); } ?> @@ -50,15 +50,15 @@ if (!$retval) { > // - $expiresEpoch = $row['expires']; + $expiresEpoch = $row['until']; $expiresConvert = $expiresEpoch / 1000; $expiresResult = date('F j, Y, g:i a', $expiresConvert); ?> " . $row['name']; ?> - " . $row['banner']; ?> + " . $row['banned_by_name']; ?> -