From 7da0c6b61aef3ae587c7d57ce5c0be747868c8ee Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sat, 3 Nov 2001 16:15:00 +0000 Subject: [PATCH] Changed to new lang vars + redirect for login git-svn-id: file:///svn/phpbb/trunk@1263 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/lang_english/lang_main.php | 9 ++--- phpBB/login.php | 10 +++++- phpBB/posting.php | 43 +++++++++++++---------- 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php index e2ed9fac16..bb96ff6829 100644 --- a/phpBB/language/lang_english/lang_main.php +++ b/phpBB/language/lang_english/lang_main.php @@ -331,15 +331,12 @@ $lang['Stored'] = "Your message has been entered successfully"; $lang['Deleted'] = "Your message has been deleted successfully"; $lang['Poll_delete'] = "Your poll has been deleted successfully"; $lang['Vote_cast'] = "Your vote has been cast"; -$lang['Click'] = "Click"; // Followed by here and then either return to topic or view message -$lang['Here'] = "Here"; -$lang['to_return_forum'] = "to return to the forum"; -$lang['to_view_message'] = "to view your message"; -$lang['to_return_topic'] = "to return to the topic"; $lang['Click_return_topic'] = "Click %sHere%s to return to the topic"; +$lang['Click_return_login'] = "Click %sHere%s to try again"; $lang['Click_return_forum'] = "Click %sHere%s to return to the forum"; $lang['Click_view_message'] = "Click %sHere%s to view your message"; +$lang['Click_return_modcp'] = "Click %sHere%s to return to the Moderator Control Panel"; $lang['Topic_reply_notification'] = "Topic Reply Notification"; @@ -678,7 +675,7 @@ $lang['Critical_Error'] = "Critical Error"; $lang['An_error_occured'] = "An Error Occured"; $lang['A_critical_error'] = "A Critical Error Occured"; -$lang['Error_login'] = "Login Failed

You have specified an incorrect or inactive username or an invalid password"; +$lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password"; $lang['Not_Moderator'] = "You are not a moderator of this forum"; $lang['Not_Authorised'] = "Not Authorised"; diff --git a/phpBB/login.php b/phpBB/login.php index d725a4ad4b..d7f43fe1e8 100644 --- a/phpBB/login.php +++ b/phpBB/login.php @@ -77,7 +77,15 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($ } else { - message_die(GENERAL_MESSAGE, $lang['Error_login']); + $template->assign_vars(array( + "META" => '') + ); + + $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : ""; + + $message = $lang['Error_login'] . "

" . sprintf($lang['Click_return_login'], "", " ") . "

" . sprintf($lang['Click_return_index'], "", " "); + + message_die(GENERAL_MESSAGE, $message); } } else diff --git a/phpBB/posting.php b/phpBB/posting.php index c7ff3301a2..76be0380af 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1065,9 +1065,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $msg_die = $lang['Stored'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_view_message'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_forum']; + $message = $lang['Stored'] . "

" . sprintf($lang['Click_view_message'], "", "") . "

" . sprintf($lang['Click_return_forum'], "", ""); - message_die(GENERAL_MESSAGE, $msg_die); + message_die(GENERAL_MESSAGE, $message); } else { @@ -1117,7 +1117,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) if( $userdata['user_id'] != $row['poster_id'] && !$is_auth['auth_mod']) { $message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts']; - $message .= "

" . $lang['Click'] . " " . $lang['HERE'] . " ". $lang['to_return_topic']; + $message .="

" . sprintf($lang['Click_return_topic'], "", ""); + message_die(GENERAL_MESSAGE, $message); } } @@ -1131,7 +1132,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) // if( ( $delete || $mode == "delete" ) && ( ( $is_auth['auth_delete'] && !$is_last_post_topic && !$is_auth['auth_mod'] ) ) ) { - $message = $lang['Cannot_delete_replied'] . "

" . $lang['Click'] . " " . $lang['HERE'] . " ". $lang['to_return_topic']; + $message = $lang['Cannot_delete_replied'] . "

" . sprintf($lang['Click_return_topic'], "", ""); + message_die(GENERAL_MESSAGE, $message); } else if( ( $delete || $poll_delete || $mode == "delete" ) && ( ( $is_auth['auth_delete'] && $is_last_post_topic ) || $is_auth['auth_mod'] ) ) @@ -1205,9 +1207,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $msg_die = $lang['Poll_delete'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_topic']; + $message = $lang['Poll_delete'] . "

" . sprintf($lang['Click_return_topic'], "", ""); - message_die(GENERAL_MESSAGE, $msg_die); + message_die(GENERAL_MESSAGE, $message); } else { @@ -1232,12 +1234,14 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) } else if( $post_has_poll && !$can_edit_poll && $poll_delete ) { - $message = $lang['Cannot_delete_poll'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_topic']; + $message = $lang['Cannot_delete_poll'] . "

" . sprintf($lang['Click_return_topic'], "", ""); + message_die(GENERAL_MESSAGE, $message); } else if( !$is_first_post_topic && $poll_delete ) { - $message = $lang['Post_has_no_poll'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_topic']; + $message = $lang['Post_has_no_poll'] . "

" . sprintf($lang['Click_return_topic'], "", ""); + message_die(GENERAL_MESSAGE, $message); } @@ -1380,7 +1384,8 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $msg_die .= "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $message .= "

" . sprintf($lang['Click_return_topic'], "", ""); + } else { @@ -1388,9 +1393,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); } - $msg_die .= "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_forum']; + $message .= "

" . sprintf($lang['Click_return_forum'], "", ""); - message_die(GENERAL_MESSAGE, $msg_die); + message_die(GENERAL_MESSAGE, $message); } else { @@ -1590,9 +1595,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $msg_die = $lang['Stored'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_view_message'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_forum']; + $message = $lang['Stored'] . "

" . sprintf($lang['Click_view_message'], "", "") . "

" . sprintf($lang['Click_return_topic'], "", ""); - message_die(GENERAL_MESSAGE, $msg_die); + message_die(GENERAL_MESSAGE, $message); } else { @@ -1615,9 +1620,9 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $msg_die = $lang['Stored'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_view_message'] . "

" . $lang['Click'] . " " . $lang['Here'] . " ". $lang['to_return_forum']; + $message = $lang['Stored'] . "

" . sprintf($lang['Click_view_message'], "", "") . "

" . sprintf($lang['Click_return_topic'], "", ""); - message_die(GENERAL_MESSAGE, $msg_die); + message_die(GENERAL_MESSAGE, $message); } else { @@ -1661,7 +1666,7 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $message = $lang['No_vote_option'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $message = $lang['No_vote_option'] . "

" . sprintf($lang['Click_view_message'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -1696,7 +1701,7 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $message = $lang['Vote_cast'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $message = $lang['Vote_cast'] . "

" . sprintf($lang['Click_view_message'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -1725,7 +1730,7 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) "META" => '') ); - $message = $lang['Already_voted'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $message = $lang['Already_voted'] . "

" . sprintf($lang['Click_view_message'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -1733,7 +1738,7 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) } else { - $message = $lang['No_vote_option'] . "

" . $lang['Click'] . " " . $lang['Here'] . " " . $lang['to_return_topic']; + $message = $lang['No_vote_option'] . "

" . sprintf($lang['Click_view_message'], "", ""); message_die(GENERAL_MESSAGE, $message); }