mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Fix some instances where we left db connections open (registration -> captcha for example)
git-svn-id: file:///svn/phpbb/trunk@8656 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
677e6451c4
commit
eeba8f4560
6 changed files with 29 additions and 26 deletions
|
@ -52,9 +52,8 @@ class acp_captcha
|
||||||
{
|
{
|
||||||
include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT);
|
include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_non_gd.' . PHP_EXT);
|
||||||
}
|
}
|
||||||
|
|
||||||
captcha::execute(gen_rand_string(mt_rand(5, 8)), time());
|
captcha::execute(gen_rand_string(mt_rand(5, 8)), time());
|
||||||
exit();
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$config_vars = array(
|
$config_vars = array(
|
||||||
|
|
|
@ -55,7 +55,7 @@ class acp_forums
|
||||||
$total = request_var('total', 0);
|
$total = request_var('total', 0);
|
||||||
|
|
||||||
$this->display_progress_bar($start, $total);
|
$this->display_progress_bar($start, $total);
|
||||||
exit_handler();
|
exit;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'delete':
|
case 'delete':
|
||||||
|
|
|
@ -72,7 +72,9 @@ class ucp_confirm
|
||||||
}
|
}
|
||||||
|
|
||||||
captcha::execute($row['code'], $row['seed']);
|
captcha::execute($row['code'], $row['seed']);
|
||||||
exit;
|
|
||||||
|
garbage_collection();
|
||||||
|
exit_handler();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -166,7 +166,7 @@ if ($quickmod)
|
||||||
case 'delete_post':
|
case 'delete_post':
|
||||||
case 'delete_topic':
|
case 'delete_topic':
|
||||||
$module->load('mcp', 'main', 'quickmod');
|
$module->load('mcp', 'main', 'quickmod');
|
||||||
exit_handler();
|
exit;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'topic_logs':
|
case 'topic_logs':
|
||||||
|
|
|
@ -114,8 +114,7 @@ switch ($mode)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
upload_popup();
|
upload_popup();
|
||||||
garbage_collection();
|
exit;
|
||||||
exit_handler();
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -146,7 +145,7 @@ if (!$post_data)
|
||||||
if ($mode == 'popup')
|
if ($mode == 'popup')
|
||||||
{
|
{
|
||||||
upload_popup($post_data['forum_style']);
|
upload_popup($post_data['forum_style']);
|
||||||
exit_handler();
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
|
$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']);
|
||||||
|
@ -277,7 +276,7 @@ if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id))
|
||||||
if ($mode == 'delete')
|
if ($mode == 'delete')
|
||||||
{
|
{
|
||||||
handle_post_delete($forum_id, $topic_id, $post_id, $post_data);
|
handle_post_delete($forum_id, $topic_id, $post_id, $post_data);
|
||||||
exit_handler();
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle bump mode...
|
// Handle bump mode...
|
||||||
|
@ -1402,6 +1401,9 @@ function upload_popup($forum_style = 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
$template->display('popup');
|
$template->display('popup');
|
||||||
|
|
||||||
|
garbage_collection();
|
||||||
|
exit_handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -69,7 +69,7 @@ switch ($mode)
|
||||||
|
|
||||||
case 'confirm':
|
case 'confirm':
|
||||||
$module->load('ucp', 'confirm');
|
$module->load('ucp', 'confirm');
|
||||||
exit_handler();
|
exit;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'login':
|
case 'login':
|
||||||
|
|
Loading…
Add table
Reference in a new issue