diff --git a/mods/Virtual Keyboard/install.txt b/mods/Virtual Keyboard/install.txt index 4d4630879..3cdba121d 100644 --- a/mods/Virtual Keyboard/install.txt +++ b/mods/Virtual Keyboard/install.txt @@ -124,6 +124,24 @@ $lang['KB_TRANSLIT_OPERA7'] = 'Нажмите здесь для перевода +# +#-----[ OPEN / Открыть ]----------------------------------------- +# + templates/default/posting_editor.tpl + +# +#-----[ FIND / Найти ]------------------------------------------- +# + +class="editor mrg_4" name="message" id="message" rows="18" cols="92" + +# +#-----[ ADD / Добавить]------------------------------ +# + + + onkeypress = "if(use_kb) return decode(event);" + # #-----[ SAVE/CLOSE ALL FILES / Сохранить/Закрыть все файлы]------------------------------------------ diff --git a/upload/ajax/change_torrent.php b/upload/ajax/change_torrent.php index de5de12ed..81009e00b 100644 --- a/upload/ajax/change_torrent.php +++ b/upload/ajax/change_torrent.php @@ -80,11 +80,13 @@ switch($type) break; case 'del_torrent'; + if (empty($this->request['confirmed'])) $this->prompt_for_confirm('Вы уверены, что хотите удалить торрент?'); delete_torrent($attach_id); $url = make_url(TOPIC_URL . $torrent['topic_id']); break; case 'del_torrent_move_topic'; + if (empty($this->request['confirmed'])) $this->prompt_for_confirm('Вы уверены, что хотите удалить и перенести топик?'); delete_torrent($attach_id); $url = make_url("modcp.php?t={$torrent['topic_id']}&mode=move&sid={$userdata['session_id']}"); break; } diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index 8538babd5..5809bd69e 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -29,21 +29,26 @@ if (!defined('WORD_LIST_OBTAINED')) } switch($this->request['type']) -{ case 'delete'; +{ + case 'delete'; if(!$post) $this->ajax_die('not post'); $is_auth = auth(AUTH_ALL, $post['forum_id'], $userdata, $post); if($post['post_id'] != $post['topic_first_post_id'] && ($is_auth['auth_mod'] || ($userdata['user_id'] == $post['poster_id'] && $is_auth['auth_delete'] && $post['topic_last_post_id'] == $post['post_id'] && $post['post_time'] + 3600*3 > TIMENOW))) - { if (empty($this->request['confirmed'])) + { + if (empty($this->request['confirmed'])) { $this->prompt_for_confirm($lang['CONFIRM_DELETE']); } post_delete($post_id); $this->response['hide'] = true; - $this->response['post_id'] = $post_id; } + $this->response['post_id'] = $post_id; + } else - { $this->ajax_die(sprintf($lang['SORRY_AUTH_DELETE'], strip_tags($is_auth['auth_delete_type']))); } + { + $this->ajax_die(sprintf($lang['SORRY_AUTH_DELETE'], strip_tags($is_auth['auth_delete_type']))); + } break; case 'reply'; @@ -73,7 +78,9 @@ switch($this->request['type']) } if(mb_strlen($message, 'UTF-8') > 1000) - { $this->response['redirect'] = make_url('posting.php?mode=quote&p='. $post_id); } + { + $this->response['redirect'] = make_url('posting.php?mode=quote&p='. $post_id); + } $this->response['quote'] = true; $this->response['message'] = $message; @@ -91,7 +98,9 @@ switch($this->request['type']) if(!$post) $this->ajax_die('not post'); if(mb_strlen($post['post_text'], 'UTF-8') > 1000) - { $this->response['redirect'] = make_url('posting.php?mode=editpost&p='. $post_id); } + { + $this->response['redirect'] = make_url('posting.php?mode=editpost&p='. $post_id); + } else if($this->request['type'] == 'editor') { $text = (string) $this->request['text']; @@ -160,11 +169,14 @@ switch($this->request['type']) } } } + + $hidden_form = ''; + $hidden_form .= ''; + $submit = $this->response['redirect'] = make_url('posting.php?mode=editpost&p='. $post_id); $this->response['text'] = '
- - + '. $hidden_form .'
@@ -181,7 +193,7 @@ switch($this->request['type'])
- +
@@ -299,7 +311,8 @@ switch($this->request['type']) default: $this->ajax_die('empty type'); - break; } + break; +} diff --git a/upload/ajax/view_post.php b/upload/ajax/view_post.php index c69c506b0..0b738f153 100644 --- a/upload/ajax/view_post.php +++ b/upload/ajax/view_post.php @@ -16,7 +16,6 @@ $sql = " SELECT p.*, h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text, - pt.post_subject, f.auth_read FROM ". BB_POSTS ." p INNER JOIN ". BB_POSTS_TEXT ." pt ON(pt.post_id = p.post_id) diff --git a/upload/attach_mod/posting_attachments.php b/upload/attach_mod/posting_attachments.php index 17718a787..86ba2e9e0 100644 --- a/upload/attach_mod/posting_attachments.php +++ b/upload/attach_mod/posting_attachments.php @@ -13,6 +13,7 @@ define('FILENAME_CRYPTIC', false); define('FILENAME_CRYPTIC_LENGTH', 64); define('FILENAME_TRANSLITERATE', true); + class attach_parent { var $post_attach = false; @@ -789,6 +790,7 @@ class attach_parent if ($this->add_attachment_body) { $template->assign_vars(array( + 'TPL_ADD_ATTACHMENT' => true, 'FILE_COMMENT' => htmlspecialchars($this->file_comment), 'FILESIZE' => $attach_config['max_filesize'], 'FILENAME' => htmlspecialchars($this->filename), diff --git a/upload/config.php b/upload/config.php index a5e5a5804..8ed6f9b77 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.0.2'; -$bb_cfg['tp_release_state'] = 'TP II r165'; +$bb_cfg['tp_release_state'] = 'TP II r166'; $bb_cfg['tp_release_date'] = '27-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php index e1362ca1d..1285b6793 100644 --- a/upload/includes/functions_post.php +++ b/upload/includes/functions_post.php @@ -1,24 +1,4 @@ assign_vars(array( 'TPL_TOPIC_REVIEW' => (bool) $review_posts, - 'L_TOPIC_REVIEW' => $lang['TOPIC_REVIEW'], )); } \ No newline at end of file diff --git a/upload/includes/report_hack/report_post.php b/upload/includes/report_hack/report_post.php index 4184c38dd..36b266fb2 100644 --- a/upload/includes/report_hack/report_post.php +++ b/upload/includes/report_hack/report_post.php @@ -172,7 +172,7 @@ class report_post extends report_module // function subject_obtain($report_subject) { - $sql = 'SELECT pt.post_subject, t.topic_title, t.topic_first_post_id + $sql = 'SELECT t.topic_title, t.topic_first_post_id FROM ' . BB_POSTS . ' p INNER JOIN ' . BB_POSTS_TEXT . ' pt ON pt.post_id = p.post_id @@ -192,9 +192,9 @@ class report_post extends report_module return false; } - if ($row['post_subject'] != '') + if ($row['topic_title'] != '') { - return $row['post_subject']; + return $row['topic_title']; } else { diff --git a/upload/posting.php b/upload/posting.php index 7dca362d6..8e7b0dd7e 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -616,7 +616,7 @@ else } else if ( $mode == 'quote' || $mode == 'editpost' ) { - $subject = ( $post_data['first_post'] ) ? $post_info['topic_title'] : $post_info['post_subject']; + $subject = ( $post_data['first_post'] ) ? $post_info['topic_title'] : ''; $message = $post_info['post_text']; if ( $mode == 'quote' ) diff --git a/upload/templates/default/posting_attach.tpl b/upload/templates/default/posting_attach.tpl index ecd6b90d3..401223af2 100644 --- a/upload/templates/default/posting_attach.tpl +++ b/upload/templates/default/posting_attach.tpl @@ -5,7 +5,7 @@ {L_ADD_ATTACHMENT_TITLE} - {L_FILE_NAME} + {L_FILENAME} @@ -39,7 +39,7 @@ - + diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl index a349b1f96..05544597c 100644 --- a/upload/templates/default/posting_editor.tpl +++ b/upload/templates/default/posting_editor.tpl @@ -92,9 +92,6 @@ ajax.callback.posts = function(data){
{L_FILE_NAME}{L_FILENAME} {attach_row.FILE_NAME}