From 84341fcd6e55e38dd70bd933b9ba7b2656aa9a9b Mon Sep 17 00:00:00 2001
From: Ruan <ruany@users.noreply.github.com>
Date: Thu, 9 Jul 2015 14:07:56 +0200
Subject: [PATCH] Add null check for history lookups

---
 bans.php          | 15 ++++++++-------
 includes/page.php |  2 +-
 mutes.php         | 15 ++++++++-------
 warnings.php      | 12 +++++++-----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/bans.php b/bans.php
index d0290ab..4116afd 100644
--- a/bans.php
+++ b/bans.php
@@ -13,22 +13,23 @@
                 global $table_bans, $conn, $show_inactive_bans;
                 $result = run_query($table_bans);
                 while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-                    $timeResult = millis_to_date($row['time']);
-                    $expiresResult = millis_to_date($row['until']);
+                    $player_name = get_name($row['uuid']);
+                    if ($player_name === null) continue;
+                    $until = millis_to_date($row['until']);
                     ?>
                     <tr>
-                        <td><?php echo get_avatar(get_name($row['uuid'])); ?></td>
+                        <td><?php echo get_avatar($player_name); ?></td>
                         <td><?php echo get_avatar(get_banner_name($row)); ?></td>
                         <td style="width: 30%;"><?php echo clean($row['reason']); ?></td>
-                        <td><?php echo $timeResult; ?></td>
+                        <td><?php echo millis_to_date($row['time']); ?></td>
                         <td>
                             <?php if ($row['until'] <= 0) {
-                                $expiresResult = 'Permanent Ban';
+                                $until = 'Permanent Ban';
                             }
                             if ($show_inactive_bans && !$row['active']) {
-                                $expiresResult .= ' (Unbanned)';
+                                $until .= ' (Unbanned)';
                             }
-                            echo $expiresResult;
+                            echo $until;
                             ?>
                         </td>
                     </tr>
diff --git a/includes/page.php b/includes/page.php
index 45a44df..e93867b 100644
--- a/includes/page.php
+++ b/includes/page.php
@@ -101,7 +101,7 @@ function print_check_form($table) {
                  <form onsubmit="captureForm(event);" class="form-inline"><div class="form-group"><input type="text" class="form-control" id="user" placeholder="Player"></div><button type="submit" class="btn btn-default" style="margin-left: 5px;">Check</button></form>
              </div>
              <script type="text/javascript">function captureForm(b){o=$("#output");o.removeClass("in");x=setTimeout(function(){o.html("<br>")}, 150);$.ajax({type:"POST",url:"check.php",data:{name:$("#user").val(),table:"' . $table . '"}}).done(function(c){clearTimeout(x);o.html(c);o.addClass("in")});b.preventDefault();return false};</script>
-             <div id="output" class="success fade" data-alert="alert" style="margin-left: 15px;"></div>
+             <div id="output" class="success fade" data-alert="alert" style="margin-left: 15px;"><br></div>
          </div>
          ');
 }
diff --git a/mutes.php b/mutes.php
index 5d0f5b1..9ce21db 100644
--- a/mutes.php
+++ b/mutes.php
@@ -12,22 +12,23 @@
                 global $table_mutes, $conn, $show_inactive_bans;
                 $result = run_query($table_mutes);
                 while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-                    $timeResult = millis_to_date($row['time']);
-                    $expiresResult = millis_to_date($row['until']);
+                    $player_name = get_name($row['uuid']);
+                    if ($player_name === null) continue;
+                    $until = millis_to_date($row['until']);
                     ?>
                     <tr>
-                        <td><?php echo get_avatar(get_name($row['uuid'])); ?></td>
+                        <td><?php echo get_avatar($player_name); ?></td>
                         <td><?php echo get_avatar(get_banner_name($row)); ?></td>
                         <td style="width: 30%;"><?php echo clean($row['reason']); ?></td>
-                        <td><?php echo $timeResult; ?></td>
+                        <td><?php echo millis_to_date($row['time']); ?></td>
                         <td>
                             <?php if ($row['until'] <= 0) {
-                                $expiresResult = 'Permanent Mute';
+                                $until = 'Permanent Mute';
                             }
                             if ($show_inactive_bans && !$row['active']) {
-                                $expiresResult .= ' (Unmuted)';
+                                $until .= ' (Unmuted)';
                             }
-                            echo $expiresResult;
+                            echo $until;
                             ?>
                         </td>
                     </tr>
diff --git a/warnings.php b/warnings.php
index a9c8a65..0b6430e 100644
--- a/warnings.php
+++ b/warnings.php
@@ -12,20 +12,22 @@
                 global $table_warnings, $conn, $show_inactive_bans;
                 $result = run_query($table_warnings);
                 while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-                    $expiresResult = millis_to_date($row['until']);
+                    $player_name = get_name($row['uuid']);
+                    if ($player_name === null) continue;
+                    $until = millis_to_date($row['until']);
                     ?>
                     <tr>
-                        <td><?php echo get_avatar(get_name($row['uuid'])); ?></td>
+                        <td><?php echo get_avatar($player_name); ?></td>
                         <td><?php echo get_avatar(get_banner_name($row)); ?></td>
                         <td style="width: 30%;"><?php echo clean($row['reason']); ?></td>
                         <td>
                             <?php if ($row['until'] <= 0) {
-                                $expiresResult = 'Permanent Warning';
+                                $until = 'Permanent Warning';
                             }
                             if ($show_inactive_bans && !$row['active']) {
-                                $expiresResult .= ' (Expired)';
+                                $until .= ' (Expired)';
                             }
-                            echo $expiresResult;
+                            echo $until;
                             ?>
                         </td>
                         <td>