diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php index 3daae302b1..26f9dabff8 100644 --- a/phpBB/admin/admin_ranks.php +++ b/phpBB/admin/admin_ranks.php @@ -88,6 +88,8 @@ if ($mode != '') $result = $db->sql_query($sql); $rank_info = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + $s_hidden_fields .= ''; } @@ -102,27 +104,27 @@ if ($mode != '')

lang['RANKS']; ?>

-

lang['Ranks_explain']; ?>

+

lang['RANKS_EXPLAIN']; ?>

"> - + - + - + - + - - + + @@ -142,13 +144,13 @@ if ($mode != '') $rank_id = (isset($_POST['id'])) ? intval($_POST['id']) : 0; $rank_title = (isset($_POST['title'])) ? trim($_POST['title']) : ''; - $special_rank = ($_POST['special_rank'] == 1) ? TRUE : 0; + $special_rank = (!empty($_POST['special_rank'])) ? 1 : 0; $min_posts = (isset($_POST['min_posts'])) ? intval($_POST['min_posts']) : -1; - $rank_image = ((isset($_POST['rank_image']))) ? trim($_POST['rank_image']) : ''; + $rank_image = (isset($_POST['rank_image'])) ? trim($_POST['rank_image']) : ''; if ($rank_title == '') { - trigger_error($user->lang['Must_select_rank']); + trigger_error($user->lang['MUST_SELECT_RANK']); } if ($special_rank == 1) @@ -161,7 +163,7 @@ if ($mode != '') // if ($rank_image != '') { - if (!preg_match('/(\.gif|\.png|\.jpg|\.jpeg)$/is', $rank_image)) + if (!preg_match('#(\.gif|\.png|\.jpg|\.jpeg)$#is', $rank_image)) { $rank_image = ''; } @@ -170,40 +172,27 @@ if ($mode != '') if ($rank_id) { $sql = "UPDATE " . RANKS_TABLE . " - SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "' + SET rank_title = '" . $db->sql_escape($rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . $db->sql_escape($rank_image) . "' WHERE rank_id = $rank_id"; - $message = $user->lang['Rank_updated']; + $message = $user->lang['RANK_UPDATED']; } else { $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_min, rank_image) - VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')"; + VALUES ('" . $db->sql_escape($rank_title) . "', $special_rank, $min_posts, '" . $db->sql_escape($rank_image) . "')"; - $message = $user->lang['Rank_added']; + $message = $user->lang['RANK_ADDED']; } - $db->sql_query($sql); - $message .= '

' . sprintf($user->lang['Click_return_rankadmin'], '', '') . '

' . sprintf($user->lang['Click_return_admin_index'], '', ''); - trigger_error($message); } else if ($mode == 'delete') { - // // Ok, they want to delete their rank - // - - if (isset($_POST['id']) || isset($_GET['id'])) - { - $rank_id = (isset($_POST['id'])) ? intval($_POST['id']) : intval($_GET['id']); - } - else - { - $rank_id = 0; - } + $rank_id = (isset($_REQUEST['id'])) ? intval($_REQUEST['id']) : 0; if ($rank_id) { @@ -216,14 +205,12 @@ if ($mode != '') WHERE user_rank = $rank_id"; $db->sql_query($sql); - $message = $user->lang['Rank_removed'] . '

' . sprintf($user->lang['Click_return_rankadmin'], '', '') . '

' . sprintf($user->lang['Click_return_admin_index'], '', ''); - - trigger_error($message); + trigger_error($user->lang['RANK_REMOVED']); } else { - trigger_error($user->lang['Must_select_rank']); + trigger_error($user->lang['MUST_SELECT_RANK']); } } } @@ -234,15 +221,14 @@ page_header($user->lang['RANKS']);

lang['RANKS']; ?>

-

lang['Ranks_explain']; ?>

+

lang['RANKS_EXPLAIN']; ?>

">
lang['Ranks']; ?>lang['RANKS']; ?>
lang['Rank_title']; ?>: lang['RANK_TITLE']; ?>:
lang['Rank_special']; ?>: lang['RANK_SPECIAL']; ?>: />lang['YES']; ?>    /> lang['NO']; ?>
lang['Rank_minimum']; ?>: lang['RANK_MINIMUM']; ?>:
lang['Rank_image']; ?>:
lang['Rank_image_explain']; ?>

' : ''; ?>
lang['RANK_IMAGE']; ?>:
lang['RANK_IMAGE_EXPLAIN']; ?>
  ' : ''; ?>
  
- - - - - + + + + sql_fetchrow($result)) - - + sql_fetchrow($result)) ?> - +
lang['Rank_image']; ?>lang['Rank_title']; ?>lang['Rank_minimum']; ?>lang['Edit']; ?>lang['DELETE']; ?>lang['RANK_IMAGE']; ?>lang['RANK_TITLE']; ?>lang['RANK_MINIMUM']; ?>lang['ACTION']; ?>
<?php echo $row['rank_title']; ?> ">lang['Edit']; ?>">lang['DELETE']; ?> ">lang['EDIT']; ?> | ">lang['DELETE']; ?>