diff options
Diffstat (limited to 'phpBB/privmsg.php')
| -rw-r--r-- | phpBB/privmsg.php | 1337 |
1 files changed, 643 insertions, 694 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index c8bea4ff60..074c5c392b 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -21,7 +21,7 @@ ***************************************************************************/ define('IN_PHPBB', true); -$phpbb_root_path = "./"; +$phpbb_root_path = './'; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx); @@ -35,9 +35,6 @@ if ( !empty($board_config['privmsg_disable']) ) message_die(GENERAL_MESSAGE, 'PM_disabled'); } -// -// Var definitions -// $html_entities_match = array('#&#', '#<#', '#>#'); $html_entities_replace = array('&', '<', '>'); @@ -76,7 +73,9 @@ else // if ( $cancel ) { - header('Location: ' . append_sid("privmsg.$phpEx?folder=$folder", true)); + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; + header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); + exit; } // @@ -97,7 +96,7 @@ if ( !empty($HTTP_POST_VARS['mode']) || !empty($HTTP_GET_VARS['mode']) ) } else { - $mode = ""; + $mode = ''; } $start = ( !empty($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0; @@ -108,7 +107,7 @@ if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL } else { - $privmsg_id = ""; + $privmsg_id = ''; } $error = FALSE; @@ -116,22 +115,22 @@ $error = FALSE; // // Define the box image links // -$inbox_img = ($folder != "inbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '"><img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" /></a>' : '<img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" />'; -$inbox_url = ($folder != "inbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">' . $lang['Inbox'] . '</a>' : $lang['Inbox']; +$inbox_img = ( $folder != 'inbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '"><img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" /></a>' : '<img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" />'; +$inbox_url = ( $folder != 'inbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">' . $lang['Inbox'] . '</a>' : $lang['Inbox']; -$outbox_img = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '"><img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" /></a>' : '<img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" />'; -$outbox_url = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '">' . $lang['Outbox'] . '</a>' : $lang['Outbox']; +$outbox_img = ( $folder != 'outbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '"><img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" /></a>' : '<img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" />'; +$outbox_url = ( $folder != 'outbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '">' . $lang['Outbox'] . '</a>' : $lang['Outbox']; -$sentbox_img = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '"><img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" /></a>' : '<img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" />'; -$sentbox_url = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '">' . $lang['Sentbox'] . '</a>' : $lang['Sentbox']; +$sentbox_img = ( $folder != 'sentbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '"><img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" /></a>' : '<img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sentbox'] . '" />'; +$sentbox_url = ( $folder != 'sentbox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '">' . $lang['Sentbox'] . '</a>' : $lang['Sentbox']; -$savebox_img = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '"><img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" /></a>' : '<img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" />'; -$savebox_url = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '">' . $lang['Savebox'] . '</a>' : $lang['Savebox']; +$savebox_img = ( $folder != 'savebox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '"><img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" /></a>' : '<img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" />'; +$savebox_url = ( $folder != 'savebox' || $mode != '' ) ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '">' . $lang['Savebox'] . '</a>' : $lang['Savebox']; // ---------- // Start main // -if ( $mode == "newpm" ) +if ( $mode == 'newpm' ) { $gen_simple_header = TRUE; @@ -139,7 +138,7 @@ if ( $mode == "newpm" ) include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - "body" => "privmsgs_popup.tpl") + 'body' => 'privmsgs_popup.tpl') ); if ( $userdata['session_logged_in'] ) @@ -153,7 +152,7 @@ if ( $mode == "newpm" ) $l_new_message = $lang['You_no_new_pm']; } - $l_new_message .= "<br /><br />" . sprintf($lang['Click_view_privmsg'], "<a href=\"" . append_sid("privmsg.".$phpEx."?folder=inbox") . "\" onClick=\"jump_to_inbox();return false;\" target=\"_new\">", "</a>"); + $l_new_message .= '<br /><br />' . sprintf($lang['Click_view_privmsg'], '<a href="' . append_sid("privmsg.".$phpEx."?folder=inbox") . '" onClick="jump_to_inbox();return false;" target="_new">', '</a>'); } else { @@ -161,16 +160,16 @@ if ( $mode == "newpm" ) } $template->assign_vars(array( - "L_CLOSE_WINDOW" => $lang['Close_window'], - "L_MESSAGE" => $l_new_message) + 'L_CLOSE_WINDOW' => $lang['Close_window'], + 'L_MESSAGE' => $l_new_message) ); - $template->pparse("body"); + $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } -else if ( $mode == "read" ) +else if ( $mode == 'read' ) { if ( !empty($HTTP_GET_VARS[POST_POST_URL]) ) { @@ -183,58 +182,45 @@ else if ( $mode == "read" ) if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true)); } - if ( $folder ) + // + // SQL to pull appropriate message, prevents nosey people + // reading other peoples messages ... hopefully! + // + switch( $folder ) { - // - // SQL to pull appropriate message, prevents nosey people - // reading other peoples messages ... hopefully! - // - if ($folder == "inbox") - { + case 'inbox': $l_box_name = $lang['Inbox']; - $pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; - } - else if ($folder == "outbox") - { + break; + case 'outbox': $l_box_name = $lang['Outbox']; - $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) "; - } - else if ($folder == "sentbox") - { + break; + case 'sentbox': $l_box_name = $lang['Sentbox']; - $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL; - } - else if ($folder == "savebox") - { + break; + case 'savebox': $l_box_name = $lang['Savebox']; - $pm_sql_user .= "AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . " AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . " AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) )"; - } - else - { + break; + default: message_die(GENERAL_ERROR, $lang['No_such_folder']); - } - } - else - { - message_die(GENERAL_ERROR, $lang['No_folder']); + break; } // @@ -247,17 +233,17 @@ else if ( $mode == "read" ) $pm_sql_user AND u.user_id = pm.privmsgs_from_userid AND u2.user_id = pm.privmsgs_to_userid"; - if ( !$pm_status = $db->sql_query($sql) ) + if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not query private message post information.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } // // Did the query return any data? // - if ( !( $privmsg = $db->sql_fetchrow($pm_status) ) ) + if ( !($privmsg = $db->sql_fetchrow($result)) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } @@ -267,22 +253,22 @@ else if ( $mode == "read" ) // Is this a new message in the inbox? If it is then save // a copy in the posters sent box // - if ( ( $privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL || $privmsg['privmsgs_type'] == PRIVMSGS_UNREAD_MAIL ) && $folder == "inbox" ) + if ( ( $privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL || $privmsg['privmsgs_type'] == PRIVMSGS_UNREAD_MAIL ) && $folder == 'inbox' ) { $sql = "UPDATE " . PRIVMSGS_TABLE . " SET privmsgs_type = " . PRIVMSGS_READ_MAIL . " WHERE privmsgs_id = " . $privmsg['privmsgs_id']; - if ( !$pm_upd_status = $db->sql_query($sql) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not update private message read status.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql); } $sql = "UPDATE " . USERS_TABLE . " SET user_unread_privmsg = user_unread_privmsg - 1 WHERE user_id = " . $userdata['user_id']; - if ( !$user_upd_status = $db->sql_query($sql) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not update private message read status for user.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql); } // @@ -294,103 +280,132 @@ else if ( $mode == "read" ) AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } - $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; - if ( $db->sql_numrows($result) ) + if ( $sent_info = $db->sql_fetchrow($result) ) { - $sent_info = $db->sql_fetchrow($result); - if ( $sent_info['sent_items'] >= $board_config['max_sentbox_privmsgs'] ) { $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " AND privmsgs_date = " . $sent_info['oldest_post_time'] . " AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs', '', __LINE__, __FILE__, $sql); } } } // - // This makes a copy of the post and stores - // it as a SENT message from the sendee. Perhaps - // not the most DB friendly way but a lot easier - // to manage, besides the admin will be able to - // set limits on numbers of storable posts for - // users ... hopefully! + // This makes a copy of the post and stores it as a SENT message from the sendee. Perhaps + // not the most DB friendly way but a lot easier to manage, besides the admin will be able to + // set limits on numbers of storable posts for users ... hopefully! // $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_subject'])) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_html'] . ", " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ", " . $privmsg['privmsgs_attach_sig'] . ")"; - if ( !$pm_sent_status = $db->sql_query($sql) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not insert private message sent info.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql); } - else - { - $privmsg_sent_id = $db->sql_nextid(); - $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) - VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_text'])) . "')"; - if (!$pm_sent_text_status = $db->sql_query($sql)) - { - message_die(GENERAL_ERROR, "Could not insert private message sent text.<BR>$sql", "", __LINE__, __FILE__, $sql); - } + $privmsg_sent_id = $db->sql_nextid(); + + $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_text'])) . "')"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql); } } // - // Pick a folder, any folder, so long as it's one - // below ... + // Pick a folder, any folder, so long as it's one below ... // - if ( $folder == "inbox" ) + $post_urls = array( + 'post' => append_sid("privmsg.$phpEx?mode=post"), + 'reply' => append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id"), + 'quote' => append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id"), + 'edit' => append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") + ); + $post_icons = array( + 'post_img' => '<a href="' . $post_urls['post'] . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>', + 'post' => '<a href="' . $post_urls['post'] . '">' . $lang['Post_new_pm'] . '</a>', + 'reply_img' => '<a href="' . $post_urls['reply'] . '"><img src="' . $images['pm_replymsg'] . '" alt="' . $lang['Post_reply_pm'] . '" border="0"></a>', + 'reply' => '<a href="' . $post_urls['reply'] . '">' . $lang['Post_reply_pm'] . '</a>', + 'quote_img' => '<a href="' . $post_urls['quote'] . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>', + 'quote' => '<a href="' . $post_urls['quote'] . '">' . $lang['Post_quote_pm'] . '</a>', + 'edit_img' => '<a href="' . $post_urls['edit'] . '"><img src="' . $images['pm_editmsg'] . '" alt="' . $lang['Edit_pm'] . '" border="0"></a>', + 'edit' => '<a href="' . $post_urls['edit'] . '">' . $lang['Edit_pm'] . '</a>' + ); + + if ( $folder == 'inbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; - $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; - $edit_pm_img = ""; + $post_img = $post_icons['post_img']; + $reply_img = $post_icons['reply_img']; + $quote_img = $post_icons['quote_img']; + $edit_img = ''; + $post = $post_icons['post']; + $reply = $post_icons['reply']; + $quote = $post_icons['quote']; + $edit = ''; $l_box_name = $lang['Inbox']; } - else if ( $folder == "outbox" ) + else if ( $folder == 'outbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = ""; - $quote_pm_img = ""; - $edit_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_editmsg'] . "\" alt=\"" . $lang['Edit_pm'] . "\" border=\"0\"></a>"; + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = $post_icons['edit_img']; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = $post_icons['edit']; $l_box_name = $lang['Outbox']; } - else if ( $folder == "savebox" ) + else if ( $folder == 'savebox' ) { if ( $privmsg['privmsgs_type'] == PRIVMSGS_SAVED_IN_MAIL ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; - $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; - $edit_pm_img = ""; + $post_img = $post_icons['post_img']; + $reply_img = $post_icons['reply_img']; + $quote_img = $post_icons['quote_img']; + $edit_img = ''; + $post = $post_icons['post']; + $reply = $post_icons['reply']; + $quote = $post_icons['quote']; + $edit = ''; } else { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = ""; - $quote_pm_img = ""; - $edit_pm_img = ""; + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = ''; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = ''; } $l_box_name = $lang['Saved']; } - else if ( $folder == "sentbox" ) + else if ( $folder == 'sentbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = ""; - $quote_pm_img = ""; - $edit_pm_img = ""; + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = ''; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = ''; $l_box_name = $lang['Sent']; } - $s_hidden_fields = "<input type=\"hidden\" name=\"mark[]\" value=\"$privmsgs_id\" />"; + $s_hidden_fields = '<input type="hidden" name="mark[]" value="' . $privmsgs_id . '" />'; $page_title = $lang['Read_private_message']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); @@ -399,53 +414,47 @@ else if ( $mode == "read" ) // Load templates // $template->set_filenames(array( - "body" => "privmsgs_read_body.tpl", - "jumpbox" => "jumpbox.tpl") - ); - - $jumpbox = make_jumpbox(); - $template->assign_vars(array( - "L_GO" => $lang['Go'], - "L_JUMP_TO" => $lang['Jump_to'], - "L_SELECT_FORUM" => $lang['Select_forum'], - - "S_JUMPBOX_LIST" => $jumpbox, - "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx")) + 'body' => 'privmsgs_read_body.tpl') ); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + make_jumpbox('viewforum.'.$phpEx); $template->assign_vars(array( - "INBOX_IMG" => $inbox_img, - "SENTBOX_IMG" => $sentbox_img, - "OUTBOX_IMG" => $outbox_img, - "SAVEBOX_IMG" => $savebox_img, - "INBOX_LINK" => $inbox_url, - - "POST_PM_IMG" => $post_pm_img, - "REPLY_PM_IMG" => $reply_pm_img, - "EDIT_PM_IMG" => $edit_pm_img, - "QUOTE_PM_IMG" => $quote_pm_img, - - "SENTBOX_LINK" => $sentbox_url, - "OUTBOX_LINK" => $outbox_url, - "SAVEBOX_LINK" => $savebox_url, - - "BOX_NAME" => $l_box_name, - - "L_INBOX" => $lang['Inbox'], - "L_OUTBOX" => $lang['Outbox'], - "L_SENTBOX" => $lang['Sent'], - "L_SAVEBOX" => $lang['Saved'], - "L_FLAG" => $lang['Flag'], - "L_SUBJECT" => $lang['Subject'], - "L_DATE" => $lang['Date'], - "L_FROM" => $lang['From'], - "L_TO" => $lang['To'], - "L_SAVE_MSG" => $lang['Save_message'], - "L_DELETE_MSG" => $lang['Delete_message'], - - "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "S_HIDDEN_FIELDS" => $s_hidden_fields) + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + + 'POST_PM_IMG' => $post_img, + 'REPLY_PM_IMG' => $reply_img, + 'EDIT_PM_IMG' => $edit_img, + 'QUOTE_PM_IMG' => $quote_img, + 'POST_PM' => $post, + 'REPLY_PM' => $reply, + 'EDIT_PM' => $edit, + 'QUOTE_PM' => $quote, + + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'BOX_NAME' => $l_box_name, + + 'L_INBOX' => $lang['Inbox'], + 'L_OUTBOX' => $lang['Outbox'], + 'L_SENTBOX' => $lang['Sent'], + 'L_SAVEBOX' => $lang['Saved'], + 'L_FLAG' => $lang['Flag'], + 'L_SUBJECT' => $lang['Subject'], + 'L_POSTED' => $lang['Posted'], + 'L_DATE' => $lang['Date'], + 'L_FROM' => $lang['From'], + 'L_TO' => $lang['To'], + 'L_SAVE_MSG' => $lang['Save_message'], + 'L_DELETE_MSG' => $lang['Delete_message'], + + 'S_PRIVMSGS_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); $username_from = $privmsg['username_1']; @@ -455,39 +464,56 @@ else if ( $mode == "read" ) $post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); - $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . "\" border=\"0\" /></a>"; + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id_from); + $profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>'; + $profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>'; - if ( !empty($privmsg['user_viewemail']) ) + $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id"); + $pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>'; + $pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>'; + + if ( !empty($privmsg['user_viewemail']) || $is_auth['auth_mod'] ) { - $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $user_id_from) : 'mailto:' . $privmsg['user_email']; + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $privmsg['user_email']; - $email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" border="0" /></a>'; + $email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>'; + $email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>'; } else { $email_img = ''; + $email = ''; } - $www_img = ( $privmsg['user_website']) ? '<a href="' .$privmsg['user_website'] . '" target="_userwww"><img src="' .$images['icon_www'] . '" alt="' .$lang['Visit_website'] . '" border="0" /></a>' : ''; + $www_img = ( $privmsg['user_website'] ) ? '<a href="' . $privmsg['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : ''; + $www = ( $privmsg['user_website'] ) ? '<a href="' . $privmsg['user_website'] . '" target="_userwww">' . $lang['Visit_website'] . '</a>' : ''; if ( !empty($privmsg['user_icq']) ) { $icq_status_img = '<a href="http://wwp.icq.com/' . $privmsg['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $privmsg['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>'; - $icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $privmsg['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>'; + $icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $privmsg['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>'; + $icq = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $privmsg['user_icq'] . '">' . $lang['ICQ'] . '</a>'; } else { $icq_status_img = ''; - $icq_add_img = ''; + $icq_img = ''; + $icq = ''; } - $aim_img = ( $privmsg['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $privmsg['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : ""; + $aim_img = ( $privmsg['user_aim'] ) ? '<a href="aim:goim?screenname=' . $privmsg['user_aim'] . '&message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : ''; + $aim = ( $privmsg['user_aim'] ) ? '<a href="aim:goim?screenname=' . $privmsg['user_aim'] . '&message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : ''; - $msn_img = ( $privmsg['user_msnm'] ) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : ""; + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id"); + $msn_img = ( $privmsg['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : ''; + $msn = ( $privmsg['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : ''; - $yim_img = ( $privmsg['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $privmsg['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : ""; + $yim_img = ( $privmsg['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $privmsg['user_yim'] . '&.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : ''; + $yim = ( $privmsg['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $privmsg['user_yim'] . '&.src=pg">' . $lang['YIM'] . '</a>' : ''; - $search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($username_from) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" /></a>"; + $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username_from) . "&showresults=posts"); + $search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>'; + $search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>'; // // Processing of post @@ -503,8 +529,9 @@ else if ( $mode == "read" ) } else { - $user_sig = ""; + $user_sig = ''; } + $user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid']; // @@ -513,32 +540,32 @@ else if ( $mode == "read" ) // if ( !$board_config['allow_html'] ) { - if ( $user_sig != "" && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] ) + if ( $user_sig != '' && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] ) { - $user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig); + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); } if ( $privmsg['privmsgs_enable_html'] ) { - $private_message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $private_message); + $private_message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $private_message); } } - if ( $user_sig != "" && $privmsg['privmsgs_attach_sig'] && $user_sig_bbcode_uid != "" ) + if ( $user_sig != '' && $privmsg['privmsgs_attach_sig'] && $user_sig_bbcode_uid != '' ) { - $user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig); + $user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $user_sig); } - if ( $bbcode_uid != "" ) + if ( $bbcode_uid != '' ) { - $private_message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($private_message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $private_message); + $private_message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($private_message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $private_message); } $private_message = make_clickable($private_message); - if ( $privmsg['privmsgs_attach_sig'] && $user_sig != "" ) + if ( $privmsg['privmsgs_attach_sig'] && $user_sig != '' ) { - $private_message .= "<br /><br />_________________<br />" . make_clickable($user_sig); + $private_message .= '<br /><br />_________________<br />' . make_clickable($user_sig); } if ( count($orig_word) ) @@ -552,45 +579,52 @@ else if ( $mode == "read" ) $private_message = smilies_pass($private_message); } - $private_message = str_replace("\n", "<br />", $private_message); + $private_message = str_replace("\n", '<br />', $private_message); // // Dump it to the templating engine // $template->assign_vars(array( - "MESSAGE_TO" => $username_to, - "MESSAGE_FROM" => $username_from, - "RANK_IMAGE" => $rank_image, - "POSTER_JOINED" => $poster_joined, - "POSTER_POSTS" => $poster_posts, - "POSTER_FROM" => $poster_from, - "POSTER_AVATAR" => $poster_avatar, - "PROFILE_IMG" => $profile_img, - "SEARCH_IMG" => $search_img, - "EMAIL_IMG" => $email_img, - "WWW_IMG" => $www_img, - "ICQ" => ( $privmsg['user_icq'] ) ? $privmsg['user_icq'] : " ", - "ICQ_IMG" => ( $privmsg['user_icq'] ) ? $images['icon_icq'] : " ", - "ICQ_STATUS_IMG" => $icq_status_img, - "ICQ_ADD_IMG" => $icq_add_img, - "AIM_IMG" => $aim_img, - "MSN_IMG" => $msn_img, - "YIM_IMG" => $yim_img, - "POST_SUBJECT" => $post_subject, - "MESSAGE" => $private_message, - "POST_DATE" => $post_date) + 'MESSAGE_TO' => $username_to, + 'MESSAGE_FROM' => $username_from, + 'RANK_IMAGE' => $rank_image, + 'POSTER_JOINED' => $poster_joined, + 'POSTER_POSTS' => $poster_posts, + 'POSTER_FROM' => $poster_from, + 'POSTER_AVATAR' => $poster_avatar, + 'POST_SUBJECT' => $post_subject, + 'POST_DATE' => $post_date, + 'MESSAGE' => $private_message, + + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim) ); - $template->pparse("body"); + $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } else if ( ( $delete && $mark_list ) || $delete_all ) { - if (!$userdata['session_logged_in']) + if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } if ( isset($mark_list) && !is_array($mark_list) ) @@ -602,7 +636,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) if ( !$confirm ) { $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />'; - $s_hidden_fields .= (isset($HTTP_POST_VARS['delete'])) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />'; + $s_hidden_fields .= ( isset($HTTP_POST_VARS['delete']) ) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />'; for($i = 0; $i < count($mark_list); $i++) { @@ -615,19 +649,20 @@ else if ( ( $delete && $mark_list ) || $delete_all ) include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - "confirm_body" => "confirm_body.tpl") + 'confirm_body' => 'confirm_body.tpl') ); $template->assign_vars(array( - "MESSAGE_TITLE" => $lang['Information'], - "MESSAGE_TEXT" => ( count($mark_list) == 1) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'], + 'MESSAGE_TITLE' => $lang['Information'], + 'MESSAGE_TEXT' => ( count($mark_list) == 1 ) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'], - "L_YES" => $lang['Yes'], - "L_NO" => $lang['No'], + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], - "S_CONFIRM_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "S_HIDDEN_FIELDS" => $s_hidden_fields) + 'S_CONFIRM_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); - $template->pparse("confirm_body"); + + $template->pparse('confirm_body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); @@ -664,7 +699,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) WHERE $delete_type"; if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not obtain id list to delete all messages.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) @@ -677,7 +712,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) if ( count($mark_list) ) { - $delete_sql_id = implode(", ", $mark_list); + $delete_sql_id = implode(', ', $mark_list); // // Need to decrement the new message counter of recipient @@ -693,23 +728,23 @@ else if ( ( $delete && $mark_list ) || $delete_all ) AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Couldn't obtain user id list for outbox messages", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } - $update_pm_sql = ""; + $update_pm_sql = ''; while( $row = $db->sql_fetchrow($result) ) { - $update_pm_sql .= ( ( $update_pm_sql != "" ) ? ", " : "" ) . $row['privmsgs_to_userid']; + $update_pm_sql .= ( ( $update_pm_sql != '' ) ? ', ' : '' ) . $row['privmsgs_to_userid']; } - if ( $update_pm_sql != "" ) + if ( $update_pm_sql != '' ) { $sql = "UPDATE " . USERS_TABLE . " SET user_new_privmsg = user_new_privmsg - 1 WHERE user_id IN ($update_pm_sql)"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Couldn't update users new msg counters", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update users new msg counters', '', __LINE__, __FILE__, $sql); } } @@ -720,23 +755,23 @@ else if ( ( $delete && $mark_list ) || $delete_all ) AND privmsgs_type = " . PRIVMSGS_UNREAD_MAIL; if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Couldn't obtain user id list for outbox messages", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } - $update_pm_sql = ""; + $update_pm_sql = ''; while( $row = $db->sql_fetchrow($result) ) { - $update_pm_sql .= ( ( $update_pm_sql != "" ) ? ", " : "" ) . $row['privmsgs_to_userid']; + $update_pm_sql .= ( ( $update_pm_sql != '' ) ? ', ' : '' ) . $row['privmsgs_to_userid']; } - if ( $update_pm_sql != "" ) + if ( $update_pm_sql != '' ) { $sql = "UPDATE " . USERS_TABLE . " SET user_unread_privmsg = user_unread_privmsg - 1 WHERE user_id IN ($update_pm_sql)"; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Couldn't update users new msg counters", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update users new msg counters', '', __LINE__, __FILE__, $sql); } } } @@ -747,7 +782,7 @@ else if ( ( $delete && $mark_list ) || $delete_all ) WHERE privmsgs_id IN ($delete_sql_id) AND "; - switch($folder) + switch( $folder ) { case 'inbox': $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( @@ -773,21 +808,21 @@ else if ( ( $delete && $mark_list ) || $delete_all ) if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) ) { - message_die(GENERAL_ERROR, "Could not delete private message info.", "", __LINE__, __FILE__, $delete_sql); + message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql); } if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) ) { - message_die(GENERAL_ERROR, "Could not delete private message text.", "", __LINE__, __FILE__, $delete_text_sql); + message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql); } } } } -else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") +else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' ) { if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } @@ -802,10 +837,10 @@ else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )"; if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } - $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; if ( $saved_info = $db->sql_fetchrow($result) ) { @@ -817,9 +852,9 @@ else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") OR ( privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") ) AND privmsgs_date = " . $saved_info['oldest_post_time']; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs', '', __LINE__, __FILE__, $sql); } } } @@ -829,7 +864,7 @@ else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") // $saved_sql = "UPDATE " . PRIVMSGS_TABLE; - switch($folder) + switch( $folder ) { case 'inbox': $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " @@ -855,32 +890,28 @@ else if ( $save && $mark_list && $folder != "savebox" && $folder != "outbox") if ( count($mark_list) ) { - $saved_sql_id = ""; + $saved_sql_id = ''; for($i = 0; $i < count($mark_list); $i++) { - if ( $saved_sql_id != "" ) - { - $saved_sql_id .= ", "; - } - $saved_sql_id .= $mark_list[$i]; + $saved_sql_id .= ( ( $saved_sql_id != '' ) ? ', ' : '' ) . $mark_list[$i]; } $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)"; - if ( !$save_status = $db->sql_query($saved_sql) ) + if ( !$db->sql_query($saved_sql) ) { - message_die(GENERAL_ERROR, "Could not save private messages.", "", __LINE__, __FILE__, $saved_sql); + message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql); } } } -else if ( $submit || $refresh || $mode != "" ) +else if ( $submit || $refresh || $mode != '' ) { - if (!$userdata['session_logged_in']) + if ( !$userdata['session_logged_in'] ) { - $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? "&" . POST_USERS_URL . "=" . $HTTP_GET_VARS[POST_USERS_URL] : ""; - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . $HTTP_GET_VARS[POST_USERS_URL] : ''; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true)); } @@ -915,9 +946,9 @@ else if ( $submit || $refresh || $mode != "" ) } $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; - $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; + $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; - if ( $submit && $mode != "edit" ) + if ( $submit && $mode != 'edit' ) { // // Flood control @@ -952,15 +983,13 @@ else if ( $submit || $refresh || $mode != "" ) FROM " . USERS_TABLE . " WHERE username = '" . str_replace("\'", "''", $to_username) . "' AND user_id <> " . ANONYMOUS; - if (!($result = $db->sql_query($sql))) + if ( !($result = $db->sql_query($sql)) ) { $error = TRUE; $error_msg = $lang['No_such_user']; } - else - { - $to_userdata = $db->sql_fetchrow($result); - } + + $to_userdata = $db->sql_fetchrow($result); } else { @@ -1024,7 +1053,7 @@ else if ( $submit || $refresh || $mode != "" ) message_die(GENERAL_MESSAGE, $lang['No_such_user']); } - $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; if ( $inbox_info = $db->sql_fetchrow($result) ) { @@ -1036,21 +1065,13 @@ else if ( $submit || $refresh || $mode != "" ) OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " AND privmsgs_to_userid = " . $to_userdata['user_id']; - if ( !($result = $db->sql_query($sql)) ) + if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs', '', __LINE__, __FILE__, $sql); } } } - // - // This area is reserved for future use :D - // - - // - // - // - $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $html_on, $bbcode_on, $smilies_on, $attach_sig)"; } @@ -1061,85 +1082,81 @@ else if ( $submit || $refresh || $mode != "" ) WHERE privmsgs_id = $privmsg_id"; } - if ( !$pm_sent_status = $db->sql_query($sql_info, BEGIN_TRANSACTION) ) + if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) ) { message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); } + + if ( $mode != "edit" ) + { + $privmsg_sent_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')"; + } else { - if ( $mode != "edit" ) - { - $privmsg_sent_id = $db->sql_nextid(); + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . str_replace("\'", "''", $privmsg_message) . "', privmsgs_bbcode_uid = '$bbcode_uid' + WHERE privmsgs_text_id = $privmsg_id"; + } - $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) - VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')"; - } - else - { - $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " - SET privmsgs_text = '" . str_replace("\'", "''", $privmsg_message) . "', privmsgs_bbcode_uid = '$bbcode_uid' - WHERE privmsgs_text_id = $privmsg_id"; - } + if ( !$db->sql_query($sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); + } - if ( !($pm_sent_text_status = $db->sql_query($sql, END_TRANSACTION)) ) + if ( $mode != 'edit' ) + { + // + // Add to the users new pm counter + // + $sql = "UPDATE " . USERS_TABLE . " + SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " + WHERE user_id = " . $to_userdata['user_id']; + if ( !$status = $db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); + message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } - else if ( $mode != "edit" ) - { - // - // Add to the users new pm counter - // - $sql = "UPDATE " . USERS_TABLE . " - SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " - WHERE user_id = " . $to_userdata['user_id']; - if ( !$status = $db->sql_query($sql) ) - { - message_die(GENERAL_ERROR, "Could not update private message new/read status for user.", "", __LINE__, __FILE__, $sql); - } - if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] ) - { - $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] ) + { + $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - $script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path'])); - $script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx; - $server_name = trim($board_config['server_name']); - $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://"; - $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; + $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])); + $script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx; + $server_name = trim($board_config['server_name']); + $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; + $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($board_config['smtp_delivery']); + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); - // - // Attempt to use language setting for recipient - // - $emailer->use_template("privmsg_notify", $to_userdata['user_lang']); - $emailer->extra_headers($email_headers); - $emailer->email_address($to_userdata['user_email']); - $emailer->set_subject(); //$lang['Notification_subject'] + $emailer->use_template('privmsg_notify', $to_userdata['user_lang']); + $emailer->extra_headers($email_headers); + $emailer->email_address($to_userdata['user_email']); + $emailer->set_subject(); //$lang['Notification_subject'] - $emailer->assign_vars(array( - "USERNAME" => $to_username, - "SITENAME" => $board_config['sitename'], - "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), + $emailer->assign_vars(array( + 'USERNAME' => $to_username, + 'SITENAME' => $board_config['sitename'], + 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']), - "U_INBOX" => $server_protocol . $server_name . $server_port . $script_name . "?folder=inbox") - ); + 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox') + ); - $emailer->send(); - $emailer->reset(); - } + $emailer->send(); + $emailer->reset(); } + } - $template->assign_vars(array( - "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("privmsg.$phpEx?folder=inbox") . '">') - ); + $template->assign_vars(array( + 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("privmsg.$phpEx?folder=inbox") . '">') + ); - $msg = $lang['Message_sent'] . "<br /><br />" . sprintf($lang['Click_return_inbox'], "<a href=\"" . append_sid("privmsg.$phpEx?folder=inbox") . "\">", "</a> ") . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); + $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); - message_die(GENERAL_MESSAGE, $msg); - } + message_die(GENERAL_MESSAGE, $msg); } else if ( $preview || $refresh || $error ) { @@ -1149,9 +1166,9 @@ else if ( $submit || $refresh || $mode != "" ) // passed to the script, process it a little, do some checks // where neccessary, etc. // - $to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ""; - $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ""; - $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ""; + $to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ''; + $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ''; + $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ''; $privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message); if ( !$preview ) { @@ -1161,21 +1178,21 @@ else if ( $submit || $refresh || $mode != "" ) // // Do mode specific things // - if ( $mode == "post" ) + if ( $mode == 'post' ) { $page_title = $lang['Send_new_privmsg']; - $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; + $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ''; } - else if ( $mode == "reply" ) + else if ( $mode == 'reply' ) { $page_title = $lang['Reply_privmsg']; - $user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; + $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ''; } - else if ( $mode == "edit" ) + else if ( $mode == 'edit' ) { $page_title = $lang['Edit_privmsg']; @@ -1183,26 +1200,25 @@ else if ( $submit || $refresh || $mode != "" ) FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u WHERE pm.privmsgs_id = $privmsg_id AND u.user_id = pm.privmsgs_from_userid"; - if ($result = $db->sql_query($sql)) + if ( !($result = $db->sql_query($sql)) ) { - $postrow = $db->sql_fetchrow($result); + message_die(GENERAL_ERROR, "Could not obtain post and post text", "", __LINE__, __FILE__, $sql); + } + if ( $postrow = $db->sql_fetchrow($result) ) + { if ( $userdata['user_id'] != $postrow['user_id'] ) { message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']); } - $user_sig = ( $postrow['user_sig'] != "" && $board_config['allow_sig'] ) ? $postrow['user_sig'] : ""; - } - else - { - message_die(GENERAL_ERROR, "Couldn't obtain post and post text", "", __LINE__, __FILE__, $sql); + $user_sig = ( $postrow['user_sig'] != '' && $board_config['allow_sig'] ) ? $postrow['user_sig'] : ''; } } } else { - if ( !$privmsg_id && ( $mode == "reply" || $mode == "edit" || $mode == "quote" ) ) + if ( !$privmsg_id && ( $mode == 'reply' || $mode == 'edit' || $mode == 'quote' ) ) { message_die(GENERAL_ERROR, $lang['No_post_id']); } @@ -1215,41 +1231,19 @@ else if ( $submit || $refresh || $mode != "" ) FROM " . USERS_TABLE . " WHERE user_id = $user_id AND user_id <> " . ANONYMOUS; - if (!($result = $db->sql_query($sql))) + if ( !($result = $db->sql_query($sql)) ) { $error = TRUE; $error_msg = $lang['No_such_user']; } - else - { - $row = $db->sql_fetchrow($result); - $to_username = $row['username']; - } - } - // - // Obtain list of groups/users is - // this user is a group moderator - // - if ( $mode == "post" ) - { - unset($mod_group_list); - $sql = "SELECT g.group_id, g.group_name, g.group_moderator, g.group_single_user, u.username - FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u - WHERE g.group_moderator = " . $userdata['user_id'] ." - AND ug.group_id = g.group_id - AND u.user_id = ug.user_id"; - if (!$group_status = $db->sql_query($sql)) - { - message_die(GENERAL_ERROR, "Could not obtain group moderator list.", "", __LINE__, __FILE__, $sql); - } - if ($db->sql_numrows($group_status)) + if ( $row = $db->sql_fetchrow($result) ) { - $mod_group_list = $db->sql_fetchrowset($group_status); + $to_username = $row['username']; } } - if ( $mode == "edit" ) + if ( $mode == 'edit' ) { $sql = "SELECT pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id, u.user_sig FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u @@ -1259,13 +1253,14 @@ else if ( $submit || $refresh || $mode != "" ) AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) AND u.user_id = pm.privmsgs_to_userid"; - if ( !$pm_edit_status = $db->sql_query($sql) ) + if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } - if ( !($privmsg = $db->sql_fetchrow($pm_edit_status)) ) + + if ( !($privmsg = $db->sql_fetchrow($result)) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } @@ -1274,21 +1269,21 @@ else if ( $submit || $refresh || $mode != "" ) $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid']; $privmsg_bbcode_enabled = ($privmsg['privmsgs_enable_bbcode'] == 1); - if ($privmsg_bbcode_enabled) + if ( $privmsg_bbcode_enabled ) { - $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); + $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", '', $privmsg_message); } - $privmsg_message = str_replace("<br />", "\n", $privmsg_message); + $privmsg_message = str_replace('<br />', "\n", $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); - $user_sig = ( $board_config['allow_sig'] ) ? $privmsg['user_sig'] : ""; + $user_sig = ( $board_config['allow_sig'] ) ? $privmsg['user_sig'] : ''; $to_username = $privmsg['username']; $to_userid = $privmsg['user_id']; } - else if ( $mode == "reply" || $mode == "quote" ) + else if ( $mode == 'reply' || $mode == 'quote' ) { $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id @@ -1297,36 +1292,36 @@ else if ( $submit || $refresh || $mode != "" ) AND pmt.privmsgs_text_id = pm.privmsgs_id AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " AND u.user_id = pm.privmsgs_from_userid"; - if (!$pm_reply_status = $db->sql_query($sql)) + if ( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } - if ( !($privmsg = $db->sql_fetchrow($pm_reply_status)) ) + if ( !($privmsg = $db->sql_fetchrow($result)) ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true)); } - $privmsg_subject = ( ( !preg_match("/^Re:/", $privmsg['privmsgs_subject']) ) ? "Re: " : "" ) . $privmsg['privmsgs_subject']; + $privmsg_subject = ( ( !preg_match('/^Re:/', $privmsg['privmsgs_subject']) ) ? 'Re: ' : '' ) . $privmsg['privmsgs_subject']; $to_username = $privmsg['username']; $to_userid = $privmsg['user_id']; - if ( $mode == "quote" ) + if ( $mode == 'quote' ) { $privmsg_message = $privmsg['privmsgs_text']; $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid']; - $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", "", $privmsg_message); - $privmsg_message = str_replace("<br />", "\n", $privmsg_message); + $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", '', $privmsg_message); + $privmsg_message = str_replace('<br />', "\n", $privmsg_message); $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); - $privmsg_message = "[quote=\"" . $to_username . "\"]" . $privmsg_message . "[/quote]\n"; + $privmsg_message = '[quote="' . $to_username . '"]' . $privmsg_message . '[/quote]'; - $mode = "reply"; + $mode = 'reply'; } } } @@ -1334,15 +1329,14 @@ else if ( $submit || $refresh || $mode != "" ) // // Has admin prevented user from sending PM's? // - if ( !$userdata['user_allow_pm'] && $mode != "edit" ) + if ( !$userdata['user_allow_pm'] && $mode != 'edit' ) { $message = $lang['Cannot_send_privmsg']; message_die(GENERAL_MESSAGE, $message); } // - // Start output, first preview, then errors - // then post form + // Start output, first preview, then errors then post form // $page_title = $lang['Send_private_message']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); @@ -1366,13 +1360,13 @@ else if ( $submit || $refresh || $mode != "" ) // if ( !$html_on ) { - if ( $user_sig != "" || !$userdata['user_allowhtml'] ) + if ( $user_sig != '' || !$userdata['user_allowhtml'] ) { - $user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig); + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); } } - if ( $attach_sig && $user_sig != "" && $userdata['user_sig_bbcode_uid'] ) + if ( $attach_sig && $user_sig != '' && $userdata['user_sig_bbcode_uid'] ) { $user_sig = bbencode_second_pass($user_sig, $userdata['user_sig_bbcode_uid']); } @@ -1382,9 +1376,9 @@ else if ( $submit || $refresh || $mode != "" ) $preview_message = bbencode_second_pass($preview_message, $bbcode_uid); } - if ( $attach_sig && $user_sig != "" ) + if ( $attach_sig && $user_sig != '' ) { - $preview_message = $preview_message . "<br /><br />_________________<br />" . $user_sig; + $preview_message = $preview_message . '<br /><br />_________________<br />' . $user_sig; } if ( count($orig_word) ) @@ -1403,37 +1397,39 @@ else if ( $submit || $refresh || $mode != "" ) } $preview_message = make_clickable($preview_message); - $preview_message = str_replace("\n", "<br />", $preview_message); + $preview_message = str_replace("\n", '<br />', $preview_message); - $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\" />"; - $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\" />"; + $s_hidden_fields = '<input type="hidden" name="folder" value="' . $folder . '" />'; + $s_hidden_fields .= '<input type="hidden" name="mode" value="' . $mode . '" />'; if ( isset($privmsg_id) ) { - $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsg_id\" />"; + $s_hidden_fields .= '<input type="hidden" name="' . POST_POST_URL . '" value="' . $privmsg_id . '" />'; } $template->set_filenames(array( - "preview" => "privmsgs_preview.tpl") + "preview" => 'privmsgs_preview.tpl') ); + $template->assign_vars(array( - "TOPIC_TITLE" => $preview_subject, - "POST_SUBJECT" => $preview_subject, - "MESSAGE_TO" => $to_username, - "MESSAGE_FROM" => $userdata['username'], - "POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), - "MESSAGE" => $preview_message, - - "S_HIDDEN_FIELDS" => $s_hidden_fields, - - "L_SUBJECT" => $lang['Subject'], - "L_DATE" => $lang['Date'], - "L_FROM" => $lang['From'], - "L_TO" => $lang['To'], - "L_PREVIEW" => $lang['Preview'], - "L_POSTED" => $lang['Posted']) + 'TOPIC_TITLE' => $preview_subject, + 'POST_SUBJECT' => $preview_subject, + 'MESSAGE_TO' => $to_username, + 'MESSAGE_FROM' => $userdata['username'], + 'POST_DATE' => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), + 'MESSAGE' => $preview_message, + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + + 'L_SUBJECT' => $lang['Subject'], + 'L_DATE' => $lang['Date'], + 'L_FROM' => $lang['From'], + 'L_TO' => $lang['To'], + 'L_PREVIEW' => $lang['Preview'], + 'L_POSTED' => $lang['Posted']) ); - $template->assign_var_from_handle("POST_PREVIEW_BOX", "preview"); + + $template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview'); } // @@ -1442,52 +1438,34 @@ else if ( $submit || $refresh || $mode != "" ) if ($error) { $template->set_filenames(array( - "reg_header" => "error_body.tpl") + 'reg_header' => 'error_body.tpl') ); $template->assign_vars(array( - "ERROR_MESSAGE" => $error_msg) + 'ERROR_MESSAGE' => $error_msg) ); - $template->assign_var_from_handle("ERROR_BOX", "reg_header"); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); } - // - // End error handling - // - - // - // Generic posting form ... - // // // Load templates // $template->set_filenames(array( - "body" => "posting_body.tpl", - "jumpbox" => "jumpbox.tpl") - ); - - $jumpbox = make_jumpbox(); - $template->assign_vars(array( - "L_GO" => $lang['Go'], - "L_JUMP_TO" => $lang['Jump_to'], - "L_SELECT_FORUM" => $lang['Select_forum'], - - "S_JUMPBOX_LIST" => $jumpbox, - "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx")) + 'body' => 'posting_body.tpl') ); - $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + make_jumpbox('viewforum.'.$phpEx); // // Enable extensions in posting_body // - $template->assign_block_vars("privmsg_extensions", array()); + $template->assign_block_vars('switch_privmsg', array()); // // HTML toggle selection // - if ($board_config['allow_html']) + if ( $board_config['allow_html'] ) { $html_status = $lang['HTML_is_ON']; - $template->assign_block_vars("html_checkbox", array()); + $template->assign_block_vars('switch_html_checkbox', array()); } else { @@ -1497,10 +1475,10 @@ else if ( $submit || $refresh || $mode != "" ) // // BBCode toggle selection // - if ($board_config['allow_bbcode']) + if ( $board_config['allow_bbcode'] ) { $bbcode_status = $lang['BBCode_is_ON']; - $template->assign_block_vars("bbcode_checkbox", array()); + $template->assign_block_vars('switch_bbcode_checkbox', array()); } else { @@ -1510,10 +1488,10 @@ else if ( $submit || $refresh || $mode != "" ) // // Smilies toggle selection // - if ($board_config['allow_smilies']) + if ( $board_config['allow_smilies'] ) { $smilies_status = $lang['Smilies_are_ON']; - $template->assign_block_vars("smilies_checkbox", array()); + $template->assign_block_vars('switch_smilies_checkbox', array()); } else { @@ -1524,35 +1502,30 @@ else if ( $submit || $refresh || $mode != "" ) // Signature toggle selection - only show if // the user has a signature // - if ( $user_sig != "" ) + if ( $user_sig != '' ) { - $template->assign_block_vars("signature_checkbox", array()); + $template->assign_block_vars('switch_signature_checkbox', array()); } - if ($mode == 'post') + if ( $mode == 'post' ) { $post_a = $lang['Send_a_new_message']; } - else if ($mode == 'reply') + else if ( $mode == 'reply' ) { $post_a = $lang['Send_a_reply']; - // - // Switch mode to post ... it's a bit of a cheat really but once the basic - // info for the reply is determined it really becomes a new post ... so why - // do it any other way?! - // - $mode = "post"; + $mode = 'post'; } - else if ($mode == 'edit') + else if ( $mode == 'edit' ) { $post_a = $lang['Edit_message']; } - $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\" />"; - $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\" />"; - if ($mode == "edit") + $s_hidden_fields = '<input type="hidden" name="folder" value="' . $folder . '" />'; + $s_hidden_fields .= '<input type="hidden" name="mode" value="' . $mode . '" />'; + if ( $mode == 'edit' ) { - $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsg_id\" />"; + $s_hidden_fields .= '<input type="hidden" name="' . POST_POST_URL . '" value="' . $privmsg_id . '" />'; } // @@ -1561,96 +1534,95 @@ else if ( $submit || $refresh || $mode != "" ) generate_smilies('inline', PAGE_PRIVMSGS); $template->assign_vars(array( - "SUBJECT" => preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject), - "USERNAME" => preg_replace($html_entities_match, $html_entities_replace, $to_username), - "MESSAGE" => $privmsg_message, - "HTML_STATUS" => $html_status, - "SMILIES_STATUS" => $smilies_status, - "BBCODE_STATUS" => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), - "FORUM_NAME" => $lang['Private_message'], - - "BOX_NAME" => $l_box_name, - "INBOX_IMG" => $inbox_img, - "SENTBOX_IMG" => $sentbox_img, - "OUTBOX_IMG" => $outbox_img, - "SAVEBOX_IMG" => $savebox_img, - "INBOX_LINK" => $inbox_url, - "SENTBOX_LINK" => $sentbox_url, - "OUTBOX_LINK" => $outbox_url, - "SAVEBOX_LINK" => $savebox_url, - - "L_SUBJECT" => $lang['Subject'], - "L_MESSAGE_BODY" => $lang['Message_body'], - "L_OPTIONS" => $lang['Options'], - "L_SPELLCHECK" => $lang['Spellcheck'], - "L_PREVIEW" => $lang['Preview'], - "L_SUBMIT" => $lang['Submit'], - "L_CANCEL" => $lang['Cancel'], - "L_POST_A" => $post_a, - "L_FIND_USERNAME" => $lang['Find_username'], - "L_FIND" => $lang['Find'], - "L_DISABLE_HTML" => $lang['Disable_HTML_pm'], - "L_DISABLE_BBCODE" => $lang['Disable_BBCode_pm'], - "L_DISABLE_SMILIES" => $lang['Disable_Smilies_pm'], - "L_ATTACH_SIGNATURE" => $lang['Attach_signature'], - - "L_BBCODE_B_HELP" => $lang['bbcode_b_help'], - "L_BBCODE_I_HELP" => $lang['bbcode_i_help'], - "L_BBCODE_U_HELP" => $lang['bbcode_u_help'], - "L_BBCODE_Q_HELP" => $lang['bbcode_q_help'], - "L_BBCODE_C_HELP" => $lang['bbcode_c_help'], - "L_BBCODE_L_HELP" => $lang['bbcode_l_help'], - "L_BBCODE_O_HELP" => $lang['bbcode_o_help'], - "L_BBCODE_P_HELP" => $lang['bbcode_p_help'], - "L_BBCODE_W_HELP" => $lang['bbcode_w_help'], - "L_BBCODE_A_HELP" => $lang['bbcode_a_help'], - "L_BBCODE_S_HELP" => $lang['bbcode_s_help'], - "L_BBCODE_F_HELP" => $lang['bbcode_f_help'], - "L_EMPTY_MESSAGE" => $lang['Empty_message'], - - "L_FONT_COLOR" => $lang['Font_color'], - "L_COLOR_DEFAULT" => $lang['color_default'], - "L_COLOR_DARK_RED" => $lang['color_dark_red'], - "L_COLOR_RED" => $lang['color_red'], - "L_COLOR_ORANGE" => $lang['color_orange'], - "L_COLOR_BROWN" => $lang['color_brown'], - "L_COLOR_YELLOW" => $lang['color_yellow'], - "L_COLOR_GREEN" => $lang['color_green'], - "L_COLOR_OLIVE" => $lang['color_olive'], - "L_COLOR_CYAN" => $lang['color_cyan'], - "L_COLOR_BLUE" => $lang['color_blue'], - "L_COLOR_DARK_BLUE" => $lang['color_dark_blue'], - "L_COLOR_INDIGO" => $lang['color_indigo'], - "L_COLOR_VIOLET" => $lang['color_violet'], - "L_COLOR_WHITE" => $lang['color_white'], - "L_COLOR_BLACK" => $lang['color_black'], - - "L_FONT_SIZE" => $lang['Font_size'], - "L_FONT_TINY" => $lang['font_tiny'], - "L_FONT_SMALL" => $lang['font_small'], - "L_FONT_NORMAL" => $lang['font_normal'], - "L_FONT_LARGE" => $lang['font_large'], - "L_FONT_HUGE" => $lang['font_huge'], - - "L_BBCODE_CLOSE_TAGS" => $lang['Close_Tags'], - "L_STYLES_TIP" => $lang['Styles_tip'], - - "S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", - "S_BBCODE_CHECKED" => (!$bbcode_on) ? "checked=\"checked\"" : "", - "S_SMILIES_CHECKED" => (!$smilies_on) ? "checked=\"checked\"" : "", - "S_SIGNATURE_CHECKED" => ($attach_sig) ? "checked=\"checked\"" : "", - "S_NAMES_SELECT" => $user_names_select, - "S_HIDDEN_FORM_FIELDS" => $s_hidden_fields, - "S_POST_ACTION" => append_sid("privmsg.$phpEx"), + 'SUBJECT' => preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject), + 'USERNAME' => preg_replace($html_entities_match, $html_entities_replace, $to_username), + 'MESSAGE' => $privmsg_message, + 'HTML_STATUS' => $html_status, + 'SMILIES_STATUS' => $smilies_status, + 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), + 'FORUM_NAME' => $lang['Private_message'], + + 'BOX_NAME' => $l_box_name, + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'L_SUBJECT' => $lang['Subject'], + 'L_MESSAGE_BODY' => $lang['Message_body'], + 'L_OPTIONS' => $lang['Options'], + 'L_SPELLCHECK' => $lang['Spellcheck'], + 'L_PREVIEW' => $lang['Preview'], + 'L_SUBMIT' => $lang['Submit'], + 'L_CANCEL' => $lang['Cancel'], + 'L_POST_A' => $post_a, + 'L_FIND_USERNAME' => $lang['Find_username'], + 'L_FIND' => $lang['Find'], + 'L_DISABLE_HTML' => $lang['Disable_HTML_pm'], + 'L_DISABLE_BBCODE' => $lang['Disable_BBCode_pm'], + 'L_DISABLE_SMILIES' => $lang['Disable_Smilies_pm'], + 'L_ATTACH_SIGNATURE' => $lang['Attach_signature'], + + 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], + 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], + 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], + 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], + 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], + 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], + 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], + 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], + 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], + 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], + 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], + 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], + 'L_EMPTY_MESSAGE' => $lang['Empty_message'], + + 'L_FONT_COLOR' => $lang['Font_color'], + 'L_COLOR_DEFAULT' => $lang['color_default'], + 'L_COLOR_DARK_RED' => $lang['color_dark_red'], + 'L_COLOR_RED' => $lang['color_red'], + 'L_COLOR_ORANGE' => $lang['color_orange'], + 'L_COLOR_BROWN' => $lang['color_brown'], + 'L_COLOR_YELLOW' => $lang['color_yellow'], + 'L_COLOR_GREEN' => $lang['color_green'], + 'L_COLOR_OLIVE' => $lang['color_olive'], + 'L_COLOR_CYAN' => $lang['color_cyan'], + 'L_COLOR_BLUE' => $lang['color_blue'], + 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], + 'L_COLOR_INDIGO' => $lang['color_indigo'], + 'L_COLOR_VIOLET' => $lang['color_violet'], + 'L_COLOR_WHITE' => $lang['color_white'], + 'L_COLOR_BLACK' => $lang['color_black'], + + 'L_FONT_SIZE' => $lang['Font_size'], + 'L_FONT_TINY' => $lang['font_tiny'], + 'L_FONT_SMALL' => $lang['font_small'], + 'L_FONT_NORMAL' => $lang['font_normal'], + 'L_FONT_LARGE' => $lang['font_large'], + 'L_FONT_HUGE' => $lang['font_huge'], + + 'L_BBCODE_CLOSE_TAGS' => $lang['Close_Tags'], + 'L_STYLES_TIP' => $lang['Styles_tip'], + + 'S_HTML_CHECKED' => ( !$html_on ) ? ' checked="checked"' : '', + 'S_BBCODE_CHECKED' => ( !$bbcode_on ) ? ' checked="checked"' : '', + 'S_SMILIES_CHECKED' => ( !$smilies_on ) ? ' checked="checked"' : '', + 'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? ' checked="checked"' : '', + 'S_NAMES_SELECT' => $user_names_select, + 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, + 'S_POST_ACTION' => append_sid("privmsg.$phpEx"), - "U_SEARCH_USER" => append_sid("search.$phpEx?mode=searchuser"), - "U_VIEW_FORUM" => append_sid("privmsg.$phpEx")) + 'U_SEARCH_USER' => append_sid("search.$phpEx?mode=searchuser"), + 'U_VIEW_FORUM' => append_sid("privmsg.$phpEx")) ); - $template->pparse("body"); + $template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); - } // @@ -1658,7 +1630,7 @@ else if ( $submit || $refresh || $mode != "" ) // if ( !$userdata['session_logged_in'] ) { - $header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; + $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); } @@ -1668,18 +1640,18 @@ if ( !$userdata['session_logged_in'] ) $sql = "UPDATE " . USERS_TABLE . " SET user_unread_privmsg = user_unread_privmsg + user_new_privmsg, user_new_privmsg = 0, user_last_privmsg = " . $userdata['session_start'] . " WHERE user_id = " . $userdata['user_id']; -if ( !$status = $db->sql_query($sql) ) +if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not update private message new/read status for user.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } $sql = "UPDATE " . PRIVMSGS_TABLE . " SET privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " AND privmsgs_to_userid = " . $userdata['user_id']; -if ( !$status = $db->sql_query($sql) ) +if ( !$db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not update private message new/read status (2) for user.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql); } // @@ -1698,25 +1670,14 @@ include($phpbb_root_path . 'includes/page_header.'.$phpEx); // Load templates // $template->set_filenames(array( - "body" => "privmsgs_body.tpl", - "jumpbox" => "jumpbox.tpl") -); - -$jumpbox = make_jumpbox(); -$template->assign_vars(array( - "L_GO" => $lang['Go'], - "L_JUMP_TO" => $lang['Jump_to'], - "L_SELECT_FORUM" => $lang['Select_forum'], - - "S_JUMPBOX_LIST" => $jumpbox, - "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx")) + 'body' => 'privmsgs_body.tpl') ); -$template->assign_var_from_handle("JUMPBOX", "jumpbox"); +make_jumpbox('viewforum.'.$phpEx); // // New message // -$post_new_mesg_url = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['post_new'] . "\" alt=\"" . $lang['Post_new_message'] . "\" border=\"0\" /></a>"; +$post_new_mesg_url = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['post_new'] . '" alt="' . $lang['Post_new_message'] . '" border="0" /></a>'; // // General SQL to obtain messages @@ -1725,8 +1686,7 @@ $sql_tot = "SELECT COUNT(privmsgs_id) AS total FROM " . PRIVMSGS_TABLE . " "; $sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u "; - -switch($folder) +switch( $folder ) { case 'inbox': $sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . " @@ -1776,7 +1736,8 @@ switch($folder) break; default: - message_die(GENERAL_ERROR, "Could not query private message information. No folder specified.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_MESSAGE, $lang['No_such_folder']); + break; } // @@ -1784,20 +1745,20 @@ switch($folder) // if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) ) { - $msg_days = (!empty($HTTP_POST_VARS['msgdays'])) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays']; + $msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays']; $min_msg_time = time() - ($msg_days * 86400); $limit_msg_time_total = " AND privmsgs_date > $min_msg_time"; $limit_msg_time = " AND pm.privmsgs_date > $min_msg_time "; - if (!empty($HTTP_POST_VARS['msgdays'])) + if ( !empty($HTTP_POST_VARS['msgdays']) ) { $start = 0; } } else { - $limit_msg_time = ""; + $limit_msg_time = ''; $post_days = 0; } @@ -1808,39 +1769,19 @@ $sql_tot .= $limit_msg_time_total; // // Get messages // -if ( !$pm_tot_status = $db->sql_query($sql_tot) ) +if ( !($result = $db->sql_query($sql_tot)) ) { - message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); -} -else -{ - if ( $db->sql_numrows($pm_tot_status) ) - { - $row = $db->sql_fetchrow($pm_tot_status); - $pm_total = $row['total']; - } + message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } -if ( !$pm_all_status = $db->sql_query($sql_all_tot) ) -{ - message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); -} -else -{ - if ( $db->sql_numrows($pm_all_status) ) - { - $row = $db->sql_fetchrow($pm_all_status); - $pm_all_total = $row['total']; - } -} +$pm_total = ( $row = $db->sql_fetchrow($result) ) ? $row['total'] : 0; -if ( !$pm_status = $db->sql_query($sql) ) +if ( !($result = $db->sql_query($sql_all_tot)) ) { - message_die(GENERAL_ERROR, "Could not query private messages.", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } -$pm_count = $db->sql_numrows($pm_status); -$pm_list = $db->sql_fetchrowset($pm_status); +$pm_all_total = ( $row = $db->sql_fetchrow($result) ) ? $row['total'] : 0; // // Build select box @@ -1848,49 +1789,49 @@ $pm_list = $db->sql_fetchrowset($pm_status); $previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); $previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); -$select_msg_days = ""; +$select_msg_days = ''; for($i = 0; $i < count($previous_days); $i++) { - $selected = ($msg_days == $previous_days[$i]) ? " selected=\"selected\"" : ""; - $select_msg_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>"; + $selected = ( $msg_days == $previous_days[$i] ) ? ' selected="selected"' : ''; + $select_msg_days .= '<option value="' . $previous_days[$i] . '"' . $selected . '>' . $previous_days_text[$i] . '</option>'; } // // Define correct icons // -if ( $folder == "inbox" ) +if ( $folder == 'inbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; - $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; - $edit_pm_img = ""; + $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>'; + $reply_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_replymsg'] . '" alt="' . $lang['Post_reply_pm'] . '" border="0"></a>'; + $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>'; + $edit_pm_img = ''; $l_box_name = $lang['Inbox']; } -else if ( $folder == "outbox" ) +else if ( $folder == 'outbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = ""; - $quote_pm_img = ""; - $edit_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_editmsg'] . "\" alt=\"" . $lang['Edit_pm'] . "\" border=\"0\"></a>"; + $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>'; + $reply_pm_img = ''; + $quote_pm_img = ''; + $edit_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_editmsg'] . '" alt="' . $lang['Edit_pm'] . '" border="0"></a>'; $l_box_name = $lang['Outbox']; } -else if ( $folder == "savebox" ) +else if ( $folder == 'savebox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; - $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; - $edit_pm_img = ""; + $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>'; + $reply_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_replymsg'] . '" alt="' . $lang['Post_reply_pm'] . '" border="0"></a>'; + $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>'; + $edit_pm_img = ''; $l_box_name = $lang['Savedbox']; } -else if ( $folder == "sentbox" ) +else if ( $folder == 'sentbox' ) { - $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; - $reply_pm_img = ""; - $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; - $edit_pm_img = ""; + $post_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post") . '"><img src="' . $images['pm_postmsg'] . '" alt="' . $lang['Post_new_pm'] . '" border="0"></a>'; + $reply_pm_img = ''; + $quote_pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . '"><img src="' . $images['pm_quotemsg'] . '" alt="' . $lang['Post_quote_pm'] . '" border="0"></a>'; + $edit_pm_img = ''; $l_box_name = $lang['Sentbox']; } @@ -1898,7 +1839,7 @@ else if ( $folder == "sentbox" ) // // Output data for inbox status // -if ( $folder != "outbox" ) +if ( $folder != 'outbox' ) { if ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) { @@ -1925,7 +1866,7 @@ if ( $folder != "outbox" ) $inbox_limit_remain = 0; } - $template->assign_block_vars("box_size_notice", array()); + $template->assign_block_vars('switch_box_size_notice', array()); switch( $folder ) { @@ -1939,76 +1880,81 @@ if ( $folder != "outbox" ) $l_box_size_status = sprintf($lang['Savebox_size'], $inbox_limit_pct); break; default: - $l_box_size_status = ""; + $l_box_size_status = ''; break; } - } // // Dump vars to template // $template->assign_vars(array( - "BOX_NAME" => $l_box_name, - "INBOX_IMG" => $inbox_img, - "SENTBOX_IMG" => $sentbox_img, - "OUTBOX_IMG" => $outbox_img, - "SAVEBOX_IMG" => $savebox_img, - "INBOX_LINK" => $inbox_url, - "SENTBOX_LINK" => $sentbox_url, - "OUTBOX_LINK" => $outbox_url, - "SAVEBOX_LINK" => $savebox_url, - - "POST_PM_IMG" => $post_pm_img, - - "INBOX_LIMIT_IMG_WIDTH" => $inbox_limit_img_length, - "INBOX_LIMIT_PERCENT" => $inbox_limit_pct, - - "BOX_SIZE_STATUS" => $l_box_size_status, - - "L_INBOX" => $lang['Inbox'], - "L_OUTBOX" => $lang['Outbox'], - "L_SENTBOX" => $lang['Sent'], - "L_SAVEBOX" => $lang['Saved'], - "L_MARK" => $lang['Mark'], - "L_FLAG" => $lang['Flag'], - "L_SUBJECT" => $lang['Subject'], - "L_DATE" => $lang['Date'], - "L_DISPLAY_MESSAGES" => $lang['Display_messages'], - "L_FROM_OR_TO" => ($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To'], - "L_MARK_ALL" => $lang['Mark_all'], - "L_UNMARK_ALL" => $lang['Unmark_all'], - "L_DELETE_MARKED" => $lang['Delete_marked'], - "L_DELETE_ALL" => $lang['Delete_all'], - "L_SAVE_MARKED" => $lang['Save_marked'], - - "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "S_HIDDEN_FIELDS" => "", - "S_POST_NEW_MSG" => $post_new_mesg_url, - "S_MSG_DAYS_OPTIONS" => $select_msg_days, - - "U_POST_NEW_TOPIC" => $post_new_topic_url) + 'BOX_NAME' => $l_box_name, + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'POST_PM_IMG' => $post_pm_img, + + 'INBOX_LIMIT_IMG_WIDTH' => $inbox_limit_img_length, + 'INBOX_LIMIT_PERCENT' => $inbox_limit_pct, + + 'BOX_SIZE_STATUS' => $l_box_size_status, + + 'L_INBOX' => $lang['Inbox'], + 'L_OUTBOX' => $lang['Outbox'], + 'L_SENTBOX' => $lang['Sent'], + 'L_SAVEBOX' => $lang['Saved'], + 'L_MARK' => $lang['Mark'], + 'L_FLAG' => $lang['Flag'], + 'L_SUBJECT' => $lang['Subject'], + 'L_DATE' => $lang['Date'], + 'L_DISPLAY_MESSAGES' => $lang['Display_messages'], + 'L_FROM_OR_TO' => ( $folder == 'inbox' || $folder == 'savebox' ) ? $lang['From'] : $lang['To'], + 'L_MARK_ALL' => $lang['Mark_all'], + 'L_UNMARK_ALL' => $lang['Unmark_all'], + 'L_DELETE_MARKED' => $lang['Delete_marked'], + 'L_DELETE_ALL' => $lang['Delete_all'], + 'L_SAVE_MARKED' => $lang['Save_marked'], + + 'S_PRIVMSGS_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => '', + 'S_POST_NEW_MSG' => $post_new_mesg_url, + 'S_SELECT_MSG_DAYS' => $select_msg_days, + + 'U_POST_NEW_TOPIC' => $post_new_topic_url) ); - // // Okay, let's build the correct folder // -if ( $pm_count ) +if ( !($result = $db->sql_query($sql)) ) { - for($i = 0; $i < $pm_count; $i++) + message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql); +} + +if ( $row = $db->sql_fetchrow($result) ) +{ + do { - $privmsg_id = $pm_list[$i]['privmsgs_id']; + $privmsg_id = $row['privmsgs_id']; + + $flag = $row['privmsgs_type']; - $flag = $pm_list[$i]['privmsgs_type']; - $icon_flag = ($flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? "<img src=\"" . $images['pm_unreadmsg'] . "\" alt=\"" . $lang['Unread_message'] . "\" border=\"0\">" : "<img src=\"" . $images['pm_readmsg'] . "\" alt=\"" . $lang['Read_message'] . "\" border=\"0\">"; + $icon_flag = ( $flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? $images['pm_unreadmsg'] : $images['pm_readmsg']; + $icon_flag_alt = ( $flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? $lang['Unread_message'] : $lang['Read_message']; - $msg_userid = $pm_list[$i]['user_id']; - $msg_username = $pm_list[$i]['username']; + $msg_userid = $row['user_id']; + $msg_username = $row['username']; $u_from_user_profile = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$msg_userid"); - $msg_subject = $pm_list[$i]['privmsgs_subject']; + $msg_subject = $row['privmsgs_subject']; if ( count($orig_word) ) { @@ -2017,52 +1963,55 @@ if ( $pm_count ) $u_subject = append_sid("privmsg.$phpEx?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"); - $msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']); + $msg_date = create_date($board_config['default_dateformat'], $row['privmsgs_date'], $board_config['board_timezone']); - if ( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" ) + if ( $flag == PRIVMSGS_NEW_MAIL && $folder == 'inbox' ) { - $msg_subject = "<b>" . $msg_subject . "</b>"; - $msg_date = "<b>" . $msg_date . "</b>"; - $msg_username = "<b>" . $msg_username . "</b>"; + $msg_subject = '<b>' . $msg_subject . '</b>'; + $msg_date = '<b>' . $msg_date . '</b>'; + $msg_username = '<b>' . $msg_username . '</b>'; } - $row_color = (!($i % 2)) ? $theme['td_color1'] : $theme['td_color2']; - $row_class = (!($i % 2)) ? $theme['td_class1'] : $theme['td_class2']; + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; - $template->assign_block_vars("listrow", array( - "ROW_COLOR" => "#". $row_color, - "ROW_CLASS" => $row_class, - "ICON_FLAG_IMG" => $icon_flag, - "FROM" => $msg_username, - "SUBJECT" => $msg_subject, - "DATE" => $msg_date, + $template->assign_block_vars('listrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FROM' => $msg_username, + 'SUBJECT' => $msg_subject, + 'DATE' => $msg_date, + 'PRIVMSG_FOLDER_IMG' => $icon_flag, - "S_MARK_ID" => $privmsg_id, + 'L_PRIVMSG_FOLDER_ALT' => $icon_flag_alt, - "U_READ" => $u_subject, - "U_FROM_USER_PROFILE" => $u_from_user_profile) + 'S_MARK_ID' => $privmsg_id, + + 'U_READ' => $u_subject, + 'U_FROM_USER_PROFILE' => $u_from_user_profile) ); - } // for ... + } + while( $row = $db->sql_fetchrow($result) ); $template->assign_vars(array( - "PAGINATION" => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start), - "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )), + 'PAGINATION' => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )), - "L_GOTO_PAGE" => $lang['Goto_page']) + 'L_GOTO_PAGE' => $lang['Goto_page']) ); } else { $template->assign_vars(array( - "L_NO_MESSAGES" => $lang['No_messages_folder']) + 'L_NO_MESSAGES' => $lang['No_messages_folder']) ); - $template->assign_block_vars("nomessages", array() ); + $template->assign_block_vars("switch_no_messages", array() ); } -$template->pparse("body"); +$template->pparse('body'); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> +?>
\ No newline at end of file |