' . Lang::$txt['convert_to_suggest_text'] . '
'; } - - Utils::$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : null; + } else { + unset(Utils::$context['options']['convertmsgbody']); } if (isset($_GET['done']) && $_GET['done'] == 'convertentities') { - Utils::$context['maintenance_finished'] = Lang::getTxt('entity_convert_title', file: 'ManageMaintenance'); + Utils::$context['maintenance_finished'] = Lang::getTxt('maintain_convertentities_title', file: 'ManageMaintenance'); } } diff --git a/Sources/Actions/Admin/Subscriptions.php b/Sources/Actions/Admin/Subscriptions.php index 2c89120980..1b3781721d 100644 --- a/Sources/Actions/Admin/Subscriptions.php +++ b/Sources/Actions/Admin/Subscriptions.php @@ -871,6 +871,7 @@ public function modifyUser(): void // Setup the template. Utils::$context['sub_template'] = 'modify_user_subscription'; Utils::$context['page_title'] = Lang::getTxt(Utils::$context['action_type'] . '_subscriber', file: 'ManagePaid'); + Theme::loadJavaScriptFile('paidsubs.js', ['defer' => true, 'minimize' => true], 'smf_paidsubs'); // If we haven't been passed the subscription ID get it. if (Utils::$context['log_id'] && !Utils::$context['sub_id']) { diff --git a/Sources/Actions/Admin/Themes.php b/Sources/Actions/Admin/Themes.php index 9fe376eb0b..1acdbef168 100644 --- a/Sources/Actions/Admin/Themes.php +++ b/Sources/Actions/Admin/Themes.php @@ -602,7 +602,49 @@ public function setOptions(): void Utils::$context['sub_template'] = 'set_options'; Utils::$context['page_title'] = Lang::getTxt('theme_settings', file: 'Admin'); - Utils::$context['options'] = Utils::$context['theme_options']; + // Check for variants or dark mode + if (!empty(Theme::$current->settings['theme_variants']) || !empty(Theme::$current->settings['has_dark_mode'])) { + Utils::$context['options'] = []; + + // Theme Variants + if (!empty(Theme::$current->settings['theme_variants'])) { + $available_variants = []; + foreach (Theme::$current->settings['theme_variants'] as $variant) { + $available_variants[$variant] = Lang::$txt['variant_' . $variant] ?? $variant; + } + + Utils::$context['options'][] = Lang::$txt['theme_opt_variant']; + Utils::$context['options'][] = [ + 'id' => 'theme_variant', + 'label' => Lang::$txt['theme_pick_variant'], + 'options' => $available_variants, + 'default' => isset(Theme::$current->settings['default_variant']) && !empty(Theme::$current->settings['default_variant']) ? Theme::$current->settings['default_variant'] : Theme::$current->settings['theme_variants'][0], + 'enabled' => !empty(Theme::$current->settings['theme_variants']), + ]; + } + + // Theme Color Mode + if (!empty(Theme::$current->settings['has_dark_mode'])) { + $available_modes = []; + foreach (Theme::$current->settings['theme_colormodes'] as $mode) { + $available_modes[$mode] = Lang::$txt['colormode_' . $mode] ?? $mode; + } + + Utils::$context['options'][] = Lang::$txt['theme_opt_colormode']; + Utils::$context['options'][] = [ + 'id' => 'theme_colormode', + 'label' => Lang::$txt['theme_pick_colormode'], + 'options' => $available_modes, + 'default' => isset(Theme::$current->settings['default_colormode']) && !empty(Theme::$current->settings['default_colormode']) ? Theme::$current->settings['default_colormode'] : Theme::$current->settings['theme_colormodes'][0], + 'enabled' => !empty(Theme::$current->settings['has_dark_mode']), + ]; + } + + Utils::$context['options'] = array_merge(Utils::$context['options'], Utils::$context['theme_options']); + } else { + Utils::$context['options'] = Utils::$context['theme_options']; + } + Utils::$context['theme_settings'] = Theme::$current->settings; if (empty($_REQUEST['who'])) { @@ -833,6 +875,9 @@ public function setSettings(): void if (!empty(Theme::$current->settings['theme_variants'])) { Utils::$context['theme_variants'] = []; + // Add the default variant + Theme::$current->settings['theme_variants'] = array_unique(array_merge(['default'], Theme::$current->settings['theme_variants'])); + foreach (Theme::$current->settings['theme_variants'] as $variant) { // Have any text, old chap? Utils::$context['theme_variants'][$variant] = [ diff --git a/Sources/Actions/BoardIndex.php b/Sources/Actions/BoardIndex.php index 6333705f30..8bbd5b50b2 100644 --- a/Sources/Actions/BoardIndex.php +++ b/Sources/Actions/BoardIndex.php @@ -57,8 +57,11 @@ class BoardIndex implements ActionInterface, Routable public function execute(): void { Theme::loadTemplate('BoardIndex'); - Utils::$context['template_layers'][] = 'boardindex_outer'; - + Utils::$context['sub_templates'] = [ + 'newsfader', + 'boardindex', + 'info_center', + ]; Utils::$context['page_title'] = Lang::getTxt('forum_index', ['forum_name' => Utils::$context['forum_name']], file: 'General'); // Set a canonical URL for this page. diff --git a/Sources/Actions/Calendar.php b/Sources/Actions/Calendar.php index 84bf30d12f..b6435048cb 100644 --- a/Sources/Actions/Calendar.php +++ b/Sources/Actions/Calendar.php @@ -118,7 +118,7 @@ public function show(): void // This is gonna be needed... Theme::loadTemplate('Calendar'); - Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true, 'rtl' => 'calendar.rtl.css'], 'smf_calendar'); + Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true], 'smf_calendar'); Theme::loadJavaScriptFile('calendar.js', ['defer' => true], 'smf_calendar'); // Did they specify an individual event ID? If so, let's splice the year/month in to what we would otherwise be doing. @@ -771,6 +771,8 @@ public function clock(): void $bcd = !isset($_REQUEST['rb']) && !isset($_REQUEST['omfg']) && !isset($_REQUEST['time']); Theme::loadTemplate('Calendar'); + Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true], 'smf_calendar'); + Theme::loadJavaScriptFile('calendar.js', ['defer' => true], 'smf_calendar'); if ($bcd) { Utils::$context['sub_template'] = 'bcd'; diff --git a/Sources/Actions/Credits.php b/Sources/Actions/Credits.php index c4f8e98e67..a8f516aeb3 100644 --- a/Sources/Actions/Credits.php +++ b/Sources/Actions/Credits.php @@ -342,11 +342,13 @@ public function execute(): void 'Minify | © Matthias Mullie | Licensed under The MIT License (MIT)', 'PHP-Punycode | © True B.V. | Licensed under The MIT License (MIT)', 'Coloris | © Mohammed Bassit | Licensed under The MIT License (MIT)', + ' Font Awesome | © 2023 | Licensed under The MIT License (MIT)', ], 'fonts' => [ ' Anonymous Pro | © 2009 | This font is licensed under the SIL Open Font License, Version 1.1', ' ConsolaMono | © 2012 | This font is licensed under the SIL Open Font License, Version 1.1', ' Phennig | © 2009-2012 | This font is licensed under the SIL Open Font License, Version 1.1', + ' Font Awesome | © 2023 | This font is licensed under the SIL Open Font License, Version 1.1', ], ]; diff --git a/Sources/Actions/Display.php b/Sources/Actions/Display.php index c0b7aea94d..4c4092fa85 100644 --- a/Sources/Actions/Display.php +++ b/Sources/Actions/Display.php @@ -209,7 +209,6 @@ public function prepareDisplayContext(): array|bool 'quote' => [ 'label' => Lang::getTxt('quote_action', file: 'General'), 'href' => Config::$scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';last_msg=' . Topic::$info->id_last_msg, - 'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"', 'icon' => 'quote', 'show' => Utils::$context['can_quote'], ], @@ -225,7 +224,7 @@ public function prepareDisplayContext(): array|bool 'label' => Lang::getTxt('quick_edit', file: 'General'), 'class' => 'quick_edit', 'id' => 'modify_button_' . $output['id'], - 'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty(Config::$modSettings['toggle_subject']) . '\')"', + 'custom' => 'hidden', 'icon' => 'quick_edit_button', 'show' => $output['can_modify'], ], @@ -1005,6 +1004,7 @@ protected function setupTemplate(): void { // Load the proper template. Theme::loadTemplate('Display'); + Theme::loadCSSFile('postbit.css', ['minimize' => true], 'smf_post'); Theme::loadCSSFile('attachments.css', ['minimize' => true, 'order_pos' => 450], 'smf_attachments'); // Set a canonical URL for this page. @@ -1078,7 +1078,7 @@ protected function setupTemplate(): void // Load the drafts js file. if (!empty(Topic::$info->permissions['drafts_autosave'])) { - Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts'); + Theme::loadJavaScriptFile('sceditor.plugins.drafts.js', ['defer' => true, 'minimize' => true], 'smf_drafts'); } // Spellcheck @@ -1086,16 +1086,15 @@ protected function setupTemplate(): void Theme::loadJavaScriptFile('spellcheck.js', ['defer' => false, 'minimize' => true], 'smf_spellcheck'); } - // topic.js - Theme::loadJavaScriptFile('topic.js', ['defer' => false, 'minimize' => true], 'smf_topic'); - - // quotedText.js + Theme::loadJavaScriptFile('topic.js', ['defer' => true, 'minimize' => true], 'smf_topic'); + Theme::loadJavaScriptFile('sceditor.plugins.quote-fast.js', ['defer' => true, 'minimize' => true], 'smf_quote_fast'); Theme::loadJavaScriptFile('quotedText.js', ['defer' => true, 'minimize' => true], 'smf_quotedText'); // Mentions if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) { - Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho'); - Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret'); + Theme::loadJavaScriptFile('caret.js', ['defer' => true, 'minimize' => true], 'smf_caret'); + Theme::loadCSSFile('atwho.css', ['minimize' => true], 'smf_atwho'); + Theme::loadJavaScriptFile('atwho.js', ['defer' => true, 'minimize' => true], 'smf_atwho'); Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions'); } @@ -1301,21 +1300,45 @@ protected function setOldTopicWarning(): void */ protected function loadEditor(): void { - // Now create the editor. - new Editor([ + $editorOptions = [ 'id' => 'quickReply', 'value' => '', 'labels' => [ 'post_button' => Lang::getTxt('post', file: 'General'), ], - // add height and width for the editor - 'height' => '150px', - 'width' => '100%', // We do HTML preview here. 'preview_type' => Editor::PREVIEW_HTML, - // This is required + // This is a required field. 'required' => true, - ]); + // SCEditor plugins. + 'plugins' => ['quoteFast'], + // SCEditor options. + 'options' => [ + 'quoteFastOptions' => [ + 'sPostContainerId' => 'forumposts', + 'sQuickButtonsSelector' => '.quickbuttons', + 'iChildNum' => 0, + 'sJumpAnchor' => 'quickreply_anchor', + ], + ], + ]; + + if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) { + $editorOptions['plugins'][] = 'mentions'; + } + + if (!empty(Topic::$info->permissions['drafts_autosave'])) { + $editorOptions['plugins'][] = 'drafts'; + $editorOptions['plugins'][] = 'messageDrafts'; + $editorOptions['options']['draftOptions'] = [ + 'sLastNote' => 'draft_lastautosave', + 'sLastID' => 'id_draft', + 'sQueryParams' => 'action=post2;board=' . Utils::$context['current_board'], + 'iFreq' => empty(Config::$modSettings['drafts_autosave_frequency']) ? 60000 : Config::$modSettings['drafts_autosave_frequency'] * 1000, + ]; + } + + new Editor($editorOptions); Utils::$context['attached'] = ''; Utils::$context['make_poll'] = isset($_REQUEST['poll']); diff --git a/Sources/Actions/Login.php b/Sources/Actions/Login.php index 21f702b778..1dce62508f 100644 --- a/Sources/Actions/Login.php +++ b/Sources/Actions/Login.php @@ -60,6 +60,7 @@ public function execute(): void parent::checkAjax(); // Get the template ready.... not really much else to do. + Theme::loadJavaScriptFile('login.js', ['minimize' => true], 'smf_login'); Utils::$context['page_title'] = Lang::getTxt('login', file: 'General'); Utils::$context['default_username'] = &$_REQUEST['u']; Utils::$context['default_password'] = ''; diff --git a/Sources/Actions/Login2.php b/Sources/Actions/Login2.php index ce81f3de0f..57e0e7076f 100644 --- a/Sources/Actions/Login2.php +++ b/Sources/Actions/Login2.php @@ -237,6 +237,7 @@ public function main(): void // Load the template stuff. Theme::loadTemplate('Login'); + Theme::loadJavaScriptFile('login.js', ['minimize' => true], 'smf_login'); Utils::$context['sub_template'] = 'login'; // Create a one time token. diff --git a/Sources/Actions/MessageIndex.php b/Sources/Actions/MessageIndex.php index d01b3c8a33..50c54370c6 100644 --- a/Sources/Actions/MessageIndex.php +++ b/Sources/Actions/MessageIndex.php @@ -258,7 +258,7 @@ public static function getBoardList(array $boardListOptions = []): array public static function buildTopicContext(array $row): void { // Reference the main color class. - $colorClass = 'windowbg'; + $colorClass = ''; // Does the theme support message previews? if (!empty(Config::$modSettings['preview_characters'])) { @@ -311,9 +311,14 @@ public static function buildTopicContext(array $row): void // Decide how many pages the topic should have. if ($row['num_replies'] + 1 > Utils::$context['messages_per_page']) { + $templateOverrides = [ + 'extra_before' => '', + 'current_page' => '', + ]; + // We can't pass start by reference. $start = -1; - $pages = new PageIndex(Config::$scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, (int) Utils::$context['messages_per_page'], true, false); + $pages = new PageIndex(Config::$scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, (int) Utils::$context['messages_per_page'], true, false, $templateOverrides); // If we can use all, show all. if (!empty(Config::$modSettings['enableAllMessages']) && $row['num_replies'] + 1 < Config::$modSettings['enableAllMessages']) { @@ -350,7 +355,7 @@ public static function buildTopicContext(array $row): void // Is this topic pending approval, or does it have any posts pending approval? if (!empty($row['unapproved_posts']) && User::$me->allowedTo('approve_posts')) { - $colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost'); + $colorClass .= !$row['approved'] ? ' approvetopic' : ' approvepost'; } // Sticky topics should get a different color, too. @@ -933,15 +938,11 @@ protected function setUnapprovedPostsMessage(): void { // If we can view unapproved messages and there are some build up a list. if (User::$me->allowedTo('approve_posts') && (Board::$info->unapproved_topics || Board::$info->unapproved_posts)) { - $untopics = Board::$info->unapproved_topics ? '' . Board::$info->unapproved_topics . '' : 0; - - $unposts = Board::$info->unapproved_posts ? '' . (Board::$info->unapproved_posts - Board::$info->unapproved_topics) . '' : 0; - Utils::$context['unapproved_posts_message'] = Lang::getTxt( 'there_are_unapproved_topics', [ - 'topics' => $untopics, - 'posts' => $unposts, + 'topics' => Board::$info->unapproved_topics, + 'posts' => Board::$info->unapproved_posts - Board::$info->unapproved_topics, 'url' => Config::$scripturl . '?action=moderate;area=postmod;sa=' . (Board::$info->unapproved_topics ? 'topics' : 'posts') . ';brd=' . Board::$info->id, ], file: 'General', @@ -958,6 +959,7 @@ protected function setUnapprovedPostsMessage(): void */ protected function setupTemplate(): void { + Theme::loadTemplate('BoardIndex'); Theme::loadTemplate('MessageIndex'); // Javascript for inline editing. diff --git a/Sources/Actions/PersonalMessage.php b/Sources/Actions/PersonalMessage.php index f23b0c4935..fbad9e8d84 100644 --- a/Sources/Actions/PersonalMessage.php +++ b/Sources/Actions/PersonalMessage.php @@ -291,6 +291,7 @@ public function isAgreementAction(): bool public function execute(): void { Theme::loadTemplate(isset($_REQUEST['xml']) ? 'Xml' : 'PersonalMessage'); + Theme::loadCSSFile('postbit.css', ['minimize' => true], 'smf_post'); $this->buildLimitBar(); diff --git a/Sources/Actions/Post.php b/Sources/Actions/Post.php index ba1953b354..ec8aaa2c9e 100644 --- a/Sources/Actions/Post.php +++ b/Sources/Actions/Post.php @@ -348,17 +348,20 @@ public function show(): void // Mentions if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) { - Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret'); - Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho'); + Theme::loadCSSFile('atwho.css', ['minimize' => true], 'smf_atwho'); + Theme::loadJavaScriptFile('atwho.js', ['dmfer' => true, 'minimize' => true], 'smf_atwho'); + Theme::loadJavaScriptFile('caret.js', ['defer' => true, 'minimize' => true], 'smf_caret'); Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions'); } // Load the drafts.js file if (Utils::$context['drafts_autosave']) { - Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts'); + Theme::loadJavaScriptFile('sceditor.plugins.drafts.js', ['defer' => true, 'minimize' => true], 'smf_drafts'); } - // quotedText.js + Theme::loadCSSFile('attachments.css', ['minimize' => true, 'order_pos' => 450], 'smf_attachments'); + Theme::loadJavaScriptFile('post.js', ['defer' => true, 'minimize' => true], 'smf_post'); + Theme::loadJavaScriptFile('sceditor.plugins.quote-fast.js', ['defer' => true, 'minimize' => true], 'smf_quote_fast'); Theme::loadJavaScriptFile('quotedText.js', ['defer' => true, 'minimize' => true], 'smf_quotedText'); // Knowing the current board ID might be handy. @@ -1001,8 +1004,6 @@ protected function showPreview(): void 'is_last' => false, ]; } - Utils::$context['last_choice_id'] = $choice_id; - Utils::$context['choices'][\count(Utils::$context['choices']) - 1]['is_last'] = true; } // Are you... a guest? @@ -1600,50 +1601,6 @@ protected function showAttachments(): void });'); } } - - // File Upload. - if (Utils::$context['can_post_attachment']) { - $acceptedFiles = empty(Utils::$context['allowed_extensions']) ? '' : implode(',', array_map( - function ($val) { - return !empty($val) ? ('.' . Utils::htmlTrim($val)) : ''; - }, - explode(',', Utils::$context['allowed_extensions']), - )); - - Theme::loadJavaScriptFile('dropzone.min.js', ['defer' => true], 'smf_dropzone'); - Theme::loadJavaScriptFile('smf_fileUpload.js', ['defer' => true, 'minimize' => true], 'smf_fileUpload'); - Theme::addInlineJavaScript(' - $(function() { - smf_fileUpload({ - dictDefaultMessage : ' . Utils::escapeJavaScript(Lang::getTxt('attach_drop_zone', file: 'Post')) . ', - dictFallbackMessage : ' . Utils::escapeJavaScript(Lang::getTxt('attach_drop_zone_no', file: 'Post')) . ', - dictCancelUpload : ' . Utils::escapeJavaScript(Lang::getTxt('modify_cancel', file: 'General')) . ', - genericError: ' . Utils::escapeJavaScript(Lang::getTxt('attach_php_error', file: 'Post')) . ', - text_attachDropzoneLabel: ' . Utils::escapeJavaScript(Lang::getTxt('attach_drop_zone', file: 'Post')) . ', - text_attachLimitNag: ' . Utils::escapeJavaScript(Lang::getTxt('attach_limit_nag', file: 'Post')) . ', - text_attachLeft: ' . Utils::escapeJavaScript(Lang::getTxt('attachments_left', file: 'Post')) . ', - text_deleteAttach: ' . Utils::escapeJavaScript(Lang::getTxt('attached_file_delete', file: 'Post')) . ', - text_attachDeleted: ' . Utils::escapeJavaScript(Lang::getTxt('attached_file_deleted', file: 'Post')) . ', - text_insertBBC: ' . Utils::escapeJavaScript(Lang::getTxt('attached_insert_bbc', file: 'Post')) . ', - text_attachUploaded: ' . Utils::escapeJavaScript(Lang::getTxt('attached_file_uploaded', file: 'Post')) . ', - text_attach_unlimited: ' . Utils::escapeJavaScript(Lang::getTxt('attach_drop_unlimited', file: 'Post')) . ', - text_totalMaxSize: ' . Utils::escapeJavaScript(Lang::getTxt('attach_max_total_file_size_current', file: 'Post')) . ', - text_max_size_progress: ' . Utils::escapeJavaScript('{currentRemain} ' . (Config::$modSettings['attachmentPostLimit'] >= 1024 ? Lang::getTxt('megabyte', file: 'General') : Lang::getTxt('kilobyte', file: 'General')) . ' / {currentTotal} ' . (Config::$modSettings['attachmentPostLimit'] >= 1024 ? Lang::getTxt('megabyte', file: 'General') : Lang::getTxt('kilobyte', file: 'General'))) . ', - dictMaxFilesExceeded: ' . Utils::escapeJavaScript(Lang::getTxt('more_attachments_error', file: 'Post')) . ', - dictInvalidFileType: ' . Utils::escapeJavaScript(Lang::getTxt('cant_upload_type', Utils::$context, file: 'Post')) . ', - dictFileTooBig: ' . Utils::escapeJavaScript(Lang::getTxt('file_too_big', [Lang::numberFormat(Config::$modSettings['attachmentSizeLimit'], 0)], file: 'Post')) . ', - acceptedFiles: ' . Utils::escapeJavaScript($acceptedFiles) . ', - thumbnailWidth: ' . (!empty(Config::$modSettings['attachmentThumbWidth']) ? Config::$modSettings['attachmentThumbWidth'] : 'null') . ', - thumbnailHeight: ' . (!empty(Config::$modSettings['attachmentThumbHeight']) ? Config::$modSettings['attachmentThumbHeight'] : 'null') . ', - limitMultiFileUploadSize:' . round(max(Config::$modSettings['attachmentPostLimit'] - (Utils::$context['attachments']['total_size'] / 1024), 0)) * 1024 . ', - maxFileAmount: ' . (!empty(Utils::$context['num_allowed_attachments']) ? Utils::$context['num_allowed_attachments'] : 'null') . ', - maxTotalSize: ' . (!empty(Config::$modSettings['attachmentPostLimit']) ? Config::$modSettings['attachmentPostLimit'] : '0') . ', - maxFilesize: ' . (!empty(Config::$modSettings['attachmentSizeLimit']) ? Config::$modSettings['attachmentSizeLimit'] : '0') . ', - }); - });', true); - } - - Theme::loadCSSFile('attachments.css', ['minimize' => true, 'order_pos' => 450], 'smf_attachments'); } /** @@ -1764,19 +1721,92 @@ protected function loadDrafts(): void */ protected function loadEditor(): void { - new Editor([ + $editorOptions = [ 'id' => 'message', 'value' => Utils::$context['message'], 'labels' => [ 'post_button' => Utils::$context['submit_label'], ], - // add height and width for the editor - 'height' => '175px', - 'width' => '100%', // We do XML preview here. 'preview_type' => Editor::PREVIEW_XML, + // This is a required field. 'required' => true, - ]); + // SCEditor plugins. + 'plugins' => ['quoteFast', 'messagePreview'], + // SCEditor options. + 'options' => [ + 'quoteFastOptions' => [ + 'sPostContainerId' => 'recent', + 'sQuickButtonsSelector' => '.quickbuttons', + 'iChildNum' => 1, + 'sJumpAnchor' => 'postmodify', + ], + ], + ]; + + if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) { + $editorOptions['plugins'][] = 'mentions'; + } + + if (Utils::$context['drafts_autosave']) { + $editorOptions['plugins'][] = 'drafts'; + $editorOptions['plugins'][] = 'messageDrafts'; + $editorOptions['options']['draftOptions'] = [ + 'sLastNote' => 'draft_lastautosave', + 'sLastID' => 'id_draft', + 'sQueryParams' => 'action=post2;board=' . Utils::$context['current_board'], + 'iFreq' => empty(Config::$modSettings['drafts_autosave_frequency']) ? 60000 : Config::$modSettings['drafts_autosave_frequency'] * 1000, + ]; + } + + if (Utils::$context['can_post_attachment']) { + Theme::loadJavaScriptFile('dropzone.min.js', ['defer' => true], 'smf_dropzone'); + Theme::loadJavaScriptFile('smf_fileUpload.js', ['defer' => true, 'minimize' => true], 'smf_fileUpload'); + + $editorOptions['plugins'][] = 'fileUpload'; + $editorOptions['options']['fileUploadOptions'] = [ + 'dictDefaultMessage' => Lang::$txt['attach_drop_zone'], + 'dictFallbackMessage' => Lang::$txt['attach_drop_zone_no'], + 'dictCancelUpload' => Lang::$txt['modify_cancel'], + 'genericError' => Lang::$txt['attach_php_error'], + 'text_attachDropzoneLabel' => Lang::$txt['attach_drop_zone'], + 'text_attachLimitNag' => Lang::$txt['attach_limit_nag'], + 'text_attachLeft' => Lang::$txt['attachments_left'], + 'text_deleteAttach' => Lang::$txt['attached_file_delete'], + 'text_attachDeleted' => Lang::$txt['attached_file_deleted'], + 'text_insertBBC' => Lang::$txt['attached_insert_bbc'], + 'text_attachUploaded' => Lang::$txt['attached_file_uploaded'], + 'text_attach_unlimited' => Lang::$txt['attach_drop_unlimited'], + 'text_totalMaxSize' => Lang::$txt['attach_max_total_file_size_current'], + 'text_max_size_progress' => '{currentRemain} ' . (Config::$modSettings['attachmentPostLimit'] >= 1024 ? Lang::$txt['megabyte'] : Lang::$txt['kilobyte']) . ' / {currentTotal} ' . (Config::$modSettings['attachmentPostLimit'] >= 1024 ? Lang::$txt['megabyte'] : Lang::$txt['kilobyte']), + 'dictMaxFilesExceeded' => Lang::$txt['more_attachments_error'], + 'dictInvalidFileType' => Lang::getTxt('cant_upload_type', Utils::$context), + 'dictFileTooBig' => Lang::getTxt( + 'file_too_big', + [Lang::numberFormat(Config::$modSettings['attachmentSizeLimit'], 0)], + ), + 'acceptedFiles' => implode( + ',', + array_map( + fn($val) => !empty($val) ? ('.' . Utils::htmlTrim($val)) : '', + explode(',', Utils::$context['allowed_extensions']), + ), + ), + 'thumbnailWidth' => !empty(Config::$modSettings['attachmentThumbWidth']) ? Config::$modSettings['attachmentThumbWidth'] : null, + 'thumbnailHeight' => !empty(Config::$modSettings['attachmentThumbHeight']) ? Config::$modSettings['attachmentThumbHeight'] : null, + 'limitMultiFileUploadSize' => round( + max( + Config::$modSettings['attachmentPostLimit'] - (Utils::$context['attachments']['total_size'] / 1024), + 0, + ), + ) * 1024, + 'maxFileAmount' => !empty(Utils::$context['num_allowed_attachments']) ? Utils::$context['num_allowed_attachments'] : null, + 'maxTotalSize' => !empty(Config::$modSettings['attachmentPostLimit']) ? Config::$modSettings['attachmentPostLimit'] : 0, + 'maxFilesize' => !empty(Config::$modSettings['attachmentSizeLimit']) ? Config::$modSettings['attachmentSizeLimit'] : 0, + ]; + } + + new Editor($editorOptions); } /** @@ -1830,6 +1860,100 @@ protected function setMessageIcons(): void */ protected function setupPostingFields(): void { + /* + **Keys in Each Option Array**: + + **`can_show`** (bool) + A boolean flag that determines if the option should be displayed. If + set to `true`, the option will be rendered; if `false`, it will be skipped. + + **`name`** (string) + The `name` attribute for the checkbox input. This is the identifier + sent when the form is submitted. Each checkbox must have a unique name. + + **`id`** (string) + The `id` attribute for the checkbox input. This must be unique + and is used to associate the checkbox with its label (`for` attribute). + + **`checked`** (bool) + Whether the checkbox should be checked by default. If set to `true`, + the checkbox will be checked. If set to `false`, it will be unchecked. + + **`label`** (string) + The label text that will appear next to the checkbox. It describes + the option to the user, such as "Notify me of replies". + + **`value`** (string, optional) + The `value` attribute of the checkbox. This determines the value that + will be submitted when the checkbox is checked. The default value is `'1'`. + + **`hidden`** (array, optional) + An associative array of hidden input fields related to this option. + The keys represent the name of the hidden field, and the values + represent the value of the hidden field. + */ + Utils::$context['Additional_options'] = [ + [ + 'can_show' => Utils::$context['can_notify'], + 'name' => 'notify', + 'id' => 'check_notify', + 'checked' => Utils::$context['notify'] || !empty(Theme::$current->options['auto_notify']) || Utils::$context['auto_notify'], + 'label' => Lang::$txt['notify_replies'], + ], + [ + 'can_show' => Utils::$context['can_lock'], + 'name' => 'lock', + 'id' => 'check_lock', + 'checked' => Utils::$context['locked'], + 'label' => Lang::$txt['lock_topic'], + 'hidden' => ['already_locked' => Utils::$context['already_locked']], + ], + [ + 'can_show' => Utils::$context['can_sticky'], + 'name' => 'sticky', + 'id' => 'check_sticky', + 'checked' => Utils::$context['sticky'], + 'label' => Lang::$txt['sticky_after_posting'], + 'hidden' => ['already_sticky' => Utils::$context['already_sticky']], + ], + [ + 'can_show' => Utils::$context['can_move'], + 'name' => 'move', + 'id' => 'check_move', + 'checked' => !empty(Utils::$context['move']), + 'label' => Lang::$txt['move_after_posting'], + ], + [ + 'can_show' => Utils::$context['can_announce'] && Utils::$context['is_first_post'], + 'name' => 'announce_topic', + 'id' => 'check_announce', + 'checked' => !empty(Utils::$context['announce']), + 'label' => Lang::$txt['announce_topic'], + ], + [ + 'can_show' => Utils::$context['show_approval'] === 2, + 'name' => 'approve', + 'id' => 'approve', + 'checked' => Utils::$context['show_approval'] === 2, + 'label' => Lang::$txt['approve_this_post'], + ], + [ + 'can_show' => true, + 'name' => 'goback', + 'id' => 'check_back', + 'checked' => Utils::$context['back_to_topic'] || !empty(Theme::$current->options['return_to_post']), + 'label' => Lang::$txt['back_to_topic'], + ], + [ + 'can_show' => true, + 'name' => 'ns', + 'id' => 'check_smileys', + 'checked' => !Utils::$context['use_smileys'], + 'label' => Lang::$txt['dont_use_smileys'], + 'value' => 'NS', + ], + ]; + /* Each item in Utils::$context['posting_fields'] is an array similar to one of the following: diff --git a/Sources/Actions/Profile/BuddyIgnoreLists.php b/Sources/Actions/Profile/BuddyIgnoreLists.php index 4a37eba5c5..e7545b1de7 100644 --- a/Sources/Actions/Profile/BuddyIgnoreLists.php +++ b/Sources/Actions/Profile/BuddyIgnoreLists.php @@ -96,7 +96,7 @@ public function execute(): void Menu::$loaded['profile']->tab_data = [ 'title' => Lang::getTxt('editBuddyIgnoreLists', file: 'Profile'), 'description' => Lang::getTxt('buddy_ignore_desc', file: 'Profile'), - 'icon_class' => 'main_icons profile_hd', + 'icon_class' => 'main_icons profile medium_icon', 'tabs' => [ 'buddies' => [], 'ignore' => [], diff --git a/Sources/Actions/Profile/Main.php b/Sources/Actions/Profile/Main.php index 4edb72ab28..a739cd1dfc 100644 --- a/Sources/Actions/Profile/Main.php +++ b/Sources/Actions/Profile/Main.php @@ -460,7 +460,7 @@ class Main implements ActionInterface, Routable 'report' => [ 'label' => 'report_profile', 'custom_url' => '{scripturl}?action=reporttm;{session_var}={session_id}', - 'icon' => 'warning', + 'icon' => 'report', 'enabled' => true, 'permission' => [ 'own' => [], @@ -671,12 +671,12 @@ public function execute(): void } // Set the template for this area and add the profile layer. + Theme::loadTemplate('Profile'); + Theme::loadJavaScriptFile('profile.js', ['defer' => true, 'minimize' => true], 'smf_profile'); + Theme::loadCSSFile('profile.css', ['minimize' => true], 'smf_profile'); Utils::$context['sub_template'] = $menu->include_data['sub_template'] ?? $menu->include_data['function']; - Utils::$context['template_layers'][] = 'profile'; - Theme::loadJavaScriptFile('profile.js', ['defer' => false, 'minimize' => true], 'smf_profile'); - // Right - are we saving - if so let's save the old data first. if (Utils::$context['completed_save']) { // Clean up the POST variables. diff --git a/Sources/Actions/Profile/ShowPosts.php b/Sources/Actions/Profile/ShowPosts.php index 3f288a1e5d..8350276c10 100644 --- a/Sources/Actions/Profile/ShowPosts.php +++ b/Sources/Actions/Profile/ShowPosts.php @@ -90,7 +90,7 @@ public function execute(): void Menu::$loaded['profile']->tab_data = [ 'title' => Lang::getTxt('showPosts', file: 'Profile'), 'description' => Lang::getTxt('showPosts_help', file: 'Profile'), - 'icon_class' => 'main_icons profile_hd', + 'icon_class' => 'main_icons profile medium_icon', 'tabs' => [ 'messages' => [ ], diff --git a/Sources/Actions/Profile/StatPanel.php b/Sources/Actions/Profile/StatPanel.php index f1006f1bca..fab53c2a08 100644 --- a/Sources/Actions/Profile/StatPanel.php +++ b/Sources/Actions/Profile/StatPanel.php @@ -49,7 +49,7 @@ public function execute(): void // Menu tab Menu::$loaded['profile']->tab_data = [ 'title' => Lang::getTxt('statPanel_showStats', ['name' => Profile::$member->name]), - 'icon' => 'stats_info.png', + 'icon_class' => 'main_icons stats', ]; // Is the load average too high to allow searching just now? diff --git a/Sources/Actions/Profile/Summary.php b/Sources/Actions/Profile/Summary.php index 25be72a45c..8d9b1398c3 100644 --- a/Sources/Actions/Profile/Summary.php +++ b/Sources/Actions/Profile/Summary.php @@ -48,7 +48,7 @@ public function execute(): void // Menu tab Menu::$loaded['profile']->tab_data = [ 'title' => Lang::getTxt('summary', file: 'General'), - 'icon_class' => 'main_icons profile_hd', + 'icon_class' => 'main_icons profile medium_icon', ]; // Expand the warning settings. diff --git a/Sources/Actions/Profile/ThemeOptions.php b/Sources/Actions/Profile/ThemeOptions.php index ee6d593eff..4dd1012052 100644 --- a/Sources/Actions/Profile/ThemeOptions.php +++ b/Sources/Actions/Profile/ThemeOptions.php @@ -43,6 +43,49 @@ public function execute(): void Theme::loadTemplate('Settings'); Theme::loadSubTemplate('options'); + // Check for variants or dark mode + if (!empty(Theme::$current->settings['theme_variants']) || !empty(Theme::$current->settings['has_dark_mode'])) { + + Lang::load('Themes'); + Utils::$context['additional_options'] = []; + + // Theme Variants + if (!empty(Theme::$current->settings['theme_variants']) && (empty(Theme::$current->settings['disable_user_variant']) || User::$me->allowedTo('admin_forum'))) { + $available_variants = []; + foreach (Theme::$current->settings['theme_variants'] as $variant) { + $available_variants[$variant] = Lang::$txt['variant_' . $variant] ?? $variant; + } + + Utils::$context['additional_options'][] = Lang::$txt['theme_opt_variant']; + Utils::$context['additional_options'][] = [ + 'id' => 'theme_variant', + 'label' => Lang::$txt['theme_pick_variant'], + 'options' => $available_variants, + 'default' => isset(Theme::$current->settings['default_variant']) && !empty(Theme::$current->settings['default_variant']) ? Theme::$current->settings['default_variant'] : Theme::$current->settings['theme_variants'][0], + 'enabled' => !empty(Theme::$current->settings['theme_variants']), + ]; + } + + // Theme Color Mode + if (!empty(Theme::$current->settings['has_dark_mode']) && (empty(Theme::$current->settings['disable_user_mode']) || User::$me->allowedTo('admin_forum'))) { + $available_modes = []; + foreach (Theme::$current->settings['theme_colormodes'] as $mode) { + $available_modes[$mode] = Lang::$txt['colormode_' . $mode] ?? $mode; + } + + Utils::$context['additional_options'][] = Lang::$txt['theme_opt_colormode']; + Utils::$context['additional_options'][] = [ + 'id' => 'theme_colormode', + 'label' => Lang::$txt['theme_pick_colormode'], + 'options' => $available_modes, + 'default' => isset(Theme::$current->settings['default_colormode']) && !empty(Theme::$current->settings['default_colormode']) ? Theme::$current->settings['default_colormode'] : Theme::$current->settings['theme_colormodes'][0], + 'enabled' => !empty(Theme::$current->settings['has_dark_mode']), + ]; + } + + Utils::$context['theme_options'] = array_merge(Utils::$context['additional_options'], Utils::$context['theme_options']); + } + // Let mods hook into the theme options. IntegrationHook::call('integrate_theme_options'); diff --git a/Sources/Actions/Profile/Tracking.php b/Sources/Actions/Profile/Tracking.php index 95c2099ba4..630c9f3a8e 100644 --- a/Sources/Actions/Profile/Tracking.php +++ b/Sources/Actions/Profile/Tracking.php @@ -95,7 +95,7 @@ public function execute(): void Menu::$loaded['profile']->tab_data = [ 'title' => Lang::getTxt('tracking', file: 'Profile'), 'description' => Lang::getTxt('tracking_description', file: 'Profile'), - 'icon_class' => 'main_icons profile_hd', + 'icon_class' => 'main_icons profile medium_icon', 'tabs' => [], ]; diff --git a/Sources/Actions/Reminder.php b/Sources/Actions/Reminder.php index f80454786a..850cac8e6c 100644 --- a/Sources/Actions/Reminder.php +++ b/Sources/Actions/Reminder.php @@ -261,6 +261,7 @@ public function setPassword2(): void IntegrationHook::call('integrate_reset_pass', [$this->member->username, $this->member->username, $_POST['passwrd1']]); Theme::loadTemplate('Login'); + Theme::loadJavaScriptFile('login.js', ['minimize' => true], 'smf_login'); Utils::$context += [ 'page_title' => Lang::getTxt('reminder_password_set', file: 'Profile'), 'sub_template' => 'login', @@ -384,6 +385,7 @@ public function secretAnswer2(): void // Tell them it went fine. Theme::loadTemplate('Login'); + Theme::loadJavaScriptFile('login.js', ['minimize' => true], 'smf_login'); Utils::$context += [ 'page_title' => Lang::getTxt('reminder_password_set', file: 'Profile'), 'sub_template' => 'login', diff --git a/Sources/Actions/Search.php b/Sources/Actions/Search.php index 4427689e13..e835849cd8 100644 --- a/Sources/Actions/Search.php +++ b/Sources/Actions/Search.php @@ -18,6 +18,7 @@ use SMF\ActionInterface; use SMF\ActionRouter; use SMF\ActionTrait; +use SMF\Board; use SMF\Category; use SMF\Config; use SMF\Db\DatabaseApi as Db; @@ -70,6 +71,7 @@ public function execute(): void // Don't load this in XML mode. if (!isset($_REQUEST['xml'])) { Theme::loadTemplate('Search'); + Theme::loadTemplate('GenericControls'); Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest'); } @@ -174,91 +176,18 @@ public function execute(): void } } - // Find all the boards this user is allowed to see. - $request = Db::$db->query( - 'SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level - FROM {db_prefix}boards AS b - LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat) - WHERE {query_see_board} - AND redirect = {string:empty_string}', - [ - 'empty_string' => '', - ], - identifier: 'order_by_board_order', - ); - Utils::$context['num_boards'] = Db::$db->num_rows($request); - Utils::$context['boards_check_all'] = true; - Utils::$context['categories'] = []; - - while ($row = Db::$db->fetch_assoc($request)) { - // This category hasn't been set up yet.. - if (!isset(Utils::$context['categories'][$row['id_cat']])) { - Utils::$context['categories'][$row['id_cat']] = [ - 'id' => $row['id_cat'], - 'name' => $row['cat_name'], - 'boards' => [], - ]; - } - - $is_recycle_board = !empty(Config::$modSettings['recycle_enable']) && $row['id_board'] == Config::$modSettings['recycle_board']; - - // Set this board up, and let the template know when it's a child. (indent them..) - Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [ - 'id' => $row['id_board'], - 'name' => $row['name'], - 'child_level' => $row['child_level'], - ]; - - // If user selected some particular boards, is this one of them? - if (!empty(Utils::$context['search_params']['brd'])) { - Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] = \in_array($row['id_board'], Utils::$context['search_params']['brd']); - } - // User didn't select any boards, so select all except ignored and recycle boards. - else { - Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] = !$is_recycle_board && !\in_array($row['id_board'], User::$me->ignoreboards); - } - - // If a board wasn't checked that probably should have been ensure the board selection is selected, yo! - if (!Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && !$is_recycle_board) { - Utils::$context['boards_check_all'] = false; - } - } - Db::$db->free_result($request); - - Category::sort(Utils::$context['categories']); - - // Now, let's sort the list of categories into the boards for templates that like that. - $temp_boards = []; - - foreach (Utils::$context['categories'] as $category) { - $temp_boards[] = [ - 'name' => $category['name'], - 'child_ids' => array_keys($category['boards']), - ]; - $temp_boards = array_merge($temp_boards, array_values($category['boards'])); - - // Include a list of boards per category for easy toggling. - Utils::$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']); + // If user selected some particular boards, is this one of them? + if (!empty(Utils::$context['search_params']['brd'])) { + $boards = Utils::$context['search_params']['brd']; } - - $max_boards = ceil(\count($temp_boards) / 2); - - if ($max_boards == 1) { - $max_boards = 2; + // User didn't select any boards, so select all except ignored and recycle boards. + elseif (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board'])) { + $boards = array_merge(User::$me->ignoreboards, [(int) Config::$modSettings['recycle_board']]); + } else { + $boards = User::$me->ignoreboards; } - // Now, alternate them so they can be shown left and right ;). - Utils::$context['board_columns'] = []; - - for ($i = 0; $i < $max_boards; $i++) { - Utils::$context['board_columns'][] = $temp_boards[$i]; - - if (isset($temp_boards[$i + $max_boards])) { - Utils::$context['board_columns'][] = $temp_boards[$i + $max_boards]; - } else { - Utils::$context['board_columns'][] = []; - } - } + Utils::$context['categories'] = Board::getUserVisibleBoards($boards); if (!empty($_REQUEST['topic'])) { Utils::$context['search_params']['topic'] = (int) $_REQUEST['topic']; diff --git a/Sources/BBCode/Code1.php b/Sources/BBCode/Code1.php index f5410b07ea..f3e7d42c4f 100644 --- a/Sources/BBCode/Code1.php +++ b/Sources/BBCode/Code1.php @@ -39,7 +39,7 @@ class Code1 extends BBCode /** * */ - public ?string $content = '$1';
+ public ?string $content = '$1\t", "\t", implode('', $php_parts)); - - $code = str_replace("\t", "\t", $code); - - if ($add_begin) { - $code = preg_replace(['/^(.+?)<\?.{0,40}?php(?: |\s)/', '/\?>((?:\s*<\/(font|span)>)*)$/m'], '$1', $code, 2); - } - - if (\is_array($data)) { - $data[0] = $code; + if (is_array($data)) { + $data[0] = implode('', $parts); } else { - $data = $code; + $data = implode('', $parts); } } } diff --git a/Sources/BBCode/Code2.php b/Sources/BBCode/Code2.php index 9ab100397c..253d086b61 100644 --- a/Sources/BBCode/Code2.php +++ b/Sources/BBCode/Code2.php @@ -39,7 +39,7 @@ class Code2 extends BBCode /** * */ - public ?string $content = '
$1';
+ public ?string $content = '$1\t", "\t", implode('', $php_parts)); - - $code = str_replace("\t", "\t", $code); - - if ($add_begin) { - $code = preg_replace(['/^(.+?)<\?.{0,40}?php(?: |\s)/', '/\?>((?:\s*<\/(font|span)>)*)$/m'], '$1', $code, 2); - } - - if (\is_array($data)) { - $data[0] = $code; + if (is_array($data)) { + $data[0] = implode('', $parts); } else { - $data = $code; + $data = implode('', $parts); } } } diff --git a/Sources/Board.php b/Sources/Board.php index 4abafec7c5..9a70bb9ac8 100644 --- a/Sources/Board.php +++ b/Sources/Board.php @@ -1071,6 +1071,59 @@ public static function getMsgMemberID(int $messageID): int return (int) $memberID; } + /** + * Fetches the list of boards the user is allowed to see and organizes them by categories. + * + * This function queries the database for boards visible to the current user, grouped by categories. + * It returns a structured array of categories and their associated boards. + * + * @param array $boards An array of board IDs to mark as selected. + * @return array The structured array of categories and boards. + */ + public static function getUserVisibleBoards(array $boards): array + { + // Query to fetch boards visible to the user. + $request = Db::$db->query( + 'order_by_board_order', + 'SELECT id_board, b.name, child_level, c.name AS cat_name, id_cat + FROM {db_prefix}boards AS b + JOIN {db_prefix}categories AS c USING (id_cat) + WHERE {query_see_board} + AND redirect = {string:empty_string} + ORDER BY board_order', + [ + 'empty_string' => '', + ], + ); + + $categories = []; + $categoryTracker = []; + $currentCategoryIndex = -1; + + // Process the results and group boards by categories. + while ($row = Db::$db->fetch_assoc($request)) { + if (!isset($categoryTracker[$row['id_cat']])) { + $categories[++$currentCategoryIndex] = [ + 'id' => (int) $row['id_cat'], + 'name' => $row['cat_name'], + 'boards' => [], + ]; + $categoryTracker[$row['id_cat']] = true; + } + + $categories[$currentCategoryIndex]['boards'][] = [ + 'id' => (int) $row['id_board'], + 'name' => $row['name'], + 'child_level' => (int) $row['child_level'], + 'selected' => in_array($row['id_board'], $boards), + ]; + } + + Db::$db->free_result($request); + + return $categories; + } + /** * Modify the settings and position of a board. * Used by ManageBoards.php to change the settings of a board. diff --git a/Sources/Editor.php b/Sources/Editor.php index 1e7d79b617..d9d4f20fe1 100644 --- a/Sources/Editor.php +++ b/Sources/Editor.php @@ -21,7 +21,7 @@ /** * Creates the editor input box so that people can write messages to post. */ -class Editor implements \ArrayAccess +class Editor implements \ArrayAccess, \Stringable { use ArrayAccessHelper; @@ -51,9 +51,14 @@ class Editor implements \ArrayAccess public string $value; /** - * @var bool + * Determines whether the editor starts in rich text (WYSIWYG) mode. + * + * This property is initialized based on several factors: + * - If the global setting `disable_wysiwyg` is enabled; + * - If the user's theme preference or the provided option `force_rich` is true; + * - If a request explicitly sets the editor mode for the instance (e.g., `$_REQUEST[$this->id . '_mode']`); it overrides other settings. * - * Whether WYSIWYG mode is initially on or off. + * @var bool True if the editor starts in WYSIWYG mode, false otherwise. */ public bool $rich_active; @@ -169,21 +174,18 @@ class Editor implements \ArrayAccess public static array $bbc_toolbar = []; /** - * @var string + * @var array * * */ - public static string $bbc_handlers = ''; + public static array $bbc_handlers = []; /** * @var array * * */ - public static array $smileys_toolbar = [ - 'postform' => [], - 'popup' => [], - ]; + public static array $smileys_toolbar = []; /********************* * Internal properties @@ -203,9 +205,76 @@ class Editor implements \ArrayAccess ****************/ /** - * Constructor. + * Initializes a new instance of the editor class and configures its options and behavior. * - * @param array $options Various options for the editor. + * This constructor prepares the editor with default or user-specified options, including its + * dimensions, behavior, and visual features. It also sets up toolbars, smileys, and WYSIWYG + * capabilities if enabled. + * + * Behavior: + * 1. Initializes the editor with a unique ID and sets default options for its dimensions and behavior. + * 2. Configures the smiley and BBC toolbars, applying any necessary translations or replacements. + * 3. Enables WYSIWYG mode based on global settings, user preferences, or provided options. + * 4. Sets the SCEditor options using the provided `$options` array. + * 5. Adds backward compatibility support by storing the editor ID in the global context. + * + * Supported options: + * - `id` (string): The unique identifier for the editor instance. Defaults to 'message'. + * - `value` (string): The initial value of the editor, with certain replacements for compatibility. + * - `disable_smiley_box` (bool): Whether to disable the smiley selection box. Default is false. + * - `columns` (int): Number of columns for the editor text area. Default is 60. + * - `rows` (int): Number of rows for the editor text area. Default is 18. + * - `width` (string): Width of the editor. Default is '100%'. + * - `height` (string): Height of the editor. Default is '250px'. + * - `form` (string): The form name associated with the editor. Default is 'postmodify'. + * - `preview_type` (int): The type of preview for the editor. Default is `self::PREVIEW_HTML`. + * - `labels` (array): Additional labels for customization. + * - `required` (bool): Indicates whether the editor input is required. Default is false. + * - `force_rich` (bool): Force the editor to start in rich text mode. Default is false. + * This option directly influences `$this->rich_active`, which determines if WYSIWYG mode is enabled. + * - `plugins` (array): List of additional plugins to be loaded. Defaults to an empty array if not set. + * - `disable_url_autolinking` (bool): If set, disables the autolinker plugin for URLs. + * - `options` (array): Additional SCEditor configuration options to be merged with default settings. + * + * Custom SCEditor options: + * - `commandsWithDropdown`: Identifies buttons that use dropdown menus. + * - `textOnlyCommands`: Configures buttons to display text without icons. + * - `commandsWithText`: Configures buttons to show text alongside icons. + * + * Hooks: + * - Hook: `integrate_sceditor_options` + * - Parameters: + * - `array &$this->sce_options`: Reference to the array of SCEditor options. + * + * - Hook: `integrate_bbc_buttons` + * - Parameters: + * - `array &$bbc_tags`: Reference to the array of BBC tags. + * - `array &$editor_tag_map`: Reference to the mapping of BBC tags to SCEditor commands. + * - `array &$disabled_tags`: Reference to the array of disabled BBC tags. + * + * Example bbc tag array: + * ```php + * [ + * 'code' => 'b', + * 'description' => Lang::getTxt('bold', var: 'editortxt'), // Optional + * 'image' => 'bold', // Optional + * 'before' => '[b]', // Optional + * 'after' => '[/b]', // Optional + * ] + * ``` + * + * Example editor tag map: + * ```php + * [ + * 'bbcode' => 'sceditorCommand', + * ] + * ``` + * + * Notes: + * - A blank array (`[]`) in the `bbc_tags` represents a separator between groups of buttons in the toolbar. + * - The `editor_tag_map` is only used when the BBC tag and the SCEditor command differ. + * + * @param array $options An associative array of configuration options for the editor. */ public function __construct(array $options) { @@ -224,7 +293,7 @@ public function __construct(array $options) $this->disable_smiley_box = !empty($options['disable_smiley_box']); $this->columns = (int) ($options['columns'] ?? 60); $this->rows = (int) ($options['rows'] ?? 18); - $this->width = (string) ($options['width'] ?? '70%'); + $this->width = (string) ($options['width'] ?? '100%'); $this->height = (string) ($options['height'] ?? '250px'); $this->form = (string) ($options['form'] ?? 'postmodify'); $this->preview_type = (int) ($options['preview_type'] ?? self::PREVIEW_HTML); @@ -237,7 +306,7 @@ public function __construct(array $options) $this->buildBbcToolbar(); $this->buildSmileysToolbar(); - $this->setSCEditorOptions(); + $this->setSCEditorOptions($options); self::$loaded[$this->id] = $this; @@ -245,6 +314,14 @@ public function __construct(array $options) Utils::$context['post_box_name'] = $this->id; } + /** + * Allows this object to be handled like a string. + */ + public function __toString(): string + { + return json_encode($this->sce_options, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } + /*********************** * Public static methods ***********************/ @@ -260,6 +337,56 @@ public static function load(array $options): object return new self($options); } + /** + * Adds a new BBC tag to the toolbar before or after a specified tag. + * + * @param array $new_tag The new tag to add. + * @param string $reference_tag The tag code to reference. + * @param bool $before True to add the new tag before the reference tag, false to add it after. + */ + public static function addBbcTag(array $new_tag, string $reference_tag, bool $before = true): void + { + if (self::$bbc_tags == []) { + self::initBbcTags(); + } + + foreach (self::$bbc_tags as &$row) { + foreach ($row as $index => $tag) { + if (isset($tag['code']) && $tag['code'] === $reference_tag) { + if ($before) { + array_splice($row, $index, 0, [$new_tag]); + } else { + array_splice($row, $index + 1, 0, [$new_tag]); + } + + return; + } + } + } + } + + /** + * Removes a BBC tag from the toolbar. + * + * @param string $tag_code The tag code to remove. + */ + public static function removeBbcTag(string $tag_code): void + { + if (self::$bbc_tags == []) { + self::initBbcTags(); + } + + foreach (self::$bbc_tags as &$row) { + foreach ($row as $index => $tag) { + if (isset($tag['code']) && $tag['code'] === $tag_code) { + array_splice($row, $index, 1); + + return; + } + } + } + } + /** * Retrieves a list of message icons. * @@ -333,8 +460,6 @@ public static function getMessageIcons(int $board_id): array foreach ($icons as $k => $dummy) { $icons[$k]['url'] = Theme::$current->settings['images_url'] . '/post/' . $dummy['value'] . '.png'; - - $icons[$k]['is_last'] = false; } } // Otherwise load the icons, and check we give the right image too... @@ -359,7 +484,6 @@ public static function getMessageIcons(int $board_id): array 'value' => $row['filename'], 'name' => $row['title'], 'url' => Theme::$current->settings[file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['filename'] . '.png') ? 'images_url' : 'default_images_url'] . '/post/' . $row['filename'] . '.png', - 'is_last' => false, ]; } Db::$db->free_result($request); @@ -373,6 +497,170 @@ public static function getMessageIcons(int $board_id): array return array_values($icons); } + /************************* + * Internal static methods + *************************/ + + /** + * Initializes BBC tags for the toolbar. + */ + protected static function initBbcTags(): void + { + // The below array makes it dead easy to add images to this control. Add it to the array and everything else is done for you! + /* + array( + 'code' => 'b', // Required + 'description' => Lang::getTxt('bold', var: 'editortxt'), // Required + 'image' => 'bold', // Optional + 'before' => '[b]', // Optional + 'after' => '[/b]', // Optional + ), + */ + self::$bbc_tags = [ + [ + [ + 'code' => 'bold', + 'description' => Lang::getTxt('bold', var: 'editortxt'), + ], + [ + 'code' => 'italic', + 'description' => Lang::getTxt('italic', var: 'editortxt'), + ], + [ + 'code' => 'underline', + 'description' => Lang::getTxt('underline', var: 'editortxt'), + ], + [ + 'code' => 'strike', + 'description' => Lang::getTxt('strikethrough', var: 'editortxt'), + ], + [ + 'code' => 'superscript', + 'description' => Lang::getTxt('superscript', var: 'editortxt'), + ], + [ + 'code' => 'subscript', + 'description' => Lang::getTxt('subscript', var: 'editortxt'), + ], + [ + 'image' => 'tt', + 'code' => 'tt', + 'description' => Lang::getTxt('tt', var: 'editortxt'), + ], + [], + [ + 'code' => 'pre', + 'description' => Lang::getTxt('preformatted_text', var: 'editortxt'), + ], + [ + 'code' => 'left', + 'description' => Lang::getTxt('align_left', var: 'editortxt'), + ], + [ + 'code' => 'center', + 'description' => Lang::getTxt('center', var: 'editortxt'), + ], + [ + 'code' => 'right', + 'description' => Lang::getTxt('align_right', var: 'editortxt'), + ], + [ + 'code' => 'justify', + 'description' => Lang::getTxt('justify', var: 'editortxt'), + ], + [], + [ + 'code' => 'font', + 'description' => Lang::getTxt('font_name', var: 'editortxt'), + ], + [ + 'code' => 'size', + 'description' => Lang::getTxt('font_size', var: 'editortxt'), + ], + [ + 'code' => 'color', + 'description' => Lang::getTxt('font_color', var: 'editortxt'), + ], + [], + [ + 'code' => 'removeformat', + 'description' => Lang::getTxt('remove_formatting', var: 'editortxt'), + ], + ], + [ + [ + 'code' => 'floatleft', + 'description' => Lang::getTxt('float_left', var: 'editortxt'), + ], + [ + 'code' => 'floatright', + 'description' => Lang::getTxt('float_right', var: 'editortxt'), + ], + [], + [ + 'code' => 'youtube', + 'description' => Lang::getTxt('insert_youtube_video', var: 'editortxt'), + ], + [ + 'code' => 'image', + 'description' => Lang::getTxt('insert_image', var: 'editortxt'), + ], + [ + 'code' => 'email', + 'description' => Lang::getTxt('insert_email', var: 'editortxt'), + ], + [ + 'code' => 'link', + 'description' => Lang::getTxt('insert_link', var: 'editortxt'), + ], + [ + 'code' => 'unlink', + 'description' => Lang::getTxt('unlink', var: 'editortxt'), + ], + [], + [ + 'code' => 'table', + 'description' => Lang::getTxt('insert_table', var: 'editortxt'), + ], + [ + 'code' => 'code', + 'description' => Lang::getTxt('code', var: 'editortxt'), + ], + [ + 'code' => 'quote', + 'description' => Lang::getTxt('insert_quote', var: 'editortxt'), + ], + [ + 'image' => 'heading', + 'code' => 'heading', + 'description' => Lang::getTxt('heading', var: 'editortxt'), + ], + [], + [ + 'code' => 'bulletlist', + 'description' => Lang::getTxt('bullet_list', var: 'editortxt'), + ], + [ + 'code' => 'orderedlist', + 'description' => Lang::getTxt('numbered_list', var: 'editortxt'), + ], + [ + 'code' => 'horizontalrule', + 'description' => Lang::getTxt('insert_horizontal_rule', var: 'editortxt'), + ], + [], + [ + 'code' => 'maximize', + 'description' => Lang::getTxt('maximize', var: 'editortxt'), + ], + [ + 'code' => 'source', + 'description' => Lang::getTxt('view_source', var: 'editortxt'), + ], + ], + ]; + } + /****************** * Internal methods ******************/ @@ -408,32 +696,33 @@ protected function init(): void */ Theme::loadCSSFile('jquery.sceditor.theme.css', ['force_current' => true, 'validate' => true], 'smf_jquery_sceditor_theme'); - // JS makes the editor go round - Theme::loadJavaScriptFile('editor.js', ['minimize' => true], 'smf_editor'); Theme::loadJavaScriptFile('jquery.sceditor.bbcode.min.js', [], 'smf_sceditor_bbcode'); - Theme::loadJavaScriptFile('jquery.sceditor.smf.js', ['minimize' => true], 'smf_sceditor_smf'); - - $scExtraLangs = ' - $.sceditor.locale["' . Lang::getTxt('lang_dictionary', file: 'General') . '"] = { - "Width (optional):": "' . Lang::getTxt('width', var: 'editortxt') . '", - "Height (optional):": "' . Lang::getTxt('height', var: 'editortxt') . '", - "Insert": "' . Lang::getTxt('insert', var: 'editortxt') . '", - "Description (optional):": "' . Lang::getTxt('description', var: 'editortxt') . '", - "Rows:": "' . Lang::getTxt('rows', var: 'editortxt') . '", - "Cols:": "' . Lang::getTxt('cols', var: 'editortxt') . '", - "URL:": "' . Lang::getTxt('url', var: 'editortxt') . '", - "E-mail:": "' . Lang::getTxt('email', var: 'editortxt') . '", - "Video URL:": "' . Lang::getTxt('video_url', var: 'editortxt') . '", - "More": "' . Lang::getTxt('more', var: 'editortxt') . '", - "Close": "' . Lang::getTxt('close', var: 'editortxt') . '", - dateFormat: "' . Lang::getTxt('dateformat', var: 'editortxt') . '", - details: "' . Lang::getTxt('details', var: 'editortxt') . '", - spoiler: "' . Lang::getTxt('spoiler', var: 'editortxt') . '", - summaryPrompt: "' . Lang::getTxt('summary_prompt', var: 'editortxt') . '", - };'; - - Theme::addInlineJavaScript($scExtraLangs, true); + Theme::loadJavaScriptFile('sceditor.plugins.smf.js', ['minimize' => true], 'smf_sceditor_smf_plugin'); + + $locale_key = Lang::getTxt('lang_dictionary', file: 'General'); + + $translation_map = [ + 'Width (optional):' => Lang::getTxt('width', var: 'editortxt'), + 'Height (optional):' => Lang::getTxt('height', var: 'editortxt'), + 'Insert' => Lang::getTxt('insert', var: 'editortxt'), + 'Description (optional):' => Lang::getTxt('description', var: 'editortxt'), + 'Rows:' => Lang::getTxt('rows', var: 'editortxt'), + 'Cols:' => Lang::getTxt('cols', var: 'editortxt'), + 'URL:' => Lang::getTxt('url', var: 'editortxt'), + 'E-mail:' => Lang::getTxt('email', var: 'editortxt'), + 'Video URL:' => Lang::getTxt('video_url', var: 'editortxt'), + 'More' => Lang::getTxt('more', var: 'editortxt'), + 'Close' => Lang::getTxt('close', var: 'editortxt'), + 'dateFormat' => Lang::getTxt('dateformat', var: 'editortxt'), + 'details' => Lang::getTxt('details', var: 'editortxt'), + 'spoiler' => Lang::getTxt('spoiler', var: 'editortxt'), + 'summaryPrompt' => Lang::getTxt('summary_prompt', var: 'editortxt'), + ]; + IntegrationHook::call('integrate_sceditor_locale', [&$translation_map]); + $sc_extra_langs = 'sceditor.locale["' . $locale_key . '"] = ' . json_encode($translation_map, JSON_UNESCAPED_UNICODE) . ';'; + + Theme::addInlineJavaScript($sc_extra_langs, true); Theme::addInlineJavaScript(' var smf_smileys_url = \'' . Theme::$current->settings['smileys_url'] . '\'; var bbc_quote_from = \'' . addcslashes(Lang::getTxt('quote_from', file: 'General'), "'") . '\'; @@ -466,8 +755,8 @@ protected function buildButtons(): void Utils::$context['richedit_buttons'] = [ 'save_draft' => [ 'type' => 'submit', - 'value' => Lang::getTxt('draft_save', file: 'Drafts'), - 'onclick' => !empty(Utils::$context['drafts_save']) ? 'submitThisOnce(this);' : (!empty(Utils::$context['drafts_save']) ? 'return confirm(' . Utils::escapeJavaScript(Lang::getTxt('draft_save_note', file: 'Drafts')) . ') && submitThisOnce(this);' : ''), + 'value' => Lang::$txt['draft_save'], + 'onclick' => !empty(Utils::$context['drafts_save']) ? 'return confirm(' . Utils::escapeJavaScript(Lang::$txt['draft_save_note']) . ');' : '', 'accessKey' => 'd', 'show' => !empty(Utils::$context['drafts_save']), ], @@ -490,12 +779,24 @@ protected function buildButtons(): void } /** - * Initialize the BBC button toolbar, if not already loaded. + * Initializes and constructs the BBC (Bulletin Board Code) button toolbar for the editor. + * + * This method sets up the available BBC tags and their corresponding actions for the editor. + * It manages which tags are enabled, disabled, and how they appear in the toolbar. The method + * also allows integrations or modifications via hooks for custom functionality. + * + * Behavior: + * 1. Links key context variables (e.g., `bbc_tags`, `disabled_tags`, `bbc_toolbar`) for use in the editor. + * 2. Initializes the BBC tags with predefined options, such as the tag's code, description, and icon. + * 3. Maps specific BBC tags to SCEditor commands for seamless functionality. + * 4. Dynamically generates a list of disabled buttons based on configuration settings. + * 5. Applies integration hooks (`integrate_bbc_buttons`) to allow modifications to BBC buttons. + * 6. Assembles the toolbar structure based on the active and disabled tags. */ protected function buildBbcToolbar(): void { - if (!empty(self::$bbc_tags)) { - return; + if (self::$bbc_tags == []) { + self::initBbcTags(); } Utils::$context['bbc_tags'] = &self::$bbc_tags; @@ -503,175 +804,7 @@ protected function buildBbcToolbar(): void Utils::$context['bbc_toolbar'] = &self::$bbc_toolbar; Utils::$context['bbcodes_handlers'] = &self::$bbc_handlers; - // The below array makes it dead easy to add images to this control. Add it to the array and everything else is done for you! - // Note: 'before' and 'after' are deprecated as of SMF 2.1. Instead, use a separate JS file to configure the functionality of your toolbar buttons. - /* - array( - 'code' => 'b', // Required - 'description' => Lang::getTxt('bold', var: 'editortxt'), // Required - 'image' => 'bold', // Optional - 'before' => '[b]', // Deprecated - 'after' => '[/b]', // Deprecated - ), - */ - self::$bbc_tags[] = [ - [ - 'code' => 'bold', - 'description' => Lang::getTxt('bold', var: 'editortxt'), - ], - [ - 'code' => 'italic', - 'description' => Lang::getTxt('italic', var: 'editortxt'), - ], - [ - 'code' => 'underline', - 'description' => Lang::getTxt('underline', var: 'editortxt'), - ], - [ - 'code' => 'strike', - 'description' => Lang::getTxt('strikethrough', var: 'editortxt'), - ], - [ - 'code' => 'superscript', - 'description' => Lang::getTxt('superscript', var: 'editortxt'), - ], - [ - 'code' => 'subscript', - 'description' => Lang::getTxt('subscript', var: 'editortxt'), - ], - [ - 'image' => 'tt', - 'code' => 'tt', - 'description' => Lang::getTxt('tt', var: 'editortxt'), - ], - [ - 'image' => 'hidden', - 'code' => 'spoiler', - 'description' => Lang::getTxt('spoiler', var: 'editortxt'), - ], - [], - [ - 'code' => 'pre', - 'description' => Lang::getTxt('preformatted_text', var: 'editortxt'), - ], - [ - 'code' => 'left', - 'description' => Lang::getTxt('align_left', var: 'editortxt'), - ], - [ - 'code' => 'center', - 'description' => Lang::getTxt('center', var: 'editortxt'), - ], - [ - 'code' => 'right', - 'description' => Lang::getTxt('align_right', var: 'editortxt'), - ], - [ - 'code' => 'justify', - 'description' => Lang::getTxt('justify', var: 'editortxt'), - ], - [], - [ - 'code' => 'font', - 'description' => Lang::getTxt('font_name', var: 'editortxt'), - ], - [ - 'code' => 'size', - 'description' => Lang::getTxt('font_size', var: 'editortxt'), - ], - [ - 'code' => 'color', - 'description' => Lang::getTxt('font_color', var: 'editortxt'), - ], - ]; - - if (empty(Config::$modSettings['disable_wysiwyg'])) { - self::$bbc_tags[\count(self::$bbc_tags) - 1][] = [ - 'code' => 'removeformat', - 'description' => Lang::getTxt('remove_formatting', var: 'editortxt'), - ]; - } - - self::$bbc_tags[] = [ - [ - 'code' => 'floatleft', - 'description' => Lang::getTxt('float_left', var: 'editortxt'), - ], - [ - 'code' => 'floatright', - 'description' => Lang::getTxt('float_right', var: 'editortxt'), - ], - [], - [ - 'code' => 'youtube', - 'description' => Lang::getTxt('insert_youtube_video', var: 'editortxt'), - ], - [ - 'code' => 'image', - 'description' => Lang::getTxt('insert_image', var: 'editortxt'), - ], - [ - 'code' => 'email', - 'description' => Lang::getTxt('insert_email', var: 'editortxt'), - ], - [ - 'code' => 'link', - 'description' => Lang::getTxt('insert_link', var: 'editortxt'), - ], - [ - 'code' => 'unlink', - 'description' => Lang::getTxt('unlink', var: 'editortxt'), - ], - [], - [ - 'code' => 'table', - 'description' => Lang::getTxt('insert_table', var: 'editortxt'), - ], - [ - 'code' => 'code', - 'description' => Lang::getTxt('code', var: 'editortxt'), - ], - [ - 'code' => 'quote', - 'description' => Lang::getTxt('insert_quote', var: 'editortxt'), - ], - [ - 'image' => 'details', - 'code' => 'details', - 'description' => Lang::getTxt('details', var: 'editortxt'), - ], - [], - [ - 'image' => 'heading', - 'code' => 'heading', - 'description' => Lang::getTxt('heading', var: 'editortxt'), - ], - [ - 'code' => 'bulletlist', - 'description' => Lang::getTxt('bullet_list', var: 'editortxt'), - ], - [ - 'code' => 'orderedlist', - 'description' => Lang::getTxt('numbered_list', var: 'editortxt'), - ], - [ - 'code' => 'horizontalrule', - 'description' => Lang::getTxt('insert_horizontal_rule', var: 'editortxt'), - ], - [], - [ - 'code' => 'maximize', - 'description' => Lang::getTxt('maximize', var: 'editortxt'), - ], - ]; - - if (empty(Config::$modSettings['disable_wysiwyg'])) { - self::$bbc_tags[\count(self::$bbc_tags) - 1][] = [ - 'code' => 'source', - 'description' => Lang::getTxt('view_source', var: 'editortxt'), - ]; - } - + // Map BBC tags to SCEditor commands. $editor_tag_map = [ 'b' => 'bold', 'i' => 'italic', @@ -707,6 +840,11 @@ protected function buildBbcToolbar(): void // Generate a list of buttons that shouldn't be shown - this should be the fastest way to do this. $disabled_bbc = !empty(Config::$modSettings['disabledBBC']) ? explode(',', Config::$modSettings['disabledBBC']) : []; + if (empty(Config::$modSettings['disable_wysiwyg'])) { + self::$disabled_tags['removeformat'] = true; + self::$disabled_tags['orderedlist'] = true; + } + foreach ($disabled_bbc as $tag) { $tag = trim($tag); @@ -720,66 +858,52 @@ protected function buildBbcToolbar(): void self::$disabled_tags['floatright'] = true; } - foreach ($editor_tag_map as $tag_name => $tag_alias) { - if ($tag === $tag_name) { - self::$disabled_tags[$tag_alias] = true; - } - } - - self::$disabled_tags[$tag] = true; + self::$disabled_tags[$editor_tag_map[$tag] ?? $tag] = true; } - $bbcodes_styles = ''; + // Allow mods to modify BBC buttons. + IntegrationHook::call('integrate_bbc_buttons', [&self::$bbc_tags, &$editor_tag_map, &self::$disabled_tags]); + + $group = 0; foreach (self::$bbc_tags as $row => $tag_row) { if (!isset(self::$bbc_toolbar[$row])) { self::$bbc_toolbar[$row] = []; } - $tags_row = []; - foreach ($tag_row as $tag) { - if (empty($tag['code'])) { - self::$bbc_toolbar[$row][] = implode(',', $tags_row); - $tags_row = []; - } elseif (empty(self::$disabled_tags[$tag['code']])) { - $tags_row[] = $tag['code']; - - // If we have a custom button image, set it now. - if (isset($tag['image'])) { - $bbcodes_styles .= ' - .sceditor-button-' . $tag['code'] . ' div { - background: url(\'' . Theme::$current->settings['default_theme_url'] . '/images/bbc/' . $tag['image'] . '.png\'); - }'; - } + if (isset($tag['code']) && !isset(self::$disabled_tags[$tag['code']])) { + $this_tag = $editor_tag_map[$tag['code']] ?? $tag['code']; + self::$bbc_toolbar[$row][$group][] = $this_tag; - // Set the tooltip and possibly the command info - self::$bbc_handlers .= ' - sceditor.command.set(' . Utils::escapeJavaScript($tag['code']) . ', { - tooltip: ' . Utils::escapeJavaScript($tag['description'] ?? $tag['code']); - - // Legacy support for 2.0 BBC mods - if (isset($tag['before'])) { - self::$bbc_handlers .= ', - exec: function () { - this.insertText(' . Utils::escapeJavaScript($tag['before']) . (isset($tag['after']) ? ', ' . Utils::escapeJavaScript($tag['after']) : '') . '); - }, - txtExec: [' . Utils::escapeJavaScript($tag['before']) . (isset($tag['after']) ? ', ' . Utils::escapeJavaScript($tag['after']) : '') . ']'; + if (isset($tag['before']) || isset($tag['image'])) { + self::$bbc_handlers[$this_tag] = $tag; } - - self::$bbc_handlers .= ' - });'; + } else { + $group++; } } - - if (!empty($tags_row)) { - self::$bbc_toolbar[$row][] = implode(',', $tags_row); - } } + } - if (!empty($bbcodes_styles)) { - Theme::addInlineCss($bbcodes_styles); - } + /** + * Recursively implodes an array + * + * @param string[] $glue list of values that glue elements together + * @param array $pieces multi-dimensional array to recursively implode + * @param int $counter internal + * + * @return string imploded array + */ + protected function implodeRecursive(array $glue, array $pieces, int $counter = 0): string + { + return implode( + $glue[$counter++], + array_map( + fn($v) => is_array($v) ? $this->implodeRecursive($glue, $v, $counter) : $v, + $pieces, + ), + ); } /** @@ -787,11 +911,11 @@ protected function buildBbcToolbar(): void */ protected function buildSmileysToolbar(): void { - if ($this->disable_smiley_box || !empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup'])) { + if ($this->disable_smiley_box || self::$smileys_toolbar != []) { return; } - Utils::$context['smileys'] = self::$smileys_toolbar; + Utils::$context['smileys'] = &self::$smileys_toolbar; if (User::$me->smiley_set != 'none') { // Cache for longer when customized smiley codes aren't enabled @@ -813,26 +937,9 @@ protected function buildSmileysToolbar(): void ); while ($row = Db::$db->fetch_assoc($request)) { - if (Lang::txtExists('icon_' . strtolower($row['description']), file: 'General')) { - $row['description'] = Utils::htmlspecialchars(Lang::getTxt('icon_' . strtolower($row['description']), file: 'General')); - } else { - $row['description'] = Utils::htmlspecialchars($row['description']); - } - - self::$smileys_toolbar[empty($row['hidden']) ? 'postform' : 'popup'][$row['smiley_row']]['smileys'][] = $row; + self::$smileys_toolbar[] = $row; } Db::$db->free_result($request); - - foreach (self::$smileys_toolbar as $section => $smiley_rows) { - foreach ($smiley_rows as $rowIndex => $smileys) { - self::$smileys_toolbar[$section][$rowIndex]['smileys'][\count($smileys['smileys']) - 1]['isLast'] = true; - } - - if (!empty($smiley_rows)) { - self::$smileys_toolbar[$section][\count($smiley_rows) - 1]['isLast'] = true; - } - } - CacheApi::put('posting_smileys_' . User::$me->smiley_set, self::$smileys_toolbar, $cache_time); } else { self::$smileys_toolbar = $temp; @@ -841,98 +948,110 @@ protected function buildSmileysToolbar(): void } /** - * Initialize the smiley toolbar, if enabled and not already loaded. + * Configures the options for the SCEditor instance and applies + * necessary plugins, styles, and other customizations. + * + * This method sets default options for the SCEditor, including dimensions, + * style paths, plugins, toolbar configuration, emoticons, and localization + * settings. Additionally, it allows for customization via integration hooks + * and external editor options provided as arguments. + * + * @param array $editorOptions An associative array of editor options provided externally. + * + * Behavior: + * 1. Initializes default plugins, enabling `autolinker` if URL auto-linking is enabled. + * 2. Configures SCEditor options such as dimensions, toolbar, colors, fonts, and parsing behavior. + * 3. Sets emoticons and their display behavior based on smiley toolbar configurations. + * 4. Provides integration hooks to allow further modification by mods. */ - protected function setSCEditorOptions(): void + protected function setSCEditorOptions(array $editorOptions) { - // Set up the SCEditor options + if (!isset($editorOptions['plugins'])) { + $editorOptions['plugins'] = []; + } + + if ($this->preview_type == self::PREVIEW_XML) { + $editorOptions['plugins'][] = 'xmlPreview'; + Theme::loadJavaScriptFile('sceditor.plugins.xml-preview.js', ['minimize' => true], 'smf_xml_preview'); + } + + if (!empty(Config::$modSettings['autoLinkUrls']) && empty($editorOptions['disable_url_autolinking']) && User::$me->allowedTo('bbc_url')) { + $editorOptions['plugins'][] = 'autolinker'; + Autolinker::createJavaScriptFile(); + Theme::loadJavaScriptFile('sceditor.plugins.autolinker.js', ['minimize' => true], 'smf_autolinker'); + } + $this->sce_options = [ 'width' => $this->width ?? '100%', 'height' => $this->height ?? '250px', 'style' => Theme::$current->settings[file_exists(Theme::$current->settings['theme_dir'] . '/css/jquery.sceditor.default.css') ? 'theme_url' : 'default_theme_url'] . '/css/jquery.sceditor.default.css' . Utils::$context['browser_cache'], + 'autoUpdate' => true, 'emoticonsCompat' => true, - 'colors' => 'black,maroon,brown,green,navy,grey,red,orange,teal,blue,white,hotpink,yellow,limegreen,purple', + 'emoticons' => [], + 'emoticonsEnabled' => !$this->disable_smiley_box, + 'emoticonsRoot' => Theme::$current->settings['smileys_url'] . '/', + 'colors' => [ + ['black', Lang::getTxt('black', var: 'editortxt')], + ['red', Lang::getTxt('red', var: 'editortxt')], + ['yellow', Lang::getTxt('yellow', var: 'editortxt')], + ['pink', Lang::getTxt('pink', var: 'editortxt')], + ['green', Lang::getTxt('green', var: 'editortxt')], + ['orange', Lang::getTxt('orange', var: 'editortxt')], + ['purple', Lang::getTxt('purple', var: 'editortxt')], + ['blue', Lang::getTxt('blue', var: 'editortxt')], + ['beige', Lang::getTxt('beige', var: 'editortxt')], + ['brown', Lang::getTxt('brown', var: 'editortxt')], + ['teal', Lang::getTxt('teal', var: 'editortxt')], + ['navy', Lang::getTxt('navy', var: 'editortxt')], + ['maroon', Lang::getTxt('maroon', var: 'editortxt')], + ['limegreen', Lang::getTxt('lime_green', var: 'editortxt')], + ['white', Lang::getTxt('white', var: 'editortxt')], + ], + 'fonts' => 'Arial,Arial Black,Comic Sans MS,Courier New,Georgia,Impact,Sans-serif,Serif,Times New Roman,Trebuchet MS,Verdana', + 'icons' => 'monocons', 'format' => 'bbcode', - 'plugins' => '', + 'plugins' => 'smf,' . implode(',', $editorOptions['plugins'] ?? []), + 'toolbar' => $this->implodeRecursive(['||', '|', ','], self::$bbc_toolbar), + 'customTextualCommands' => self::$bbc_handlers, + 'startInSourceMode' => !$this->rich_active, 'bbcodeTrim' => false, + 'resizeWidth' => false, + 'resizeMaxHeight' => -1, + 'locale' => $this->locale ?? 'en', + 'rtl' => !empty(Utils::$context['right_to_left']), + 'commandsWithDropdown' => [ + 'color' => true, + 'heading' => true, + 'font' => true, + 'size' => true, + ], + 'textOnlyCommands' => [], + 'commandsWithText' => [], + 'parserOptions' => [ + 'txtVars' => [ + 'code' => Lang::$txt['code'], + ], + ], ]; - if (!empty(Config::$modSettings['autoLinkUrls']) && User::$me->allowedTo('bbc_url')) { - $this->sce_options['plugins'] = 'autolinker'; - Autolinker::createJavaScriptFile(); - Theme::loadJavaScriptFile('autolinker.js', ['minimize' => true], 'smf_autolinker'); - } - - if (!empty($this->locale)) { - $this->sce_options['locale'] = $this->locale; - } - - if (!empty(Utils::$context['right_to_left'])) { - $this->sce_options['rtl'] = true; + if (isset($editorOptions['options'])) { + $this->sce_options = array_merge_recursive($this->sce_options, $editorOptions['options']); } - if ($this->id != 'quickReply') { - $this->sce_options['autofocus'] = true; - } - - $this->sce_options['emoticons'] = []; - $this->sce_options['emoticonsDescriptions'] = []; - $this->sce_options['emoticonsEnabled'] = false; - - if ((!empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup'])) && !$this->disable_smiley_box) { - $this->sce_options['emoticonsEnabled'] = true; - $this->sce_options['emoticons']['dropdown'] = []; - $this->sce_options['emoticons']['popup'] = []; - - $count_locations = \count(self::$smileys_toolbar); - - foreach (self::$smileys_toolbar as $location => $smiley_rows) { - $count_locations--; - - unset($smiley_location); - - if ($location == 'postform') { - $smiley_location = &$this->sce_options['emoticons']['dropdown']; - } elseif ($location == 'popup') { - $smiley_location = &$this->sce_options['emoticons']['popup']; - } - - $num_rows = \count($smiley_rows); - - // This is needed because otherwise the editor will remove all the duplicate (empty) keys and leave only 1 additional line - $empty_placeholder = 0; - - foreach ($smiley_rows as $smiley_row) { - foreach ($smiley_row['smileys'] as $smiley) { - $smiley_location[$smiley['code']] = Theme::$current->settings['smileys_url'] . '/' . $smiley['filename']; - - $this->sce_options['emoticonsDescriptions'][$smiley['code']] = $smiley['description']; - } - - if (empty($smiley_row['isLast']) && $num_rows != 1) { - $smiley_location['-' . $empty_placeholder++] = ''; - } - } - } - } - - $this->sce_options['parserOptions']['txtVars'] = [ - 'code' => Lang::getTxt('code', file: 'General'), - ]; - - $this->sce_options['toolbar'] = ''; - - if (!empty(Config::$modSettings['enableBBC'])) { - $count_tags = \count(self::$bbc_tags); - - foreach (self::$bbc_toolbar as $i => $buttonRow) { - $this->sce_options['toolbar'] .= implode('|', $buttonRow); - - $count_tags--; - - if (!empty($count_tags)) { - $this->sce_options['toolbar'] .= '||'; - } + if ($this->sce_options['emoticonsEnabled']) { + $translations = [ + 0 => 'dropdown', + 2 => 'more', + ]; + $prevRowIndex = 0; + + foreach (self::$smileys_toolbar as $smiley) { + $this->sce_options['emoticons'][$translations[$smiley['hidden']]][$smiley['code']] = [ + 'newRow' => $smiley['smiley_row'] != $prevRowIndex, + 'url' => $smiley['filename'], + 'tooltip' => Utils::htmlspecialchars(Lang::$txt['icon_' . strtolower($smiley['description'])] ?? $smiley['description']), + ]; + $prevRowIndex = $smiley['smiley_row']; } } diff --git a/Sources/PersonalMessage/PM.php b/Sources/PersonalMessage/PM.php index 930e085071..c7b2a01c67 100644 --- a/Sources/PersonalMessage/PM.php +++ b/Sources/PersonalMessage/PM.php @@ -595,7 +595,7 @@ public static function compose(): void Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest'); if (Utils::$context['drafts_autosave']) { - Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts'); + Theme::loadJavaScriptFile('sceditor.plugins.drafts.js', ['defer' => true, 'minimize' => true], 'smf_drafts'); } Utils::$context['sub_template'] = 'send'; @@ -792,7 +792,7 @@ public static function compose(): void } // Now create the editor. - new Editor([ + $editorOptions = [ 'id' => 'message', 'value' => Utils::$context['message'], 'height' => '175px', @@ -800,9 +800,41 @@ public static function compose(): void 'labels' => [ 'post_button' => Lang::getTxt('send_message', file: 'General'), ], + // We do XML preview here. 'preview_type' => Editor::PREVIEW_XML, + // This is a required field. 'required' => true, - ]); + // SCEditor plugins. + 'plugins' => [], + // SCEditor options. + 'options' => [ + 'previewOptions' => [ + 'sPreviewSectionContainerID' => 'preview_section', + 'sPreviewSubjectContainerID' => 'preview_subject', + 'sPreviewBodyContainerID' => 'preview_body', + 'sErrorsContainerID' => 'errors', + 'sErrorsSeriousContainerID' => 'error_serious', + 'sErrorsListContainerID' => 'error_list', + 'sCaptionContainerID' => 'caption_%ID%', + 'sTxtPreviewTitle' => Utils::escapeJavaScript(Lang::$txt['preview_title']), + 'sTxtPreviewFetch' => Utils::escapeJavaScript(Lang::$txt['preview_fetch']), + 'sUrl' => Config::$scripturl . '?action=pm;sa=send2;preview;xml', + ], + ], + ]; + + if (Utils::$context['drafts_autosave']) { + $editorOptions['plugins'][] = 'drafts'; + $editorOptions['plugins'][] = 'pmDrafts'; + $editorOptions['options']['draftOptions'] = [ + 'sLastNote' => 'draft_lastautosave', + 'sLastID' => 'id_draft', + 'sQueryParams' => 'action=pm;sa=send2;xml', + 'iFreq' => empty(Config::$modSettings['drafts_autosave_frequency']) ? 60000 : Config::$modSettings['drafts_autosave_frequency'] * 1000, + ]; + } + + new Editor($editorOptions); Utils::$context['bcc_value'] = ''; @@ -2155,8 +2187,7 @@ public static function reportErrors(array $error_types, array $named_recipients, } } - // Create it... - new Editor([ + $editorOptions = [ 'id' => 'message', 'value' => Utils::$context['message'], 'width' => '90%', @@ -2164,8 +2195,41 @@ public static function reportErrors(array $error_types, array $named_recipients, 'labels' => [ 'post_button' => Lang::getTxt('send_message', file: 'General'), ], + // We do XML preview here. 'preview_type' => Editor::PREVIEW_XML, - ]); + // This is a required field. + 'required' => true, + // SCEditor plugins. + 'plugins' => [], + // SCEditor options. + 'options' => [ + 'previewOptions' => [ + 'sPreviewSectionContainerID' => 'preview_section', + 'sPreviewSubjectContainerID' => 'preview_subject', + 'sPreviewBodyContainerID' => 'preview_body', + 'sErrorsContainerID' => 'errors', + 'sErrorsSeriousContainerID' => 'error_serious', + 'sErrorsListContainerID' => 'error_list', + 'sCaptionContainerID' => 'caption_%ID%', + 'sTxtPreviewTitle' => Utils::escapeJavaScript(Lang::$txt['preview_title']), + 'sTxtPreviewFetch' => Utils::escapeJavaScript(Lang::$txt['preview_fetch']), + 'sUrl' => Config::$scripturl . '?action=pm;sa=send2;preview;xml', + ], + ], + ]; + + if (Utils::$context['drafts_autosave']) { + $editorOptions['plugins'][] = 'drafts'; + $editorOptions['plugins'][] = 'pmDrafts'; + $editorOptions['options']['draftOptions'] = [ + 'sLastNote' => 'draft_lastautosave', + 'sLastID' => 'id_draft', + 'sQueryParams' => 'action=pm;sa=send2;xml', + 'iFreq' => empty(Config::$modSettings['drafts_autosave_frequency']) ? 60000 : Config::$modSettings['drafts_autosave_frequency'] * 1000, + ]; + } + + new Editor($editorOptions); // Check whether we need to show the code again. Utils::$context['require_verification'] = !User::$me->is_admin && !empty(Config::$modSettings['pm_posts_verification']) && User::$me->posts < Config::$modSettings['pm_posts_verification']; diff --git a/Sources/Poll.php b/Sources/Poll.php index 9b4902251c..4f57861c18 100644 --- a/Sources/Poll.php +++ b/Sources/Poll.php @@ -1059,15 +1059,11 @@ protected function initNewPoll(): void 'guest_vote' => !empty($_POST['poll_guest_vote']), ]); - // Make all five poll choices empty. - Utils::$context['last_choice_id'] = 4; - - for ($i = 0; $i <= Utils::$context['last_choice_id']; $i++) { + for ($i = 0; $i <= 4; $i++) { $this->addChoice([ 'id' => $i, 'number' => $i + 1, 'label' => '', - 'is_last' => $i === Utils::$context['last_choice_id'], ], true); } } diff --git a/Sources/Profile.php b/Sources/Profile.php index 10478fda40..e83fa95482 100644 --- a/Sources/Profile.php +++ b/Sources/Profile.php @@ -1260,12 +1260,7 @@ public function loadAvatarData(): bool } // Get a list of all the server stored avatars. - if ($this->formatted['avatar']['allow_server_stored']) { - Utils::$context['avatar_list'] = []; - Utils::$context['avatars'] = is_dir(Config::$modSettings['avatar_directory']) ? $this->getAvatars('', 0) : []; - } else { - Utils::$context['avatars'] = []; - } + Utils::$context['avatars'] = $this->formatted['avatar']['allow_server_stored'] && is_dir(Config::$modSettings['avatar_directory']) ? $this->getAvatars('', 0) : []; // Second level selected avatar... Utils::$context['avatar_selected'] = substr((string) strrchr($this->formatted['avatar']['server_pic'], '/'), 1); @@ -1479,20 +1474,13 @@ public function setupContext(array $fields): void } } - // Some spicy JS. + Theme::addJavaScriptVar('require_password', !empty(Utils::$context['require_password']), true); + Theme::addJavaScriptVar('required_security_reasons', Lang::$txt['required_security_reasons'], true); + Theme::addJavaScriptVar('autodetect', Lang::$txt['timeoffset_autodetect'], true); + + // Backwards compatibility. Theme::addInlineJavaScript(' - var form_handle = document.forms.creator; - createEventListener(form_handle); - ' . (!empty(Utils::$context['require_password']) ? ' - form_handle.addEventListener("submit", function(event) - { - if (this.oldpasswrd.value == "") - { - event.preventDefault(); - alert(' . (Utils::escapeJavaScript(Lang::getTxt('required_security_reasons', file: 'Profile'))) . '); - return false; - } - }, false);' : ''), true); + var form_handle = document.forms.creator;', true); // Any onsubmit JavaScript? if (!empty(Utils::$context['profile_onsubmit_javascript'])) { @@ -2531,7 +2519,7 @@ protected function prepareToSaveOptions(): void * @param int $level How many levels we should go in the directory. * @return array An array of information about the files and directories found. */ - protected function getAvatars(string $directory, int $level = 0): array + protected function getAvatars(string $directory = '', int $level = 0): array { $result = []; @@ -2539,7 +2527,7 @@ protected function getAvatars(string $directory, int $level = 0): array $files = []; // Open the directory.. - $dir = dir(Config::$modSettings['avatar_directory'] . (!empty($directory) ? '/' : '') . $directory); + $dir = dir(Config::$modSettings['avatar_directory'] . '/' . $directory); if (!$dir) { return []; @@ -2571,10 +2559,12 @@ protected function getAvatars(string $directory, int $level = 0): array ]; } + $directory .= $directory != '' ? '/' : ''; + foreach ($dirs as $line) { - $tmp = $this->getAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1); + $tmp = $this->getAvatars($directory . $line, $level + 1); - if (!empty($tmp)) { + if ($tmp != []) { $result[] = [ 'filename' => Utils::htmlspecialchars($line), 'checked' => str_contains(Utils::$context['member']['avatar']['server_pic'], $line . '/'), @@ -2588,32 +2578,20 @@ protected function getAvatars(string $directory, int $level = 0): array } foreach ($files as $line) { - $filename = substr($line, 0, (\strlen($line) - \strlen(strrchr($line, '.')))); - $extension = substr(strrchr($line, '.'), 1); + $found = preg_match('/([^.]+)\.(jpe?g|png|gif|bmp)$/i', $line, $match); // Make sure it is an image. // @todo Change this to use MIME type. - if ( - strcasecmp($extension, 'gif') != 0 - && strcasecmp($extension, 'jpg') != 0 - && strcasecmp($extension, 'jpeg') != 0 - && strcasecmp($extension, 'png') != 0 - && strcasecmp($extension, 'bmp') != 0 - && strcasecmp($extension, 'webp') != 0 - ) { + if ($found !== 1) { continue; } $result[] = [ 'filename' => Utils::htmlspecialchars($line), - 'checked' => $line == Utils::$context['member']['avatar']['server_pic'], - 'name' => Utils::htmlspecialchars(str_replace('_', ' ', $filename)), + 'checked' => $directory . $line == Utils::$context['member']['avatar']['server_pic'], + 'name' => Utils::htmlspecialchars(str_replace('_', ' ', $match[1])), 'is_dir' => false, ]; - - if ($level == 1) { - Utils::$context['avatar_list'][] = $directory . '/' . $line; - } } return $result; @@ -2657,8 +2635,6 @@ protected function setAvatarServerStored(string $filename): void if ( // Named 'blank.png' $this->new_data['avatar'] == 'blank.png' - // Not inside the expected directory. - || !str_starts_with($avatar_path, Config::$modSettings['avatar_directory'] . '/') // Not a file. || !is_file($avatar_path) // Not a valid image file. diff --git a/Sources/Theme.php b/Sources/Theme.php index 219b5c707a..831bb33434 100644 --- a/Sources/Theme.php +++ b/Sources/Theme.php @@ -2139,6 +2139,30 @@ protected function loadTemplatesAndLangFiles(): void */ protected function loadCss(): void { + // Load FontAwesome + $FontAwesomeUrls = [ + 'cdn' => 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/' . FONTAWESOME_VERSION . '/css/all.min.css', + 'fontawesome_cdn' => 'https://use.fontawesome.com/releases/v' . FONTAWESOME_VERSION . '/css/all.css', + ]; + + if (isset(Config::$modSettings['fontawesome_source']) && array_key_exists(Config::$modSettings['fontawesome_source'], $FontAwesomeUrls)) { + self::loadCSSFile($FontAwesomeUrls[Config::$modSettings['fontawesome_source']], ['external' => true, 'order_pos' => -100], 'smf_fontawesome'); + } elseif (isset(Config::$modSettings['fontawesome_source']) && Config::$modSettings['fontawesome_source'] == 'local') { + self::loadCSSFile('fontawesome.min.css', ['default_theme' => true, 'minimize' => true, 'order_pos' => -100], 'smf_fontawesome'); + } elseif (isset(Config::$modSettings['fontawesome_source'], Config::$modSettings['fontawesome_custom']) && Config::$modSettings['fontawesome_source'] == 'custom') { + self::loadCSSFile(Config::$modSettings['fontawesome_custom'], ['external' => true, 'order_pos' => -100], 'smf_fontawesome'); + } + // Fall back to the fa forum default + else { + self::loadCSSFile('https://use.fontawesome.com/releases/v' . FONTAWESOME_VERSION . '/css/all.css', ['external' => true, 'order_pos' => -100], 'smf_fontawesome'); + } + + // Icons + self::loadCSSFile('icons.css', ['minimize' => true, 'order_pos' => -200], 'smf_icons'); + + // Variables + self::loadCSSFile('variables.css', ['minimize' => true, 'order_pos' => -2], 'smf_variables'); + // And of course, let's load the default CSS file. self::loadCSSFile('index.css', ['minimize' => true, 'order_pos' => 1], 'smf_index'); @@ -2156,6 +2180,47 @@ protected function loadCss(): void self::loadCSSFile('noscript.css', ['minimize' => true, 'order_pos' => 1, 'noscript' => true], 'smf_noscript'); } + /** + * Loads the theme mode, if applicable. + */ + protected function loadMode(): void + { + Utils::$context['theme_colormode'] = ''; + + if (!empty($this->settings['has_dark_mode'])) { + // Theme Modes + $this->settings['theme_colormodes'] = ['light', 'system', 'dark']; + + // Overriding - for previews and that ilk. + if (!empty($_REQUEST['mode'])) { + $_SESSION['theme_colormode'] = $_REQUEST['mode']; + + // If the user is logged, save this to their profile + if (User::$me->is_logged && in_array($_SESSION['theme_colormode'], $this->settings['theme_colormodes'])) { + Db::$db->insert( + 'replace', + '{db_prefix}themes', + ['id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'], + [self::$current->settings['theme_id'], User::$me->id, 'theme_colormode', $_SESSION['theme_colormode']], + ['id_theme', 'id_member', 'variable'], + ); + } + } + + // User selection? + if (empty($this->settings['disable_user_mode']) || User::$me->allowedTo('admin_forum')) { + Utils::$context['theme_colormode'] = !empty($_SESSION['theme_colormode']) && in_array($_SESSION['theme_colormode'], $this->settings['theme_colormodes']) ? $_SESSION['theme_colormode'] : (!empty($this->options['theme_colormode']) && in_array($this->options['theme_colormode'], $this->settings['theme_colormodes']) ? $this->options['theme_colormode'] : ''); + } + + // If no color mode, set a default + if (empty(Utils::$context['theme_colormode']) || !in_array(Utils::$context['theme_colormode'], $this->settings['theme_colormodes'])) { + Utils::$context['theme_colormode'] = !empty($this->settings['default_colormode']) && in_array($this->settings['default_colormode'], $this->settings['theme_colormodes']) ? $this->settings['default_colormode'] : $this->settings['theme_colormodes'][0]; + } + + self::loadCSSFile('dark.css', ['order_pos' => 2, 'attributes' => (Utils::$context['theme_colormode'] == 'system' ? ['media' => '(prefers-color-scheme: dark)'] : [])], 'smf_dark'); + } + } + /** * Loads the correct theme variant, if applicable. */ @@ -2166,11 +2231,34 @@ protected function loadVariant(): void Utils::$context['theme_variant_url'] = ''; if (!empty($this->settings['theme_variants'])) { + // Add the default variant + $this->settings['theme_variants'] = array_unique(array_merge(['default'], $this->settings['theme_variants'])); + // Overriding - for previews and that ilk. if (!empty($_REQUEST['variant'])) { $_SESSION['id_variant'] = $_REQUEST['variant']; + + // If the user is logged, save this to their profile + if (User::$me->is_logged && in_array($_SESSION['id_variant'], $this->settings['theme_variants'])) { + Db::$db->insert( + 'replace', + '{db_prefix}themes', + ['id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'], + [self::$current->settings['theme_id'], User::$me->id, 'theme_variant', $_SESSION['id_variant']], + ['id_theme', 'id_member', 'variable'], + ); + } } + /** + * Attempt to load a variants file for variable overriding + * using data attribute (:root[data-variant="variant"]) + * + * This is useful when you only want a single file for + * recoloring the variants. + */ + self::loadCSSFile('variants.css', ['order_pos' => 0], 'smf_variants'); + // User selection? if (empty($this->settings['disable_user_variant']) || User::$me->allowedTo('admin_forum')) { Utils::$context['theme_variant'] = !empty($_SESSION['id_variant']) && \in_array($_SESSION['id_variant'], $this->settings['theme_variants']) ? $_SESSION['id_variant'] : (!empty($this->options['theme_variant']) && \in_array($this->options['theme_variant'], $this->settings['theme_variants']) ? $this->options['theme_variant'] : ''); @@ -2181,16 +2269,8 @@ protected function loadVariant(): void Utils::$context['theme_variant'] = !empty($this->settings['default_variant']) && \in_array($this->settings['default_variant'], $this->settings['theme_variants']) ? $this->settings['default_variant'] : $this->settings['theme_variants'][0]; } - // Do this to keep things easier in the templates. - Utils::$context['theme_variant'] = '_' . Utils::$context['theme_variant']; - Utils::$context['theme_variant_url'] = Utils::$context['theme_variant'] . '/'; - - if (!empty(Utils::$context['theme_variant'])) { - self::loadCSSFile('index' . Utils::$context['theme_variant'] . '.css', ['order_pos' => 300], 'smf_index' . Utils::$context['theme_variant']); - - if (Utils::$context['right_to_left']) { - self::loadCSSFile('rtl' . Utils::$context['theme_variant'] . '.css', ['order_pos' => 4200], 'smf_rtl' . Utils::$context['theme_variant']); - } + if (!empty(Utils::$context['theme_variant']) && Utils::$context['theme_variant'] !== 'default') { + self::loadCSSFile('index_' . Utils::$context['theme_variant'] . '.css', ['order_pos' => 2], 'smf_index' . Utils::$context['theme_variant']); } } } @@ -2203,6 +2283,7 @@ protected function loadJavaScript(): void // Default JS variables for use in every theme Utils::$context['javascript_vars'] = [ 'smf_theme_url' => '"' . $this->settings['theme_url'] . '"', + 'smf_theme_id' => self::$current->settings['theme_id'], 'smf_default_theme_url' => '"' . $this->settings['default_theme_url'] . '"', 'smf_images_url' => '"' . $this->settings['images_url'] . '"', 'smf_smileys_url' => '"' . Config::$modSettings['smileys_url'] . '"', @@ -2245,16 +2326,11 @@ protected function loadJavaScript(): void } // Queue our JQuery plugins! - self::loadJavaScriptFile('smf_jquery_plugins.js', ['minimize' => true], 'smf_jquery_plugins'); - - if (!User::$me->is_guest) { - self::loadJavaScriptFile('jquery.custom-scrollbar.js', ['minimize' => true], 'smf_jquery_scrollbar'); - self::loadCSSFile('jquery.custom-scrollbar.css', ['force_current' => false, 'validate' => true], 'smf_scrollbar'); - } + self::loadJavaScriptFile('smf_jquery_plugins.js', ['defer' => true, 'minimize' => true], 'smf_jquery_plugins'); // script.js and theme.js, always required, so always add them! Makes index.template.php cleaner and all. self::loadJavaScriptFile('script.js', ['defer' => false, 'minimize' => true], 'smf_script'); - self::loadJavaScriptFile('theme.js', ['minimize' => true], 'smf_theme'); + self::loadJavaScriptFile('theme.js', ['defer' => true, 'minimize' => true], 'smf_theme'); // And we should probably trigger the cron too. if (empty(Config::$modSettings['cron_is_real_cron'])) { diff --git a/Themes/default/Admin.template.php b/Themes/default/Admin.template.php index dd76d419e2..d037ef49a4 100644 --- a/Themes/default/Admin.template.php +++ b/Themes/default/Admin.template.php @@ -73,34 +73,40 @@ function template_admin() - '; + +