diff --git a/sources/ElkArte/AdminController/ManageDraftsModule.php b/sources/ElkArte/AdminController/ManageDraftsModule.php index 56bba07388..64952cf914 100644 --- a/sources/ElkArte/AdminController/ManageDraftsModule.php +++ b/sources/ElkArte/AdminController/ManageDraftsModule.php @@ -48,7 +48,7 @@ public static function addCoreFeature(&$core_features) 'setting_callback' => static function ($value) { require_once(SUBSDIR . '/ScheduledTasks.subs.php'); toggleTaskStatusByName('remove_old_drafts', $value); - $modules = array('admin', 'post', 'display', 'profile', 'personalmessage'); + $modules = ['admin', 'post', 'display', 'profile', 'personalmessage', 'messageindex']; // Enabling, let's register the modules and prepare the scheduled task if ($value) diff --git a/sources/ElkArte/Controller/Display.php b/sources/ElkArte/Controller/Display.php index 7ea99e6cd1..6d5b14655e 100644 --- a/sources/ElkArte/Controller/Display.php +++ b/sources/ElkArte/Controller/Display.php @@ -247,8 +247,16 @@ public function action_display() 'width' => '100%', 'smiley_container' => 'smileyBox_message', 'bbc_container' => 'bbcBox_message', - // We do XML preview here. + // We submit/switch to full post page for the preview 'preview_type' => 1, + 'buttons' => [ + 'more' => [ + 'type' => 'submit', + 'name' => 'more_options', + 'value' => $txt['post_options'], + 'options' => '' + ] + ], ]; // Load the template basics now as template_layers is requested by the prepare_context event diff --git a/sources/ElkArte/Controller/MessageIndex.php b/sources/ElkArte/Controller/MessageIndex.php index 047c68e9ed..48d7ca3cb5 100644 --- a/sources/ElkArte/Controller/MessageIndex.php +++ b/sources/ElkArte/Controller/MessageIndex.php @@ -23,6 +23,8 @@ use ElkArte\EventManager; use ElkArte\FrontpageInterface; use ElkArte\Helper\DataValidator; +use ElkArte\MembersList; +use ElkArte\Themes\TemplateLayers; use ElkArte\TopicUtil; use ElkArte\User; @@ -31,6 +33,27 @@ */ class MessageIndex extends AbstractController implements FrontpageInterface { + /** @var string The db column wer are going to sort */ + public $sort_column = ''; + + /** @var array Know sort methods to db column */ + public $sort_methods = []; + + /** @var bool Sort direction asc or desc */ + public $ascending = ''; + + /** @var TemplateLayers The template layers object */ + private $template_layers; + + /** @var bool if we are marking as read */ + public $is_marked_notify; + + /** @var string Chosen sort method from the request */ + public $sort_by; + + /** @var int Basically the page start */ + public $sort_start; + /** * {@inheritDoc} */ @@ -69,7 +92,7 @@ public static function frontPageOptions() }); // Trigger change event - var event = new Event("change"); + let event = new Event("change"); document.getElementById("front_page").dispatchEvent(event);', true); return [['select', 'message_index_frontpage', self::_getBoardsList()]]; @@ -132,149 +155,411 @@ public function action_index() */ public function action_messageindex() { - global $txt, $board, $modSettings, $context, $options, $settings, $board_info; - - // Fairly often, we'll work with boards. Current board, sub-boards. - require_once(SUBSDIR . '/Boards.subs.php'); - require_once(SUBSDIR . '/MessageIndex.subs.php'); + global $txt, $context, $board_info; - // If this is a redirection board head off. + // Check for redirection board, and if found, head off if ($board_info['redirect']) { - incrementBoard($board, 'num_posts'); - redirectexit($board_info['redirect']); + $this->handleRedirectBoard(); } - theme()->getTemplates()->load('MessageIndex'); - loadJavascriptFile('topic.js'); + // Load any necessary resources + $this->loadSupportingResources(); - $context['name'] = $board_info['name']; - $context['sub_template'] = 'topic_listing'; - $context['description'] = ParserWrapper::instance()->parseBoard($board_info['description']); - $template_layers = theme()->getLayers(); + // Initialize $context + $this->initializeContext(); - // How many topics do we have in total? - $board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics']; + // Build a list of unapproved posts, if applicable + if ($this->currentUserCanApprovePosts() && $this->hasUnapprovedPosts()) + { + $context['unapproved_posts_message'] = $this->buildUnapprovedPostsMessage(); + } - // View all the topics, or just a few? - $context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics']; - $context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages']; - $maxindex = isset($this->_req->query->all) && !empty($modSettings['enableAllMessages']) ? $board_info['total_topics'] : $context['topics_per_page']; + // Make sure the starting place makes sense and construct the page index + $this->setPageNavigation(); + + // Prepare profile links to those who can moderate on this board + $this->setBoardModeratorLinks(); - // Right, let's only index normal stuff! - $context['robot_no_index'] = $this->setRobotNoIndex(); + // Mark current and parent boards as seen. + $this->markCurrentAndParentBoardsAsSeen(); + + // Load basic information about the boards children, aka sub boards + $this->prepareSubBoardsForDisplay(); + + // Who else is taking a look + $this->prepareWhoViewing(); + + // Setup topic sort icons/options for template use + $this->setSortIcons(); + + // Load the topic listing, accounting for sort, start page, etc. + $this->loadBoardTopics(); + + // What quick moderation options are available? + $this->quickModeration(); - // If we can view unapproved messages and there are some build up a list. - if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts'])) + // Set template details/layers + $this->template_layers = theme()->getLayers(); + if (!empty($context['boards']) && $this->sort_start === 0) { - $untopics = $board_info['unapproved_topics'] ? '' . $board_info['unapproved_topics'] . '' : 0; - $unposts = $board_info['unapproved_posts'] ? '' . ($board_info['unapproved_posts'] - $board_info['unapproved_topics']) . '' : 0; - $context['unapproved_posts_message'] = sprintf($txt['there_are_unapproved_topics'], $untopics, $unposts, getUrl('action', ['action' => 'moderate', 'area' => 'postmod', 'sa' => ($board_info['unapproved_topics'] ? 'topics' : 'posts'), 'brd' => $board])); + $this->template_layers->add('display_child_boards'); } - // Known sort methods. - $sort_methods = messageIndexSort(); - $default_sort_method = 'last_post'; - $sort_string = ''; + // If there are children, but no topics and no ability to post topics... + $context['no_topic_listing'] = !empty($context['boards']) && empty($context['topics']) && !$context['can_post_new']; + + $this->template_layers->add('topic_listing'); - // Requested a sorting method - $chosen_sort = $this->_req->getQuery('sort', 'trim'); - if (isset($chosen_sort)) + theme()->addJavascriptVar(['notification_board_notice' => $this->is_marked_notify ? $txt['notification_disable_board'] : $txt['notification_enable_board']], true); + + // Is Quick Topic available + $this->quickTopic(); + + // Finally action buttons like start new topic, notify, mark read ... + $this->buildBoardButtons(); + } + + /** + * Handles redirection for a board. Increments the number of posts in the board + * and redirects to the specified board URL. + */ + private function handleRedirectBoard(): void + { + global $board, $board_info; + + // If this is a redirection board head off. + require_once(SUBSDIR . '/Boards.subs.php'); + + incrementBoard($board, 'num_posts'); + redirectexit($board_info['redirect']); + } + + /** + * Initializes the context by setting various variables for the template. + */ + private function initializeContext(): void + { + global $txt, $context, $board_info, $modSettings; + + $description = ParserWrapper::instance()->parseBoard($board_info['description']); + + $context += [ + 'name' => $board_info['name'], + 'sub_template' => 'topic_listing', + 'description' => $description, + 'robot_no_index' => $this->setRobotNoIndex(), + // 'Print' the header and board info. + 'page_title' => strip_tags($board_info['name']), + 'page_description' => strip_tags($description), + // Set the variables up for the template. + 'can_mark_notify' => $this->currentUserCanMarkNotify(), + 'can_post_new' => $this->currentUserCanPostNew(), + 'can_post_poll' => $this->currentUserCanPostPoll(), + 'can_moderate_forum' => $this->currentUserCanModerate(), + 'can_approve_posts' => $this->currentUserCanApprovePosts(), + 'jump_to' => [ + 'label' => addslashes(un_htmlspecialchars($txt['jump_to'])), + 'board_name' => htmlspecialchars(strtr(strip_tags($board_info['name']), ['&' => '&']), ENT_COMPAT, 'UTF-8'), + 'child_level' => $board_info['child_level'], + ], + 'message_index_preview' => !empty($modSettings['message_index_preview']) + ]; + } + + /** + * Sets if this is a page that we do, or do not, want bots to index + * + * @return bool + */ + public function setRobotNoIndex() + { + global $context; + + foreach ($this->_req->query as $k => $v) { - // We only know these. - if (!isset($sort_methods[$chosen_sort])) + // Don't index a sort result etc. + if (!in_array($k, ['board', 'start', session_name()], true)) { - $chosen_sort = $default_sort_method; + return true; } + } + + return !empty($this->_req->query->start) + && (!is_numeric($this->_req->query->start) || $this->_req->query->start % $context['messages_per_page'] !== 0); + } + + /** + * Checks whether the current user has permission to mark notifications + * + * @return bool True if the current user can mark notifications, false otherwise + */ + private function currentUserCanMarkNotify(): bool + { + return allowedTo('mark_notify') && $this->user->is_guest === false; + } + + /** + * Checks if the current user is allowed to post new topics + * + * @return bool Returns true if the current user is allowed to post new topics, otherwise false. + */ + private function currentUserCanPostNew(): bool + { + global $modSettings; + + return allowedTo('post_new') || ($modSettings['postmod_active'] && allowedTo('post_unapproved_topics')); + } - $sort_string = ';sort=' . $chosen_sort . (isset($this->_req->query->desc) ? ';desc' : ''); + /** + * Checks if the current user can post a poll + * + * @return bool Returns true if the current user can post a poll, false otherwise + */ + private function currentUserCanPostPoll(): bool + { + global $modSettings; + + return !empty($modSettings['pollMode']) && allowedTo('poll_post') && $this->currentUserCanPostNew(); + } + + /** + * Checks if the current user is allowed to moderate the forum + * + * @return bool Returns true if the current user is allowed to moderate the forum, false otherwise + */ + private function currentUserCanModerate(): bool + { + return allowedTo('moderate_forum'); + } + + /** + * Checks if the current user has the permission to approve posts + * + * @return bool True if the current user can approve posts, false otherwise + */ + private function currentUserCanApprovePosts(): bool + { + return allowedTo('approve_posts'); + } + + /** + * Check if the current user can restore a topic + * + * @return bool True if they can restore a topic + */ + private function currentUserCanRestore(): bool + { + global $modSettings, $board; + + return allowedTo('move_any') && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board; + } + + /** + * Loads supporting resources for the MessageIndex page. + */ + private function loadSupportingResources(): void + { + global $modSettings, $txt; + + // Fairly often, we'll work with boards. Current board, sub-boards. + require_once(SUBSDIR . '/Boards.subs.php'); + require_once(SUBSDIR . '/MessageIndex.subs.php'); + + theme()->getTemplates()->load('MessageIndex'); + loadJavascriptFile('topic.js'); + + if (!empty($modSettings['message_index_preview'])) + { + loadJavascriptFile('elk_toolTips.js', ['defer' => true]); } + theme()->addJavascriptVar([ + 'txt_mark_as_read_confirm' => $txt['mark_these_as_read_confirm'] + ], true); + } + + /** + * Checks if the current board has unapproved posts or topics. + * + * @return bool Returns true if the board has unapproved posts or topics, otherwise false. + */ + private function hasUnapprovedPosts(): bool + { + global $board_info; + + return $board_info['unapproved_topics'] || $board_info['unapproved_posts']; + } + + /** + * Builds the message/links for the number of unapproved posts and topics in the current board. + * + * @return string The message containing the number of unapproved topics and posts. + */ + private function buildUnapprovedPostsMessage(): string + { + global $txt, $board_info, $board; + + $unApprovedTopics = $board_info['unapproved_topics'] ? '' . $board_info['unapproved_topics'] . '' : 0; + $unApprovedPosts = $board_info['unapproved_posts'] ? '' . ($board_info['unapproved_posts'] - $board_info['unapproved_topics']) . '' : 0; + + return sprintf($txt['there_are_unapproved_topics'], $unApprovedTopics, $unApprovedPosts, getUrl('action', ['action' => 'moderate', 'area' => 'postmod', 'sa' => ($board_info['unapproved_topics'] ? 'topics' : 'posts'), 'brd' => $board])); + } + + /** + * Sets up the page navigation for the board view. + */ + private function setPageNavigation() + { + global $board, $modSettings, $context, $options, $board_info; + + // How many topics do we have in total? + $board_info['total_topics'] = $this->currentUserCanApprovePosts() + ? $board_info['num_topics'] + $board_info['unapproved_topics'] + : $board_info['num_topics'] + $board_info['unapproved_user_topics']; + + $all = $this->_req->isSet('all'); + $start = $this->_req->getQuery('start', 'intval', 0); + + // View all the topics, or just a few? + $context['topics_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['topics_per_page']) ? $options['topics_per_page'] : $modSettings['defaultMaxTopics']; + $context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages']; + $per_page = $all && !empty($modSettings['enableAllMessages']) ? $board_info['total_topics'] : $context['topics_per_page']; + // Make sure the starting place makes sense and construct the page index. - $context['page_index'] = constructPageIndex('{scripturl}?board=' . $board . '.%1$d' . $sort_string, $this->_req->query->start, $board_info['total_topics'], $maxindex, true); - $context['start'] = &$this->_req->query->start; + $context['page_index'] = constructPageIndex('{scripturl}?board=' . $board . '.%1$d' . $this->buildSortingString(), $start, $board_info['total_topics'], $per_page, true); // Set a canonical URL for this page. - $context['canonical_url'] = getUrl('board', ['board' => $board, 'start' => $context['start'], 'name' => $board_info['name']]); + $context['canonical_url'] = getUrl('board', ['board' => $board, 'start' => $start, 'name' => $board_info['name']]); $context['links'] += [ - 'prev' => $this->_req->query->start >= $context['topics_per_page'] ? getUrl('board', ['board' => $board, 'start' => $this->_req->query->start - $context['topics_per_page'], 'name' => $board_info['name']]) : '', - 'next' => $this->_req->query->start + $context['topics_per_page'] < $board_info['total_topics'] ? getUrl('board', ['board' => $board, 'start' => $this->_req->query->start + $context['topics_per_page'], 'name' => $board_info['name']]) : '', + 'prev' => $start >= $context['topics_per_page'] ? getUrl('board', ['board' => $board, 'start' => $start - $context['topics_per_page'], 'name' => $board_info['name']]) : '', + 'next' => $start + $context['topics_per_page'] < $board_info['total_topics'] ? getUrl('board', ['board' => $board, 'start' => $start + $context['topics_per_page'], 'name' => $board_info['name']]) : '', ]; - if (isset($this->_req->query->all) && !empty($modSettings['enableAllMessages']) && $maxindex > $modSettings['enableAllMessages']) + if ($all && !empty($modSettings['enableAllMessages']) && $per_page > $modSettings['enableAllMessages']) + { + $per_page = $modSettings['enableAllMessages']; + $start = 0; + } + + $this->sort_start = $start; + $context['start'] = $start; + $context['per_page'] = $per_page; + } + + /** + * Builds the sorting string for the message index page. + * + * @return string The sorting string with the chosen sort method and direction + */ + private function buildSortingString() + { + global $context, $txt; + + // Known sort methods. + $this->sort_methods = messageIndexSort(); + $default_sort_method = 'last_post'; + + // Requested a sorting method? + $chosen_sort = $this->_req->getQuery('sort', 'trim', $default_sort_method); + + // We only know these. + if (!isset($this->sort_methods[$chosen_sort])) { - $maxindex = $modSettings['enableAllMessages']; - $this->_req->query->start = 0; + $chosen_sort = $default_sort_method; } + $sort_string = ';sort=' . $chosen_sort . ($this->_req->isSet('desc') ? ';desc' : ''); + $this->sort_by = $chosen_sort; + $this->ascending = $this->_req->isSet('asc'); + $this->sort_column = $this->sort_methods[$this->sort_by]; + + $context['sort_by'] = $this->sort_by; + $context['sort_direction'] = $this->ascending ? 'up' : 'down'; + $context['sort_title'] = $this->ascending ? $txt['sort_desc'] : $txt['sort_asc']; + + return $sort_string; + } + + /** + * Loads board moderator links into the context for displaying on the template. + */ + private function setBoardModeratorLinks() + { + global $board_info, $context, $txt; + // Build a list of the board's moderators. $context['moderators'] = &$board_info['moderators']; $context['link_moderators'] = []; + if (!empty($board_info['moderators'])) { foreach ($board_info['moderators'] as $mod) { - $context['link_moderators'][] = '' . $mod['name'] . ''; + $context['link_moderators'][] = '' . $mod['name'] . ''; } } + } - // Mark current and parent boards as seen. - if ($this->user->is_guest === false) + /** + * Marks the current board and its parent boards as seen for the current user + */ + public function markCurrentAndParentBoardsAsSeen() + { + global $board_info, $board; + + if ($this->user->is_guest) { - // We can't know they read it if we allow prefetches. - stop_prefetching(); + $this->is_marked_notify = false; + return; + } - // Mark the board as read, and its parents. - if (!empty($board_info['parent_boards'])) - { - $board_list = array_keys($board_info['parent_boards']); - $board_list[] = $board; - } - else - { - $board_list = [$board]; - } + // We can't know they read it if we allow prefetches. + stop_prefetching(); + + // Mark the board as read, and its parents. + if (!empty($board_info['parent_boards'])) + { + $board_list = array_keys($board_info['parent_boards']); + $board_list[] = $board; + } + else + { + $board_list = [$board]; + } - // Mark boards as read. Boards alone, no need for topics. - markBoardsRead($board_list, false, false); + // Mark boards as read. Boards alone, no need for topics. + markBoardsRead($board_list); - // Clear topicseen cache - if (!empty($board_info['parent_boards'])) + // Clear topicseen cache + if (!empty($board_info['parent_boards'])) + { + // We've seen all these boards now! + foreach ($board_info['parent_boards'] as $k => $dummy) { - // We've seen all these boards now! - foreach ($board_info['parent_boards'] as $k => $dummy) + if (isset($_SESSION['topicseen_cache'][$k])) { - if (isset($_SESSION['topicseen_cache'][$k])) - { - unset($_SESSION['topicseen_cache'][$k]); - } + unset($_SESSION['topicseen_cache'][$k]); } } - - if (isset($_SESSION['topicseen_cache'][$board])) - { - unset($_SESSION['topicseen_cache'][$board]); - } - - // From now on, they've seen it. So we reset notifications. - $context['is_marked_notify'] = resetSentBoardNotification($this->user->id, $board); } - else + + if (isset($_SESSION['topicseen_cache'][$board])) { - $context['is_marked_notify'] = false; + unset($_SESSION['topicseen_cache'][$board]); } - // 'Print' the header and board info. - $context['page_title'] = strip_tags($board_info['name']); - $context['page_description'] = strip_tags($context['description']); + // From now on, they've seen it. So we reset notifications. + $this->is_marked_notify = resetSentBoardNotification($this->user->id, $board); + } - // Set the variables up for the template. - $context['can_mark_notify'] = allowedTo('mark_notify') && $this->user->is_guest === false; - $context['can_post_new'] = allowedTo('post_new') || ($modSettings['postmod_active'] && allowedTo('post_unapproved_topics')); - $context['can_post_poll'] = !empty($modSettings['pollMode']) && allowedTo('poll_post') && $context['can_post_new']; - $context['can_moderate_forum'] = allowedTo('moderate_forum'); - $context['can_approve_posts'] = allowedTo('approve_posts'); + /** + * Prepare and load sub-boards for display. + */ + private function prepareSubBoardsForDisplay() + { + global $board_info, $modSettings, $context; // Prepare sub-boards for display. $boardIndexOptions = [ @@ -284,8 +569,17 @@ public function action_messageindex() 'set_latest_post' => false, 'countChildPosts' => !empty($modSettings['countChildPosts']), ]; - $boardlist = new BoardsList($boardIndexOptions); - $context['boards'] = $boardlist->getBoards(); + + $boardList = new BoardsList($boardIndexOptions); + $context['boards'] = $boardList->getBoards(); + } + + /** + * Prepares and loads into context the information about who is currently viewing the board + */ + private function prepareWhoViewing() + { + global $settings, $board; // Nosey, nosey - who's viewing this board? if (!empty($settings['display_who_viewing'])) @@ -293,41 +587,51 @@ public function action_messageindex() require_once(SUBSDIR . '/Who.subs.php'); formatViewers($board, 'board'); } + } - // Set the sort - $context['sort_by'] = $chosen_sort ?? $default_sort_method; - $ascending = isset($this->_req->query->asc); - $sort_column = $sort_methods[$context['sort_by']]; - $context['sort_direction'] = $ascending ? 'up' : 'down'; - $context['sort_title'] = $ascending ? $txt['sort_desc'] : $txt['sort_asc']; + /** + * Sets the sort icons for the topics headers in the context. + */ + private function setSortIcons() + { + global $context, $board, $board_info, $txt; // Trick $txt['starter'] = $txt['started_by']; // todo: Need to move this to theme. - foreach ($sort_methods as $key => $val) + foreach ($this->sort_methods as $key => $val) { - $sorticon = match ($key) + $sortIcon = match ($key) { 'subject', 'starter', 'last_poster' => 'alpha', default => 'numeric', }; $context['topics_headers'][$key] = [ - 'url' => getUrl('board', ['board' => $context['current_board'], 'start' => $context['start'], 'sort' => $key, 'name' => $board_info['name'], $context['sort_by'] == $key && $context['sort_direction'] === 'up' ? 'desc' : 'asc']), - 'sort_dir_img' => $context['sort_by'] === $key ? '' . $context['sort_title'] . '' : '', + 'url' => getUrl('board', ['board' => $board, 'start' => $this->sort_start, 'sort' => $key, 'name' => $board_info['name'], $this->sort_by === $key && $this->ascending ? 'desc' : 'asc']), + 'sort_dir_img' => $this->sort_by === $key ? '' . $context['sort_title'] . '' : '', ]; } + } + + /** + * Loads board topics into the context + */ + private function loadBoardTopics() + { + global $board, $modSettings, $context, $settings, $board_info; // Calculate the fastest way to get the topics. $start = $this->_req->getQuery('start', 'intval', 0); + $per_page = $context['per_page']; $fake_ascending = false; if ($start > ($board_info['total_topics'] - 1) / 2) { - $ascending = !$ascending; + $this->ascending = !$this->ascending; $fake_ascending = true; - $maxindex = $board_info['total_topics'] < $start + $maxindex + 1 ? $board_info['total_topics'] - $start : $maxindex; - $start = $board_info['total_topics'] < $start + $maxindex + 1 ? 0 : $board_info['total_topics'] - $start - $maxindex; + $per_page = $board_info['total_topics'] < $start + $per_page + 1 ? $board_info['total_topics'] - $start : $per_page; + $start = $board_info['total_topics'] < $start + $per_page + 1 ? 0 : $board_info['total_topics'] - $start - $per_page; } $context['topics'] = []; @@ -337,14 +641,14 @@ public function action_messageindex() 'only_approved' => $modSettings['postmod_active'] && !allowedTo('approve_posts'), 'previews' => empty($modSettings['message_index_preview']) ? 0 : (empty($modSettings['preview_characters']) ? -1 : $modSettings['preview_characters']), 'include_avatars' => $settings['avatars_on_indexes'], - 'ascending' => $ascending, + 'ascending' => $this->ascending, 'fake_ascending' => $fake_ascending ]; // Allow integration to modify / add to the $indexOptions - call_integration_hook('integrate_messageindex_topics', [&$sort_column, &$indexOptions]); + call_integration_hook('integrate_messageindex_topics', [&$this->sort_column, &$indexOptions]); - $topics_info = messageIndexTopics($board, $this->user->id, $start, $maxindex, $context['sort_by'], $sort_column, $indexOptions); + $topics_info = messageIndexTopics($board, $this->user->id, $start, $per_page, $this->sort_by, $this->sort_column, $indexOptions); $context['topics'] = TopicUtil::prepareContext($topics_info, false, empty($modSettings['preview_characters']) ? 128 : $modSettings['preview_characters']); @@ -371,28 +675,33 @@ public function action_messageindex() // Trigger a topic loaded event $this->_events->trigger('topicinfo', ['callbacks' => &$context['topics']]); + } - $context['jump_to'] = [ - 'label' => addslashes(un_htmlspecialchars($txt['jump_to'])), - 'board_name' => htmlspecialchars(strtr(strip_tags($board_info['name']), ['&' => '&']), ENT_COMPAT, 'UTF-8'), - 'child_level' => $board_info['child_level'], - ]; + /** + * Determines which quick moderation actions are available for this user. + * Loads which actions are available, on a per-topic basis, into $context. + */ + private function quickModeration() + { + global $modSettings, $context, $options, $board_info; // Is Quick Moderation active/needed? if (!empty($options['display_quick_mod']) && !empty($context['topics'])) { - $context['can_markread'] = $context['user']['is_logged']; - $context['can_lock'] = allowedTo('lock_any'); - $context['can_sticky'] = allowedTo('make_sticky'); - $context['can_move'] = allowedTo('move_any'); - $context['can_remove'] = allowedTo('remove_any'); - $context['can_merge'] = allowedTo('merge_any'); + $context += [ + 'can_markread' => $context['user']['is_logged'], + 'can_lock' => allowedTo('lock_any'), + 'can_sticky' => allowedTo('make_sticky'), + 'can_move' => allowedTo('move_any'), + 'can_remove' => allowedTo('remove_any'), + 'can_merge' => allowedTo('merge_any'), + ]; // Ignore approving own topics as it's unlikely to come up... $context['can_approve'] = $modSettings['postmod_active'] && allowedTo('approve_posts') && !empty($board_info['unapproved_topics']); // Can we restore topics? - $context['can_restore'] = allowedTo('move_any') && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $board; + $context['can_restore'] = $this->currentUserCanRestore(); // Set permissions for all the topics. foreach ($context['topics'] as $t => $topic) @@ -411,26 +720,195 @@ public function action_messageindex() $context['can_remove'] |= ($started && allowedTo('remove_own')); } - // Can we even use quick moderation on this batch? - $context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore']; - if (!empty($context['can_quick_mod'])) + // Can we even use quick moderation on this batch? + $context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore']; + if (!empty($context['can_quick_mod'])) + { + $this->buildQuickModerationButtons(); + $context['qmod_actions'] = ['approve', 'remove', 'lock', 'sticky', 'move', 'merge', 'restore', 'markread']; + call_integration_hook('integrate_quick_mod_actions'); + } + } + } + + /** + * Loads into $context the moderation button array for template use. + * Call integrate_message_index_mod_buttons hook + */ + public function buildQuickModerationButtons() + { + global $context; + + $context['can_show'] = false; + $quickMod = array_column($context['topics'], 'quick_mod', 'id'); + $context['show_qm_message_checkbox'] = array_column($context['topics'], 'id'); + + // Build valid topic id's by action + $keys = array_keys($quickMod); + foreach (['move', 'lock', 'remove', 'approve'] as $area) + { + // e.g. get topic id's where this quick_mod action xxx value is valid + $temp = array_combine($keys, array_column($quickMod, $area)); + $context['allow_qm']['can_' . $area] = array_keys($temp, true); + ${'show_' . $area} = !empty($context['allow_qm']['can_' . $area]); + } + + // Build the mod button array with buttons that are valid for, at least some, of the messages + $context['mod_buttons'] = [ + 'move' => [ + 'test' => $show_move ? 'can_move' : 'can_show', + 'text' => 'move_topic', + 'id' => 'move', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'remove' => [ + 'test' => $show_remove ? 'can_remove' : 'can_show', + 'text' => 'remove_topic', + 'id' => 'remove', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'lock' => [ + 'test' => $show_lock ? 'can_lock' : 'can_show', + 'text' => 'set_lock', + 'id' => 'lock', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'approve' => [ + 'test' => $show_approve ? 'can_approve' : 'can_show', + 'text' => 'approve', + 'id' => 'approve', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'sticky' => [ + 'test' => 'can_sticky', + 'text' => 'set_sticky', + 'id' => 'sticky', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'merge' => [ + 'test' => 'can_merge', + 'text' => 'merge', + 'id' => 'merge', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + 'markread' => [ + 'test' => 'can_markread', + 'text' => 'mark_read_short', + 'id' => 'markread', + 'lang' => true, + 'url' => 'javascript:void(0);', + ], + ]; + + // Restore a topic, maybe even some doxing ! + if ($context['can_restore']) + { + $context['mod_buttons']['restore'] = [ + 'text' => 'restore_topic', + 'lang' => true, + 'url' => 'javascript:void(0);', + ]; + } + + // Allow adding new buttons easily. + call_integration_hook('integrate_message_index_quickmod_buttons'); + + $context['mod_buttons'] = array_reverse($context['mod_buttons']); + } + + /** + * Similar to Quick Reply, this is Quick Topic. + * Allows a way to start a new topic from the boards message index. + */ + private function quickTopic(): void + { + global $txt, $modSettings, $context, $options; + + // Quick topic enabled? + if ($context['can_post_new'] && !empty($options['display_quick_reply'])) + { + $this->prepareQuickTopic(); + + checkSubmitOnce('register'); + + $context['becomes_approved'] = true; + if ($modSettings['postmod_active'] && !allowedTo('post_new') && allowedTo('post_unapproved_topics')) { - $this->buildQuickModerationButtons(); - $context['qmod_actions'] = ['approve', 'remove', 'lock', 'sticky', 'move', 'merge', 'restore', 'markread']; - call_integration_hook('integrate_quick_mod_actions'); + $context['becomes_approved'] = false; + } + else + { + isAllowedTo('post_new'); } + + require_once(SUBSDIR . '/Editor.subs.php'); + // Create the editor for the QT area + $editorOptions = [ + 'id' => 'message', + 'value' => '', + 'labels' => [ + 'post_button' => $txt['post'], + ], + 'height' => '200px', + 'width' => '100%', + 'smiley_container' => 'smileyBox_message', + 'bbc_container' => 'bbcBox_message', + // We submit/switch to full post page for the preview + 'preview_type' => 1, + 'buttons' => [ + 'more' => [ + 'type' => 'submit', + 'name' => 'more_options', + 'value' => $txt['post_options'], + 'options' => '' + ] + ], + ]; + + // Trigger the prepare_context event for modules that have tied in to it + $this->_events->trigger('prepare_context', ['editorOptions' => &$editorOptions, 'use_quick_reply' => !empty($options['display_quick_reply'])]); + + create_control_richedit($editorOptions); + + theme()->getTemplates()->load('GenericMessages'); } + } + + /** + * If Quick Topic is on, we need to load user information into $context so the poster sidebar renders + */ + private function prepareQuickTopic(): void + { + global $options, $context, $modSettings; - if (!empty($context['boards']) && $context['start'] == 0) + if (empty($options['hide_poster_area']) && $options['display_quick_reply']) { - $template_layers->add('display_child_boards'); + MembersList::load(User::$info->id); + $thisUser = MembersList::get(User::$info->id); + $thisUser->loadContext(); + + $context['thisMember'] = [ + 'id' => 'new', + 'is_message_author' => true, + 'member' => $thisUser->toArray()['data'] + ]; + $context['can_issue_warning'] = allowedTo('issue_warning') && featureEnabled('w') && !empty($modSettings['warning_enable']); + $context['can_send_pm'] = allowedTo('pm_send'); } + } - // If there are children, but no topics and no ability to post topics... - $context['no_topic_listing'] = !empty($context['boards']) && empty($context['topics']) && !$context['can_post_new']; - $template_layers->add('topic_listing'); - - theme()->addJavascriptVar(['notification_board_notice' => $context['is_marked_notify'] ? $txt['notification_disable_board'] : $txt['notification_enable_board']], true); + /** + * Build the board buttons for the message index page. + */ + private function buildBoardButtons(): void + { + global $context, $settings, $board; // Build the message index button array. $context['normal_buttons'] = [ @@ -438,26 +916,22 @@ public function action_messageindex() 'test' => 'can_post_new', 'text' => 'new_topic', 'lang' => true, - 'url' => getUrl('action', ['action' => 'post', 'board' => $context['current_board'] . '.0']), + 'url' => getUrl('action', ['action' => 'post', 'board' => $board . '.0']), 'active' => true], 'notify' => [ 'test' => 'can_mark_notify', - 'text' => $context['is_marked_notify'] ? 'unnotify' : 'notify', + 'text' => $this->is_marked_notify ? 'unnotify' : 'notify', 'lang' => true, 'custom' => 'onclick="return notifyboardButton(this);"', - 'url' => getUrl('action', ['action' => 'notifyboard', 'sa' => ($context['is_marked_notify'] ? 'off' : 'on'), 'board' => $context['current_board'] . '.' . $context['start'], '{session_data}'])], + 'url' => getUrl('action', ['action' => 'notifyboard', 'sa' => ($this->is_marked_notify ? 'off' : 'on'), 'board' => $board . '.' . $this->sort_start, '{session_data}'])], ]; - theme()->addJavascriptVar([ - 'txt_mark_as_read_confirm' => $txt['mark_these_as_read_confirm'] - ], true); - // They can only mark read if they are logged in, and it's enabled! if ($this->user->is_guest === false && $settings['show_mark_read']) { $context['normal_buttons']['markread'] = [ 'text' => 'mark_read_short', 'lang' => true, - 'url' => getUrl('action', ['action' => 'markasread', 'sa' => 'board', 'board' => $context['current_board'] . '.0', '{session_data}']), + 'url' => getUrl('action', ['action' => 'markasread', 'sa' => 'board', 'board' => $board . '.0', '{session_data}']), 'custom' => 'onclick="return markboardreadButton(this);"' ]; } @@ -467,34 +941,6 @@ public function action_messageindex() // Trigger a post load event with quick access to normal buttons $this->_events->trigger('post_load', ['callbacks' => &$context['normal_buttons']]); - - if (!empty($modSettings['message_index_preview'])) - { - loadJavascriptFile('elk_toolTips.js', ['defer' => true]); - $context['message_index_preview'] = true; - } - } - - /** - * Sets if this is a page that we do, or do not, want bots to index - * - * @return bool - */ - public function setRobotNoIndex() - { - global $context; - - foreach ($this->_req->query as $k => $v) - { - // Don't index a sort result etc. - if (!in_array($k, ['board', 'start', session_name()], true)) - { - return true; - } - } - - return !empty($this->_req->query->start) - && (!is_numeric($this->_req->query->start) || $this->_req->query->start % $context['messages_per_page'] !== 0); } /** @@ -792,6 +1238,56 @@ public function action_quickmod() redirectexit($redirect_url); } + /** + * Just what actions can they perform on this board + * + * Checks if they can markread, sticky, move, remove, lock or merge + * + * @param array $boards_can + * @return array + */ + public function setPossibleQmActions($boards_can) + { + $possibleActions = []; + + if ($this->user->is_guest === false) + { + $possibleActions[] = 'markread'; + } + + if (!empty($boards_can['make_sticky'])) + { + $possibleActions[] = 'sticky'; + } + + if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) + { + $possibleActions[] = 'move'; + } + + if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) + { + $possibleActions[] = 'remove'; + } + + if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) + { + $possibleActions[] = 'lock'; + } + + if (!empty($boards_can['merge_any'])) + { + $possibleActions[] = 'merge'; + } + + if (!empty($boards_can['approve_posts'])) + { + $possibleActions[] = 'approve'; + } + + return $possibleActions; + } + /** * Can they sticky a topic * @@ -851,145 +1347,4 @@ public function canLock($boards_can, $row) && $row['locked'] != 1 && (in_array(0, $boards_can['lock_own']) || in_array($row['id_board'], $boards_can['lock_own']))); } - - /** - * Just what actions can they perform on this board - * - * Checks if they can markread, sticky, move, remove, lock or merge - * - * @param array $boards_can - * @return array - */ - public function setPossibleQmActions($boards_can) - { - $possibleActions = []; - - if ($this->user->is_guest === false) - { - $possibleActions[] = 'markread'; - } - - if (!empty($boards_can['make_sticky'])) - { - $possibleActions[] = 'sticky'; - } - - if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) - { - $possibleActions[] = 'move'; - } - - if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) - { - $possibleActions[] = 'remove'; - } - - if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) - { - $possibleActions[] = 'lock'; - } - - if (!empty($boards_can['merge_any'])) - { - $possibleActions[] = 'merge'; - } - - if (!empty($boards_can['approve_posts'])) - { - $possibleActions[] = 'approve'; - } - - return $possibleActions; - } - - /** - * Loads into $context the moderation button array for template use. - * Call integrate_message_index_mod_buttons hook - */ - public function buildQuickModerationButtons() - { - global $context; - - $context['can_show'] = false; - $quickMod = array_column($context['topics'], 'quick_mod', 'id'); - $context['show_qm_message_checkbox'] = array_column($context['topics'], 'id'); - - // Build valid topic id's by action - $keys = array_keys($quickMod); - foreach (['move', 'lock', 'remove', 'approve'] as $area) - { - // e.g. get topic id's where this quick_mod action xxx value is valid - $temp = array_combine($keys, array_column($quickMod, $area)); - $context['allow_qm']['can_' . $area] = array_keys($temp, true); - ${'show_' . $area} = !empty($context['allow_qm']['can_' . $area]); - } - - // Build the mod button array with buttons that are valid for, at least some, of the messages - $context['mod_buttons'] = [ - 'move' => [ - 'test' => $show_move ? 'can_move' : 'can_show', - 'text' => 'move_topic', - 'id' => 'move', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'remove' => [ - 'test' => $show_remove ? 'can_remove' : 'can_show', - 'text' => 'remove_topic', - 'id' => 'remove', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'lock' => [ - 'test' => $show_lock ? 'can_lock' : 'can_show', - 'text' => 'set_lock', - 'id' => 'lock', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'approve' => [ - 'test' => $show_approve ? 'can_approve' : 'can_show', - 'text' => 'approve', - 'id' => 'approve', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'sticky' => [ - 'test' => 'can_sticky', - 'text' => 'set_sticky', - 'id' => 'sticky', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'merge' => [ - 'test' => 'can_merge', - 'text' => 'merge', - 'id' => 'merge', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - 'markread' => [ - 'test' => 'can_markread', - 'text' => 'mark_read_short', - 'id' => 'markread', - 'lang' => true, - 'url' => 'javascript:void(0);', - ], - ]; - - // Restore a topic, maybe even some doxing ! - if ($context['can_restore']) - { - $context['mod_buttons']['restore'] = [ - 'text' => 'restore_topic', - 'lang' => true, - 'url' => 'javascript:void(0);', - ]; - } - - // Allow adding new buttons easily. - call_integration_hook('integrate_message_index_quickmod_buttons'); - - $context['mod_buttons'] = array_reverse($context['mod_buttons']); - } -} +} \ No newline at end of file diff --git a/sources/ElkArte/Controller/Post.php b/sources/ElkArte/Controller/Post.php index a810e89982..1c5cd40c81 100644 --- a/sources/ElkArte/Controller/Post.php +++ b/sources/ElkArte/Controller/Post.php @@ -245,7 +245,7 @@ protected function _beforePrepareContext() is_not_guest(); } - // By default the reply will be approved... + // By default, the reply will be approved... $context['becomes_approved'] = true; if ($this->_topic_attributes['id_member'] != $this->user->id) { @@ -352,10 +352,10 @@ protected function _beforePrepareContext() * Get the message setup for ... * * - Sets up the form for preview / modify / new message status. Items - * such as icons, text, etc + * such as icons, text, etc. * - Look if a new topic was posted while working on this prose * - Shows the message preview if requested - * - triggers prepare_modifying, prepare_editing, prepare_posting + * - Triggers prepare_modifying, prepare_editing, prepare_posting */ protected function _generatingMessage() { @@ -441,6 +441,7 @@ private function _previewPost($msg, $topic, $message, $subject) global $txt, $modSettings, $context; $preview = $this->_req->getPost('preview', 'isset', false); + $more_options = $this->_req->getPost('more_options', 'isset', false); $ns = $this->_req->getPost('ns', 'isset', false); $notify = $this->_req->getPost('notify', 'intval', 0); $quote = $this->_req->getRequest('quote', 'intval', 0); @@ -450,8 +451,8 @@ private function _previewPost($msg, $topic, $message, $subject) $icon = $this->_req->getPost('icon', 'trim', 'xx'); $msg_id = 0; - // Validate inputs. - if (!$this->_post_errors->hasErrors()) + // Validate inputs if they are not just moving the full post form (from QR / QT) + if (!$more_options && !$this->_post_errors->hasErrors()) { // This means they didn't click Post and get an error. $really_previewing = true; @@ -496,7 +497,7 @@ private function _previewPost($msg, $topic, $message, $subject) $this->user->name = $context['name']; } - // Only show the preview stuff if they hit Preview. + // Only show the preview stuff if they really hit Preview, not post, not more options if ($really_previewing) { $this->_setupPreviewContext(!$ns); @@ -697,7 +698,7 @@ private function _setupPreviewContext($ns) // Protect any CDATA blocks. if ($this->getApi() === 'xml') { - $context['preview_message'] = strtr($context['preview_message'], array(']]>' => ']]]]>')); + $context['preview_message'] = strtr($context['preview_message'], [']]>' => ']]]]>']); } } @@ -873,7 +874,7 @@ protected function _finalizePage() * - Requires various permissions depending on the action. * - Handles attachment, post, and calendar saving. * - Sends off notifications, and allows for announcements and moderation. - * accessed from ?action=post2. + * - Accessed from ?action=post2. * - Triggers events associated with the actual posting * - prepare_save_post, save_replying, save_new_topic, save_modify * - before_save_post, pre_save_post, after_save_post @@ -919,7 +920,7 @@ public function action_post2() $topic_info = []; // Previewing? Go back to start. - if (isset($_REQUEST['preview'])) + if (isset($_REQUEST['preview']) || isset($_POST['more_options'])) { return $this->action_post(); } diff --git a/sources/ElkArte/Languages/Index/English.php b/sources/ElkArte/Languages/Index/English.php index d87a628220..4d3311d817 100644 --- a/sources/ElkArte/Languages/Index/English.php +++ b/sources/ElkArte/Languages/Index/English.php @@ -818,7 +818,7 @@ $txt['preview_fetch'] = 'Fetching preview...'; $txt['pm_error_while_submitting'] = 'The following error or errors occurred while sending this personal message:'; $txt['warning_while_submitting'] = 'Something happened, review it here:'; -$txt['error_while_submitting'] = 'The message has the following error or errors that must be corrected before continuing:'; +$txt['error_while_submitting'] = 'The message has the following error or errors that must be corrected before posting:'; $txt['error_old_topic'] = 'Warning: this topic has not been posted in for at least %1$d days.
Unless you\'re sure you want to reply, please consider starting a new topic.'; $txt['split_selected_posts'] = 'Selected posts'; diff --git a/sources/ElkArte/Languages/Profile/English.php b/sources/ElkArte/Languages/Profile/English.php index b6050b86b0..aa41ad8b44 100644 --- a/sources/ElkArte/Languages/Profile/English.php +++ b/sources/ElkArte/Languages/Profile/English.php @@ -305,7 +305,7 @@ $txt['return_to_post'] = 'Return to topics after posting by default.'; $txt['no_new_reply_warning'] = 'Don\'t warn on new replies made while posting.'; $txt['recent_pms_at_top'] = 'Show most recent personal messages at top.'; -$txt['wysiwyg_default'] = 'Show WYSIWYG editor on post page by default.'; +$txt['wysiwyg_default'] = 'Start editor in WYSIWYG mode by default.'; $txt['timeformat_default'] = '(Forum Default)'; $txt['timeformat_easy1'] = 'Month Day, Year, HH:MM:SS am/pm'; diff --git a/sources/ElkArte/Modules/Drafts/Display.php b/sources/ElkArte/Modules/Drafts/Display.php index 042b0a2fef..bdf2ed572d 100644 --- a/sources/ElkArte/Modules/Drafts/Display.php +++ b/sources/ElkArte/Modules/Drafts/Display.php @@ -23,7 +23,7 @@ /** * Class \ElkArte\Modules\Drafts\Display * - * Enables draft functions for the Display.controller page (quick reply) + * Enables draft functions for the Display Controller (quick reply) */ class Display extends AbstractModule { @@ -106,24 +106,24 @@ public function prepare_context($use_quick_reply, &$editorOptions, $board) id_draft: ' . (empty($context['id_draft']) ? 0 : $context['id_draft']) . ' }'; - $context['shortcuts_text'] = $txt['shortcuts_drafts']; - - $editorOptions['buttons'] = $editorOptions['buttons'] ?? []; - $editorOptions['hidden_fields'] = $editorOptions['hidden_fields'] ?? []; + loadJavascriptFile('editor/drafts.plugin.js', ['defer' => true]); + } - $editorOptions['buttons'][] = [ - 'name' => 'save_draft', - 'value' => $txt['draft_save'], - 'options' => 'onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d"', - ]; + // No need to show this on the quick reply area, normally set as $txt['shortcuts_drafts'] + $context['shortcuts_text'] = ''; - $editorOptions['hidden_fields'][] = [ - 'name' => 'id_draft', - 'value' => empty($context['id_draft']) ? 0 : $context['id_draft'], - ]; + $editorOptions['buttons'] = $editorOptions['buttons'] ?? []; + array_unshift($editorOptions['buttons'], [ + 'name' => 'save_draft', + 'value' => $txt['draft_save'], + 'options' => 'onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d"', + ]); - loadJavascriptFile('editor/drafts.plugin.js', ['defer' => true]); - } + $editorOptions['hidden_fields'] = $editorOptions['hidden_fields'] ?? []; + $editorOptions['hidden_fields'][] = [ + 'name' => 'id_draft', + 'value' => empty($context['id_draft']) ? 0 : $context['id_draft'], + ]; } } } diff --git a/sources/ElkArte/Modules/Drafts/MessageIndex.php b/sources/ElkArte/Modules/Drafts/MessageIndex.php new file mode 100644 index 0000000000..ebf9acf84d --- /dev/null +++ b/sources/ElkArte/Modules/Drafts/MessageIndex.php @@ -0,0 +1,129 @@ + true]); + } + + // Hide this for quick topic + $context['shortcuts_text'] = ''; + + $editorOptions['buttons'] = $editorOptions['buttons'] ?? []; + array_unshift($editorOptions['buttons'], [ + 'name' => 'save_draft', + 'value' => $txt['draft_save'], + 'options' => 'onclick="return confirm(' . JavaScriptEscape($txt['draft_save_note']) . ') && submitThisOnce(this);" accesskey="d"', + ]); + + $editorOptions['hidden_fields'] = $editorOptions['hidden_fields'] ?? []; + $editorOptions['hidden_fields'][] = [ + 'name' => 'id_draft', + 'value' => empty($context['id_draft']) ? 0 : $context['id_draft'], + ]; + } + } +} diff --git a/sources/ElkArte/Themes/Templates.php b/sources/ElkArte/Themes/Templates.php index a2b5837f0f..831974e6af 100644 --- a/sources/ElkArte/Themes/Templates.php +++ b/sources/ElkArte/Themes/Templates.php @@ -21,12 +21,11 @@ use ElkArte\Errors\Errors; use ElkArte\Exceptions\Exception; use ElkArte\Helper\FileFunctions; +use ElkArte\Helper\HttpReq; use ElkArte\Http\Headers; use ElkArte\Languages\Txt; use Error; use Generator; -use JetBrains\PhpStorm\NoReturn; - /** * Class Templates @@ -262,7 +261,7 @@ protected function requireTemplate($template_name, $style_sheets, $fatal): bool * * @param Error $e */ - #[NoReturn] protected function templateNotFound(Error $e) + protected function templateNotFound(Error $e) { global $context, $txt, $scripturl, $boardurl; @@ -411,7 +410,7 @@ private function printLines(Error $e): void * * @used-by printLines() Prints syntax for template files with errors. * @return Generator Highlighted lines ranging from $min to $max. - * @uses highlight_file() Highlights syntax. + * @uses highlight_file() Highlights syntax. * */ public function getHighlightedLinesFromFile(string $file, int $min, int $max): Generator @@ -466,6 +465,7 @@ public function loadSubTemplate($sub_template_name, $fatal = false) { try { + $this->_templateDebug($sub_template_name, true); $theme_function(); } catch (Error $e) @@ -494,6 +494,30 @@ public function loadSubTemplate($sub_template_name, $fatal = false) ); } } + + $this->_templateDebug($sub_template_name); + } + + /** + * Are we showing debugging for templates? Just make sure not to do it before the doctype... + * + * @param bool $start + * @param string $sub_template_name + */ + private function _templateDebug($sub_template_name, $start = false) + { + $req = HttpReq::instance(); + + if ($req->isSet('debug') + && $sub_template_name !== 'init' + && ob_get_length() > 0 + && empty($req->getRequest('xml')) + && empty($req->getRequest('api')) + && allowedTo('admin_forum')) + { + echo ' +
---- ', $sub_template_name, ' ', ($start ? 'starts' : 'ends'), ' ----
'; + } } /** diff --git a/sources/ElkArte/TopicUtil.php b/sources/ElkArte/TopicUtil.php index ab6951de43..b384873045 100644 --- a/sources/ElkArte/TopicUtil.php +++ b/sources/ElkArte/TopicUtil.php @@ -111,6 +111,7 @@ public static function prepareContext($topics_info, $topic_seen = false, $previe // Decide how many pages the topic should have. $topic_length = $row['num_replies'] + 1; + $pages = ''; if ($topic_length > $messages_per_page) { // We can't pass start by reference. @@ -118,10 +119,6 @@ public static function prepareContext($topics_info, $topic_seen = false, $previe $show_all = !empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages']; $pages = constructPageIndex('{scripturl}?topic=' . $row['id_topic'] . '.%1$d' . $topicseen, $start, $topic_length, $messages_per_page, true, array('prev_next' => false, 'all' => $show_all)); } - else - { - $pages = ''; - } $row['new_from'] = $row['new_from'] ?? 0; $first_poster_href = getUrl('profile', ['action' => 'profile', 'u' => $row['first_id_member'], 'name' => $row['first_display_name']]); diff --git a/sources/subs/Drafts.subs.php b/sources/subs/Drafts.subs.php index 51783a47a5..b5811e013c 100644 --- a/sources/subs/Drafts.subs.php +++ b/sources/subs/Drafts.subs.php @@ -564,8 +564,8 @@ function saveDraft($draft, $check_last_save = false) * - The core draft feature must be enabled, as well as the pm draft option * - Determines if this is a new or and update to an existing pm draft * - * @param mixed[] $recipientList - * @param mixed[] $draft + * @param array $recipientList + * @param array $draft * @param bool $check_last_save * * @return bool|void diff --git a/themes/default/Display.template.php b/themes/default/Display.template.php index e3c9528d64..6e4df352b2 100644 --- a/themes/default/Display.template.php +++ b/themes/default/Display.template.php @@ -46,29 +46,19 @@ function template_messages_informations_above() // Show the topic information - icon, subject, stats, etc. echo '
-
+
', $context['subject'], ' - ', $context['topic_starter_name'], ' + ', sprintf($txt['topic_started_by'], $context['topic_starter_name']), ' · ', $context['topic_start_time'], ' · ', $context['num_views_text'], ' - - ', - empty($context['links']['go_prev']) ? '' : '' . $txt['previous_next_back'] . '', - empty($context['links']['go_next']) ? '' : ' - ' . $txt['previous_next_forward'] . '', - empty($context['links']['derived_from']) ? '' : ' - ' . sprintf($txt['topic_derived_from'], '' . Util::shorten_text($context['topic_derived_from']['subject'], empty($modSettings['subject_length']) ? 32 : $modSettings['subject_length'])) . '', - ' -
-
'; + '; if (!empty($settings['display_who_viewing']) || !empty($context['topic_redirected_from'])) { - echo ' -
'; - if (!empty($settings['display_who_viewing'])) { echo ' @@ -77,12 +67,12 @@ function template_messages_informations_above() // Show just numbers...? if ($settings['display_who_viewing'] == 1) { - echo count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members']; + echo '', count($context['view_members']), ' ', count($context['view_members']) === 1 ? $txt['who_member'] : $txt['members']; } // Or show the actual people viewing the topic? else { - echo empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')'); + echo '', empty($context['view_members_list']) ? '0 ' . $txt['members'] : implode(', ', $context['view_members_list']) . (empty($context['view_num_hidden']) || $context['can_moderate_forum'] ? '' : ' (+ ' . $context['view_num_hidden'] . ' ' . $txt['hidden'] . ')'); } // Now show how many guests are here too. @@ -98,12 +88,16 @@ function template_messages_informations_above() ' . sprintf($txt['no_redir'], '' . $context['topic_redirected_from']['subject'] . ''), ' '; } - - echo ' -
'; } echo ' + ', + empty($context['links']['go_prev']) ? '' : '' . $txt['previous_next_back'] . '', + empty($context['links']['go_next']) ? '' : ' - ' . $txt['previous_next_forward'] . '', + empty($context['links']['derived_from']) ? '' : ' - ' . sprintf($txt['topic_derived_from'], '' . Util::shorten_text($context['topic_derived_from']['subject'], empty($modSettings['subject_length']) ? 32 : $modSettings['subject_length'])) . '', ' + +
+
'; } @@ -307,6 +301,14 @@ function template_messages() } } +/** + * This function is responsible for rendering the key information section of a message. + * + * @param array $message The message data. + * @param bool $ignoring Whether the message is being ignored. + * @param bool $above Indicates if the key info section should be rendered above the message body. + * @return void + */ function template_keyinfo($message, $ignoring, $above = false) { global $context, $settings, $options, $txt; @@ -383,8 +385,7 @@ function template_quickreply_below() ', $txt['quick_reply'], '
-
-
'; +
'; if (empty($options['hide_poster_area'])) { @@ -394,84 +395,71 @@ function template_quickreply_below() // Make a postarea similar to post echo ' -
-
-

', $txt['reply'], '

-
-
- - - - - - - - - - - '; +
+
+

', $txt['reply'], '

+
+
+ + + + + + + + + + + '; // Guests just need more. if ($context['user']['is_guest']) { echo ' -
-
- - -
- - -
'; +
+
+ + +
+ + +
'; } // Is visual verification enabled? if (!empty($context['require_verification'])) { - template_verification_controls($context['visual_verification_id'], ' - ' . $txt['verification'] . ':', '
'); + template_verification_controls($context['visual_verification_id'], '' . $txt['verification'] . ':', '
'); } echo ' - ', template_control_richedit($context['post_box_name']); + ', template_control_richedit($context['post_box_name']); echo ' - ', $context['is_locked'] ? '

' . $txt['quick_reply_warning'] . '

' : '', - $context['oldTopicError'] ? '

' . sprintf($txt['error_old_topic'], $modSettings['oldTopicDays']) . '

' : '', ' - ', $context['can_reply_approved'] ? '' : '

' . $txt['wait_for_approval'] . '

'; + ', $context['is_locked'] ? '

' . $txt['quick_reply_warning'] . '

' : '', + $context['oldTopicError'] ? '

' . sprintf($txt['error_old_topic'], $modSettings['oldTopicDays']) . '

' : '', ' + ', $context['can_reply_approved'] ? '' : '

' . $txt['wait_for_approval'] . '

'; echo ' -
- - '; - - // Draft save button? - if (!empty($context['drafts_save'])) - { - echo ' - - '; - } - - echo ' -
'; +
', + template_control_richedit_buttons($context['post_box_name']), ' +
'; // Show the draft last saved on area if (!empty($context['drafts_save'])) { echo ' -
-   - -
'; +
+   + +
'; } echo ' - -
+
-
-
+
+ '; } diff --git a/themes/default/GenericControls.template.php b/themes/default/GenericControls.template.php index 24f7efc29e..9339e82733 100644 --- a/themes/default/GenericControls.template.php +++ b/themes/default/GenericControls.template.php @@ -41,6 +41,7 @@ function elk_editor() { sceditor.createEx(eTextarea, { style: "', $settings['theme_url'], '/css/', $context['theme_variant_url'], 'jquery.sceditor.wysiwyg', $context['theme_variant'], '.css', CACHE_STALE, '", width: "100%", + height: "', $editor_context['height'], '", autofocus: ', (!empty($context['site_action']) && $context['site_action'] !== 'display') ? 'true' : 'false', ', autofocusEnd: false, startInSourceMode: ', $editor_context['rich_active'] ? 'false' : 'true', ', diff --git a/themes/default/GenericHelpers.template.php b/themes/default/GenericHelpers.template.php index bc5f172843..2359e96784 100644 --- a/themes/default/GenericHelpers.template.php +++ b/themes/default/GenericHelpers.template.php @@ -121,7 +121,7 @@ function template_select_boards($name, $label = '', $extra = '', $all = false) * 'counter' => (optional) if set, will add a count indicator span in front of the link text * ]] * - * @param mixed[] $button_strip the above definition array + * @param array $button_strip the above definition array * @param string $class overall class to append to "buttonlist no_js" on the list UL * @param array $strip_options = [] of options applied to the outer