From 8f051f1b474fe8ede0540baca4ad1bc80742f4db Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 26 Nov 2002 00:50:16 +0000 Subject: [PATCH] I know the jumpbox layout doesn't always match the real forum structure ... will fix git-svn-id: file:///svn/phpbb/trunk@3099 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_forums.php | 2 +- phpBB/admin/admin_permissions.php | 2 +- phpBB/admin/admin_viewlogs.php | 92 +++++++++++------------------- phpBB/includes/functions.php | 6 +- phpBB/includes/functions_admin.php | 56 +++++++++++++----- 5 files changed, 80 insertions(+), 78 deletions(-) diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php index ff73d57e3b..23ff74bb06 100644 --- a/phpBB/admin/admin_forums.php +++ b/phpBB/admin/admin_forums.php @@ -752,7 +752,7 @@ while ($row = $db->sql_fetchrow($result))
- +
lang['Select_forum']; ?>: lang['Select_forum']; ?>:
diff --git a/phpBB/admin/admin_permissions.php b/phpBB/admin/admin_permissions.php index 73c7535e3f..9d629a4871 100644 --- a/phpBB/admin/admin_permissions.php +++ b/phpBB/admin/admin_permissions.php @@ -534,7 +534,7 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators' else { - $select_list = make_forum_select(); + $select_list = make_forum_select(false, false, false); page_header($l_title); diff --git a/phpBB/admin/admin_viewlogs.php b/phpBB/admin/admin_viewlogs.php index f1506c9185..9aa8ce2be8 100644 --- a/phpBB/admin/admin_viewlogs.php +++ b/phpBB/admin/admin_viewlogs.php @@ -19,9 +19,9 @@ * ***************************************************************************/ -if ( !empty($setmodules) ) +if (!empty($setmodules)) { - if ( !$auth->acl_get('a_general') ) + if (!$auth->acl_get('a_general')) { return; } @@ -34,60 +34,36 @@ if ( !empty($setmodules) ) } define('IN_PHPBB', 1); -// // Include files -// $phpbb_root_path = '../'; require($phpbb_root_path . 'extension.inc'); require('pagestart.' . $phpEx); -// // Do we have styles admin permissions? -// -if ( !$auth->acl_get('a_general') ) +if (!$auth->acl_get('a_general')) { - message_die(MESSAGE, $user->lang['No_admin']); + trigger_error($user->lang['No_admin']); } -// // Set some variables -// -$start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; - -if ( isset($_POST['mode']) || isset($_GET['mode']) ) -{ - $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; -} -else -{ - $mode = 'admin'; -} - -if ( isset($_POST['f']) || isset($_GET['f']) ) -{ - $forum_id = ( isset($_POST['f']) ) ? $_POST['f'] : $_GET['f']; -} -else -{ - $forum_id = 0; -} +$forum_id = (isset($_REQUEST['f'])) ? intval($_REQUEST['f']) : 0; +$start = (isset($_GET['start'])) ? intval($_GET['start']) : 0; +$mode = (isset($_REQUEST['mode'])) ? $_REQUEST['mode'] : 'admin'; // Define some vars depending on which logs we're looking at -$log_table_sql = ( $mode == 'admin' ) ? LOG_ADMIN_TABLE : LOG_MOD_TABLE; -$l_title = ( $mode == 'admin' ) ? $user->lang['Admin_logs'] : $user->lang['Mod_logs']; -$l_title_explain = ( $mode == 'admin' ) ? $user->lang['Admin_logs_explain'] : $user->lang['Mod_logs_explain']; +$log_table_sql = ($mode == 'admin') ? LOG_ADMIN_TABLE : LOG_MOD_TABLE; +$l_title = ($mode == 'admin') ? $user->lang['Admin_logs'] : $user->lang['Mod_logs']; +$l_title_explain = ($mode == 'admin') ? $user->lang['Admin_logs_explain'] : $user->lang['Mod_logs_explain']; -// // Delete entries if requested and able -// -if ( ( isset($_POST['delmarked']) || isset($_POST['delall']) ) && $auth->acl_get('a_clearlogs')) +if ((isset($_POST['delmarked']) || isset($_POST['delall'])) && $auth->acl_get('a_clearlogs')) { $where_sql = ''; - if ( isset($_POST['delmarked']) && isset($_POST['mark']) ) + if (isset($_POST['delmarked']) && isset($_POST['mark'])) { - foreach ( $_POST['mark'] as $marked ) + foreach ($_POST['mark'] as $marked) { - $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . intval($marked); + $where_sql .= (($where_sql != '') ? ', ' : '') . intval($marked); } $where_sql = "WHERE log_id IN ($where_sql)"; } @@ -99,23 +75,21 @@ if ( ( isset($_POST['delmarked']) || isset($_POST['delall']) ) && $auth->acl_get add_admin_log('log_' . $mode . '_clear'); } -// // Sorting ... this could become a function -// -if ( isset($_POST['sort']) || $start ) +if (isset($_POST['sort']) || $start) { - if ( !empty($_POST['sort_days']) || !empty($_GET['sort_days']) ) + if (!empty($_REQUEST['sort_days'])) { - $sort_days = ( !empty($_POST['sort_days']) ) ? intval($_POST['sort_days']) : intval($_GET['sort_days']); - $where_sql = time() - ( $sort_days * 86400 ); + $sort_days = intval($_REQUEST['sort_days']); + $where_sql = time() - ($sort_days * 86400); } else { $where_sql = 0; } - $sort_key = ( isset($_POST['sort_key']) ) ? $_POST['sort_key'] : $_GET['sort_key']; - $sort_dir = ( isset($_POST['sort_dir']) ) ? $_POST['sort_dir'] : $_GET['sort_dir']; + $sort_key = (isset($_REQUEST['sort_key'])) ? $_REQUEST['sort_key'] : ''; + $sort_dir = (isset($_REQUEST['sort_dir'])) ? $_REQUEST['sort_dir'] : ''; } else { @@ -131,22 +105,22 @@ $sort_by_text = array('u' => $user->lang['Sort_Username'], 't' => $user->lang['S $sort_by = array('u' => 'l.user_id', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); $sort_day_options = ''; -foreach ( $previous_days as $day => $text ) +foreach ($previous_days as $day => $text) { - $selected = ( $sort_days == $day ) ? ' selected="selected"' : ''; + $selected = ($sort_days == $day) ? ' selected="selected"' : ''; $sort_day_options .= ''; } $sort_key_options = ''; -foreach ( $sort_by_text as $key => $text ) +foreach ($sort_by_text as $key => $text) { - $selected = ( $sort_key == $key ) ? ' selected="selected"' : ''; + $selected = ($sort_key == $key) ? ' selected="selected"' : ''; $sort_key_options .= ''; } -$sort_order_options = ( $sort_dir == 'a' ) ? '' : ''; +$sort_order_options = ($sort_dir == 'a') ? '' : ''; -$sort_sql = $sort_by[$sort_key] . ' ' . ( ( $sort_dir == 'd' ) ? 'DESC' : 'ASC' ); +$sort_sql = $sort_by[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); // Output page page_header($l_title); @@ -161,15 +135,15 @@ page_header($l_title); - +
lang['Select_forum']; ?>: lang['Select_forum']; ?>:
@@ -216,7 +190,7 @@ if ( $log_count ) } - if ( $auth->acl_get('a_clearlogs') ) + if ($auth->acl_get('a_clearlogs')) { ?> @@ -245,7 +219,7 @@ else   acl_get('a_clearlogs') ) + if ($auth->acl_get('a_clearlogs')) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 18785b2939..729c1c8120 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -186,13 +186,13 @@ function make_jumpbox($action, $forum_id = false) $boxstring = '