From cd887d4414e2380dd27dbc4c25374fd3964b3b51 Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sun, 22 Jan 2006 20:44:04 +0000 Subject: [PATCH] Changes to rank handling and the admin panel - Removal of unneeded code - Deletions now require confirmation - A few miscellaneous bug fixes Note to translators: This adds a new language variable Note to designers: This adds a new template file git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5489 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_ranks.php | 198 +++++++----------- phpBB/language/lang_english/lang_admin.php | 1 + .../subSilver/admin/confirm_body.tpl | 11 + 3 files changed, 92 insertions(+), 118 deletions(-) create mode 100755 phpBB/templates/subSilver/admin/confirm_body.tpl diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php index 5c5af5204d..f920797a15 100644 --- a/phpBB/admin/admin_ranks.php +++ b/phpBB/admin/admin_ranks.php @@ -19,8 +19,6 @@ * ***************************************************************************/ -define('IN_PHPBB', 1); - if( !empty($setmodules) ) { $file = basename(__FILE__); @@ -28,6 +26,8 @@ if( !empty($setmodules) ) return; } +define('IN_PHPBB', 1); + // // Let's set the root dir for phpBB // @@ -37,7 +37,7 @@ require('./pagestart.' . $phpEx); if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { - $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; + $mode = (isset($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = htmlspecialchars($mode); } else @@ -213,8 +213,10 @@ if( $mode != "" ) { $rank_id = 0; } + + $confirm = isset($HTTP_POST_VARS['confirm']); - if( $rank_id ) + if( $rank_id && $confirm ) { $sql = "DELETE FROM " . RANKS_TABLE . " WHERE rank_id = $rank_id"; @@ -238,135 +240,95 @@ if( $mode != "" ) message_die(GENERAL_MESSAGE, $message); } + elseif( $rank_id && !$confirm) + { + // Present the confirmation screen to the user + $template->set_filenames(array( + 'body' => 'admin/confirm_body.tpl') + ); + + $hidden_fields = ''; + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_delete_rank'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("admin_ranks.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + } else { message_die(GENERAL_MESSAGE, $lang['Must_select_rank']); } } - else - { - // - // They didn't feel like giving us any information. Oh, too bad, we'll just display the - // list then... - // - $template->set_filenames(array( - "body" => "admin/ranks_list_body.tpl") - ); - - $sql = "SELECT * FROM " . RANKS_TABLE . " - ORDER BY rank_min, rank_title"; - if( !$result = $db->sql_query($sql) ) - { - message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql); - } - - $rank_rows = $db->sql_fetchrowset($result); - $rank_count = count($rank_rows); - - $template->assign_vars(array( - "L_RANKS_TITLE" => $lang['Ranks_title'], - "L_RANKS_TEXT" => $lang['Ranks_explain'], - "L_RANK" => $lang['Rank_title'], - "L_RANK_MINIMUM" => $lang['Rank_minimum'], - "L_SPECIAL_RANK" => $lang['Special_rank'], - "L_EDIT" => $lang['Edit'], - "L_DELETE" => $lang['Delete'], - "L_ADD_RANK" => $lang['Add_new_rank'], - "L_ACTION" => $lang['Action'], - - "S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx")) - ); - - for( $i = 0; $i < $rank_count; $i++) - { - $rank = $rank_rows[$i]['rank_title']; - $special_rank = $rank_rows[$i]['rank_special']; - $rank_id = $rank_rows[$i]['rank_id']; - $rank_min = $rank_rows[$i]['rank_min']; - if($special_rank) - { - $rank_min = $rank_max = "-"; - } - - $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; - $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; - - $template->assign_block_vars("ranks", array( - "ROW_COLOR" => "#" . $row_color, - "ROW_CLASS" => $row_class, - "RANK" => $rank, - "RANK_MIN" => $rank_min, + $template->pparse("body"); - "SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'], - - "U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"), - "U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id")) - ); - } - } + include('./page_footer_admin.'.$phpEx); } -else + +// +// Show the default page +// +$template->set_filenames(array( + "body" => "admin/ranks_list_body.tpl") +); + +$sql = "SELECT * FROM " . RANKS_TABLE . " + ORDER BY rank_min ASC, rank_special ASC"; +if( !$result = $db->sql_query($sql) ) { - // - // Show the default page - // - $template->set_filenames(array( - "body" => "admin/ranks_list_body.tpl") - ); + message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql); +} +$rank_count = $db->sql_numrows($result); + +$rank_rows = $db->sql_fetchrowset($result); + +$template->assign_vars(array( + "L_RANKS_TITLE" => $lang['Ranks_title'], + "L_RANKS_TEXT" => $lang['Ranks_explain'], + "L_RANK" => $lang['Rank_title'], + "L_RANK_MINIMUM" => $lang['Rank_minimum'], + "L_SPECIAL_RANK" => $lang['Rank_special'], + "L_EDIT" => $lang['Edit'], + "L_DELETE" => $lang['Delete'], + "L_ADD_RANK" => $lang['Add_new_rank'], + "L_ACTION" => $lang['Action'], - $sql = "SELECT * FROM " . RANKS_TABLE . " - ORDER BY rank_min ASC, rank_special ASC"; - if( !$result = $db->sql_query($sql) ) + "S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx")) +); + +for($i = 0; $i < $rank_count; $i++) +{ + $rank = $rank_rows[$i]['rank_title']; + $special_rank = $rank_rows[$i]['rank_special']; + $rank_id = $rank_rows[$i]['rank_id']; + $rank_min = $rank_rows[$i]['rank_min']; + + if( $special_rank == 1 ) { - message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql); + $rank_min = $rank_max = "-"; } - $rank_count = $db->sql_numrows($result); - $rank_rows = $db->sql_fetchrowset($result); + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $rank_is_special = ( $special_rank ) ? $lang['Yes'] : $lang['No']; - $template->assign_vars(array( - "L_RANKS_TITLE" => $lang['Ranks_title'], - "L_RANKS_TEXT" => $lang['Ranks_explain'], - "L_RANK" => $lang['Rank_title'], - "L_RANK_MINIMUM" => $lang['Rank_minimum'], - "L_SPECIAL_RANK" => $lang['Rank_special'], - "L_EDIT" => $lang['Edit'], - "L_DELETE" => $lang['Delete'], - "L_ADD_RANK" => $lang['Add_new_rank'], - "L_ACTION" => $lang['Action'], - - "S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx")) + $template->assign_block_vars("ranks", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + "RANK" => $rank, + "SPECIAL_RANK" => $rank_is_special, + "RANK_MIN" => $rank_min, + + "U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"), + "U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id")) ); - - for($i = 0; $i < $rank_count; $i++) - { - $rank = $rank_rows[$i]['rank_title']; - $special_rank = $rank_rows[$i]['rank_special']; - $rank_id = $rank_rows[$i]['rank_id']; - $rank_min = $rank_rows[$i]['rank_min']; - - if( $special_rank == 1 ) - { - $rank_min = $rank_max = "-"; - } - - $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; - $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; - - $rank_is_special = ( $special_rank ) ? $lang['Yes'] : $lang['No']; - - $template->assign_block_vars("ranks", array( - "ROW_COLOR" => "#" . $row_color, - "ROW_CLASS" => $row_class, - "RANK" => $rank, - "SPECIAL_RANK" => $rank_is_special, - "RANK_MIN" => $rank_min, - - "U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"), - "U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id")) - ); - } } $template->pparse("body"); diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 915c6648ea..962aad5b4c 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -557,6 +557,7 @@ $lang['No_update_ranks'] = 'The rank was successfully deleted. However, user acc $lang['Click_return_rankadmin'] = 'Click %sHere%s to return to Rank Administration'; +$lang['Confirm_delete_rank'] = 'Are you sure you want to delete this rank?'; // // Disallow Username Admin diff --git a/phpBB/templates/subSilver/admin/confirm_body.tpl b/phpBB/templates/subSilver/admin/confirm_body.tpl new file mode 100755 index 0000000000..1516fa9439 --- /dev/null +++ b/phpBB/templates/subSilver/admin/confirm_body.tpl @@ -0,0 +1,11 @@ + + + + + + + + +
{MESSAGE_TITLE}

{MESSAGE_TEXT}

{S_HIDDEN_FIELDS}  
+ +