--- a/punbb/admin/forums.php Sun Apr 06 00:35:38 2008 -0400
+++ b/punbb/admin/forums.php Sun Jun 15 01:42:31 2008 -0400
@@ -82,7 +82,7 @@
$forum_to_delete = intval($_GET['del_forum']);
if ($forum_to_delete < 1)
message($lang_common['Bad request']);
-
+
// User pressed the cancel button
if (isset($_POST['del_forum_cancel']))
pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Cancel redirect']);
@@ -97,7 +97,7 @@
prune($forum_to_delete, 1, -1);
delete_orphans();
-
+
// Delete the forum and any forum specific group permissions
$query = array(
'DELETE' => 'forums',
@@ -106,7 +106,7 @@
($hook = get_hook('afo_qr_delete_forum')) ? eval($hook) : null;
$pun_db->query_build($query) or error(__FILE__, __LINE__);
-
+
$query = array(
'DELETE' => 'forum_perms',
'WHERE' => 'forum_id='.$forum_to_delete
@@ -114,11 +114,11 @@
($hook = get_hook('afo_qr_delete_forum_perms')) ? eval($hook) : null;
$pun_db->query_build($query) or error(__FILE__, __LINE__);
-
+
// Regenerate the quickjump cache
require_once PUN_ROOT.'include/cache.php';
generate_quickjump_cache();
-
+
pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Forum deleted'].' '.$lang_admin['Redirect']);
}
else // If the user hasn't confirmed the delete
@@ -161,9 +161,9 @@
<div class="frm-head">
<h2><span><?php printf($lang_admin['Confirm delete forum'], htmlspecialchars($forum_name)) ?></span></h2>
</div>
- <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&del_forum=<?php echo $forum_id ?>">
+ <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&del_forum=<?php echo $forum_to_delete ?>">
<div class="hidden">
- <input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&del_forum='.$forum_id) ?>" />
+ <input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&del_forum='.$forum_to_delete) ?>" />
</div>
<div class="frm-info">
<p class="warn"><?php echo $lang_admin['Delete forum warning'] ?></p>