diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 22 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_confirm.php | 4 |
3 files changed, 18 insertions, 17 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index 8a93f887f1..3e363107f4 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -28,7 +28,7 @@ class acp_captcha $user->add_lang('acp/board'); - + $captcha_vars = array( 'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID', 'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID', @@ -52,9 +52,8 @@ class acp_captcha { include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT); } - captcha::execute(gen_rand_string(mt_rand(5, 8)), time()); - exit(); + exit; } $config_vars = array( @@ -90,7 +89,7 @@ class acp_captcha } else { - + $preview_image_src = append_sid(append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&demo=demo")); if (@extension_loaded('gd')) { @@ -110,7 +109,7 @@ class acp_captcha 'CAPTCHA_PREVIEW' => $preview_image_src, 'PREVIEW' => isset($_POST['preview']), )); - + } } } diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 4a5db8f7a0..b978bad1bc 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -55,7 +55,7 @@ class acp_forums $total = request_var('total', 0); $this->display_progress_bar($start, $total); - exit_handler(); + exit; break; case 'delete': @@ -73,7 +73,7 @@ class acp_forums { trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } - + break; } @@ -99,7 +99,7 @@ class acp_forums $cache->destroy('sql', FORUMS_TABLE); trigger_error($user->lang['FORUM_DELETED'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - + break; case 'edit': @@ -188,7 +188,7 @@ class acp_forums $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' WHERE forum_id = ' . (int) $forum_data['forum_id']; $db->sql_query($sql); - + $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE forum_id = ' . (int) $forum_data['forum_id']; $db->sql_query($sql); @@ -244,7 +244,7 @@ class acp_forums $auth->acl_clear_prefetch(); $cache->destroy('sql', FORUMS_TABLE); - + $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; $message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED']; @@ -542,7 +542,7 @@ class acp_forums $forum_type_options = ''; $forum_type_ary = array(FORUM_CAT => 'CAT', FORUM_POST => 'FORUM', FORUM_LINK => 'LINK'); - + foreach ($forum_type_ary as $value => $lang) { $forum_type_options .= '<option value="' . $value . '"' . (($value == $forum_data['forum_type']) ? ' selected="selected"' : '') . '>' . $user->lang['TYPE_' . $lang] . '</option>'; @@ -612,7 +612,7 @@ class acp_forums } } } - + if (strlen($forum_data['forum_password']) == 32) { $errors[] = $user->lang['FORUM_PASSWORD_OLD']; @@ -917,7 +917,7 @@ class acp_forums $forum_data['prune_days'] = $forum_data['prune_viewed'] = $forum_data['prune_freq'] = 0; $errors[] = $user->lang['FORUM_DATA_NEGATIVE']; } - + $range_test_ary = array( array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'), ); @@ -973,7 +973,7 @@ class acp_forums $forum_data_sql['forum_password'] = phpbb_hash($forum_data_sql['forum_password']); } unset($forum_data_sql['forum_password_unset']); - + if (!isset($forum_data_sql['forum_id'])) { // no forum_id means we're creating a new forum @@ -1631,7 +1631,7 @@ class acp_forums WHERE p.forum_id = $forum_id AND a.in_message = 0 AND a.topic_id = p.topic_id"; - $result = $db->sql_query($sql); + $result = $db->sql_query($sql); $topic_ids = array(); while ($row = $db->sql_fetchrow($result)) @@ -1688,7 +1688,7 @@ class acp_forums break; default: - + // Delete everything else and curse your DB for not offering multi-table deletion $tables_ary = array( 'post_id' => array( diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php index 55d27e3c2e..94fb9a729f 100644 --- a/phpBB/includes/ucp/ucp_confirm.php +++ b/phpBB/includes/ucp/ucp_confirm.php @@ -72,7 +72,9 @@ class ucp_confirm } captcha::execute($row['code'], $row['seed']); - exit; + + garbage_collection(); + exit_handler(); } } |