diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-22 17:30:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-22 17:30:20 +0000 |
| commit | 1e2ed1bc9f8128d4d252c6761b50216d0b01998e (patch) | |
| tree | a0f77cfde33df5debf9cc45a1444a8df5135f0fb /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | 02239880a55f38828b1f4151fc2d2a658312b98e (diff) | |
| download | forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.gz forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.bz2 forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.tar.xz forums-1e2ed1bc9f8128d4d252c6761b50216d0b01998e.zip | |
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).
git-svn-id: file:///svn/phpbb/trunk@5699 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 40f8baba7a..b3f6b02bbe 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -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( |