|
From: Paul S. O. <ps...@us...> - 2002-02-18 12:34:19
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv5288/includes
Modified Files:
post.php
Log Message:
Somewhat overhauled posting, fixed various bugs, completed new way of handling URIs in emails, blah blah
Index: post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/post.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** post.php 17 Feb 2002 17:25:31 -0000 1.15
--- post.php 18 Feb 2002 12:34:16 -0000 1.16
***************
*** 1,5 ****
<?php
/***************************************************************************
! *
* -------------------
* begin : Saturday, Feb 13, 2001
--- 1,5 ----
<?php
/***************************************************************************
! * post.php
* -------------------
* begin : Saturday, Feb 13, 2001
***************
*** 21,24 ****
--- 21,29 ----
***************************************************************************/
+ $html_entities_match = array("#&#", "#<#", "#>#");
+ $html_entities_replace = array("&", "<", ">");
+ $unhtml_specialchars_match = array("#>#", "#<#", "#"#", "#&#");
+ $unhtml_specialchars_replace = array(">", "<", "\"", "&");
+
//
// This function will prepare a posted message for
***************
*** 28,31 ****
--- 33,37 ----
{
global $board_config;
+ global $html_entities_match, $html_entities_replace;
$allowed_html_tags = split(",", $board_config['allow_html_tags']);
***************
*** 36,73 ****
$message = trim($message);
! if( $html_on )
{
! $html_entities_match = array("#&#", "#<#", "#>#");
! $html_entities_replace = array("&", "<", ">");
!
! $message = preg_replace("#&([a-z0-9]+?);#i", "&\\1;", $message);
$start_html = 1;
!
! $message = " " . $message;
! while( $start_html = strpos($message, "<", $start_html) )
{
! if( $end_html = strpos($message, ">", $start_html) )
{
$length = $end_html - $start_html + 1;
! $tagallowed = 0;
for($i = 0; $i < sizeof($allowed_html_tags); $i++)
{
$match_tag = trim($allowed_html_tags[$i]);
! if( preg_match("/^[\/]?" . $match_tag . "( .*?)*$/i", trim(substr($message, $start_html + 1, $length - 2))) )
{
! if( !preg_match("/(^\?)|(\?$)/", trim(substr($message, $start_html + 1, $length - 2))) )
! {
! $tagallowed = 1;
! }
}
}
! if( $length && !$tagallowed )
! {
! $message = str_replace(substr($message, $start_html, $length), preg_replace($html_entities_match, $html_entities_replace, substr($message, $start_html, $length)), $message);
! }
$start_html += $length;
--- 42,79 ----
$message = trim($message);
! if ( $html_on )
{
! $message = " " . preg_replace("#&#i", "&", $message);
+ $end_html = 0;
$start_html = 1;
! $temp_message = "";
! while ( $start_html = strpos($message, "<", $start_html) )
{
! $temp_message .= substr($message, $end_html + 1, ( $start_html - $end_html - 1 ));
!
! if ( $end_html = strpos($message, ">", $start_html) )
{
$length = $end_html - $start_html + 1;
+ $hold_string = substr($message, $start_html, $length);
! if ( ( $unclosed_open = strrpos(" " . $hold_string, "<") ) != 1 )
! {
! $temp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($hold_string, 0, $unclosed_open - 2));
! $hold_string = substr($hold_string, $unclosed_open - 1);
! }
!
! $tagallowed = false;
for($i = 0; $i < sizeof($allowed_html_tags); $i++)
{
$match_tag = trim($allowed_html_tags[$i]);
! if ( preg_match("/^<\/?" . $match_tag . "\b/i", $hold_string) )
{
! $tagallowed = true;
}
}
! $temp_message .= ( $length && !$tagallowed ) ? preg_replace($html_entities_match, $html_entities_replace, $hold_string) : $hold_string;
$start_html += $length;
***************
*** 75,89 ****
else
{
! $message = str_replace(substr($message, $start_html, 1), preg_replace($html_entities_match, $html_entities_replace, substr($message, $start_html, 1)), $message);
$start_html = strlen($message);
}
}
! $message = trim($message);
}
else
{
- $html_entities_match = array("#&#", "#<#", "#>#");
- $html_entities_replace = array("&", "<", ">");
$message = preg_replace($html_entities_match, $html_entities_replace, $message);
}
--- 81,94 ----
else
{
! $temp_message .= preg_replace($html_entities_match, $html_entities_replace, substr($message, $start_html, strlen($message)));
$start_html = strlen($message);
}
}
!
! $message = ( $temp_message != "" ) ? trim($temp_message) : trim($message);
}
else
{
$message = preg_replace($html_entities_match, $html_entities_replace, $message);
}
***************
*** 94,100 ****
}
! return($message);
}
//
--- 99,687 ----
}
! return $message;
! }
!
! function unprepare_message($message)
! {
! global $unhtml_specialchars_match, $unhtml_specialchars_replace;
!
! return preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $message);
! }
!
! //
! // Prepare a message for posting
! //
! function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on, &$error_msg, &$username, &$bbcode_uid, &$subject, &$message, &$poll_title, &$poll_options, &$poll_length)
! {
! global $board_config, $lang, $phpEx;
!
! // Check username
! if ( !empty($username) )
! {
! $username = htmlspecialchars(trim(strip_tags(str_replace(" ", " ", $username))));
!
! $result = validate_username($username);
! if ( $result['error'] )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $result['error_msg'] : $result['error_msg'];
! }
! }
!
! // Check subject
! if ( !empty($subject) )
! {
! $subject = htmlspecialchars(trim($subject));
! }
! else if ( $mode == "newtopic" || ( $mode == "editpost" && $post_data['first_post'] ) )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $lang['Empty_subject'] : $lang['Empty_subject'];
! }
!
! // Check message
! if ( !empty($message) )
! {
! $bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : "";
! $message = prepare_message(trim($message), $html_on, $bbcode_on, $smilies_on, $bbcode_uid);
! }
! else if ( $mode != "delete" && $mode != "polldelete" )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $lang['Empty_message'] : $lang['Empty_message'];
! }
!
! //
! // Handle poll stuff
! //
! if ( $mode == "newtopic" || ( $mode == "editpost" && $post_data['first_post'] ) )
! {
! $poll_length = ( isset($poll_length) ) ? max(0, intval($poll_length)) : 0;
!
! if ( !empty($poll_title) )
! {
! $poll_title = htmlspecialchars(trim($poll_title));
! }
!
! if( !empty($poll_options) )
! {
! $temp_option_text = array();
! while( list($option_id, $option_text) = @each($poll_options) )
! {
! $option_text = trim($option_text);
! if ( !empty($option_text) )
! {
! $temp_option_text[$option_id] = htmlspecialchars($option_text);
! }
! }
! $option_text = $temp_option_text;
!
! if ( count($poll_options) < 2 )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $lang['To_few_poll_options'] : $lang['To_few_poll_options'];
! }
! else if ( count($poll_options) > $board_config['max_poll_options'] )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $lang['To_many_poll_options'] : $lang['To_many_poll_options'];
! }
! else if ( $poll_title == "" )
! {
! $error_msg .= ( !empty($error_msg) ) ? "<br />" . $lang['Empty_poll_title'] : $lang['Empty_poll_title'];
! }
! }
! }
!
! return;
! }
!
! //
! // Post a new topic/reply/poll or edit existing post/poll
! //
! function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id, &$topic_type, &$bbcode_on, &$html_on, &$smilies_on, &$attach_sig, &$bbcode_uid, &$post_username, &$post_subject, &$post_message, &$poll_title, &$poll_options, &$poll_length)
! {
! global $board_config, $lang, $db, $phpEx;
! global $userdata, $user_ip;
!
! $current_time = time();
!
! if ( $mode == "newtopic" || $mode == "reply" )
! {
! //
! // Flood control
! //
! $where_sql = ( $userdata['user_id'] == ANONYMOUS ) ? "poster_ip = '$user_ip'" : "poster_id = " . $userdata['user_id'];
! $sql = "SELECT MAX(post_time) AS last_post_time
! FROM " . POSTS_TABLE . "
! WHERE $where_sql";
! if ( $result = $db->sql_query($sql) )
! {
! if( $row = $db->sql_fetchrow($result) )
! {
! if ( $row['last_post_time'] > 0 && ( $current_time - $row['last_post_time'] ) < $board_config['flood_interval'] )
! {
! message_die(GENERAL_MESSAGE, $lang['Flood_Error']);
! }
! }
! }
! }
!
! if ( $mode == "newtopic" || ( $mode == "editpost" && $post_data['first_post'] ) )
! {
! $topic_vote = ( !empty($poll_title) && count($poll_options) >= 2 ) ? 1 : 0;
! $sql = ( $mode != "editpost" ) ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type, topic_vote = $topic_vote WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! if( $mode == "newtopic" )
! {
! $topic_id = $db->sql_nextid();
! }
! }
!
! $edited_sql = ( $mode == "editpost" && !$post_data['last_post'] && $post_data['poster_post'] ) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : "";
! $sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id";
! if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! if( $mode != "editpost" )
! {
! $post_id = $db->sql_nextid();
! }
!
! $sql = ( $mode != "editpost" ) ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message', bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! if ( $mode == "editpost" )
! {
! $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
! WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
! }
!
! add_search_words($post_id, stripslashes($post_message), stripslashes($post_subject));
!
! //
! // Add poll
! //
! if ( ( $mode == "newtopic" || $mode == "editpost" ) && !empty($poll_title) && count($poll_options) >= 2 )
! {
! $sql = ( !$post_data['has_poll'] ) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ( $poll_length * 86400 ) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ( $poll_length * 86400 ) . " WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! $delete_option_sql = "";
! $old_poll_result = array();
! if ( $mode == "editpost" && $post_data['has_poll'] )
! {
! $sql = "SELECT vote_option_id, vote_result
! FROM " . VOTE_RESULTS_TABLE . "
! WHERE vote_id = $poll_id
! ORDER BY vote_option_id ASC";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Couldn't obtain vote data results for this topic", "", __LINE__, __FILE__, $sql);
! }
!
! while ( $row = $db->sql_fetchrow($result) )
! {
! $old_poll_result[$row['vote_option_id']] = $row['vote_result'];
!
! if( !isset($poll_options[$row['vote_option_id']]) )
! {
! $delete_option_sql .= ( $delete_option_sql != "" ) ? ", " . $row['vote_option_id'] : $row['vote_option_id'];
! }
! }
! }
! else
! {
! $poll_id = $db->sql_nextid();
! }
!
! @reset($poll_options);
!
! $poll_option_id = 1;
! while ( list($option_id, $option_text) = each($poll_options) )
! {
! if( !empty($option_text) )
! {
! $option_text = str_replace("\'", "''", $option_text);
! $poll_result = ( $mode == "editpost" && isset($old_poll_result[$option_id]) ) ? $old_poll_result[$option_id] : 0;
!
! $sql = ( $mode != "editpost" || !isset($old_poll_result[$option_id]) ) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
! $poll_option_id++;
! }
! }
!
! if( $delete_option_sql != "" )
! {
! $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
! WHERE vote_option_id IN ($delete_option_sql)";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error deleting pruned poll options", "", __LINE__, __FILE__, $sql);
! }
! }
! }
!
! if ( $mode != "editpost" )
! {
! //
! // Update statistics
! //
! $sql = "UPDATE " . TOPICS_TABLE . " SET
! topic_last_post_id = $post_id";
! $sql .= ( ( $mode == "reply" ) ? ", topic_replies = topic_replies + 1 " : ", topic_first_post_id = $post_id " ) . "WHERE topic_id = $topic_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "UPDATE " . FORUMS_TABLE . "
! SET forum_last_post_id = $post_id, forum_posts = forum_posts + 1";
! $sql .= ( ( $mode == "newtopic" ) ? ", forum_topics = forum_topics + 1 " : " " ) . "WHERE forum_id = $forum_id";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "UPDATE " . USERS_TABLE . "
! SET user_posts = user_posts + 1
! WHERE user_id = " . $userdata['user_id'];
! if ( !($result = $db->sql_query($sql, END_TRANSACTION)) )
! {
! message_die(GENERAL_ERROR, "Error in posting", "", __LINE__, __FILE__, $sql);
! }
! }
! else
! {
! remove_unmatched_words();
! }
!
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $post_id) . '#' . $post_id . '">';
! $message = $lang['Stored'] . '<br /><br />' . sprintf($lang['Click_view_message'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $post_id) . '#' . $post_id . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
!
! return false;
! }
!
! //
! // Delete a post/poll
! //
! function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id)
! {
! global $board_config, $lang, $db, $phpEx;
! global $userdata, $user_ip;
!
! $topic_update_sql = "";
! if ( $mode != "poll_delete" )
! {
! $sql = "DELETE FROM " . POSTS_TABLE . "
! WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
! WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
! WHERE post_id = $post_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $forum_update_sql = "forum_posts = forum_posts - 1";
! $topic_update_sql .= "topic_replies = topic_replies - 1";
! if ( $post_data['last_post'] )
! {
! if ( $post_data['first_post'] )
! {
! $sql = "DELETE FROM " . TOPICS_TABLE . "
! WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
! WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $forum_update_sql .= ", forum_topics = forum_topics - 1";
! }
! else
! {
! $sql = "SELECT MAX(post_id) AS post_id
! FROM " . POSTS_TABLE . "
! WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! if ( $row = $db->sql_fetchrow($result) )
! {
! $topic_update_sql .= ", topic_last_post_id = " . $row['post_id'];
! }
! }
!
! if ( $post_data['last_topic'] )
! {
! $sql = "SELECT MAX(post_id) AS post_id
! FROM " . POSTS_TABLE . "
! WHERE forum_id = $forum_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! $row = $db->sql_fetchrow($result);
!
! $forum_update_sql .= ( $row['post_id'] ) ? ", forum_last_post_id = " . $row['post_id'] : ", forum_last_post_id = 0";
! }
! }
! else if ( $post_data['first_post'] )
! {
! $sql = "SELECT MIN(post_id) AS post_id
! FROM " . POSTS_TABLE . "
! WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
!
! if ( $row = $db->sql_fetchrow($result) )
! {
! $topic_update_sql .= ", topic_first_post_id = " . $row['post_id'];
! }
! }
!
! $sql = "UPDATE " . FORUMS_TABLE . "
! SET $forum_update_sql
! WHERE forum_id = $forum_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting post", "", __LINE__, __FILE__, $sql);
! }
! }
!
! if( $mode == "poll_delete" || ( $mode == "delete" && $post_data['first_post'] && $post_data['last_post'] ) && $post_data['has_poll'] && $post_data['edit_poll'] )
! {
! if ( $mode == "poll_delete" )
! {
! $topic_update_sql .= "topic_vote = 0";
! }
!
! $sql = "DELETE FROM " . VOTE_DESC_TABLE . "
! WHERE vote_id = $poll_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting poll", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . "
! WHERE vote_id = $poll_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting poll", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . VOTE_USERS_TABLE . "
! WHERE vote_id = $poll_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in deleting poll", "", __LINE__, __FILE__, $sql);
! }
! }
!
! if ( ( $mode == "delete" && empty($post_data['first_post']) || empty($post_data['last_post']) ) || $mode == "poll_delete" )
! {
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET $topic_update_sql
! WHERE topic_id = $topic_id";
! if ( !($db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, "Error in updating topic info", "", __LINE__, __FILE__, $sql);
! }
! }
!
! remove_unmatched_words();
!
! if ( $mode == "delete" && $post_data['first_post'] && $post_data['last_post'] )
! {
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_TOPIC_URL . "=" . $forum_id) . '">';
! $message = $lang['Deleted'];
! }
! else
! {
! $meta = '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id) . '">';
! $message = ( ( $mode == "poll_delete" ) ? $lang['Poll_delete'] : $lang['Deleted'] ) . '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
! }
!
! $message .= '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a>');
!
! return;
}
+ //
+ // Handle user notification on new post
+ //
+ function user_notification($mode, &$post_data, &$forum_id, &$topic_id, &$post_id, &$notify_user)
+ {
+ global $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
+ global $board_config, $lang, $db, $phpbb_root_path, $phpEx;
+ global $userdata, $user_ip;
+
+ $current_time = time();
+
+ if ( ( $mode == "newtopic" && !$notify_user ) || $mode == "delete" )
+ {
+ $delete_sql = ( !$post_data['first_post'] && !$post_data['last_post'] ) ? " AND user_id = " . $userdata['user_id'] : "";
+ $sql = ( $mode == "newtopic" ) ? "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status) VALUES (" . $userdata['user_id'] . ", $topic_id, 0)" : "DELETE FROM " . TOPICS_WATCH_TABLE . " WHERE topic_id = $topic_id" . $delete_sql;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't change topic notify data", "", __LINE__, __FILE__, $sql);
+ }
+ }
+ else
+ {
+ if ( $mode == "reply" )
+ {
+ $sql = "SELECT ban_userid
+ FROM " . BANLIST_TABLE;
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "", "", __LINE__, __FILE__, $sql);
+ }
+
+ $user_id_sql = "";
+ while ( $row = $db->sql_fetchrow($result) )
+ {
+ $user_id_sql = ", " . $row['ban_userid'];
+ }
+
+ $sql = "SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title
+ FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u
+ WHERE tw.topic_id = $topic_id
+ AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . " )
+ AND tw.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . "
+ AND t.topic_id = tw.topic_id
+ AND u.user_id = tw.user_id";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "", "", __LINE__, __FILE__, $sql);
+ }
+
+ $orig_word = array();
+ $replacement_word = array();
+ obtain_word_list($orig_word, $replacement_word);
+
+ include($phpbb_root_path . 'includes/emailer.'.$phpEx);
+ $emailer = new emailer($board_config['smtp_delivery']);
+
+ $script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path']));
+ $script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$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']) . '/' : '/';
+
+ $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
+
+ $update_watched_sql = "";
+ if ( $row = $db->sql_fetchrow($result) )
+ {
+ $topic_title = preg_replace($orig_word, $replacement_word, unprepare_message($row['topic_title']));
+
+ do
+ {
+ if ( $row['user_email'] != "" )
+ {
+ $emailer->use_template("topic_notify", $row['user_lang']);
+ $emailer->email_address($row['user_email']);
+ $emailer->set_subject($lang['Topic_reply_notification']);
+ $emailer->extra_headers($email_headers);
+
+ $emailer->assign_vars(array(
+ "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']),
+ "USERNAME" => $row['username'],
+ "SITENAME" => $board_config['sitename'],
+ "TOPIC_TITLE" => $topic_title,
+
+ "U_TOPIC" => $server_protocol . $server_name . $server_port . $script_name . "?" . POST_POST_URL . "=$post_id#$post_id",
+ "U_STOP_WATCHING_TOPIC" => $server_protocol . $server_name . $server_port . $script_name . "?" . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
+ );
+
+ $emailer->send();
+ $emailer->reset();
+
+ $update_watched_sql .= ( $update_watched_sql != "" ) ? ", " . $row['user_id'] : $row['user_id'];
+ }
+ }
+ while ( $row = $db->sql_fetchrow($result) );
+ }
+
+ if ( $update_watched_sql != "" )
+ {
+ $sql = "UPDATE " . TOPICS_WATCH_TABLE . "
+ SET notify_status = " . TOPIC_WATCH_NOTIFIED . "
+ WHERE topic_id = $topic_id
+ AND user_id IN ($update_watched_sql)";
+ $db->sql_query($sql);
+ }
+ }
+
+ $sql = "SELECT topic_id
+ FROM " . TOPICS_WATCH_TABLE . "
+ WHERE topic_id = $topic_id
+ AND user_id = " . $userdata['user_id'];
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't obtain topic watch information", "", __LINE__, __FILE__, $sql);
+ }
+
+ $row = $db->sql_fetchrow($result);
+
+ if ( !$notify_user && !empty($row['topic_id']) )
+ {
+ $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
+ WHERE topic_id = $topic_id
+ AND user_id = " . $userdata['user_id'];
+ if ( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't delete topic watch information", "", __LINE__, __FILE__, $sql);
+ }
+ }
+ else if ( $notify_user && empty($row['topic_id']) )
+ {
+ $sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status)
+ VALUES (" . $userdata['user_id'] . ", $topic_id, 0)";
+ if ( !($result = $db->sql_query($sql)) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't insert topic watch information", "", __LINE__, __FILE__, $sql);
+ }
+ }
+ }
+ }
//
***************
*** 109,119 ****
$inline_columns = 4;
! $inline_rows = 6;
!
$window_columns = 8;
! if( $mode == "window" )
{
! $userdata = session_pagestart($user_ip, $page_id, $session_length);
init_userprefs($userdata);
--- 696,705 ----
$inline_columns = 4;
! $inline_rows = 5;
$window_columns = 8;
! if ( $mode == "window" )
{
! $userdata = session_pagestart($user_ip, $page_id);
init_userprefs($userdata);
***************
*** 131,151 ****
FROM " . SMILIES_TABLE . "
ORDER BY smilies_id";
! if( $result = $db->sql_query($sql) )
{
! if( $db->sql_numrows($result) )
{
! $num_smilies = 0;
! $rowset = array();
! while( $row = $db->sql_fetchrow($result) )
{
! // If this is the first time that we encounter this smiley:
! if( empty($rowset[$row['smile_url']]) )
! {
! $rowset[$row['smile_url']]['code'] = str_replace("\\", "\\\\", str_replace("'", "\\'", $row['code']));
! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
! $num_smilies++;
! }
}
$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == "inline" ) ? $inline_columns - 1 : $window_columns - 1;
--- 717,736 ----
FROM " . SMILIES_TABLE . "
ORDER BY smilies_id";
! if ( $result = $db->sql_query($sql) )
{
! $num_smilies = 0;
! $rowset = array();
! while ( $row = $db->sql_fetchrow($result) )
{
! if ( empty($rowset[$row['smile_url']]) )
{
! $rowset[$row['smile_url']]['code'] = str_replace("\\", "\\\\", str_replace("'", "\\'", $row['code']));
! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
! $num_smilies++;
}
+ }
+ if ( $num_smilies )
+ {
$smilies_count = ( $mode == "inline" ) ? min(19, $num_smilies) : $num_smilies;
$smilies_split_row = ( $mode == "inline" ) ? $inline_columns - 1 : $window_columns - 1;
***************
*** 155,161 ****
$col = 0;
! while( list($smile_url, $data) = @each($rowset) )
{
! if( !$col )
{
$template->assign_block_vars("smilies_row", array());
--- 740,746 ----
$col = 0;
! while ( list($smile_url, $data) = @each($rowset) )
{
! if ( !$col )
{
$template->assign_block_vars("smilies_row", array());
***************
*** 170,176 ****
$s_colspan = max($s_colspan, $col + 1);
! if( $col == $smilies_split_row )
{
! if( $mode == "inline" && $row == $inline_rows - 1 )
{
break;
--- 755,761 ----
$s_colspan = max($s_colspan, $col + 1);
! if ( $col == $smilies_split_row )
{
! if ( $mode == "inline" && $row == $inline_rows - 1 )
{
break;
***************
*** 185,189 ****
}
! if( $mode == "inline" && $num_smilies > $inline_columns * $inline_rows)
{
$template->assign_block_vars("switch_smilies_extra", array());
--- 770,774 ----
}
! if ( $mode == "inline" && $num_smilies > $inline_rows * $inline_columns )
{
$template->assign_block_vars("switch_smilies_extra", array());
***************
*** 203,207 ****
}
! if( $mode == "window" )
{
$template->pparse("smiliesbody");
--- 788,792 ----
}
! if ( $mode == "window" )
{
$template->pparse("smiliesbody");
***************
*** 211,213 ****
}
! ?>
--- 796,798 ----
}
! ?>
\ No newline at end of file
|