mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

adjusting sql_freeresult a bit as well as our error handler (it now prints out if it is because of DEBUG_EXTRA being defined - which is not enabled within the betas/rc's and stable releases).

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5699 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-03-22 17:30:20 +00:00
parent 02239880a5
commit 1e2ed1bc9f
26 changed files with 78 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_attachments.php
View File

@@ -77,11 +77,11 @@ class ucp_attachments
$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC');
$sql = 'SELECT COUNT(*) as num_attachments
$sql = 'SELECT COUNT(attach_id) as num_attachments
FROM ' . ATTACHMENTS_TABLE . '
WHERE poster_id = ' . $user->data['user_id'];
$result = $db->sql_query_limit($sql, 1);
$num_attachments = $db->sql_fetchfield('num_attachments', 0, $result);
$num_attachments = $db->sql_fetchfield('num_attachments');
$db->sql_freeresult($result);
$sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title

3
phpBB/includes/ucp/ucp_groups.php
View File

@@ -625,8 +625,7 @@ class ucp_groups
WHERE group_id = $group_id
AND group_leader <> 1";
$result = $db->sql_query($sql);
$total_members = (int) $db->sql_fetchfield('total_members', 0, $result);
$total_members = (int) $db->sql_fetchfield('total_members');
$db->sql_freeresult($result);
$start = request_var('start', 0);

9
phpBB/includes/ucp/ucp_main.php
View File

@@ -67,7 +67,7 @@ class ucp_main
$sql .= ' AND forum_id NOT IN ( ' . implode(', ', $forum_ary) . ')';
}
$result = $db->sql_query_limit($sql, 1);
$g_forum_id = (int) $db->sql_fetchfield('forum_id', 0, $result);
$g_forum_id = (int) $db->sql_fetchfield('forum_id');
$db->sql_freeresult($result);
$sql = "SELECT t.* $sql_select
@@ -303,7 +303,7 @@ class ucp_main
FROM ' . TOPICS_WATCH_TABLE . '
WHERE user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
$topics_count = (int) $db->sql_fetchfield('topics_count', 0, $result);
$topics_count = (int) $db->sql_fetchfield('topics_count');
$db->sql_freeresult($result);
if ($topics_count)
@@ -451,10 +451,11 @@ class ucp_main
$move_up = request_var('move_up', 0);
$move_down = request_var('move_down', 0);
$sql = 'SELECT MAX(order_id) as max_order_id FROM ' . BOOKMARKS_TABLE . '
$sql = 'SELECT MAX(order_id) as max_order_id
FROM ' . BOOKMARKS_TABLE . '
WHERE user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
$max_order_id = $db->sql_fetchfield('max_order_id', 0, $result);
$max_order_id = (int) $db->sql_fetchfield('max_order_id');
$db->sql_freeresult($result);
if ($move_up || $move_down)

4
phpBB/includes/ucp/ucp_pm.php
View File

@@ -125,7 +125,7 @@ class ucp_pm
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql);
$message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$message_limit = (int) $db->sql_fetchfield('group_message_limit');
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
@@ -162,7 +162,7 @@ class ucp_pm
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql);
$message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$message_limit = (int) $db->sql_fetchfield('group_message_limit');
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;

21
phpBB/includes/ucp/ucp_pm_options.php
View File

@@ -76,12 +76,13 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
FROM ' . PRIVMSGS_FOLDER_TABLE . '
WHERE user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
if ($db->sql_fetchfield('num_folder', 0, $result) >= $config['pm_max_boxes'])
$num_folder = (int) $db->sql_fetchfield('num_folder');
$db->sql_freeresult($result);
if ($num_folder >= $config['pm_max_boxes'])
{
trigger_error('MAX_FOLDER_REACHED');
}
$db->sql_freeresult($result);
$sql = 'INSERT INTO ' . PRIVMSGS_FOLDER_TABLE . ' ' . $db->sql_build_array('INSERT', array(
'user_id' => (int) $user->data['user_id'], 'folder_name' => $folder_name));
@@ -344,7 +345,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
WHERE user_id = ' . $user->data['user_id'] . '
AND folder_id = ' . PRIVMSGS_INBOX;
$result = $db->sql_query($sql);
$num_messages = $db->sql_fetchfield('num_messages', 0, $result);
$num_messages = (int) $db->sql_fetchfield('num_messages');
$db->sql_freeresult($result);
$folder[PRIVMSGS_INBOX] = array(
@@ -641,12 +642,13 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
FROM ' . USERS_TABLE . "
WHERE username = '" . $db->sql_escape($rule_string) . "'";
$result = $db->sql_query($sql);
$rule_user_id = (int) $db->sql_fetchfield('user_id');
$db->sql_freeresult($result);
if (!($rule_user_id = $db->sql_fetchfield('user_id', 0, $result)))
if (!$rule_user_id)
{
$rule_string = '';
}
$db->sql_freeresult($result);
}
else if (!$rule_string && $rule_user_id)
{
@@ -654,12 +656,13 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
FROM ' . USERS_TABLE . "
WHERE user_id = $rule_user_id";
$result = $db->sql_query($sql);
if (!($rule_string = $db->sql_fetchfield('username', 0, $result)))
$rule_string = $db->sql_fetchfield('username');
$db->sql_freeresult($result);
if (!$rule_string)
{
$rule_user_id = 0;
}
$db->sql_freeresult($result);
}
$template->assign_vars(array(