makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Less bugged version. If you sync a forum, you'll be taken back to the forum list where a message will be displayed.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4469 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-09-04 21:53:43 +00:00
parent 9f4d9ae268
commit ecc9b5eb41
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
phpBB/adm/admin_forums.php
View file

@ -38,7 +38,7 @@ require('pagestart.' . $phpEx);
// Get general vars // Get general vars
$mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : ''; $mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
$action = (isset($_POST['action'])) ? htmlspecialchars($_POST['action']) : ''; $action = (isset($_POST['action'])) ? htmlspecialchars($_POST['action']) : '';
$forum_id = (isset($_REQUEST['this_f'])) ? intval($_REQUEST['this_f']) : ((isset($_REQUEST['f'])) ? intval($_REQUEST['f']) : 0); $forum_id = (isset($_REQUEST['f'])) ? intval($_REQUEST['f']) : 0;
$parent_id = (isset($_REQUEST['parent_id'])) ? intval($_REQUEST['parent_id']) : 0; $parent_id = (isset($_REQUEST['parent_id'])) ? intval($_REQUEST['parent_id']) : 0;
$forum_data = $errors = array(); $forum_data = $errors = array();
@ -69,9 +69,12 @@ if (isset($_POST['update']))
{ {
case 'delete': case 'delete':
$action_subforums = (!empty($_POST['action_subforums'])) ? $_POST['action_subforums'] : ''; $action_subforums = (!empty($_POST['action_subforums'])) ? $_POST['action_subforums'] : '';
$action_posts = (!empty($_POST['action_posts'])) ? $_POST['action_posts'] : ''; $subforums_to_id = (!empty($_POST['subforums_to_id'])) ? intval($_POST['subforums_to_id']) : 0;
delete_forum($forum_id); $action_posts = (!empty($_POST['action_posts'])) ? $_POST['action_posts'] : '';
$posts_to_id = (!empty($_POST['posts_to_id'])) ? intval($_POST['posts_to_id']) : 0;
delete_forum($forum_id, $action_posts, $action_subforums, $posts_to_id, $subforums_to_id);
trigger_error($user->lang['FORUM_DELETED']); trigger_error($user->lang['FORUM_DELETED']);
break; break;
@ -531,8 +534,6 @@ switch ($mode)
case 'move_up': case 'move_up':
case 'move_down': case 'move_down':
$forum_id = intval($_GET['f']);
$sql = 'SELECT parent_id, left_id, right_id $sql = 'SELECT parent_id, left_id, right_id
FROM ' . FORUMS_TABLE . " FROM ' . FORUMS_TABLE . "
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";
@ -564,13 +565,13 @@ switch ($mode)
if ($mode == 'move_up') if ($mode == 'move_up')
{ {
$log_action = 'UP'; $log_action = 'LOG_FORUM_MOVE_UP';
$up_id = $forum_id; $up_id = $forum_id;
$down_id = $row['forum_id']; $down_id = $row['forum_id'];
} }
else else
{ {
$log_action = 'DOWN'; $log_action = 'LOG_FORUM_MOVE_DOWN';
$up_id = $row['forum_id']; $up_id = $row['forum_id'];
$down_id = $forum_id; $down_id = $forum_id;
} }
@ -623,13 +624,11 @@ switch ($mode)
$db->sql_transaction('commit'); $db->sql_transaction('commit');
$forum_data = get_forum_info($forum_id); $forum_data = get_forum_info($forum_id);
add_log('admin', 'LOG_FORUM_MOVE_' . $log_action, $forum_data['forum_name'], $move_forum_name); add_log('admin', $log_action, $forum_data['forum_name'], $move_forum_name);
unset($forum_data); unset($forum_data);
break; break;
case 'sync': case 'sync':
$forum_id = (isset($_REQUEST['this_f'])) ? intval($_REQUEST['this_f']) : ((isset($_REQUEST['f'])) ? intval($_REQUEST['f']) : 0);
if (!$forum_id) if (!$forum_id)
{ {
trigger_error($user->lang['NO_FORUM']); trigger_error($user->lang['NO_FORUM']);
@ -646,17 +645,15 @@ switch ($mode)
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
sync('forum', 'forum_id', $forum_id);
add_log('admin', 'LOG_FORUM_SYNC', $row['forum_name']); add_log('admin', 'LOG_FORUM_SYNC', $row['forum_name']);
sync('forum', 'forum_id', $forum_id);
break; break;
} }
// Default management page // Default management page
$forum_id = (!empty($_GET['f'])) ? intval($_GET['f']) : 0; if (!$parent_id)
if (!$forum_id)
{ {
$navigation = $user->lang['FORUM_INDEX']; $navigation = $user->lang['FORUM_INDEX'];
} }
@ -664,22 +661,22 @@ else
{ {
$navigation = '<a href="admin_forums.' . $phpEx . $SID . '">' . $user->lang['FORUM_INDEX'] . '</a>'; $navigation = '<a href="admin_forums.' . $phpEx . $SID . '">' . $user->lang['FORUM_INDEX'] . '</a>';
$forums_nav = get_forum_branch($forum_id, 'parents', 'descending'); $forums_nav = get_forum_branch($parent_id, 'parents', 'descending');
foreach ($forums_nav as $row) foreach ($forums_nav as $row)
{ {
if ($row['forum_id'] == $forum_id) if ($row['forum_id'] == $parent_id)
{ {
$navigation .= ' -&gt; ' . $row['forum_name']; $navigation .= ' -&gt; ' . $row['forum_name'];
} }
else else
{ {
$navigation .= ' -&gt; <a href="admin_forums.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>'; $navigation .= ' -&gt; <a href="admin_forums.' . $phpEx . $SID . '&amp;parent_id=' . $row['forum_id'] . '">' . $row['forum_name'] . '</a>';
} }
} }
} }
// Jumpbox // Jumpbox
$forum_box = make_forum_select($forum_id); $forum_box = make_forum_select($parent_id);
// Front end // Front end
adm_page_header($user->lang['MANAGE']); adm_page_header($user->lang['MANAGE']);
@ -688,9 +685,14 @@ adm_page_header($user->lang['MANAGE']);
<h1><?php echo $user->lang['MANAGE']; ?></h1> <h1><?php echo $user->lang['MANAGE']; ?></h1>
<p><?php echo $user->lang['FORUM_ADMIN_EXPLAIN']; ?></p> <p><?php echo $user->lang['FORUM_ADMIN_EXPLAIN']; ?></p><?php
<form method="post" action="<?php echo "admin_forums.$phpEx$SID" ?>"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> if ($mode == 'sync')
{
echo '<br /><div class="gen" align="center"><b>' . $user->lang['FORUM_RESYNCED'] . '</b></div>';
}
?><form method="post" action="<?php echo "admin_forums.$phpEx$SID" ?>"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td class="nav"><?php echo $navigation ?></td> <td class="nav"><?php echo $navigation ?></td>
</tr> </tr>
@ -704,7 +706,7 @@ adm_page_header($user->lang['MANAGE']);
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . FORUMS_TABLE . " FROM ' . FORUMS_TABLE . "
WHERE parent_id = $forum_id WHERE parent_id = $parent_id
ORDER BY left_id"; ORDER BY left_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -729,10 +731,10 @@ while ($row = $db->sql_fetchrow($result))
} }
} }
$forum_title = ($forum_type != FORUM_LINK) ? "<a href=\"admin_forums.$phpEx$SID&amp;f=" . $row['forum_id'] . '">' : ''; $forum_title = ($forum_type != FORUM_LINK) ? "<a href=\"admin_forums.$phpEx$SID&amp;parent_id=" . $row['forum_id'] . '">' : '';
$forum_title .= $row['forum_name']; $forum_title .= $row['forum_name'];
$forum_title .= ($forum_type != FORUM_LINK) ? '</a>' : ''; $forum_title .= ($forum_type != FORUM_LINK) ? '</a>' : '';
$url = "$phpEx$SID&amp;parent_id=$forum_id&amp;f=" . $row['forum_id']; $url = "$phpEx$SID&amp;parent_id=$parent_id&amp;f=" . $row['forum_id'];
?> ?>
<tr> <tr>