Fixed thumbnail bugs in forum posts.

drozco · Sep 22, 2019 · 25bf60c · 25bf60c
1 parent 5feceaf
commit 25bf60c
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 9 deletions.
diff --git a/armory.php b/armory.php
@@ -4,11 +4,11 @@
 $title = 'Armory: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/players_lib.php';
 include 'includes/classes/armory_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';
-include 'includes/classes/accounts_lib.php';
 include 'header.php';
 include 'footer.php';
 ?>
diff --git a/forum.php b/forum.php
@@ -4,9 +4,9 @@
 $title = 'Forum: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';
-include 'includes/classes/accounts_lib.php';
 include 'header.php';
 include 'footer.php';
 ?>

diff --git a/gallery.php b/gallery.php
@@ -4,6 +4,7 @@
 $title = 'Gallery: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/site_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';

diff --git a/howto.php b/howto.php
@@ -4,6 +4,7 @@
 $title = 'How to connect: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';
 include 'header.php';

diff --git a/includes/classes/forum_lib.php b/includes/classes/forum_lib.php
@@ -1,6 +1,7 @@
 <?php
+require_once('accounts_lib.php');
 
-class Forum {
+class Forum extends Account {
 
     public $forumActive;
 
@@ -177,6 +178,26 @@ public function listTopics($postID) {
         }
     }
 
+    public function fileExists($userID) {
+        global $mysqli_auth;
+        global $mysqli_cms;
+
+        $query = "SELECT * FROM account WHERE id='$userID'";
+        $result = $mysqli_auth->query($query);
+        $fetch = $result->fetch_assoc();
+        $poster = new Account($userID);
+        $poster->retrieveAccount();
+
+        $realPath = $_SERVER['DOCUMENT_ROOT'] . '/img/avatars/' . $poster->getAvatarID() . '.png';
+        $imgURL = '/img/avatars/' . $poster->getAvatarID() . '.png';
+
+        if (!file_exists($realPath)) {
+            return '/img/avatars/no-avatar.png';
+        } else {
+            return $imgURL;
+        }
+    }
+
     public function displayTopic($topicID)
     {
         global $mysqli_auth;
@@ -186,6 +207,7 @@ public function displayTopic($topicID)
         $result = $mysqli_cms->query($query);
         $fetch = $result->fetch_assoc();
         $poster = new Account($fetch['user_id']);
+        $posterID = $fetch['user_id'];
         $poster->retrieveAccount();
         $poster_name = $poster->getName();
         ?>
@@ -205,7 +227,7 @@ public function displayTopic($topicID)
                         <tbody>
                         <tr>
                             <td class="forum-post-avatar">
-                                <img src="img/avatars/<?= $poster->getAvatarID(); ?>.png" width="180">
+                                <img src="<?php echo $this->fileExists($posterID); ?>" width="180">
                                 <div class="role">Rank: <?= $poster->getRole(); ?></div>
                                 <div class="role">Highest level: <?= $poster->getHighestLevel(); ?></div>
                             </td>
@@ -238,6 +260,7 @@ public function displayReplies($topicID) {
         foreach ($array as $reply) {
             $poster = new Account($reply['user_id']);
             $poster->retrieveAccount();
+            $posterID = $reply['user_id'];
             $poster_name = $poster->getName();
             $thumbs = $this->displayThumbs($reply['id']);
             ?>
@@ -266,7 +289,7 @@ public function displayReplies($topicID) {
                             <tbody>
                             <tr>
                                 <td class="forum-post-avatar">
-                                    <img src="img/avatars/<?= $poster->getAvatarID(); ?>.png" width="180">
+                                    <img src="<?php echo $this->fileExists($posterID); ?>" width="180">
                                     <div class="role">Rank: <?= $poster->getRole(); ?></div>
                                     <div class="role">Highest level: <?= $poster->getHighestLevel(); ?></div>
                                 </td>

diff --git a/includes/classes/site_lib.php b/includes/classes/site_lib.php
@@ -104,8 +104,8 @@ public function getCurrentURL() {
         $link .= "://";
 
         $link .= $_SERVER['HTTP_HOST'];
-        $validURL = str_replace("&", "&amp", $url);
-        return $validURL;
+        $link .= $_SERVER['REQUEST_URI'];
+        return $link;
     }
 
 }
diff --git a/index.php b/index.php
@@ -10,6 +10,7 @@
 
 include 'includes/functions.php';
 include 'includes/classes/site_lib.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';
 include 'includes/classes/polls_lib.php';

diff --git a/onlineplayers.php b/onlineplayers.php
@@ -4,6 +4,7 @@
 $title = 'Online players: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/players_lib.php';
 include 'includes/classes/events_lib.php';
 include 'includes/classes/forum_lib.php';

diff --git a/pages/legion/user.php b/pages/legion/user.php
@@ -78,10 +78,10 @@
                 <?php
                 if (empty($account->getAvatarID())) {
                     ?>
-                    <img src="<?php echo $site->getCurrentURL(); ?>/img/avatars/no-avatar.png" title="Avatar" alt="Avatar">
+                    <img src="../../img/avatars/no-avatar.png" title="Avatar" alt="Avatar">
                     <?php
                 } else {
-                    echo '<img src="' . $site->getCurrentURL() . '/img/thumbnails/'.$account->getAvatarID().'.png" title="Avatar" alt="Avatar">';
+                    echo '<img src="../../img/thumbnails/'.$account->getAvatarID().'.png" title="Avatar" alt="Avatar">';
                 }
                 ?>
             </div>

diff --git a/register.php b/register.php
@@ -4,6 +4,7 @@
 $title = 'Register: ';
 include 'includes/config.php';
 include 'includes/functions.php';
+include 'includes/classes/accounts_lib.php';
 include 'includes/classes/forum_lib.php';
 include 'includes/classes/events_lib.php';
 include 'header.php';