From a544f1feb79d85ece8fe07d5e850a89119bc16e1 Mon Sep 17 00:00:00 2001 From: dimka3210 Date: Sat, 12 Jan 2013 21:31:50 +0000 Subject: [PATCH] r491 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пофиксил проблему на главной с черновиками. Постепенно привожу код к единому виду. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@491 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 +- upload/posting.php | 614 ++++++++++++++++++--------------------------- 2 files changed, 247 insertions(+), 371 deletions(-) diff --git a/upload/config.php b/upload/config.php index 641df3a2b..44949960e 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 pre-stable'; -$bb_cfg['tp_release_date'] = '12-01-2013'; -$bb_cfg['tp_release_state'] = 'R490'; +$bb_cfg['tp_release_date'] = '13-01-2013'; +$bb_cfg['tp_release_state'] = 'R491'; // Database $charset = 'utf8'; diff --git a/upload/posting.php b/upload/posting.php index 38c1d609c..8c18e4ee9 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -3,28 +3,28 @@ define('IN_PHPBB', true); define('BB_SCRIPT', 'posting'); define('BB_ROOT', './'); -require(BB_ROOT ."common.php"); -require(INC_DIR .'bbcode.php'); -require(INC_DIR .'functions_post.php'); -require(BB_ROOT .'attach_mod/attachment_mod.php'); +require(BB_ROOT . "common.php"); +require(INC_DIR . 'bbcode.php'); +require(INC_DIR . 'functions_post.php'); +require(BB_ROOT . 'attach_mod/attachment_mod.php'); $page_cfg['load_tpl_vars'] = array( 'post_icons', ); -$submit = (bool) @$_REQUEST['post']; -$preview = (bool) @$_REQUEST['preview']; -$delete = (bool) @$_REQUEST['delete']; -$poll_delete = (bool) @$_REQUEST['poll_delete']; -$poll_add = (bool) @$_REQUEST['add_poll_option']; -$poll_edit = (bool) @$_REQUEST['edit_poll_option']; -$topic_tpl = (bool) @$_REQUEST['tpl']; +$submit = (bool)@$_REQUEST['post']; +$preview = (bool)@$_REQUEST['preview']; +$delete = (bool)@$_REQUEST['delete']; +$poll_delete = (bool)@$_REQUEST['poll_delete']; +$poll_add = (bool)@$_REQUEST['add_poll_option']; +$poll_edit = (bool)@$_REQUEST['edit_poll_option']; +$topic_tpl = (bool)@$_REQUEST['tpl']; -$forum_id = (int) @$_REQUEST[POST_FORUM_URL]; -$topic_id = (int) @$_REQUEST[POST_TOPIC_URL]; -$post_id = (int) @$_REQUEST[POST_POST_URL]; +$forum_id = (int)@$_REQUEST[POST_FORUM_URL]; +$topic_id = (int)@$_REQUEST[POST_TOPIC_URL]; +$post_id = (int)@$_REQUEST[POST_POST_URL]; -$mode = (string) @$_REQUEST['mode']; +$mode = (string)@$_REQUEST['mode']; $confirm = isset($_POST['confirm']); @@ -34,11 +34,10 @@ $refresh = $preview || $poll_add || $poll_edit || $poll_delete; $orig_word = $replacement_word = array(); // Set topic type -$topic_type = (@$_POST['topictype']) ? (int) $_POST['topictype'] : POST_NORMAL; +$topic_type = (@$_POST['topictype']) ? (int)$_POST['topictype'] : POST_NORMAL; $topic_type = in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ? $topic_type : POST_NORMAL; -if ($mode == 'smilies') -{ +if ($mode == 'smilies') { generate_smilies('window'); exit; } @@ -49,47 +48,37 @@ $tracking_forums = get_tracks('forum'); // Start session management $user->session_start(); -if ($mode == 'new_rel') -{ - require(INC_DIR .'posting_tpl.php'); +if ($mode == 'new_rel') { + require(INC_DIR . 'posting_tpl.php'); exit; } // What auth type do we need to check? $is_auth = array(); -switch ($mode) -{ +switch ($mode) { case 'newtopic': - if(bf($userdata['user_opt'], 'user_opt', 'allow_topic')) - { - bb_die($lang['RULES_POST_CANNOT']); - } - if ($topic_type == POST_ANNOUNCE) - { + if (bf($userdata['user_opt'], 'user_opt', 'allow_topic')) { + bb_die($lang['RULES_POST_CANNOT']); + } + if ($topic_type == POST_ANNOUNCE) { $is_auth_type = 'auth_announce'; - } - else if ($topic_type == POST_STICKY) - { + } else if ($topic_type == POST_STICKY) { $is_auth_type = 'auth_sticky'; - } - else - { + } else { $is_auth_type = 'auth_post'; } break; case 'reply': case 'quote': - if(bf($userdata['user_opt'], 'user_opt', 'allow_post')) - { - bb_die($lang['RULES_REPLY_CANNOT']); - } + if (bf($userdata['user_opt'], 'user_opt', 'allow_post')) { + bb_die($lang['RULES_REPLY_CANNOT']); + } $is_auth_type = 'auth_reply'; break; case 'editpost': - if(bf($userdata['user_opt'], 'user_opt', 'allow_post_edit')) - { - bb_die($lang['RULES_EDIT_CANNOT']); - } + if (bf($userdata['user_opt'], 'user_opt', 'allow_post_edit')) { + bb_die($lang['RULES_EDIT_CANNOT']); + } $is_auth_type = 'auth_edit'; break; case 'delete': @@ -108,24 +97,21 @@ switch ($mode) // Doing it here prevents spoofing (eg. faking forum_id, topic_id or post_id $error_msg = ''; $post_data = array(); -switch ($mode) -{ +switch ($mode) { case 'newtopic': - if (!$forum_id) - { + if (!$forum_id) { message_die(GENERAL_MESSAGE, $lang['FORUM_NOT_EXIST']); } - $sql = "SELECT * FROM ". BB_FORUMS ." WHERE forum_id = $forum_id LIMIT 1"; + $sql = "SELECT * FROM " . BB_FORUMS . " WHERE forum_id = $forum_id LIMIT 1"; break; case 'reply': case 'vote': - if (!$topic_id) - { + if (!$topic_id) { message_die(GENERAL_MESSAGE, $lang['NO_TOPIC_ID']); } $sql = "SELECT f.*, t.* - FROM ". BB_FORUMS ." f, ". BB_TOPICS ." t + FROM " . BB_FORUMS . " f, " . BB_TOPICS . " t WHERE t.topic_id = $topic_id AND f.forum_id = t.forum_id LIMIT 1"; @@ -135,15 +121,14 @@ switch ($mode) case 'editpost': case 'delete': case 'poll_delete': - if (!$post_id) - { + if (!$post_id) { message_die(GENERAL_MESSAGE, $lang['NO_POST_ID']); } $select_sql = 'SELECT f.*, t.*, p.*'; $select_sql .= (!$submit) ? ', pt.*, u.username, u.user_id' : ''; - $from_sql = "FROM ". BB_POSTS ." p, ". BB_TOPICS ." t, ". BB_FORUMS ." f"; + $from_sql = "FROM " . BB_POSTS . " p, " . BB_TOPICS . " t, " . BB_FORUMS . " f"; $from_sql .= (!$submit) ? ", " . BB_POSTS_TEXT . " pt, " . BB_USERS . " u" : ''; $where_sql = " @@ -163,122 +148,95 @@ switch ($mode) message_die(GENERAL_MESSAGE, $lang['NO_VALID_MODE']); } -if ($post_info = DB()->fetch_row($sql)) -{ +if ($post_info = DB()->fetch_row($sql)) { $forum_id = $post_info['forum_id']; $forum_name = $post_info['forum_name']; $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $post_info); - if ($post_info['forum_status'] == FORUM_LOCKED && !$is_auth['auth_mod']) - { - message_die(GENERAL_MESSAGE, $lang['FORUM_LOCKED']); - } - else if ($mode != 'newtopic' && $post_info['topic_status'] == TOPIC_LOCKED && !$is_auth['auth_mod']) - { - message_die(GENERAL_MESSAGE, $lang['TOPIC_LOCKED']); + if ($post_info['forum_status'] == FORUM_LOCKED && !$is_auth['auth_mod']) { + message_die(GENERAL_MESSAGE, $lang['FORUM_LOCKED']); + } else if ($mode != 'newtopic' && $post_info['topic_status'] == TOPIC_LOCKED && !$is_auth['auth_mod']) { + message_die(GENERAL_MESSAGE, $lang['TOPIC_LOCKED']); } - if ($mode == 'editpost' || $mode == 'delete' || $mode == 'poll_delete') - { + if ($mode == 'editpost' || $mode == 'delete' || $mode == 'poll_delete') { $topic_id = $post_info['topic_id']; $post_data['poster_post'] = ($post_info['poster_id'] == $userdata['user_id']); $post_data['first_post'] = ($post_info['topic_first_post_id'] == $post_id); $post_data['last_post'] = ($post_info['topic_last_post_id'] == $post_id); $post_data['last_topic'] = ($post_info['forum_last_post_id'] == $post_id); - $post_data['has_poll'] = (bool) $post_info['topic_vote']; + $post_data['has_poll'] = (bool)$post_info['topic_vote']; $post_data['topic_type'] = $post_info['topic_type']; $post_data['poster_id'] = $post_info['poster_id']; - if ($post_data['first_post'] && $post_data['has_poll']) - { + if ($post_data['first_post'] && $post_data['has_poll']) { $sql = "SELECT * - FROM ". BB_VOTE_DESC ." vd, ". BB_VOTE_RESULTS ." vr + FROM " . BB_VOTE_DESC . " vd, " . BB_VOTE_RESULTS . " vr WHERE vd.topic_id = $topic_id AND vr.vote_id = vd.vote_id ORDER BY vr.vote_option_id"; - if (!$result = DB()->sql_query($sql)) - { + if (!$result = DB()->sql_query($sql)) { message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql); } $poll_options = array(); $poll_results_sum = 0; - if ($row = DB()->sql_fetchrow($result)) - { + if ($row = DB()->sql_fetchrow($result)) { $poll_title = $row['vote_text']; $poll_id = $row['vote_id']; $poll_length = $row['vote_length'] / 86400; - do - { + do { $poll_options[$row['vote_option_id']] = $row['vote_option_text']; $poll_results_sum += $row['vote_result']; - } - while ($row = DB()->sql_fetchrow($result)); + } while ($row = DB()->sql_fetchrow($result)); } $post_data['edit_poll'] = ((!$poll_results_sum || $is_auth['auth_mod']) && $post_data['first_post']); - } - else - { + } else { $post_data['edit_poll'] = ($post_data['first_post'] && $is_auth['auth_pollcreate']); } // Can this user edit/delete the post/poll? - if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) - { + if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) { $message = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS']; - $message .= '

'. sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); + $message .= '

' . sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); message_die(GENERAL_MESSAGE, $message); - } - else if (!$post_data['last_post'] && !$is_auth['auth_mod'] && ($mode == 'delete' || $delete)) - { + } else if (!$post_data['last_post'] && !$is_auth['auth_mod'] && ($mode == 'delete' || $delete)) { message_die(GENERAL_MESSAGE, $lang['CANNOT_DELETE_REPLIED']); - } - else if (!$post_data['edit_poll'] && !$is_auth['auth_mod'] && ($mode == 'poll_delete' || $poll_delete)) - { + } else if (!$post_data['edit_poll'] && !$is_auth['auth_mod'] && ($mode == 'poll_delete' || $poll_delete)) { message_die(GENERAL_MESSAGE, $lang['CANNOT_DELETE_POLL']); } - } - else - { - if ($mode == 'quote') - { + } else { + if ($mode == 'quote') { $topic_id = $post_info['topic_id']; } - if ($mode == 'newtopic') - { + if ($mode == 'newtopic') { $post_data['topic_type'] = POST_NORMAL; } $post_data['first_post'] = ($mode == 'newtopic'); - $post_data['last_post'] = false; - $post_data['has_poll'] = false; - $post_data['edit_poll'] = false; + $post_data['last_post'] = false; + $post_data['has_poll'] = false; + $post_data['edit_poll'] = false; } - if ($mode == 'poll_delete' && !$poll_id) - { + if ($mode == 'poll_delete' && !$poll_id) { message_die(GENERAL_MESSAGE, $lang['NO_SUCH_POST']); } -} -else -{ +} else { message_die(GENERAL_MESSAGE, $lang['NO_SUCH_POST']); } // The user is not authed, if they're not logged in then redirect // them, else show them an error message -if (!$is_auth[$is_auth_type]) -{ - if (!IS_GUEST) - { - message_die(GENERAL_MESSAGE, sprintf($lang['SORRY_'. strtoupper($is_auth_type)], $is_auth[$is_auth_type .'_type'])); +if (!$is_auth[$is_auth_type]) { + if (!IS_GUEST) { + message_die(GENERAL_MESSAGE, sprintf($lang['SORRY_' . strtoupper($is_auth_type)], $is_auth[$is_auth_type . '_type'])); } - switch ($mode) - { + switch ($mode) { case 'newtopic': $redirect = "mode=newtopic&f=$forum_id"; break; @@ -295,45 +253,38 @@ if (!$is_auth[$is_auth_type]) redirect("login.php?redirect=/posting.php?$redirect"); } -if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id']) -{ - if($tor_status = join(',', $bb_cfg['tor_cannot_new'])) - { +if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id']) { + if ($tor_status = join(',', $bb_cfg['tor_cannot_new'])) { $sql = DB()->fetch_rowset("SELECT t.topic_title, t.topic_id, tor.tor_status - FROM ". BB_BT_TORRENTS ." tor, ". BB_TOPICS ." t + FROM " . BB_BT_TORRENTS . " tor, " . BB_TOPICS . " t WHERE poster_id = {$userdata['user_id']} AND tor.topic_id = t.topic_id AND tor.tor_status IN ($tor_status) ORDER BY tor.reg_time "); - $topics = ''; - foreach($sql as $row) - { - $topics .= $bb_cfg['tor_icons'][$row['tor_status']] .''. $row['topic_title'] .'
'; - } + $topics = ''; + foreach ($sql as $row) { + $topics .= $bb_cfg['tor_icons'][$row['tor_status']] . '' . $row['topic_title'] . '
'; + } if ($topics) bb_die($topics . $lang['UNEXECUTED_RELEASE']); } - require(INC_DIR .'topic_templates.php'); + require(INC_DIR . 'topic_templates.php'); } // Notify -if ($submit || $refresh) -{ - $notify_user = (int) !empty($_POST['notify']); - $to_draft = (int) !empty($_POST['to_draft']); -} -else -{ - $to_draft = ($bb_cfg['status_of_draft'] && $mode == 'editpost') ? $post_info['is_draft'] : false ; +if ($submit || $refresh) { + $notify_user = (int)!empty($_POST['notify']); + $to_draft = (int)!empty($_POST['to_draft']); +} else { + $to_draft = ($bb_cfg['status_of_draft'] && $mode == 'editpost') ? $post_info['is_draft'] : false; $notify_user = bf($userdata['user_opt'], 'user_opt', 'notify'); - if (!IS_GUEST && $mode != 'newtopic' && !$notify_user) - { - $notify_user = (int) DB()->fetch_row(" + if (!IS_GUEST && $mode != 'newtopic' && !$notify_user) { + $notify_user = (int)DB()->fetch_row(" SELECT topic_id - FROM ". BB_TOPICS_WATCH ." + FROM " . BB_TOPICS_WATCH . " WHERE topic_id = $topic_id - AND user_id = ". $userdata['user_id'] ." + AND user_id = " . $userdata['user_id'] . " "); } } @@ -345,35 +296,31 @@ execute_posting_attachment_handling(); // если за время пока вы писали ответ, в топике появились новые сообщения, перед тем как ваше сообщение будет отправлено, выводится предупреждение с обзором этих сообщений $topic_has_new_posts = false; -if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote' || $mode == 'reply') && isset($_COOKIE[COOKIE_TOPIC])) -{ - if ($topic_last_read = max(intval(@$tracking_topics[$topic_id]), intval(@$tracking_forums[$forum_id]))) - { +if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote' || $mode == 'reply') && isset($_COOKIE[COOKIE_TOPIC])) { + if ($topic_last_read = max(intval(@$tracking_topics[$topic_id]), intval(@$tracking_forums[$forum_id]))) { $sql = "SELECT p.*, pt.post_text, u.username, u.user_rank - FROM ". BB_POSTS ." p, ". BB_POSTS_TEXT ." pt, ". BB_USERS ." u - WHERE p.topic_id = ". (int) $topic_id ." + FROM " . BB_POSTS . " p, " . BB_POSTS_TEXT . " pt, " . BB_USERS . " u + WHERE p.topic_id = " . (int)$topic_id . " AND u.user_id = p.poster_id AND pt.post_id = p.post_id AND p.post_time > $topic_last_read ORDER BY p.post_time - LIMIT ". $bb_cfg['posts_per_page']; + LIMIT " . $bb_cfg['posts_per_page']; - if ($rowset = DB()->fetch_rowset($sql)) - { + if ($rowset = DB()->fetch_rowset($sql)) { $topic_has_new_posts = true; - foreach ($rowset as $i => $row) - { + foreach ($rowset as $i => $row) { $template->assign_block_vars('new_posts', array( - 'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2', - 'POSTER' => profile_url($row), + 'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2', + 'POSTER' => profile_url($row), 'POSTER_NAME_JS' => addslashes($row['username']), - 'POST_DATE' => bb_date($row['post_time'], $bb_cfg['post_date_format']), - 'MESSAGE' => get_parsed_post($row), + 'POST_DATE' => bb_date($row['post_time'], $bb_cfg['post_date_format']), + 'MESSAGE' => get_parsed_post($row), )); } $template->assign_vars(array( - 'TPL_SHOW_NEW_POSTS' => true, + 'TPL_SHOW_NEW_POSTS' => true, )); set_tracks(COOKIE_TOPIC, $tracking_topics, $topic_id); @@ -385,33 +332,28 @@ if (!IS_GUEST && $mode != 'newtopic' && ($submit || $preview || $mode == 'quote' // -------------------- // What shall we do? // -if ( ( $delete || $poll_delete || $mode == 'delete' ) && !$confirm ) -{ - if (isset($_POST['cancel'])) - { +if (($delete || $poll_delete || $mode == 'delete') && !$confirm) { + if (isset($_POST['cancel'])) { redirect(POST_URL . "$post_id#$post_id"); } // // Confirm deletion // $hidden_fields = array( - 'p' => $post_id, + 'p' => $post_id, 'mode' => ($delete || $mode == "delete") ? 'delete' : 'poll_delete', ); print_confirmation(array( - 'QUESTION' => ($delete || $mode == 'delete') ? $lang['CONFIRM_DELETE'] : $lang['CONFIRM_DELETE_POLL'], - 'FORM_ACTION' => "posting.php", + 'QUESTION' => ($delete || $mode == 'delete') ? $lang['CONFIRM_DELETE'] : $lang['CONFIRM_DELETE_POLL'], + 'FORM_ACTION' => "posting.php", 'HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), )); -} -else if ( $mode == 'vote' ) -{ +} else if ($mode == 'vote') { // // Vote in a poll // - if ( !empty($_POST['vote_id']) ) - { + if (!empty($_POST['vote_id'])) { $vote_option_id = intval($_POST['vote_id']); $sql = "SELECT vd.vote_id @@ -420,52 +362,42 @@ else if ( $mode == 'vote' ) AND vr.vote_id = vd.vote_id AND vr.vote_option_id = $vote_option_id GROUP BY vd.vote_id"; - if ( !($result = DB()->sql_query($sql)) ) - { + if (!($result = DB()->sql_query($sql))) { message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql); } - if ( $vote_info = DB()->sql_fetchrow($result) ) - { + if ($vote_info = DB()->sql_fetchrow($result)) { $vote_id = $vote_info['vote_id']; $sql = "SELECT * FROM " . BB_VOTE_USERS . " WHERE vote_id = $vote_id AND vote_user_id = " . $userdata['user_id']; - if ( !($result2 = DB()->sql_query($sql)) ) - { + if (!($result2 = DB()->sql_query($sql))) { message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql); } - if ( !($row = DB()->sql_fetchrow($result2)) ) - { + if (!($row = DB()->sql_fetchrow($result2))) { $sql = "UPDATE " . BB_VOTE_RESULTS . " SET vote_result = vote_result + 1 WHERE vote_id = $vote_id AND vote_option_id = $vote_option_id"; - if ( !DB()->sql_query($sql) ) - { + if (!DB()->sql_query($sql)) { message_die(GENERAL_ERROR, 'Could not update poll result', '', __LINE__, __FILE__, $sql); } $sql = "INSERT INTO " . BB_VOTE_USERS . " (vote_id, vote_user_id, vote_user_ip) - VALUES ($vote_id, " . $userdata['user_id'] . ", '". USER_IP ."')"; - if ( !DB()->sql_query($sql) ) - { + VALUES ($vote_id, " . $userdata['user_id'] . ", '" . USER_IP . "')"; + if (!DB()->sql_query($sql)) { message_die(GENERAL_ERROR, "Could not insert user_id for poll", "", __LINE__, __FILE__, $sql); } $message = $lang['VOTE_CAST']; - } - else - { + } else { $message = $lang['ALREADY_VOTED']; } DB()->sql_freeresult($result2); - } - else - { + } else { $message = $lang['NO_VOTE_OPTION']; } DB()->sql_freeresult($result); @@ -473,16 +405,12 @@ else if ( $mode == 'vote' ) meta_refresh("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id"); $message .= '

' . sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); message_die(GENERAL_MESSAGE, $message); - } - else - { + } else { redirect("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id"); } -} -//snp +} //snp // else if ( $submit || $confirm ) -else if ( ($submit || $confirm) && !$topic_has_new_posts ) -//snp end +else if (($submit || $confirm) && !$topic_has_new_posts) //snp end { // // Submit post/vote (newtopic, edit, reply, etc.) @@ -490,23 +418,21 @@ else if ( ($submit || $confirm) && !$topic_has_new_posts ) $return_message = ''; $return_meta = ''; - switch ( $mode ) - { + switch ($mode) { case 'editpost': case 'newtopic': case 'reply': - $username = ( !empty($_POST['username']) ) ? clean_username($_POST['username']) : ''; - $subject = ( !empty($_POST['subject']) ) ? clean_title($_POST['subject']) : ''; - $message = ( !empty($_POST['message']) ) ? prepare_message($_POST['message']) : ''; - $poll_title = ( isset($_POST['poll_title']) && $is_auth['auth_pollcreate'] ) ? clean_title($_POST['poll_title']) : ''; - $poll_options = ( isset($_POST['poll_option_text']) && $is_auth['auth_pollcreate'] ) ? $_POST['poll_option_text'] : ''; - $poll_length = ( isset($_POST['poll_length']) && $is_auth['auth_pollcreate'] ) ? $_POST['poll_length'] : ''; + $username = (!empty($_POST['username'])) ? clean_username($_POST['username']) : ''; + $subject = (!empty($_POST['subject'])) ? clean_title($_POST['subject']) : ''; + $message = (!empty($_POST['message'])) ? prepare_message($_POST['message']) : ''; + $poll_title = (isset($_POST['poll_title']) && $is_auth['auth_pollcreate']) ? clean_title($_POST['poll_title']) : ''; + $poll_options = (isset($_POST['poll_option_text']) && $is_auth['auth_pollcreate']) ? $_POST['poll_option_text'] : ''; + $poll_length = (isset($_POST['poll_length']) && $is_auth['auth_pollcreate']) ? $_POST['poll_length'] : ''; prepare_post($mode, $post_data, $error_msg, $username, $subject, $message, $poll_title, $poll_options, $poll_length); - if (!$error_msg) - { - $topic_type = ( isset($post_data['topic_type']) && $topic_type != $post_data['topic_type'] && !$is_auth['auth_sticky'] && !$is_auth['auth_announce'] ) ? $post_data['topic_type'] : $topic_type; + if (!$error_msg) { + $topic_type = (isset($post_data['topic_type']) && $topic_type != $post_data['topic_type'] && !$is_auth['auth_sticky'] && !$is_auth['auth_announce']) ? $post_data['topic_type'] : $topic_type; submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, DB()->escape($username), DB()->escape($subject), DB()->escape($message), DB()->escape($poll_title), $poll_options, $poll_length, $update_post_time); } @@ -514,75 +440,67 @@ else if ( ($submit || $confirm) && !$topic_has_new_posts ) case 'delete': case 'poll_delete': - require_once(INC_DIR .'functions_admin.php'); + require_once(INC_DIR . 'functions_admin.php'); delete_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id); break; } - if (!$error_msg) - { - if (!in_array($mode, array('editpost', 'delete', 'poll_delete'))) - { - $user_id = ( $mode == 'reply' || $mode == 'newtopic' ) ? $userdata['user_id'] : $post_data['poster_id']; - update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id); + if (!$error_msg) { + if (!in_array($mode, array('editpost', 'delete', 'poll_delete'))) { + $user_id = ($mode == 'reply' || $mode == 'newtopic') ? $userdata['user_id'] : $post_data['poster_id']; + if (!isset($_POST['to_draft'])) { + update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id); + } } $attachment_mod['posting']->insert_attachment($post_id); - if (!$error_msg && $mode != 'poll_delete') - { + if (!$error_msg && $mode != 'poll_delete') { user_notification($mode, $post_data, $post_info['topic_title'], $forum_id, $topic_id, $post_id, $notify_user); } - if ($mode == 'newtopic' || $mode == 'reply') - { + if ($mode == 'newtopic' || $mode == 'reply') { set_tracks(COOKIE_TOPIC, $tracking_topics, $topic_id); } - if (defined('TORRENT_ATTACH_ID') && $bb_cfg['bt_newtopic_auto_reg'] && !$error_msg) - { - include(INC_DIR .'functions_torrent.php'); - if(!DB()->fetch_row("SELECT attach_id FROM ". BB_BT_TORRENTS ." WHERE attach_id = ". TORRENT_ATTACH_ID)) - { - if($bb_cfg['premod']) - { - // Получение списка id форумов начиная с parent - $forum_parent = $forum_id; - if ($post_info['forum_parent']) $forum_parent = $post_info['forum_parent']; - $count_sql = " + if (defined('TORRENT_ATTACH_ID') && $bb_cfg['bt_newtopic_auto_reg'] && !$error_msg) { + include(INC_DIR . 'functions_torrent.php'); + if (!DB()->fetch_row("SELECT attach_id FROM " . BB_BT_TORRENTS . " WHERE attach_id = " . TORRENT_ATTACH_ID)) { + if ($bb_cfg['premod']) { + // Получение списка id форумов начиная с parent + $forum_parent = $forum_id; + if ($post_info['forum_parent']) $forum_parent = $post_info['forum_parent']; + $count_sql = " SELECT forum_id - FROM ". BB_FORUMS ." + FROM " . BB_FORUMS . " WHERE forum_parent = $forum_parent "; - $count_rowset = DB()->fetch_rowset($count_sql); - $sub_forums = array(); - foreach ($count_rowset as $count_row) - { - if ($count_row['forum_id'] != $forum_id) $sub_forums[] = $count_row['forum_id']; - } - $sub_forums[] = $forum_id; - $sub_forums = join(',', $sub_forums); - // Подсчёт проверенных релизов в форумах раздела - $count_checked_releases = DB()->fetch_row(" + $count_rowset = DB()->fetch_rowset($count_sql); + $sub_forums = array(); + foreach ($count_rowset as $count_row) { + if ($count_row['forum_id'] != $forum_id) $sub_forums[] = $count_row['forum_id']; + } + $sub_forums[] = $forum_id; + $sub_forums = join(',', $sub_forums); + // Подсчёт проверенных релизов в форумах раздела + $count_checked_releases = DB()->fetch_row(" SELECT COUNT(*) AS checked_releases - FROM ". BB_BT_TORRENTS ." - WHERE poster_id = ". $userdata['user_id'] ." + FROM " . BB_BT_TORRENTS . " + WHERE poster_id = " . $userdata['user_id'] . " AND forum_id IN($sub_forums) - AND tor_status IN(". TOR_APPROVED .",". TOR_DOUBTFUL .",". TOR_TMP .") + AND tor_status IN(" . TOR_APPROVED . "," . TOR_DOUBTFUL . "," . TOR_TMP . ") LIMIT 1 ", 'checked_releases'); - if ($count_checked_releases || IS_AM) tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED); - else tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_PREMOD); - } - else tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED); + if ($count_checked_releases || IS_AM) tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED); + else tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_PREMOD); + } else tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED); } } - if ($mode == 'reply' && $post_info['topic_status'] == TOPIC_LOCKED) - { + if ($mode == 'reply' && $post_info['topic_status'] == TOPIC_LOCKED) { $locked_warn = '
- '. $lang['LOCKED_WARN'] .' + ' . $lang['LOCKED_WARN'] . '


'; @@ -595,136 +513,111 @@ else if ( ($submit || $confirm) && !$topic_has_new_posts ) //snp //if( $refresh || isset($_POST['del_poll_option']) || $error_msg != '' ) -if( $refresh || isset($_POST['del_poll_option']) || $error_msg || ($submit && $topic_has_new_posts) ) -//snp end +if ($refresh || isset($_POST['del_poll_option']) || $error_msg || ($submit && $topic_has_new_posts)) //snp end { - $username = ( !empty($_POST['username']) ) ? clean_username($_POST['username']) : ''; - $subject = ( !empty($_POST['subject']) ) ? clean_title($_POST['subject']) : ''; - $message = ( !empty($_POST['message']) ) ? prepare_message($_POST['message']) : ''; + $username = (!empty($_POST['username'])) ? clean_username($_POST['username']) : ''; + $subject = (!empty($_POST['subject'])) ? clean_title($_POST['subject']) : ''; + $message = (!empty($_POST['message'])) ? prepare_message($_POST['message']) : ''; - $poll_title = ( !empty($_POST['poll_title']) ) ? clean_title($_POST['poll_title']) : ''; - $poll_length = ( isset($_POST['poll_length']) ) ? max(0, intval($_POST['poll_length'])) : 0; + $poll_title = (!empty($_POST['poll_title'])) ? clean_title($_POST['poll_title']) : ''; + $poll_length = (isset($_POST['poll_length'])) ? max(0, intval($_POST['poll_length'])) : 0; $poll_options = array(); - if ( !empty($_POST['poll_option_text']) ) - { + if (!empty($_POST['poll_option_text'])) { # while( list($option_id, $option_text) = @each($_POST['poll_option_text']) ) - foreach ($_POST['poll_option_text'] as $option_id => $option_text) - { - if( isset($_POST['del_poll_option'][$option_id]) ) - { + foreach ($_POST['poll_option_text'] as $option_id => $option_text) { + if (isset($_POST['del_poll_option'][$option_id])) { unset($poll_options[$option_id]); - } - else if ( !empty($option_text) ) - { + } else if (!empty($option_text)) { $poll_options[$option_id] = clean_title($option_text); } } } - if ( $poll_add && !empty($_POST['add_poll_option_text']) ) - { + if ($poll_add && !empty($_POST['add_poll_option_text'])) { $poll_options[] = clean_title($_POST['add_poll_option_text']); } - if ($preview) - { - $preview_subject = $subject; + if ($preview) { + $preview_subject = $subject; $preview_username = $username; - $preview_message = htmlCHR($message, false, ENT_NOQUOTES); - $preview_message = bbcode2html($preview_message); + $preview_message = htmlCHR($message, false, ENT_NOQUOTES); + $preview_message = bbcode2html($preview_message); $template->assign_vars(array( 'TPL_PREVIEW_POST' => true, - 'TOPIC_TITLE' => wbr($preview_subject), - 'POST_SUBJECT' => $preview_subject, - 'POSTER_NAME' => $preview_username, - 'POST_DATE' => bb_date(TIMENOW), - 'PREVIEW_MSG' => $preview_message, + 'TOPIC_TITLE' => wbr($preview_subject), + 'POST_SUBJECT' => $preview_subject, + 'POSTER_NAME' => $preview_username, + 'POST_DATE' => bb_date(TIMENOW), + 'PREVIEW_MSG' => $preview_message, )); } -} -else -{ +} else { // User default entry point - if ( $mode == 'newtopic' ) - { + if ($mode == 'newtopic') { $username = ($userdata['session_logged_in']) ? $userdata['username'] : ''; $poll_title = ''; $poll_length = ''; $subject = ''; $message = ''; - } - else if ( $mode == 'reply' ) - { - $username = ( $userdata['session_logged_in'] ) ? $userdata['username'] : ''; + } else if ($mode == 'reply') { + $username = ($userdata['session_logged_in']) ? $userdata['username'] : ''; $subject = ''; $message = ''; - } - else if ( $mode == 'quote' || $mode == 'editpost' ) - { - $subject = ( $post_data['first_post'] ) ? $post_info['topic_title'] : ''; + } else if ($mode == 'quote' || $mode == 'editpost') { + $subject = ($post_data['first_post']) ? $post_info['topic_title'] : ''; $message = $post_info['post_text']; - if ( $mode == 'quote' ) - { - if (!defined('WORD_LIST_OBTAINED')) - { + if ($mode == 'quote') { + if (!defined('WORD_LIST_OBTAINED')) { $orig_word = array(); $replace_word = array(); obtain_word_list($orig_word, $replace_word); define('WORD_LIST_OBTAINED', TRUE); } - if($post_info['post_attachment'] && !IS_AM) $message = $post_info['topic_title']; + if ($post_info['post_attachment'] && !IS_AM) $message = $post_info['topic_title']; // Use trim to get rid of spaces placed there by MS-SQL 2000 - $quote_username = ( trim($post_info['post_username']) != '' ) ? $post_info['post_username'] : $post_info['username']; - $message = '[quote="'. $quote_username .'"][qpost='. $post_info['post_id'] .']' . $message . '[/quote]'; + $quote_username = (trim($post_info['post_username']) != '') ? $post_info['post_username'] : $post_info['username']; + $message = '[quote="' . $quote_username . '"][qpost=' . $post_info['post_id'] . ']' . $message . '[/quote]'; // hide user passkey $message = preg_replace('#(?<=\?uk=)[a-zA-Z0-9]{10}(?=&)#', 'passkey', $message); // hide sid $message = preg_replace('#(?<=[\?&;]sid=)[a-zA-Z0-9]{12}#', 'sid', $message); - if ( !empty($orig_word) ) - { - $subject = ( !empty($subject) ) ? preg_replace($orig_word, $replace_word, $subject) : ''; - $message = ( !empty($message) ) ? preg_replace($orig_word, $replace_word, $message) : ''; + if (!empty($orig_word)) { + $subject = (!empty($subject)) ? preg_replace($orig_word, $replace_word, $subject) : ''; + $message = (!empty($message)) ? preg_replace($orig_word, $replace_word, $message) : ''; } - if ( !preg_match('/^Re:/', $subject) && strlen($subject) > 0 ) - { + if (!preg_match('/^Re:/', $subject) && strlen($subject) > 0) { $subject = 'Re: ' . $subject; } $mode = 'reply'; - } - else - { - $username = ( $post_info['user_id'] == ANONYMOUS && !empty($post_info['post_username']) ) ? $post_info['post_username'] : ''; + } else { + $username = ($post_info['user_id'] == ANONYMOUS && !empty($post_info['post_username'])) ? $post_info['post_username'] : ''; } } } -if ($error_msg) -{ +if ($error_msg) { $template->assign_vars(array( 'ERROR_MESSAGE' => $error_msg, )); } -if (IS_GUEST || ($mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS)) -{ +if (IS_GUEST || ($mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS)) { $template->assign_var('POSTING_USERNAME'); } // // Notify checkbox // -if (!IS_GUEST) -{ - if ($mode != 'editpost' || ($mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS)) - { +if (!IS_GUEST) { + if ($mode != 'editpost' || ($mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS)) { $template->assign_var('SHOW_NOTIFY_CHECKBOX'); } } @@ -733,42 +626,34 @@ if (!IS_GUEST) // Topic type selection // $topic_type_toggle = ''; -if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) ) -{ +if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) { $template->assign_block_vars('switch_type_toggle', array()); - if( $is_auth['auth_sticky'] ) - { + if ($is_auth['auth_sticky']) { $topic_type_toggle .= '