Improved anonymous commenting

There was a bug where, if an anonymous commenter used a username that was being used by an actual member, Four Island would think the anonymous
commentor was actually the member.

2 files changed, 33 insertions, 45 deletions

@@ -43,16 +43,17 @@ $getcomments2 = mysql_query($getcomments) or die($getcomments);
 $i=0;
 while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
 {
-        $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
-        $getuser2 = mysql_query($getuser);
-        $getuser3 = mysql_fetch_array($getuser2);
-
-        if ($getuser3['username'] == $getcomments3[$i]['username'])
+        if ($getcomments3[$i]['is_anon'] == 0)
         {
+                $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
+                $getuser2 = mysql_query($getuser);
+                $getuser3 = mysql_fetch_array($getuser2);
+
                 $username = $getuser3['username'];
                 $email = $getuser3['user_email'];
                 $website = $getuser3['user_website'];
-        } else {
+        } else if ($getcomments3[$i]['is_anon'] == 1)
+        {
                 $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
                 $getanon2 = mysql_query($getanon);
                 $getanon3 = mysql_fetch_array($getanon2);
@@ -93,26 +93,26 @@ if (!isset($noRightbar))
         $i=0;
         while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
         {
-                $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
-                $getuser2 = mysql_query($getuser);
-                $getuser3 = mysql_fetch_array($getuser2);
-
-                if ($getuser3['username'] == $getcomments3[$i]['username'])
-                {
-                        $username = $getuser3['username'];
-                        $website = $getuser3['user_website'];
-                } else {
-                        $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
-                        $getanon2 = mysql_query($getanon);
-                        $getanon3 = mysql_fetch_array($getanon2);
-
-                        if ($getanon3['username'] == $getcomments3[$i]['username'])
-                        {
-                                $username = $getanon3['username'] . ' (Guest)';
-                                $website = $getanon3['website'];
-                        }
-                }
-
+                if ($getcomments3[$i]['is_anon'] == 0)
+                {
+                        $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
+                        $getuser2 = mysql_query($getuser);
+                        $getuser3 = mysql_fetch_array($getuser2);
+
+                        $username = $getuser3['username'];
+                        $website = $getuser3['user_website'];
+                } else if ($getcomments3[$i]['is_anon'] == 1) 
+                {
+                        $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
+                        $getanon2 = mysql_query($getanon);
+                        $getanon3 = mysql_fetch_array($getanon2);
+
+                        if ($getanon3['username'] == $getcomments3[$i]['username'])
+                        {
+                                $username = $getanon3['username'] . ' (Guest)';
+                                $website = $getanon3['website'];
+                        }
+                }
 
                 if (strpos($getcomments3[$i]['page_id'], 'updates') !== FALSE)
                 {
@@ -142,7 +142,7 @@ if (!isset($noRightbar))
         }
 
         $users = array();
-        $getusers = "SELECT DISTINCT username FROM comments";
+        $getusers = "SELECT DISTINCT username FROM comments WHERE is_anon = 0";
         $getusers2 = mysql_query($getusers);
         $i=0;
         while ($getusers3[$i] = mysql_fetch_array($getusers2))
@@ -151,25 +151,12 @@ if (!isset($noRightbar))
                 $getcount2 = mysql_query($getcount);
                 $getcount3 = mysql_fetch_array($getcount2);
 
-                $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getusers3[$i]['username'] . "\"";
-                $getuser2 = mysql_query($getuser);
-                $getuser3 = mysql_fetch_array($getuser2);
-
-                if ($getuser3['username'] == $getusers3[$i]['username'])
-                {
-                        $username = $getuser3['username'];
-                        $website = $getuser3['user_website'];
-                } else {
-                        $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getusers3[$i]['username'] . "\"";
-                        $getanon2 = mysql_query($getanon);
-                        $getanon3 = mysql_fetch_array($getanon2);
+                $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getusers3[$i]['username'] . "\"";
+                $getuser2 = mysql_query($getuser);
+                $getuser3 = mysql_fetch_array($getuser2);
 
-                        if ($getanon3['username'] == $getusers3[$i]['username'])
-                        {
-                                $username = $getanon3['username'] . ' (Guest)';
-                                $website = $getanon3['website'];
-                        }
-                }
+                $username = $getuser3['username'];
+                $website = $getuser3['user_website'];
 
                 $name = (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username);
                 $users[] = array('name' => $name, 'count' => $getcount3['COUNT(*)']);