5 files changed, 91 insertions, 62 deletions

@@ -30,7 +30,7 @@ $curID = 0;
 
 $template = new FITemplate('comments');
 $template->add('PAGEID',$page_id);
-$template->add('USERNAME',(isLoggedIn() ? sess_get('uname') : 'Anonymous'));
+$template->add('USERNAME',(isLoggedIn() ? getSessionUsername() : 'Anonymous'));
 
 if (!isLoggedIn())
 {
@@ -43,7 +43,7 @@ $getcomments2 = mysql_query($getcomments) or die($getcomments);
 $i=0;
 while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
 {
-        $getuser = "SELECT * FROM users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
+        $getuser = "SELECT * FROM phpbb_users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
         $getuser2 = mysql_query($getuser);
         $getuser3 = mysql_fetch_array($getuser2);
 
@@ -51,7 +51,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
         {
                 $username = $getuser3['username'];
                 $email = $getuser3['user_email'];
-                $website = $getuser3['website'];
+                $website = $getuser3['user_website'];
         } else {
                 $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
                 $getanon2 = mysql_query($getanon);
@@ -68,7 +68,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
         if (isset($username))
         {
                 $template->add_ref($curID, 'COMMENTS', array(   'CODEDEMAIL' => md5(strtolower($email)),
-                                                                'USERNAME' => (($website != '') ? '<A HREF="http://' . $website . '">' . $username . '</A>' : $username),
+                                                                'USERNAME' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username),
                                                                 'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])),
                                                                 'ID' => $getcomments3[$i]['id'],
                                                                 'TEXT' => parseText($getcomments3[$i]['comment'])));
@@ -93,14 +93,14 @@ if (!isset($noRightbar))
         $i=0;
         while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
         {
-                $getuser = "SELECT * FROM users WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
+                $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['website'];
+                        $website = $getuser3['user_website'];
                 } else {
                         $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getcomments3[$i]['username'] . "\"";
                         $getanon2 = mysql_query($getanon);
@@ -125,7 +125,7 @@ if (!isset($noRightbar))
                                                                         'CODED' => $getpost3['slug'],
                                                                         'ENDING' => '/',
                                                                         'TITLE' => stripslashes($getpost3['title']),
-                                                                        'AUTHOR' => (($website != '') ? '<A HREF="http://' . $website . '">' . $username . '</A>' : $username)));
+                                                                        'AUTHOR' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username)));
                         $i++;
                 } else if (strpos($getcomments3[$i]['page_id'], 'quote') !== FALSE)
                 {
@@ -136,11 +136,12 @@ if (!isset($noRightbar))
                                                                         'CODED' => $num,
                                                                         'ENDING' => '.php',
                                                                         'TITLE' => 'Quote #' . $num,
-                                                                        'AUTHOR' => (($website != '') ? '<A HREF="http://' . $website . '">' . $username . '</A>' : $username)));
+                                                                        'AUTHOR' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username)));
                         $i++;                   
                 }
         }
 
+        $users = array();
         $getusers = "SELECT DISTINCT username FROM comments";
         $getusers2 = mysql_query($getusers);
         $i=0;
@@ -150,14 +151,14 @@ if (!isset($noRightbar))
                 $getcount2 = mysql_query($getcount);
                 $getcount3 = mysql_fetch_array($getcount2);
 
-                $getuser = "SELECT * FROM users WHERE username = \"" . $getusers3[$i]['username'] . "\"";
+                $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['website'];
+                        $website = $getuser3['user_website'];
                 } else {
                         $getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $getusers3[$i]['username'] . "\"";
                         $getanon2 = mysql_query($getanon);
@@ -170,23 +171,39 @@ if (!isset($noRightbar))
                         }
                 }
 
-                $name = (($website != '') ? '<A HREF="http://' . $website . '">' . $username . '</A>' : $username);
-                $users[$name] = $getcount3[0];
+                $name = (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username);
+                $users[] = array('name' => $name, 'count' => $getcount3['COUNT(*)']);
 
                 $i++;
         }
 
-        arsort($users);
+        function count_sort($a, $b)
+        {
+                $a = $a['count'];
+                $b = $b['count'];
+
+                if ($a > $b)
+                {
+                        return -1;
+                } else if ($a < $b)
+                {
+                        return 1;
+                } else {
+                        return 0;
+                }
+        }
+
+        usort($users, 'count_sort');
         $i=0;
-        foreach ($users as $name => $count)
+        foreach ($users as $value)
         {
                 if ($i == 5)
                 {
                         break;
                 }
 
-                $template->adds_block('TOP', array(     'USERNAME' => $name,
-                                                        'COUNT' => $count));
+                $template->adds_block('TOP', array(     'USERNAME' => $value['name'],
+                                                        'COUNT' => $value['count']));
                 $i++;
         }
 
