From 59f3ef2ffe159e71045c70781b1acbffb6dec89f Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 13 Nov 2001 17:36:27 +0000 Subject: [PATCH] Language updates git-svn-id: file:///svn/phpbb/trunk@1307 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/modcp.php | 91 +++++++++++++----------- phpBB/templates/subSilver/modcp_body.tpl | 11 ++- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/phpBB/modcp.php b/phpBB/modcp.php index 69051bb411..5475128a22 100644 --- a/phpBB/modcp.php +++ b/phpBB/modcp.php @@ -39,7 +39,7 @@ include($phpbb_root_path . 'includes/bbcode.'.$phpEx); // if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) { - $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL]; + $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? intval($HTTP_POST_VARS[POST_FORUM_URL]) : intval($HTTP_GET_VARS[POST_FORUM_URL]); } else { @@ -48,7 +48,7 @@ else if( isset($HTTP_GET_VARS[POST_POST_URL]) || isset($HTTP_POST_VARS[POST_POST_URL]) ) { - $post_id = (isset($HTTP_POST_VARS[POST_POST_URL])) ? $HTTP_POST_VARS[POST_POST_URL] : $HTTP_GET_VARS[POST_POST_URL]; + $post_id = (isset($HTTP_POST_VARS[POST_POST_URL])) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]); } else { @@ -57,15 +57,15 @@ else if( isset($HTTP_GET_VARS[POST_TOPIC_URL]) || isset($HTTP_POST_VARS[POST_TOPIC_URL]) ) { - $topic_id = (isset($HTTP_POST_VARS[POST_TOPIC_URL])) ? $HTTP_POST_VARS[POST_TOPIC_URL] : $HTTP_GET_VARS[POST_TOPIC_URL]; + $topic_id = (isset($HTTP_POST_VARS[POST_TOPIC_URL])) ? intval($HTTP_POST_VARS[POST_TOPIC_URL]) : intval($HTTP_GET_VARS[POST_TOPIC_URL]); } else { $topic_id = ""; } -$confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : FALSE; -$cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : FALSE; +$confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : 0; +$cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : 0; // // Check if user did or did not confirm @@ -319,17 +319,20 @@ switch($mode) if( !empty($topic_id) ) { - $next_page = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"; - $return_message = $lang['to_return_forum']; + $redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"); + $l_redirect = sprintf($lang['Click_return_forum'], "", ""); } else { - $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"; - $return_message = $lang['Return_to_modcp']; + $redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"); + $l_redirect = sprintf($lang['Click_return_modcp'], "", ""); } - $message = $lang['Topics_Removed'] . "

" . $lang['Click'] . " " . $lang['HERE'] . " " . $return_message; - message_die(GENERAL_MESSAGE, $message); + $template->assign_vars(array( + "META" => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Topics_Removed'] . "

" . $l_redirect); } else { @@ -439,18 +442,20 @@ switch($mode) if( !empty($topic_id) ) { - $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; - $return_message = $lang['to_return_topic']; + $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); + $message = sprintf($lang['Click_return_topic'], "", ""); } else { - $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$old_forum_id"; - $return_message = $lang['Return_to_modcp']; + $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"); + $message = sprintf($lang['Click_return_modcp'], "", ""); } - $message = $lang['Topics_Moved'] . "

" . $lang['Click'] . " " . $lang['HERE'] . " " . $return_message; + $template->assign_vars(array( + "META" => '') + ); - message_die(GENERAL_MESSAGE, $message); + message_die(GENERAL_MESSAGE, $lang['Topics_Moved'] . "

" . $message); } else { @@ -464,9 +469,10 @@ switch($mode) if( isset($HTTP_POST_VARS['topic_id_list']) ) { $topics = $HTTP_POST_VARS['topic_id_list']; + for($i = 0; $i < count($topics); $i++) { - $hidden_fields .= ''; + $hidden_fields .= ''; } } else @@ -525,18 +531,20 @@ switch($mode) if( !empty($topic_id) ) { - $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; - $return_message = $lang['to_return_topic']; + $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); + $message = sprintf($lang['Click_return_topic'], "", ""); } else { - $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"; - $return_message = $lang['Return_to_modcp']; + $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"); + $message = sprintf($lang['Click_return_modcp'], "", ""); } - $message = $lang['Topics_Locked'] . "

" . $lang['Click'] . " " . $lang['HERE'] . " " . $return_message; + $template->assign_vars(array( + "META" => '') + ); - message_die(GENERAL_MESSAGE, $message); + message_die(GENERAL_MESSAGE, $lang['Topics_Locked'] . "

" . $message); } else { @@ -609,18 +617,21 @@ switch($mode) if( !empty($topic_id) ) { - $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; - $return_message = $lang['to_return_topic']; + $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); + $message = sprintf($lang['Click_return_topic'], "", ""); } else { - $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"; - $return_message = $lang['Return_to_modcp']; + $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id"); + $message = sprintf($lang['Click_return_modcp'], "", ""); } - $msg = $lang['Topics_Unlocked'] . "

" . $lang['Click'] . " " . $lang['HERE'] . " " . $return_message; + $template->assign_vars(array( + "META" => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Topics_Unlocked'] . "

" . $message); - message_die(GENERAL_MESSAGE, $msg); } else { @@ -738,7 +749,11 @@ switch($mode) sync("topic", $topic_id); sync("forum", $forum_id); - $message = $lang['Topic_split'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $template->assign_vars(array( + "META" => '') + ); + + $message = $lang['Topic_split'] . sprintf($lang['Click_return_topic'], "", ""); message_die(GENERAL_MESSAGE, $message); } else @@ -965,7 +980,7 @@ switch($mode) "ROW_CLASS" => $row_class, "U_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"), - "U_SEARCHPOSTS" => append_sid("search.$phpEx?a=" . urlencode($username) . "&f=all&b=0&d=DESC&c=100&dosearch=1")) + "U_SEARCHPOSTS" => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=topics")) ); } @@ -1087,17 +1102,11 @@ switch($mode) ); } - $pagination = generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start); - $template->assign_vars(array( - "PAGINATION" => $pagination, - "FORUM_ID" => $forum_id, - "POST_FORUM_URL" => POST_FORUM_URL, - "ON_PAGE" => (floor($start/$board_config['topics_per_page'])+1), - "TOTAL_PAGES" => ceil($forum_topics/$board_config['topics_per_page']), + "PAGINATION" => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start), + + "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )), - "L_OF" => $lang['of'], - "L_PAGE" => $lang['Page'], "L_GOTO_PAGE" => $lang['Goto_page']) ); diff --git a/phpBB/templates/subSilver/modcp_body.tpl b/phpBB/templates/subSilver/modcp_body.tpl index 5087fa980b..a1bf4fba8e 100644 --- a/phpBB/templates/subSilver/modcp_body.tpl +++ b/phpBB/templates/subSilver/modcp_body.tpl @@ -1,10 +1,11 @@ - + +
{SITENAME} {L_INDEX} -> {FORUM_NAME}
- +
{L_MOD_CP} @@ -45,10 +46,8 @@
- - + +
{L_PAGE} {ON_PAGE} {L_OF} {TOTAL_PAGES}{PAGINATION} -
- {S_TIMEZONE}		{PAGE_NUMBER}{S_TIMEZONE}
{PAGINATION}