diff -crbB 206c/includes/auth.php 206d/includes/auth.php
*** 206c/includes/auth.php Tue Feb 25 18:03:00 2003
--- 206d/includes/auth.php Mon Mar 1 19:20:57 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: auth.php,v 1.37.2.3 2003/02/25 16:02:59 acydburn Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: auth.php,v 1.37.2.5 2004/03/01 16:49:03 psotfx Exp $
*
*
***************************************************************************/
***************
*** 172,177 ****
--- 171,177 ----
}
while( $row = $db->sql_fetchrow($result) );
}
+ $db->sql_freeresult($result);
}
$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
diff -crbB 206c/includes/page_header.php 206d/includes/page_header.php
*** 206c/includes/page_header.php Tue Jun 10 22:48:20 2003
--- 206d/includes/page_header.php Mon Mar 1 19:20:57 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: page_header.php,v 1.106.2.20 2003/06/10 20:48:19 acydburn Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: page_header.php,v 1.106.2.22 2004/03/01 16:46:37 psotfx Exp $
*
*
***************************************************************************/
diff -crbB 206c/includes/topic_review.php 206d/includes/topic_review.php
*** 206c/includes/topic_review.php Fri May 3 17:58:36 2002
--- 206d/includes/topic_review.php Mon Mar 1 18:49:48 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: topic_review.php,v 1.5.2.1 2002/05/03 15:58:35 the_systech Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: topic_review.php,v 1.5.2.2 2004/03/01 15:56:51 psotfx Exp $
*
*
***************************************************************************/
***************
*** 51,56 ****
--- 51,57 ----
{
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
}
+ $db->sql_freeresult($result);
$forum_id = $forum_row['forum_id'];
$topic_title = $forum_row['topic_title'];
***************
*** 207,212 ****
--- 208,214 ----
{
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', '', __LINE__, __FILE__, $sql);
}
+ $db->sql_freeresult($result);
$template->assign_vars(array(
'L_AUTHOR' => $lang['Author'],
diff -crbB 206c/index.php 206d/index.php
*** 206c/index.php Thu Dec 19 19:17:40 2002
--- 206d/index.php Mon Mar 1 18:49:48 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: index.php,v 1.99.2.1 2002/12/19 17:17:40 psotfx Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: index.php,v 1.99.2.2 2004/03/01 15:56:52 psotfx Exp $
*
*
***************************************************************************/
***************
*** 119,124 ****
--- 119,125 ----
}
while( $category_rows[] = $db->sql_fetchrow($result) );
+ $db->sql_freeresult($result);
if( ( $total_categories = count($category_rows) ) )
{
***************
*** 170,175 ****
--- 171,177 ----
{
$forum_data[] = $row;
}
+ $db->sql_freeresult($result);
if ( !($total_forums = count($forum_data)) )
{
***************
*** 197,202 ****
--- 199,205 ----
{
$new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time'];
}
+ $db->sql_freeresult($result);
}
//
***************
*** 222,227 ****
--- 225,231 ----
{
$forum_moderators[$row['forum_id']][] = '' . $row['username'] . '';
}
+ $db->sql_freeresult($result);
$sql = "SELECT aa.forum_id, g.group_id, g.group_name
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
***************
*** 241,246 ****
--- 245,251 ----
{
$forum_moderators[$row['forum_id']][] = '' . $row['group_name'] . '';
}
+ $db->sql_freeresult($result);
//
// Find which forums are visible for this user
diff -crbB 206c/login.php 206d/login.php
*** 206c/login.php Sun Jul 20 16:37:22 2003
--- 206d/login.php Mon Mar 1 19:20:57 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: login.php,v 1.47.2.13 2003/06/20 07:40:27 acydburn Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: login.php,v 1.47.2.14 2004/03/01 16:53:21 psotfx Exp $
*
*
***************************************************************************/
***************
*** 83,89 ****
if( $session_id )
{
! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "index.$phpEx";
redirect(append_sid($url, true));
}
else
--- 83,89 ----
if( $session_id )
{
! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : "index.$phpEx";
redirect(append_sid($url, true));
}
else
***************
*** 93,99 ****
}
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
$redirect = str_replace('?', '&', $redirect);
$template->assign_vars(array(
--- 93,99 ----
}
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : '';
$redirect = str_replace('?', '&', $redirect);
$template->assign_vars(array(
***************
*** 108,114 ****
}
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
$redirect = str_replace("?", "&", $redirect);
$template->assign_vars(array(
--- 108,114 ----
}
else
{
! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : "";
$redirect = str_replace("?", "&", $redirect);
$template->assign_vars(array(
***************
*** 129,135 ****
if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect']))
{
! $url = (!empty($HTTP_POST_VARS['redirect'])) ? $HTTP_POST_VARS['redirect'] : $HTTP_GET_VARS['redirect'];
redirect(append_sid($url, true));
}
else
--- 129,135 ----
if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect']))
{
! $url = (!empty($HTTP_POST_VARS['redirect'])) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : htmlspecialchars($HTTP_GET_VARS['redirect']);
redirect(append_sid($url, true));
}
else
***************
*** 139,145 ****
}
else
{
! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "index.$phpEx";
redirect(append_sid($url, true));
}
}
--- 139,145 ----
}
else
{
! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : "index.$phpEx";
redirect(append_sid($url, true));
}
}
diff -crbB 206c/memberlist.php 206d/memberlist.php
*** 206c/memberlist.php Mon Jun 9 15:06:20 2003
--- 206d/memberlist.php Mon Mar 1 18:49:48 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: memberlist.php,v 1.36.2.8 2003/06/09 13:06:19 psotfx Exp $
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: memberlist.php,v 1.36.2.9 2004/03/01 15:56:52 psotfx Exp $
*
***************************************************************************/
***************
*** 269,274 ****
--- 269,275 ----
$i++;
}
while ( $row = $db->sql_fetchrow($result) );
+ $db->sql_freeresult($result);
}
if ( $mode != 'topten' || $board_config['topics_per_page'] < 10 )
***************
*** 288,293 ****
--- 289,295 ----
$pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start). ' ';
}
+ $db->sql_freeresult($result);
}
else
{
diff -crbB 206c/posting.php 206d/posting.php
*** 206c/posting.php Sat Jun 7 19:52:32 2003
--- 206d/posting.php Mon Mar 1 18:49:48 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: posting.php,v 1.159.2.18 2003/06/07 17:52:31 acydburn Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: posting.php,v 1.159.2.19 2004/03/01 15:56:52 psotfx Exp $
*
*
***************************************************************************/
***************
*** 221,226 ****
--- 221,227 ----
if ( $result = $db->sql_query($sql) )
{
$post_info = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
$forum_id = $post_info['forum_id'];
$forum_name = $post_info['forum_name'];
***************
*** 259,264 ****
--- 260,266 ----
{
message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql);
}
+ $db->sql_freeresult($result);
$poll_options = array();
$poll_results_sum = 0;
***************
*** 397,402 ****
--- 399,405 ----
}
$notify_user = ( $db->sql_fetchrow($result) ) ? TRUE : $userdata['user_notify'];
+ $db->sql_freeresult($result);
}
else
{
***************
*** 471,482 ****
FROM " . VOTE_USERS_TABLE . "
WHERE vote_id = $vote_id
AND vote_user_id = " . $userdata['user_id'];
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql);
}
! if ( !($row = $db->sql_fetchrow($result)) )
{
$sql = "UPDATE " . VOTE_RESULTS_TABLE . "
SET vote_result = vote_result + 1
--- 474,485 ----
FROM " . VOTE_USERS_TABLE . "
WHERE vote_id = $vote_id
AND vote_user_id = " . $userdata['user_id'];
! if ( !($result2 = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql);
}
! if ( !($row = $db->sql_fetchrow($result2)) )
{
$sql = "UPDATE " . VOTE_RESULTS_TABLE . "
SET vote_result = vote_result + 1
***************
*** 500,510 ****
--- 503,515 ----
{
$message = $lang['Already_voted'];
}
+ $db->sql_freeresult($result2);
}
else
{
$message = $lang['No_vote_option'];
}
+ $db->sql_freeresult($result);
$template->assign_vars(array(
'META' => '')
diff -crbB 206c/templates/subSilver/index_body.tpl 206d/templates/subSilver/index_body.tpl
*** 206c/templates/subSilver/index_body.tpl Mon Mar 24 03:23:02 2003
--- 206d/templates/subSilver/index_body.tpl Mon Mar 1 18:49:48 2004
***************
*** 91,103 ****
!  |
{L_NEW_POSTS} |
|
!  |
{L_NO_NEW_POSTS} |
|
!  |
{L_FORUM_LOCKED} |
--- 91,103 ----
!  |
{L_NEW_POSTS} |
|
!  |
{L_NO_NEW_POSTS} |
|
!  |
{L_FORUM_LOCKED} |
diff -crbB 206c/viewtopic.php 206d/viewtopic.php
*** 206c/viewtopic.php Sun Jul 20 16:37:22 2003
--- 206d/viewtopic.php Mon Mar 1 18:49:48 2004
***************
*** 6,12 ****
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: viewtopic.php,v 1.186.2.32 2003/06/20 16:34:58 psotfx Exp $
*
*
***************************************************************************/
--- 6,12 ----
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
*
! * $Id: viewtopic.php,v 1.186.2.33 2004/03/01 15:56:52 psotfx Exp $
*
*
***************************************************************************/
***************
*** 357,363 ****
//
if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) )
{
! $post_order = (!empty($HTTP_POST_VARS['postorder'])) ? $HTTP_POST_VARS['postorder'] : $HTTP_GET_VARS['postorder'];
$post_time_order = ($post_order == "asc") ? "ASC" : "DESC";
}
else
--- 357,363 ----
//
if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) )
{
! $post_order = (!empty($HTTP_POST_VARS['postorder'])) ? htmlspecialchars($HTTP_POST_VARS['postorder']) : htmlspecialchars($HTTP_GET_VARS['postorder']);
$post_time_order = ($post_order == "asc") ? "ASC" : "DESC";
}
else