@@ -22,24 +22,6 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-function isLoggedIn()
-{
-        return sess_exists('uname');
-}
-
-function getUserlevel()
-{
-        if (isLoggedIn())
-        {
-                $getuser = "SELECT * FROM users WHERE username = \"" . sess_get('uname') . "\"";
-                $getuser2 = mysql_query($getuser);
-                $getuser3 = mysql_fetch_array($getuser2);
-                return $getuser3['user_group'];
-        } else {
-                return 4;
-        }
-}
-
 function countRows($table, $extra = '')
 {
         $cntrows = "SELECT * FROM " . $table . " " . $extra;
@@ -62,7 +44,8 @@ function generateError($error)
 
 function echoLogData()
 {
-        if (!isLoggedIn()) {
+        if (!isLoggedIn())
+        {
                 return('in');
         } else {
                 return('out');
@@ -212,14 +195,6 @@ function updatePop($id, $area, $plus=1)
         }
 }
 
-function verifyUser($username, $password)
-{
-        $getuser = 'SELECT * FROM users WHERE username = "' . $username . '" AND user_password = "' . md5($password) . '"';
-        $getuser2 = mysql_query($getuser);
-        $getuser3 = mysql_fetch_array($getuser2);
-        return (($_POST['username'] != '') && ($getuser3['username'] == $_POST['username']));
-}
-
 function getTags($id, $type = 'published')
 {
         $gettags = "SELECT * FROM tags WHERE post_id = " . $id . " AND post_type = \"" . $type . "\"";
@@ -38,8 +38,6 @@ $headerTemp->add('HEADTAGS',isset($headtags) ? $headtags : '');
 $headerTemp->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
 $headerTemp->add('PAGEID',(isset($pageID)) ? $pageID : 'none');
 $headerTemp->add(strtoupper($pageCategory) . 'ACTIVE', ' CLASS="active"');
-$headerTemp->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
-$headerTemp->add('LOGDATA',echoLogData());
 
 if (isset($_POST['message']))
 {
@@ -48,6 +46,9 @@ if (isset($_POST['message']))
 
 if (($pageCategory != 'fourm') && ($pageCategory != 'wiki'))
 {
+        $headerTemp->add('REDIRPAGE',rawurlencode($_SERVER['REQUEST_URI']));
+        $headerTemp->add('LOGDATA',echoLogData());
+        $headerTemp->add('SID',getSessionID());
         $headerTemp->adds_block('MEMBERS',array('exi' => 1));
 }
 
@@ -24,38 +24,74 @@ require('headerproc.php');
 
 session_start();
 
-function sess_exists($name)
+function getSessionID()
 {
-        return(isset($_SESSION[$name]));
-}
+        $getconfig = "SELECT * FROM phpbb_config WHERE config_name LIKE \"cookie_name\"";
+        $getconfig2 = mysql_query($getconfig);
+        $getconfig3 = mysql_fetch_array($getconfig2);
 
-function sess_set($name,$value)
-{
-        $_SESSION[$name] = $value;
+        if (isset($_COOKIE[$getconfig3['config_value'] . '_sid']))
+        {
+                return $_COOKIE[$getconfig3['config_value'] . '_sid'];
+        }
+
+        return false;
 }
 
-function sess_get($name)
+function getSessionUsername()
 {
-        return $_SESSION[$name];
-}
+        $getconfig = "SELECT * FROM phpbb_config WHERE config_name LIKE \"cookie_name\"";
+        $getconfig2 = mysql_query($getconfig);
+        $getconfig3 = mysql_fetch_array($getconfig2);
+
+        if (isset($_COOKIE[$getconfig3['config_value'] . '_sid']))
+        {
+                $getsession = "SELECT * FROM phpbb_sessions AS s, phpbb_users AS u WHERE s.session_id LIKE \"" . mysql_real_escape_string($_COOKIE[$getconfig3['config_value'] . '_sid']) . "\" AND u.user_id = s.session_user_id";
+                $getsession2 = mysql_query($getsession) or die($getsession);
+                $getsession3 = mysql_fetch_array($getsession2);
 
+                return $getsession3['username'];
+        }
+
+        return false;
+}
 
-function sess_getifset($name)
+function isLoggedIn()
 {
-        if (sess_exists($name))
+        $getconfig = "SELECT * FROM phpbb_config WHERE config_name LIKE \"cookie_name\"";
+        $getconfig2 = mysql_query($getconfig);
+        $getconfig3 = mysql_fetch_array($getconfig2);
+
+        if (isset($_COOKIE[$getconfig3['config_value'] . '_sid']))
         {
-                return sess_get($name);
-        } else {
-                return false;
+                $getsession = "SELECT * FROM phpbb_sessions WHERE session_id LIKE \"" . mysql_real_escape_string($_COOKIE[$getconfig3['config_value'] . '_sid']) . "\"";
+                $getsession2 = mysql_query($getsession);
+                $getsession3 = mysql_fetch_array($getsession2);
+
+                if ($getsession3['session_user_id'] != '1')
+                {
+                        return true;
+                }
         }
+
+        return false;
 }
 
-function sess_delete($name)
+function isAdmin()
 {
-        if (sess_exists($name))
+        if (isLoggedIn())
         {
-                unset($_SESSION[$name]);
+                $getgroup = "SELECT COUNT(*) FROM phpbb_user_group, phpbb_users WHERE phpbb_user_group.user_id = phpbb_users.user_id AND phpbb_users.username = \"" . getSessionUsername() . "\" AND phpbb_user_group.group_id = 2";
+                $getgroup2 = mysql_query($getgroup);
+                $getgroup3 = mysql_fetch_array($getgroup2);
+
+                if ($getgroup3['COUNT(*)'] == '1')
+                {
+                        return true;
+                }
         }
+
+        return false;
 }
 
 ?>