diff options
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index e78b4f733c..45e388cca2 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -51,12 +51,13 @@ else } $start = (!empty($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0; +$error = FALSE; + // // Start main // if($mode == "read") { - if(!empty($HTTP_GET_VARS[POST_POST_URL])) { $privmsgs_id = $HTTP_GET_VARS[POST_POST_URL]; @@ -564,7 +565,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") $error_msg .= $lang['Empty_subject']; } - if(!empty($message)) + if( !empty($message) ) { if(!$error && !$preview) { @@ -584,9 +585,12 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") } else { - // do stripslashes incase magic_quotes is on. - $message = stripslashes($HTTP_POST_VARS['message']); - $message = preg_replace('#</textarea>#si', '</TEXTAREA>', $message); + if(!$error) + { + // do stripslashes incase magic_quotes is on. + $message = stripslashes($HTTP_POST_VARS['message']); + $message = preg_replace('#</textarea>#si', '</TEXTAREA>', $message); + } } } else @@ -599,7 +603,7 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") $error_msg .= $lang['Empty_msg']; } - if(!empty($to_username)) + if( !empty($to_username) ) { $sql = "SELECT user_id, username, user_notify_pm, user_email FROM " . USERS_TABLE . " @@ -625,9 +629,9 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") $error_msg .= $lang['No_to_user']; } - if(!$preview) + if(!$preview && !$error) { - $msg_time = get_gmt_ts(); + $msg_time = time(); if($mode != "edit") { @@ -745,6 +749,23 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") } // + // Start error handling + // + if($error) + { + $template->set_filenames(array( + "reg_header" => "error_body.tpl") + ); + $template->assign_vars(array( + "ERROR_MESSAGE" => $error_msg) + ); + $template->pparse("reg_header"); + } + // + // End error handling + // + + // // Load templates // $template->set_filenames(array( |