mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Enabled just deleting a forum instead of moving msgs
git-svn-id: file:///svn/phpbb/trunk@983 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
d40479473f
commit
2fec333213
1 changed files with 23 additions and 34 deletions
|
@ -30,24 +30,6 @@ if($setmodules==1)
|
||||||
// ------------------
|
// ------------------
|
||||||
// Begin function block
|
// Begin function block
|
||||||
//
|
//
|
||||||
function check_forum_name($forumname)
|
|
||||||
{
|
|
||||||
global $db;
|
|
||||||
|
|
||||||
$sql = "SELECT *
|
|
||||||
FROM " . FORUMS_TABLE . "
|
|
||||||
WHERE forum_name = '$forumname'";
|
|
||||||
$result = $db->sql_query($sql);
|
|
||||||
if( !$result )
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, "Couldn't get list of Categories", "", __LINE__, __FILE__, $sql);
|
|
||||||
}
|
|
||||||
if ($db->sql_numrows($result) > 0)
|
|
||||||
{
|
|
||||||
message_die(GENERAL_ERROR, "A forum with that name already exists", "", __LINE__, __FILE__, $sql);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function get_info($mode, $id)
|
function get_info($mode, $id)
|
||||||
{
|
{
|
||||||
global $db;
|
global $db;
|
||||||
|
@ -290,10 +272,12 @@ if(isset($mode)) // Are we supposed to do something?
|
||||||
$template->pparse("body");
|
$template->pparse("body");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case 'createforum':
|
case 'createforum':
|
||||||
// Create a forum in the DB
|
// Create a forum in the DB
|
||||||
|
if( trim($HTTP_POST_VARS['forumname']) == '')
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, "Can't create a forum without a name");
|
||||||
|
}
|
||||||
$sql = "SELECT MAX(forum_order) AS max_order
|
$sql = "SELECT MAX(forum_order) AS max_order
|
||||||
FROM " . FORUMS_TABLE . "
|
FROM " . FORUMS_TABLE . "
|
||||||
WHERE cat_id = " . $HTTP_POST_VARS['cat_id'];
|
WHERE cat_id = " . $HTTP_POST_VARS['cat_id'];
|
||||||
|
@ -384,6 +368,10 @@ if(isset($mode)) // Are we supposed to do something?
|
||||||
|
|
||||||
case 'addcat':
|
case 'addcat':
|
||||||
// Create a category in the DB
|
// Create a category in the DB
|
||||||
|
if( trim($HTTP_POST_VARS['catname']) == '')
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, "Can't create a category without a name");
|
||||||
|
}
|
||||||
$sql = "SELECT MAX(cat_order) AS max_order
|
$sql = "SELECT MAX(cat_order) AS max_order
|
||||||
FROM " . CATEGORIES_TABLE;
|
FROM " . CATEGORIES_TABLE;
|
||||||
if( !$result = $db->sql_query($sql) )
|
if( !$result = $db->sql_query($sql) )
|
||||||
|
@ -444,7 +432,8 @@ if(isset($mode)) // Are we supposed to do something?
|
||||||
case 'deleteforum':
|
case 'deleteforum':
|
||||||
// Show form to delete a forum
|
// Show form to delete a forum
|
||||||
$forum_id = $HTTP_GET_VARS['forum_id'];
|
$forum_id = $HTTP_GET_VARS['forum_id'];
|
||||||
$to_ids = get_list('forum', $forum_id, 0);
|
$to_ids = "<option value=\"-1\"$s>Delete all posts</option>\n";
|
||||||
|
$to_ids .= get_list('forum', $forum_id, 0);
|
||||||
$buttonvalue = "Move&Delete";
|
$buttonvalue = "Move&Delete";
|
||||||
$newmode = 'movedelforum';
|
$newmode = 'movedelforum';
|
||||||
$foruminfo = get_info('forum', $forum_id);
|
$foruminfo = get_info('forum', $forum_id);
|
||||||
|
@ -470,6 +459,15 @@ if(isset($mode)) // Are we supposed to do something?
|
||||||
$to_id = $HTTP_POST_VARS['to_id'];
|
$to_id = $HTTP_POST_VARS['to_id'];
|
||||||
$delete_old = $HTTP_POST_VARS['delete_old'];
|
$delete_old = $HTTP_POST_VARS['delete_old'];
|
||||||
|
|
||||||
|
|
||||||
|
// Either delete or move all posts in a forum
|
||||||
|
if($to_id == -1)
|
||||||
|
{
|
||||||
|
include($phpbb_root_path . "includes/prune.$phpEx");
|
||||||
|
prune($from_id, 0); // Delete everything from forum
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$sql = "SELECT *
|
$sql = "SELECT *
|
||||||
FROM " . FORUMS_TABLE . "
|
FROM " . FORUMS_TABLE . "
|
||||||
WHERE forum_id IN ($from_id, $to_id)";
|
WHERE forum_id IN ($from_id, $to_id)";
|
||||||
|
@ -481,15 +479,6 @@ if(isset($mode)) // Are we supposed to do something?
|
||||||
{
|
{
|
||||||
message_die(GENERAL_ERROR, "Ambiguous forum ID's", "", __LINE__, __FILE__);
|
message_die(GENERAL_ERROR, "Ambiguous forum ID's", "", __LINE__, __FILE__);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Either delete or move all posts in a forum
|
|
||||||
if($delete_old == 1)
|
|
||||||
{
|
|
||||||
include($phpbb_root_path . "/include/prune.$phpEx");
|
|
||||||
prune($from_id, 0); // Delete everything from forum
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$sql = "UPDATE " . TOPICS_TABLE . "
|
$sql = "UPDATE " . TOPICS_TABLE . "
|
||||||
SET forum_id = $to_id
|
SET forum_id = $to_id
|
||||||
WHERE forum_id = $from_id";
|
WHERE forum_id = $from_id";
|
||||||
|
|
Loading…
Add table
Reference in a new issue