diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-23 14:00:57 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-06-23 14:00:57 +0000 |
commit | 7661a5d040a3827e9ab39b825b47a8f036cda21b (patch) | |
tree | 8201c04116534dea228aa05d6f8e0f6a01943ffb /phpBB/posting.php | |
parent | 36685677dd8a7a607629394c3f6d238efe689139 (diff) | |
download | forums-7661a5d040a3827e9ab39b825b47a8f036cda21b.tar forums-7661a5d040a3827e9ab39b825b47a8f036cda21b.tar.gz forums-7661a5d040a3827e9ab39b825b47a8f036cda21b.tar.bz2 forums-7661a5d040a3827e9ab39b825b47a8f036cda21b.tar.xz forums-7661a5d040a3827e9ab39b825b47a8f036cda21b.zip |
Global announcements ... sort of work ... well they seem to, need to look at possbility of splitting topics table in two
git-svn-id: file:///svn/phpbb/trunk@4167 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r-- | phpBB/posting.php | 790 |
1 files changed, 690 insertions, 100 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 176d1b3868..3535337a1b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -19,15 +19,6 @@ * ***************************************************************************/ -// TODO for 2.2: -// -// * hidden form element containing sid to prevent remote posting - Edwin van Vliet -// * bbcode parsing -> see functions_posting.php -// * multichoice polls -// * permission defined ability for user to add poll options -// * Spellcheck? aspell? or some such? -// * Posting approval - define('IN_PHPBB', true); $phpbb_root_path = './'; include($phpbb_root_path . 'extension.inc'); @@ -35,11 +26,13 @@ include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'includes/functions_posting.'.$phpEx); include($phpbb_root_path . 'includes/message_parser.'.$phpEx); + // Start session management $user->start(); $auth->acl($user->data); $user->setup(); + // Grab only parameters needed here $mode = (!empty($_REQUEST['mode'])) ? strval($_REQUEST['mode']) : ''; $post_id = (!empty($_REQUEST['p'])) ? intval($_REQUEST['p']) : false; @@ -73,9 +66,17 @@ if ($cancel || time() - $lastclick < 2) $forum_validate = $topic_validate = $post_validate = false; // Easier validation -$forum_fields = array('forum_name' => 's', 'parent_id' => 'i', 'forum_parents' => 's', 'forum_status' => 'i', 'forum_type' => 'i', 'enable_icons' => 'i'); -$topic_fields = array('topic_status' => 'i', 'topic_first_post_id' => 'i', 'topic_last_post_id' => 'i', 'topic_type' => 'i', 'topic_title' => 's', 'poll_last_vote' => 'i', 'poll_start' => 'i', 'poll_title' => 's', 'poll_max_options' => 'i', 'poll_length' => 'i'); -$post_fields = array('post_time' => 'i', 'poster_id' => 'i', 'post_username' => 's', 'post_text' => 's', 'post_subject' => 's', 'post_checksum' => 's', 'post_attachment' => 'i', 'bbcode_uid' => 's', 'enable_magic_url' => 'i', 'enable_sig' => 'i', 'enable_smilies' => 'i', 'enable_bbcode' => 'i', 'post_edit_locked' => 'i'); +$parameters = array( + 'forums' => array( + 'forum_name' => 's', 'parent_id' => 'i', 'forum_parents' => 's', 'forum_status' => 'i', 'forum_type' => 'i', 'enable_icons' => 'i' + ), + 'topics' => array( + 'topic_status' => 'i', 'topic_first_post_id' => 'i', 'topic_last_post_id' => 'i', 'topic_type' => 'i', 'topic_title' => 's', 'poll_last_vote' => 'i', 'poll_start' => 'i', 'poll_title' => 's', 'poll_max_options' => 'i', 'poll_length' => 'i' + ), + 'posts' => array( + 'post_time' => 'i', 'poster_id' => 'i', 'post_username' => 's', 'post_text' => 's', 'post_subject' => 's', 'post_checksum' => 's', 'post_attachment' => 'i', 'bbcode_uid' => 's', 'enable_magic_url' => 'i', 'enable_sig' => 'i', 'enable_smilies' => 'i', 'enable_bbcode' => 'i', 'post_edit_locked' => 'i' + ) +); $sql = ''; switch ($mode) @@ -102,7 +103,7 @@ switch ($mode) $sql = 'SELECT t.*, f.* FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f WHERE t.topic_id = $topic_id - AND f.forum_id = t.forum_id"; + AND f.forum_id IN (t.forum_id, $forum_id)"; $forum_validate = $topic_validate = true; break; @@ -120,7 +121,7 @@ switch ($mode) WHERE p.post_id = $post_id AND t.topic_id = p.topic_id AND u.user_id = p.poster_id - AND f.forum_id = t.forum_id"; + AND f.forum_id IN (t.forum_id, $forum_id)"; $forum_validate = $topic_validate = $post_validate = true; break; @@ -131,7 +132,7 @@ switch ($mode) trigger_error($user->lang['NO_TOPIC']); } - topic_review($topic_id, false); + topic_review($topic_id, $forum_id, false); break; case 'smilies': @@ -142,8 +143,6 @@ switch ($mode) trigger_error($user->lang['NO_MODE']); } -$message_parser = new parse_message(0); // <- TODO: add constant (MSG_POST/MSG_PM) - if ($sql != '') { $result = $db->sql_query($sql); @@ -155,9 +154,9 @@ if ($sql != '') $postrow = $row; $quote_username = (!empty($row['username'])) ? $row['username'] : $row['post_username']; - $forum_id = intval($row['forum_id']); - $topic_id = intval($row['topic_id']); - $post_id = intval($row['post_id']); + $forum_id = (int) $row['forum_id']; + $topic_id = (int) $row['topic_id']; + $post_id = (int) $row['post_id']; $user->setup(false, $row['forum_style']); @@ -165,54 +164,29 @@ if ($sql != '') { login_forum_box($row); } - - foreach ($forum_fields as $var => $type) - { - switch ($type) - { - case 'i': - $$var = ($forum_validate) ? intval($row[$var]) : false; - break; - case 's': - $$var = ($forum_validate) ? trim($row[$var]) : ''; - break; - default: - $$var = ''; - } - } - - foreach ($topic_fields as $var => $type) - { - switch ($type) - { - case 'i': - $$var = ($topic_validate) ? intval($row[$var]) : false; - break; - case 's': - $$var = ($topic_validate) ? trim($row[$var]) : ''; - break; - default: - $$var = ''; - } - } - - foreach ($post_fields as $var => $type) + + // ??? + foreach ($parameters as $parameter => $param_ary) { - switch ($type) + foreach ($param_ary as $var => $type) { - case 'i': - $$var = ($post_validate) ? intval($row[$var]) : false; - break; - case 's': - $$var = ($post_validate) ? trim($row[$var]) : ''; - break; - default: - $$var = ''; + switch ($type) + { + case 'i': + $$var = ($forum_validate) ? (int) $row[$var] : false; + break; + case 's': + $$var = ($forum_validate) ? trim($row[$var]) : ''; + break; + default: + $$var = false; + } } } $post_subject = ($post_validate) ? $post_subject : $topic_title; + $poll_length = ($poll_length) ? $poll_length/3600 : $poll_length; $poll_options = array(); @@ -232,6 +206,10 @@ if ($sql != '') $db->sql_freeresult($result); } + + $message_parser = new parse_message(0); // <- TODO: add constant (MSG_POST/MSG_PM) + + $message_parser->filename_data['filecomment'] = (isset($_POST['filecomment'])) ? trim(strip_tags($_POST['filecomment'])) : ''; $message_parser->filename_data['filename'] = ($_FILES['fileupload']['name'] != 'none') ? trim($_FILES['fileupload']['name']) : ''; @@ -252,6 +230,7 @@ if ($sql != '') $db->sql_freeresult($result); } + if ($poster_id == ANONYMOUS || !$poster_id) { $username = ($post_validate) ? trim($post_username) : ''; @@ -263,17 +242,19 @@ if ($sql != '') $enable_urls = $enable_magic_url; + if (!$post_validate) { - $enable_sig = (intval($config['allow_sig']) && $user->data['user_attachsig']) ? true : false; - $enable_smilies = (intval($config['allow_smilies']) && $user->data['user_allowsmile']) ? true : false; - $enable_bbcode = (intval($config['allow_bbcode']) && $user->data['user_allowbbcode']) ? true : false; + $enable_sig = ($config['allow_sig'] && $user->data['user_attachsig']) ? true : false; + $enable_smilies = ($config['allow_smilies'] && $user->data['user_allowsmile']) ? true : false; + $enable_bbcode = ($config['allow_bbcode'] && $user->data['user_allowbbcode']) ? true : false; $enable_urls = true; } $enable_magic_url = false; } + // Notify user checkbox if ($mode != 'post' && $user->data['user_id'] != ANONYMOUS) { @@ -291,11 +272,13 @@ else $notify_set = -1; } + if (!$auth->acl_get('f_' . $mode, $forum_id) && $forum_type == FORUM_POST) { trigger_error($user->lang['USER_CANNOT_' . strtoupper($mode)]); } + // Forum/Topic locked? if (($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) && !$auth->acl_get('m_edit', $forum_id)) { @@ -303,29 +286,34 @@ if (($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) && !$auth->ac trigger_error($user->lang[$message]); } + // Can we edit this post? if (($mode == 'edit' || $mode == 'delete') && !$auth->acl_get('m_edit', $forum_id) && $config['edit_time'] && $post_time < time() - $config['edit_time']) { trigger_error($user->lang['CANNOT_EDIT_TIME']); } + // Do we want to edit our post ? if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id) && $user->data['user_id'] != $poster_id) { trigger_error($user->lang['USER_CANNOT_EDIT']); } + // Is edit posting locked ? if ($mode == 'edit' && $post_edit_locked && !$auth->acl_get('m_', $forum_id)) { trigger_error($user->lang['CANNOT_EDIT_POST_LOCKED']); } + if ($mode == 'edit') { $message_parser->bbcode_uid = $row['bbcode_uid']; } + // Delete triggered ? if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['user_id'] != ANONYMOUS && $auth->acl_get('f_delete', $forum_id) && $post_id == $topic_last_post_id) || $auth->acl_get('m_delete', $forum_id))) { @@ -385,7 +373,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data[' if ($post_data['topic_first_post_id'] != $post_data['topic_last_post_id'] && $post_id == $post_data['topic_first_post_id']) { $topic_sql = array( - 'topic_first_post_id' => intval($row['post_id']), + 'topic_first_post_id' => (int) $row['post_id'], 'topic_first_poster_name' => ($row['poster_id'] == ANONYMOUS) ? trim($row['post_username']) : trim($row['username']) ); } @@ -426,6 +414,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data[' $db->sql_transaction('commit'); + if ($post_data['topic_first_post_id'] == $post_data['topic_last_post_id']) { $meta_info = "viewforum.$phpEx$SID&f=$forum_id"; @@ -455,7 +444,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data[' 'MESSAGE_TITLE' => $user->lang['DELETE_MESSAGE'], 'MESSAGE_TEXT' => $user->lang['CONFIRM_DELETE'], - 'S_CONFIRM_ACTION' => $phpbb_root_path . 'posting.' . $phpEx . $SID, + 'S_CONFIRM_ACTION' => "posting.$phpEx$SID", 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); @@ -463,27 +452,31 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data[' } } + if ($mode == 'delete' && $poster_id != $user->data['user_id'] && !$auth->acl_get('f_delete', $forum_id)) { trigger_error($user->lang['DELETE_OWN_POSTS']); } + if ($mode == 'delete' && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && $post_id != $topic_last_post_id) { trigger_error($user->lang['CANNOT_DELETE_REPLIED']); } + if ($mode == 'delete') { trigger_error('USER_CANNOT_DELETE'); } + // HTML, BBCode, Smilies, Images and Flash status -$html_status = (intval($config['allow_html']) && $auth->acl_get('f_html', $forum_id)) ? true : false; -$bbcode_status = (intval($config['allow_bbcode']) && $auth->acl_get('f_bbcode', $forum_id)) ? true : false; -$smilies_status = (intval($config['allow_smilies']) && $auth->acl_get('f_smilies', $forum_id)) ? true : false; -$img_status = (intval($config['allow_img']) && $auth->acl_get('f_img', $forum_id)) ? true : false; -$flash_status = (intval($config['allow_flash']) && $auth->acl_get('f_flash', $forum_id)) ? true : false; +$html_status = ($config['allow_html'] && $auth->acl_get('f_html', $forum_id)) ? true : false; +$bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)) ? true : false; +$smilies_status = ($config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false; +$img_status = ($config['allow_img'] && $auth->acl_get('f_img', $forum_id)) ? true : false; +$flash_status = ($config['allow_flash'] && $auth->acl_get('f_flash', $forum_id)) ? true : false; if ($submit || $preview || $refresh) { @@ -498,7 +491,7 @@ if ($submit || $preview || $refresh) $message_parser->message = (!empty($_POST['message'])) ? trim(stripslashes($_POST['message'])) : ''; $username = (!empty($_POST['username'])) ? trim($_POST['username']) : ''; - $topic_type = (!empty($_POST['topic_type'])) ? intval($_POST['topic_type']) : POST_NORMAL; + $topic_type = (!empty($_POST['topic_type'])) ? (int) $_POST['topic_type'] : (($mode != 'post') ? $topic_type : POST_NORMAL); $icon_id = (!empty($_POST['icon'])) ? intval($_POST['icon']) : 0; $enable_html = (!$html_status || !empty($_POST['disable_html'])) ? FALSE : TRUE; @@ -513,10 +506,12 @@ if ($submit || $preview || $refresh) $poll_delete = (isset($_POST['poll_delete'])) ? true : false; + // Faster than crc32 $check_value = (($enable_html+1) << 16) + (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); $status_switch = (isset($_POST['status_switch']) && intval($_POST['status_switch']) != $check_value) ? true : false; + if ($poll_delete && (($mode == 'edit' && !empty($poll_options) && empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))) { // Delete Poll @@ -551,7 +546,7 @@ if ($submit || $preview || $refresh) $poll_max_options = (!empty($_POST['poll_max_options'])) ? intval($_POST['poll_max_options']) : 1; } - $err_msg = ''; + $error = array(); $current_time = time(); // If replying/quoting and last post id has changed @@ -631,7 +626,7 @@ if ($submit || $preview || $refresh) // Parse message if ($result = $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $img_status, $flash_status)) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $result; + $error[] = $result; } } @@ -639,7 +634,7 @@ if ($submit || $preview || $refresh) if (count($result)) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . implode('<br />', $result); + $error[] = implode('<br />', $result); } if ($mode != 'edit' && !$preview && !$refresh && !$auth->acl_get('f_ignoreflood', $forum_id)) @@ -654,12 +649,13 @@ if ($submit || $preview || $refresh) { if (intval($row['last_post_time']) && ($current_time - intval($row['last_post_time'])) < intval($config['flood_interval'])) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $user->lang['FLOOD_ERROR']; + $error[] = $user->lang['FLOOD_ERROR']; } } } // Validate username + // TODO if (($username != '' && $user->data['user_id'] == ANONYMOUS) || ($mode == 'edit' && $post_username != '')) { include($phpbb_root_path . 'includes/functions_user.' . $phpEx); @@ -668,14 +664,14 @@ if ($submit || $preview || $refresh) if (($result = $ucp->validate_username($username)) != false) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $result; + $error[] = $result; } } // Parse subject if ($subject == '' && ($mode == 'post' || ($mode == 'edit' && $topic_first_post_id == $post_id))) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $user->lang['EMPTY_SUBJECT']; + $error[] = $user->lang['EMPTY_SUBJECT']; } $poll_data = array( @@ -695,7 +691,7 @@ if ($submit || $preview || $refresh) $poll = array(); if (($result = $message_parser->parse_poll($poll, $poll_data)) != '') { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $result; + $error[] = $result; } $poll_options = $poll['poll_options']; @@ -704,28 +700,29 @@ if ($submit || $preview || $refresh) // Check topic type if ($topic_type != POST_NORMAL) { - $auth_option = ''; switch ($topic_type) { case POST_GLOBAL: - $auth_option = 'global'; - break; +// $auth_option = 'a_news'; +// break; case POST_ANNOUNCE: - $auth_option = 'announce'; + $auth_option = 'f_announce'; break; case POST_STICKY: - $auth_option = 'sticky'; + $auth_option = 'f_sticky'; break; + default: + $auth_option = ''; } - if (!$auth->acl_get('f_' . $auth_option, $forum_id)) + if (!$auth->acl_get($auth_option, $forum_id)) { - $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $user->lang['CANNOT_POST_' . strtoupper($auth_option)]; + $error[] = $user->lang['CANNOT_POST_' . strtoupper($auth_option)]; } } // Store message, sync counters - if ($err_msg == '' && $submit) + if (!sizeof($error) && $submit) { // Lock/Unlock Topic $change_topic_status = $topic_status; @@ -782,7 +779,6 @@ if ($submit || $preview || $refresh) 'post_edit_locked' => $post_edit_locked, 'bbcode_bitfield' => $message_parser->bbcode_bitfield ); - submit_post($mode, $message_parser->message, $subject, $username, $topic_type, $message_parser->bbcode_uid, $poll, $message_parser->attachment_data, $message_parser->filename_data, $post_data); } @@ -791,7 +787,7 @@ if ($submit || $preview || $refresh) } // Preview -if (!$err_msg && $preview) +if (!sizeof($error) && $preview) { if (empty($censors)) { @@ -801,14 +797,17 @@ if (!$err_msg && $preview) $post_time = $current_time; + include($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($message_parser->bbcode_bitfield); + $preview_message = format_display($message_parser->message, $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, $enable_sig); $preview_subject = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $subject) : $subject; + // Poll Preview - if ( ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && empty($poll_last_vote))) && ($auth->acl_get('f_poll', $forum_id) || $auth->acl_get('m_edit', $forum_id)) ) + if (($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && empty($poll_last_vote))) && ($auth->acl_get('f_poll', $forum_id) || $auth->acl_get('m_edit', $forum_id))) { decode_text($poll_title, $message_parser->bbcode_uid); $preview_poll_title = format_display(stripslashes($poll_title), $enable_html, $enable_bbcode, $message_parser->bbcode_uid, $enable_urls, $enable_smilies, false, false); @@ -826,6 +825,7 @@ if (!$err_msg && $preview) } } + // Attachment Preview if (sizeof($message_parser->attachment_data)) { @@ -840,15 +840,18 @@ if (!$err_msg && $preview) } } + // Decode text for message display $bbcode_uid = ($mode == 'quote' && !$preview) ? $row['bbcode_uid'] : $message_parser->bbcode_uid; + decode_text($post_text, $bbcode_uid); if ($subject) { decode_text($subject, $bbcode_uid); } + // Save us some processing time. ;) if (count($poll_options)) { @@ -857,24 +860,29 @@ if (count($poll_options)) $poll_options = explode("\n", $poll_options_tmp); } + if ($mode == 'quote' && !$preview && !$refresh) { $post_text = '[quote="' . $quote_username . '"]' . trim($post_text) . "[/quote]\n"; } + if (($mode == 'reply' || $mode == 'quote') && !$preview && !$refresh) { $post_subject = ((!preg_match('/^Re:/', $post_subject)) ? 'Re: ' : '') . $post_subject; } + // MAIN POSTING PAGE BEGINS HERE // Forum moderators? get_moderators($moderators, $forum_id); + // Generate smilies and topic icon listings generate_smilies('inline'); + // Generate Topic icons $s_topic_icons = false; if ($enable_icons) @@ -910,8 +918,8 @@ if ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id)) { $topic_types = array( 'sticky' => array('const' => POST_STICKY, 'lang' => 'POST_STICKY'), - 'announce' => array('const' => POST_ANNOUNCE, 'lang' => 'POST_ANNOUNCEMENT') -// 'global' => array('const' => POST_GLOBAL, 'lang' => 'POST_GLOBAL') + 'announce' => array('const' => POST_ANNOUNCE, 'lang' => 'POST_ANNOUNCEMENT'), + 'global' => array('const' => POST_GLOBAL, 'lang' => 'POST_GLOBAL') ); foreach ($topic_types as $auth_key => $topic_value) @@ -919,7 +927,7 @@ if ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id)) if ($auth->acl_get('f_' . $auth_key, $forum_id)) { $topic_type_toggle .= '<input type="radio" name="topic_type" value="' . $topic_value['const'] . '"'; - if ($topic_type == $topic_value['const']) + if ($topic_type == $topic_value['const'] || ($forum_id == 0 && $topic_value['const'] == POST_GLOBAL)) { $topic_type_toggle .= ' checked="checked"'; } @@ -991,9 +999,9 @@ $template->assign_vars(array( 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '', 'USERNAME' => (((!$preview) && ($mode != 'quote')) || ($preview)) ? stripslashes($username) : '', 'SUBJECT' => $post_subject, - 'PREVIEW_SUBJECT' => ($preview && !$err_msg) ? $preview_subject : '', + 'PREVIEW_SUBJECT' => ($preview && !sizeof($error)) ? $preview_subject : '', 'MESSAGE' => trim($post_text), - 'PREVIEW_MESSAGE' => ($preview && !$err_msg) ? $preview_message : '', + 'PREVIEW_MESSAGE' => ($preview && !sizeof($error)) ? $preview_message : '', 'HTML_STATUS' => ($html_status) ? $user->lang['HTML_IS_ON'] : $user->lang['HTML_IS_OFF'], 'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . "faq.$phpEx$SID&mode=bbcode" . '" target="_phpbbcode">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . "faq.$phpEx$SID&mode=bbcode" . '" target="_phpbbcode">', '</a>'), 'IMG_STATUS' => ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], @@ -1001,13 +1009,13 @@ $template->assign_vars(array( 'SMILIES_STATUS' => ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], 'MINI_POST_IMG' => $user->img('icon_post', $user->lang['POST']), 'POST_DATE' => ($post_time) ? $user->format_date($post_time) : '', - 'ERROR_MESSAGE' => $err_msg, + 'ERROR_MESSAGE' => (sizeof($error)) ? implode('<br />', $error) : '', 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&f=" . $forum_id, 'U_VIEWTOPIC' => ($mode != 'post') ? "viewtopic.$phpEx$SID&$forum_id&t=$topic_id" : '', 'U_REVIEW_TOPIC' => ($mode != 'post') ? "posting.$phpEx$SID&mode=topicreview&f=$forum_id&t=$topic_id" : '', - 'S_DISPLAY_PREVIEW' => ($preview && !$err_msg), + 'S_DISPLAY_PREVIEW' => ($preview && !sizeof($error)), 'S_DISPLAY_REVIEW' => ($mode == 'reply' || $mode == 'quote') ? true : false, 'S_DISPLAY_USERNAME' => ($user->data['user_id'] == ANONYMOUS || ($mode == 'edit' && $post_username)) ? true : false, 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, @@ -1111,15 +1119,593 @@ make_jumpbox('viewforum.'.$phpEx); // Topic review if ($mode == 'reply' || $mode == 'quote') { - topic_review($topic_id, true); + topic_review($topic_id, $forum_id, true); } page_footer(); + +// --------- // FUNCTIONS +// + +// Submit Post +function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_uid, $poll, $attach_data, $filename_data, $data) +{ + global $db, $auth, $user, $config, $phpEx, $SID, $template; + + $current_time = time(); + + $db->sql_transaction(); + + // Initial Topic table info + if ($mode == 'post' || ($mode == 'edit' && $data['topic_first_post_id'] == $data['post_id'])) + { + $topic_sql = array( + 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], + 'topic_title' => stripslashes($subject), + 'topic_time' => $current_time, + 'topic_type' => $topic_type, + 'topic_approved' => ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('f_ignorequeue', $data['forum_id'])) ? 0 : 1, + 'icon_id' => $data['icon_id'], + 'topic_attachment' => (sizeof($filename_data['physical_filename'])) ? 1 : 0 + ); + + if (!empty($poll['poll_options'])) + { + $topic_sql = array_merge($topic_sql, array( + 'poll_title' => stripslashes($poll['poll_title']), + 'poll_start' => ($poll['poll_start']) ? $poll['poll_start'] : $current_time, + 'poll_max_options' => $poll['poll_max_options'], + 'poll_length' => $poll['poll_length'] * 86400) + ); + } + + if ($mode == 'post') + { + $topic_sql = array_merge($topic_sql, array( + 'topic_poster' => (int) $user->data['user_id'], + 'topic_first_poster_name' => ($username) ? stripslashes($username) : (($user->data['user_id'] == ANONYMOUS) ? '' : stripslashes($user->data['username']))) + ); + } + + $sql = ($mode == 'post') ? 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $topic_sql) : 'UPDATE ' . TOPICS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $topic_sql) . ' WHERE topic_id = ' . $data['topic_id']; + $db->sql_query($sql); + + $data['topic_id'] = ($mode == 'post') ? $db->sql_nextid() : $data['topic_id']; + } + + // Post table info + $post_sql = array( + 'topic_id' => $data['topic_id'], + 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], + 'poster_id' => ($mode == 'edit') ? $data['poster_id'] : (int) $user->data['user_id'], + 'post_username' => ($username != '') ? stripslashes($username) : '', + 'post_subject' => stripslashes($subject), + 'icon_id' => $data['icon_id'], + 'poster_ip' => $user->ip, + 'post_approved' => ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('f_ignorequeue', $data['forum_id'])) ? 0 : 1, + 'post_edit_time' => ($mode == 'edit' && $data['poster_id'] == $user->data['user_id']) ? $current_time : 0, + 'enable_sig' => $data['enable_sig'], + 'enable_bbcode' => $data['enable_bbcode'], + 'enable_html' => $data['enable_html'], + 'enable_smilies' => $data['enable_smilies'], + 'enable_magic_url' => $data['enable_urls'], + 'bbcode_uid' => $bbcode_uid, + 'bbcode_bitfield' => $data['bbcode_bitfield'], + 'post_edit_locked' => $data['post_edit_locked'], + 'post_text' => $message + ); + + if ($mode != 'edit') + { + $post_sql['post_time'] = $current_time; + } + + if ($mode != 'edit' || $data['message_md5'] != $data['post_checksum']) + { + $post_sql = array_merge($post_sql, array( + 'post_checksum' => $data['message_md5'], + 'post_encoding' => $user->lang['ENCODING']) + ); + } + + if ($mode == 'edit') + { + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $post_sql) . + (($data['poster_id'] == $user->data['user_id']) ? ' , post_edit_count = post_edit_count + 1' : '') . ' + WHERE post_id = ' . $data['post_id']; + } + else + { + $sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . + $db->sql_build_array('INSERT', $post_sql); + } + $db->sql_query($sql); + + $data['post_id'] = ($mode == 'edit') ? $data['post_id'] : $db->sql_nextid(); + + // Submit Poll + if (!empty($poll['poll_options'])) + { + $cur_poll_options = array(); + + if ($poll['poll_start'] && $mode == 'edit') + { + $sql = 'SELECT * FROM ' . POLL_OPTIONS_TABLE . ' + WHERE topic_id = ' . $data['topic_id'] . ' + ORDER BY poll_option_id'; + $result = $db->sql_query($sql); + + while ($cur_poll_options[] = $db->sql_fetchrow($result)); + $db->sql_freeresult($result); + } + + for ($i = 0; $i < sizeof($poll['poll_options']); $i++) + { + if (trim($poll['poll_options'][$i])) + { + if (empty($cur_poll_options[$i])) + { + $sql = 'INSERT INTO ' . POLL_OPTIONS_TABLE . " (poll_option_id, topic_id, poll_option_text) + VALUES ($i, " . $data['topic_id'] . ", '" . $db->sql_escape($poll['poll_options'][$i]) . "')"; + $db->sql_query($sql); + } + else if ($poll['poll_options'][$i] != $cur_poll_options[$i]) + { + $sql = "UPDATE " . POLL_OPTIONS_TABLE . " + SET poll_option_text = '" . $db->sql_escape($poll['poll_options'][$i]) . "' + WHERE poll_option_id = " . $cur_poll_options[$i]['poll_option_id'] . " + AND topic_id = " . $data['topic_id']; + $db->sql_query($sql); + } + } + } + + if (sizeof($poll['poll_options']) < sizeof($cur_poll_options)) + { + $sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . ' + WHERE poll_option_id > ' . sizeof($poll['poll_options']) . ' + AND topic_id = ' . $data['topic_id']; + $db->sql_query($sql); + } + } + + // Submit Attachments + if (count($attach_data) && !empty($data['post_id']) && ($mode == 'post' || $mode == 'reply' || $mode == 'edit')) + { + foreach ($attach_data as $attach_row) + { + if ($attach_row['attach_id'] != '-1') + { + // update entry in db if attachment already stored in db and filespace + $attach_sql = array( + 'comment' => trim($attach_row['comment']) + ); + + $sql = 'UPDATE ' . ATTACHMENTS_DESC_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $attach_sql) . ' + WHERE attach_id = ' . (int) $attach_row['attach_id']; + $db->sql_query($sql); + } + else + { + // insert attachment into db + $attach_sql = array( + 'physical_filename' => $attach_row['physical_filename'], + 'real_filename' => $attach_row['real_filename'], + 'comment' => trim($attach_row['comment']), + 'extension' => $attach_row['extension'], + 'mimetype' => $attach_row['mimetype'], + 'filesize' => $attach_row['filesize'], + 'filetime' => $attach_row['filetime'], + 'thumbnail' => $attach_row['thumbnail'] + ); + + $sql = 'INSERT INTO ' . ATTACHMENTS_DESC_TABLE . ' ' . + $db->sql_build_array('INSERT', $attach_sql); + $db->sql_query($sql); + + $attach_sql = array( + 'attach_id' => $db->sql_nextid(), + 'post_id' => $data['post_id'], + 'privmsgs_id' => 0, + 'user_id_from' => ($mode == 'edit') ? $data['poster_id'] : (int) $user->data['user_id'], + 'user_id_to' => 0 + ); + + $sql = 'INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . + $db->sql_build_array('INSERT', $attach_sql); + $db->sql_query($sql); + } + } + + if (count($attach_data)) + { + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET post_attachment = 1 + WHERE post_id = ' . $data['post_id']; + $db->sql_query($sql); + + $sql = 'UPDATE ' . TOPICS_TABLE . ' + SET topic_attachment = 1 + WHERE topic_id = ' . $data['topic_id']; + $db->sql_query($sql); + } + } + + // Fulltext parse + if ($data['message_md5'] != $data['post_checksum']) + { + $search = new fulltext_search(); + $result = $search->add($mode, $data['post_id'], $message, $subject); + } + + // Sync forums, topics and users ... + if ($mode != 'edit') + { + if ($topic_type != POST_GLOBAL) + { + $forum_topics_sql = ($mode == 'post') ? ', forum_topics = forum_topics + 1, forum_topics_real = forum_topics_real + 1' : ''; + + $forum_sql = array( + 'forum_last_post_id' => $data['post_id'], + 'forum_last_post_time' => $current_time, + 'forum_last_poster_id' => (int) $user->data['user_id'], + 'forum_last_poster_name'=> ($user->data['user_id'] == ANONYMOUS) ? stripslashes($username) : $user->data['username'], + ); + + $sql = 'UPDATE ' . FORUMS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $forum_sql) . ', forum_posts = forum_posts + 1' . $forum_topics_sql . ' + WHERE forum_id = ' . $data['forum_id']; + $db->sql_query($sql); + } + + // Update topic: first/last post info, replies + $topic_sql = array( + 'topic_last_post_id' => $data['post_id'], + 'topic_last_post_time' => $current_time, + 'topic_last_poster_id' => (int) $user->data['user_id'], + 'topic_last_poster_name'=> ($username != '') ? stripslashes($username) : (($user->data['user_id'] == ANONYMOUS) ? '' : stripslashes($user->data['username'])), + ); + + if ($mode == 'post') + { + $topic_sql = array_merge($topic_sql, array( + 'topic_first_post_id' => $data['post_id']) + ); + } + + $topic_replies_sql = ($mode == 'reply' || $mode == 'quote') ? ', topic_replies = topic_replies + 1, topic_replies_real = topic_replies_real + 1' : ''; + $sql = 'UPDATE ' . TOPICS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $topic_sql) . $topic_replies_sql . ' + WHERE topic_id = ' . $data['topic_id']; + $db->sql_query($sql); + + // Update user post count ... if appropriate + if ($user->data['user_id'] != ANONYMOUS && $auth->acl_get('f_postcount', $data['forum_id'])) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_posts = user_posts + 1 + WHERE user_id = ' . intval($user->data['user_id']); + $db->sql_query($sql); + } + + // post counts for index, etc. + if ($mode == 'post') + { + set_config('num_topics', $config['num_topics'] + 1, TRUE); + } + + set_config('num_posts', $config['num_posts'] + 1, TRUE); + } + + // Topic Notification + if (($data['notify_set'] == 0 || $data['notify_set'] == -1) && $data['notify']) + { + $sql = 'INSERT INTO ' . TOPICS_WATCH_TABLE . ' (user_id, topic_id) + VALUES (' . $user->data['user_id'] . ', ' . $data['topic_id'] . ')'; + $db->sql_query($sql); + } + else if ($data['notify_set'] == 1 && !$data['notify']) + { + $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' + WHERE user_id = ' . $user->data['user_id'] . ' + AND topic_id = ' . $data['topic_id']; + $db->sql_query($sql); + } + + // Mark this topic as read and posted to. + $mark_mode = ($mode == 'post' || $mode == 'reply' || $mode == 'quote') ? 'post' : 'topic'; + markread($mark_mode, $data['forum_id'], $data['topic_id'], $data['post_time']); + + $db->sql_transaction('commit'); + + // Send Notifications + if ($mode != 'edit' && $mode != 'delete') + { + user_notification($mode, stripslashes($subject), $data['forum_id'], $data['topic_id'], $data['post_id']); + } + + meta_refresh(3, "viewtopic.$phpEx$SID&f=" . $data['forum_id'] . '&t=' . $data['topic_id'] . '&p=' . $data['post_id'] . '#' . $data['post_id']); + + $message = ($auth->acl_get('f_moderate', $data['forum_id']) && !$auth->acl_get('f_ignorequeue', $data['forum_id'])) ? 'POST_STORED_MOD' : 'POST_STORED'; + $message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="viewtopic.' . $phpEx . $SID .'&f=' . $data['forum_id'] . '&t=' . $data['topic_id'] . '&p=' . $data['post_id'] . '#' . $data['post_id'] . '">', '</a>') . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="viewforum.' . $phpEx . $SID .'&f=' . $data['forum_id'] . '">', '</a>'); + trigger_error($message); +} + +// User Notification +function user_notification($mode, $subject, $forum_id, $topic_id, $post_id) +{ + global $db, $user, $config, $phpEx; + + $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; + $newtopic_notification = ($mode == 'post') ? true : false; + + if (empty($censors)) + { + $censors = array(); + obtain_word_list($censors); + } + + // Get banned User ID's + $sql = 'SELECT ban_userid + FROM ' . BANLIST_TABLE; + $result = $db->sql_query($sql); + + $sql_ignore_users = ANONYMOUS . ', ' . $user->data['user_id']; + while ($row = $db->sql_fetchrow($result)) + { + if (isset($row['ban_userid'])) + { + $sql_ignore_users .= ', ' . $row['ban_userid']; + } + } + + $allowed_users = array(); + + $sql = "SELECT u.user_id + FROM " . TOPICS_WATCH_TABLE . " tw, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u + WHERE tw.topic_id = $topic_id + AND tw.user_id NOT IN ($sql_ignore_users) + AND t.topic_id = tw.topic_id + AND u.user_id = tw.user_id"; + $result = $db->sql_query($sql); + $ids = ''; + + while ($row = $db->sql_fetchrow($result)) + { + $ids .= ($ids != '') ? ', ' . $row['user_id'] : $row['user_id']; + } + $db->sql_freeresult($result); + + if ($ids != '') + { + // TODO: Paul - correct call to check f_read for specific users ? + $sql = "SELECT a.user_id + FROM " . ACL_OPTIONS_TABLE . " ao, " . ACL_USERS_TABLE . " a + WHERE a.user_id IN (" . $ids . ") + AND ao.auth_option_id = a.auth_option_id + AND ao.auth_option = 'f_read' + AND a.forum_id = " . $forum_id; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $allowed_users[] = $row['user_id']; + } + $db->sql_freeresult($result); + + + + + // TODO : Paul + // Now grab group settings ... users can belong to multiple groups so we grab + // the minimum setting for all options. ACL_NO overrides ACL_YES so act appropriatley + $sql = "SELECT ug.user_id, MIN(a.auth_setting) as min_setting + FROM " . USER_GROUP_TABLE . " ug, " . ACL_OPTIONS_TABLE . " ao, " . ACL_GROUPS_TABLE . " a + WHERE ug.user_id IN (" . $ids . ") + AND a.group_id = ug.group_id + AND ao.auth_option_id = a.auth_option_id + AND ao.auth_option = 'f_read' + AND a.forum_id = " . $forum_id . " + GROUP BY ao.auth_option, a.forum_id"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + if ($row['min_setting'] == 1) + { + $allowed_users[] = $row['user_id']; + } + } + $db->sql_freeresult($result); + + $allowed_users = array_unique($allowed_users); + } + + + + + + // + if ($topic_notification) + { + $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title, f.forum_name + FROM ' . TOPICS_WATCH_TABLE . ' tw, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u, ' . FORUMS_TABLE . ' f + WHERE tw.topic_id = ' . $topic_id . ' + AND tw.user_id NOT IN (' . $sql_ignore_users . ') + AND tw.notify_status = 0 + AND f.forum_id = ' . $forum_id . ' + AND t.topic_id = tw.topic_id + AND u.user_id = tw.user_id'; + } + else if ($newtopic_notification) + { + $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, f.forum_name + FROM ' . USERS_TABLE . ' u, ' . FORUMS_WATCH_TABLE . ' fw, ' . FORUMS_TABLE . ' f + WHERE fw.forum_id = ' . $forum_id . ' + AND fw.user_id NOT IN (' . $sql_ignore_users . ') + AND fw.notify_status = 0 + AND f.forum_id = fw.forum_id + AND u.user_id = fw.user_id'; + } + else + { + trigger_error('WRONG_NOTIFICATION_MODE'); + } + $result = $db->sql_query($sql); + + $email_users = array(); + $update_watched_sql_topic = $update_watched_sql_forum = $delete_users_topic = ''; + // + if ($row = $db->sql_fetchrow($result)) + { + if ($topic_notification) + { + decode_text($row['topic_title']); + $topic_title = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $row['topic_title']) : $row['topic_title']; + } + else + { + decode_text($subject); + $topic_title = (sizeof($censors)) ? preg_replace($censors['match'], $censors['replace'], $subject) : $subject; + } + + $which_sql = ($topic_notification) ? 'update_watched_sql_topic' : 'update_watched_sql_forum'; + do + { + if (trim($row['user_email']) != '' && in_array($row['user_id'], $allowed_users)) + { + $row['email_template'] = ($topic_notification) ? 'topic_notify' : 'newtopic_notify'; + $email_users[] = $row; + + $$which_sql .= ($$which_sql != '') ? ', ' . $row['user_id'] : $row['user_id']; + } + else if (!in_array($row['user_id'], $allowed_users)) + { + $delete_users_topic .= ($delete_users_topic != '') ? ', ' . $row['user_id'] : $row['user_id']; + } + } + while ($row = $db->sql_fetchrow($result)); + } + $db->sql_freeresult($result); + + // Handle remaining Notifications (Forum) + if ($topic_notification) + { + $already_notified = ($update_watched_sql_topic == '') ? '' : $update_watched_sql_topic . ', '; + $already_notified .= ($update_watched_sql_forum == '') ? '' : $update_watched_sql_forum . ', '; + + $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, t.topic_title, f.forum_name + FROM ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u, ' . FORUMS_WATCH_TABLE . ' fw, ' . FORUMS_TABLE . ' f + WHERE fw.forum_id = ' . $forum_id . ' + AND fw.user_id NOT IN (' . $already_notified . ' ' . $sql_ignore_users . ') + AND fw.notify_status = 0 + AND t.topic_id = ' . $topic_id . ' + AND f.forum_id = fw.forum_id + AND u.user_id = fw.user_id'; + $result = $db->sql_query($sql); + + if ($row = $db->sql_fetchrow($result)) + { + $forum_name = $row['forum_name']; + + do + { + if (trim($row['user_email']) != '') + { + $row['email_template'] = 'forum_notify'; + $email_users[] = $row; + + $update_watched_sql_forum .= ($update_watched_sql_forum != '') ? ', ' . $row['user_id'] : $row['user_id']; + } + } + while ($row = $db->sql_fetchrow($result)); + } + } + + // We are using an email queue here, no emails are sent now, only queued. + // Returned to use the TO-Header, default package size is 100 (should be admin-definable) !? + if (sizeof($email_users) && $config['email_enable']) + { + global $phpbb_root_path, $phpEx; + + @set_time_limit(60); + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer(true); // use queue + + $email_list_ary = array(); + foreach ($email_users as $row) + { + $pos = sizeof($email_list_ary[$row['email_template']]); + $email_list_ary[$row['email_template']][$pos]['email'] = $row['user_email']; + $email_list_ary[$row['email_template']][$pos]['name'] = $row['username']; + $email_list_ary[$row['email_template']][$pos]['lang'] = $row['user_lang']; + } + unset($email_users); + + foreach ($email_list_ary as $email_template => $email_list) + { + foreach ($email_list as $addr) + { + $emailer->template($email_template, $addr['lang']); + + $emailer->replyto($config['board_email']); + $emailer->to($addr['email'], $addr['name']); + + $emailer->assign_vars(array( + 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), + 'SITENAME' => $config['sitename'], + 'TOPIC_TITLE' => trim($topic_title), + 'FORUM_NAME' => trim($forum_name), + + 'U_TOPIC' => generate_board_url() . 'viewtopic.'.$phpEx . '?t=' . $topic_id . '&p=' . $post_id . '#' . $post_id, + 'U_FORUM' => generate_board_url() . 'viewforum.'.$phpEx . '?f=' . $forum_id, + 'U_STOP_WATCHING_TOPIC' => generate_board_url() . 'viewtopic.'.$phpEx . '?t=' . $topic_id . '&unwatch=topic', + 'U_STOP_WATCHING_FORUM' => generate_board_url() . 'viewforum.'.$phpEx . '?f=' . $forum_id . '&unwatch=forum') + ); + + $emailer->send(); + $emailer->reset(); + } + } + + $emailer->queue->save(); + } + unset($email_list_ary); + + if ($delete_users_topic != '') + { + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = " . $topic_id . " + AND user_id IN (" . $delete_users_topic . ")"; + $db->sql_query($sql); + } + + if ($update_watched_sql_topic != '') + { + $sql = "UPDATE " . TOPICS_WATCH_TABLE . " + SET notify_status = 1 + WHERE topic_id = " . $topic_id . " + AND user_id IN (" . $update_watched_sql_topic . ")"; + $db->sql_query($sql); + } + + if ($update_watched_sql_forum != '') + { + $sql = "UPDATE " . FORUMS_WATCH_TABLE . " + SET notify_status = 1 + WHERE forum_id = " . $forum_id . " + AND user_id IN (" . $update_watched_sql_forum . ")"; + $db->sql_query($sql); + } +} // Topic Review -function topic_review($topic_id, $is_inline_review = false) +function topic_review($topic_id, $forum_id, $is_inline_review = false) { global $template; @@ -1146,7 +1732,7 @@ function topic_review($topic_id, $is_inline_review = false) $sql = 'SELECT t.topic_title, f.forum_id FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f WHERE t.topic_id = $topic_id - AND f.forum_id = t.forum_id"; + AND f.forum_id IN (t.forum_id, $forum_id)"; $result = $db->sql_query($sql); if (!($row = $db->sql_fetchrow($result))) @@ -1276,4 +1862,8 @@ function phpbb_strtolower($string) return $new_string; } +// +// FUNCTIONS +// --------- + ?>
\ No newline at end of file |