diff options
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/admin_forums.php | 13 | ||||
| -rw-r--r-- | phpBB/adm/index.php | 23 |
2 files changed, 21 insertions, 15 deletions
diff --git a/phpBB/adm/admin_forums.php b/phpBB/adm/admin_forums.php index 3b61263482..528c124649 100644 --- a/phpBB/adm/admin_forums.php +++ b/phpBB/adm/admin_forums.php @@ -210,9 +210,7 @@ switch ($mode) 'forum_name' => $_POST['forum_name'], 'forum_desc' => $_POST['forum_desc'], 'forum_style' => (!empty($_POST['forum_style'])) ? intval($_POST['forum_style']) : 'NULL', - 'enable_post_count' => (!empty($_POST['disable_post_count'])) ? 0 : 1, 'enable_icons' => (!empty($_POST['enable_icons'])) ? 1 : 0, - 'enable_moderate' => (!empty($_POST['moderated'])) ? 1 : 0, 'enable_prune' => (!empty($_POST['prune_enable'])) ? 1 : 0, 'prune_days' => intval($_POST['prune_days']), 'prune_freq' => intval($_POST['prune_freq']) @@ -259,7 +257,6 @@ switch ($mode) 'forum_image' => (!empty($_POST['forum_image'])) ? $_POST['forum_image'] : '', 'display_on_index' => (!empty($_POST['display_on_index'])) ? 1 : 0, 'enable_icons' => (!empty($_POST['enable_icons'])) ? 1 : 0, - 'enable_moderate' => (!empty($_POST['moderated'])) ? 1 : 0, 'enable_prune' => (!empty($_POST['prune_enable'])) ? 1 : 0, 'prune_days' => intval($_POST['prune_days']), 'prune_freq' => intval($_POST['prune_freq']), @@ -284,7 +281,7 @@ switch ($mode) SET ' . $db->sql_build_array('UPDATE', $sql) . " WHERE forum_id = $forum_id"); - trigger_error($user->lang['Forums_updated']); + trigger_error($user->lang['FORUM_UPDATED']); break; @@ -421,8 +418,6 @@ switch ($mode) $forum_status = ITEM_UNLOCKED; $forum_name = (!empty($_POST['forum_name'])) ? htmlspecialchars($_POST['forum_name']) : ''; - $post_count_inc = TRUE; - $moderated = FALSE; $enable_icons = TRUE; $prune_enabled = ''; @@ -521,14 +516,8 @@ switch ($mode) <td class="row1"><?php echo $user->lang['OPTIONS'] ?></td> <td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><input type="checkbox" name="disable_post_count"<?php echo ((!empty($post_count_inc)) ? ' ' : 'checked="checked" ') ?>/> <?php echo $user->lang['DISABLE_POST_COUNT'] ?></td> - </tr> - <tr> <td><input type="checkbox" name="enable_icons"<?php echo ((!empty($enable_icons)) ? 'checked="checked" ' : ' ') ?>/> <?php echo $user->lang['ENABLE_TOPIC_ICONS']; ?></td> </tr> - <tr> - <td><input type="checkbox" name="moderated"<?php echo ((!empty($enable_moderate)) ? 'checked="checked" ' : ' ') ?>/> <?php echo $user->lang['FORUM_MODERATED']; ?></td> - </tr> <?php if ($mode == 'edit' && $parent_id > 0) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 55e024c61f..77433c127a 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -606,23 +606,40 @@ else header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Content-type: text/html; charset=" . $user->lang['ENCODING']); + $adm_url = "index.$phpEx$SID&pane=right"; + + /* + // Allows non-admin pages to link to admin pages + // eg: http://forums.foo.com/adm/index.php?sid=&mod=admin_forums&f=1 + if (!empty($_GET['mod']) && preg_match('/admin_([a-z]+)/', $_GET['mod'], $m)) + { + if (file_exists($phpbb_root_path . 'adm/admin_' . $m[1] . '.' . $phpEx)) + { + $adm_url = 'admin_' . $m[1] . '.' . $phpEx . $SID; + $adm_url .= (!empty($_GET['mode'])) ? '&mode=' . htmlspecialchars($_GET['mode']) : ''; + $adm_url .= (!empty($_GET['f'])) ? '&f=' . intval($_GET['f']) : ''; + $adm_url .= (!empty($_GET['u'])) ? '&u=' . intval($_GET['u']) : ''; + $adm_url .= (!empty($_GET['g'])) ? '&g=' . intval($_GET['g']) : ''; + } + } + */ ?> <html> <head> -<title><?php echo $user->lang['Admin_title']; ?></title> +<title><?php echo $user->lang['ADMIN_TITLE']; ?></title> </head> <frameset rows="60, *" border="0" framespacing="0" frameborder="NO"> <frame src="<?php echo "index.$phpEx$SID&pane=top"; ?>" name="title" noresize marginwidth="0" marginheight="0" scrolling="NO"> <frameset cols="155,*" rows="*" border="2" framespacing="0" frameborder="yes"> <frame src="<?php echo "index.$phpEx$SID&pane=left"; ?>" name="nav" marginwidth="3" marginheight="3" scrolling="yes"> - <frame src="<?php echo "index.$phpEx$SID&pane=right"; ?>" name="main" marginwidth="0" marginheight="0" scrolling="auto"> + <frame src="<?php echo $adm_url ?>" name="main" marginwidth="0" marginheight="0" scrolling="auto"> </frameset> </frameset> <noframes> <body bgcolor="white" text="#000000"> - <p><?php echo $user->lang['No_frames']; ?></p> + <p><?php echo $user->lang['NO_FRAMES']; ?></p> </body> </noframes> </html> |