' . Lang::getTxt('convert_to_suggest_text', file: 'ManageMaintenance') . '
'; } - - 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 c1de93addea..c33cb384f31 100644 --- a/Sources/Actions/Admin/Subscriptions.php +++ b/Sources/Actions/Admin/Subscriptions.php @@ -870,6 +870,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 886fe6e5ffb..afd2a233709 100644 --- a/Sources/Actions/Admin/Themes.php +++ b/Sources/Actions/Admin/Themes.php @@ -630,7 +630,7 @@ public function setOptions(): void $available_modes[$mode] = Lang::getTxt('colormode_' . $mode, file: 'Themes') ?? $mode; } - Utils::$context['options'][] = Lang::getTxt('theme_opt_colormode', file: 'Themes'); + Utils::$context['options'][] = Lang::getTxt('theme_opt_colormode', file: 'Profile'); Utils::$context['options'][] = [ 'id' => 'theme_colormode', 'label' => Lang::getTxt('theme_pick_colormode', file: 'Themes'), @@ -875,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 638398fa2c6..28f2bf63889 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 1cc1de000d7..32a4a545e34 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/Display.php b/Sources/Actions/Display.php index ec029abade4..fea003f1bb1 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,6 +224,7 @@ public function prepareDisplayContext(): array|bool 'label' => Lang::getTxt('quick_edit', file: 'General'), 'class' => 'quick_edit', 'id' => 'modify_button_' . $output['id'], + 'custom' => 'hidden', 'icon' => 'quick_edit_button', 'show' => $output['can_modify'], ], @@ -1004,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. @@ -1077,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 @@ -1085,16 +1086,15 @@ protected function setupTemplate(): void Theme::loadJavaScriptFile('spellcheck.js', ['defer' => false, 'minimize' => true], 'smf_spellcheck'); } - // topic.js Theme::loadJavaScriptFile('topic.js', ['defer' => true, 'minimize' => true], 'smf_topic'); - - // quotedText.js + 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'); } @@ -1300,8 +1300,7 @@ protected function setOldTopicWarning(): void */ protected function loadEditor(): void { - // Now create the editor. - new Editor([ + $editorOptions = [ 'id' => 'quickReply', 'value' => '', 'labels' => [ @@ -1309,9 +1308,37 @@ protected function loadEditor(): void ], // 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 1104f1fddac..b8136c9db42 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 d8e7cb8d58e..4592bb8128f 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 de8e6a62972..142338c662f 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 8d522fb593c..c56357c234a 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 bd5dbd0910d..ea7a7d6ef92 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,7 +1721,7 @@ protected function loadDrafts(): void */ protected function loadEditor(): void { - new Editor([ + $editorOptions = [ 'id' => 'message', 'value' => Utils::$context['message'], 'labels' => [ @@ -1772,11 +1729,85 @@ protected function loadEditor(): void ], // 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' => [ 'autofocus' => $this->intent !== self::INTENT_NEW_TOPIC, + '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::getTxt('attach_drop_zone', file: 'Post'), + 'dictFallbackMessage' => Lang::getTxt('attach_drop_zone_no', file: 'Post'), + 'dictCancelUpload' => Lang::getTxt('modify_cancel', file: 'Post'), + 'genericError' => Lang::getTxt('attach_php_error', file: 'Post'), + 'text_attachDropzoneLabel' => Lang::getTxt('attach_drop_zone', file: 'Post'), + 'text_attachLimitNag' => Lang::getTxt('attach_limit_nag', file: 'Post'), + 'text_attachLeft' => Lang::getTxt('attachments_left', file: 'Post'), + 'text_deleteAttach' => Lang::getTxt('attached_file_delete', file: 'Post'), + 'text_attachDeleted' => Lang::getTxt('attached_file_deleted', file: 'Post'), + 'text_insertBBC' => Lang::getTxt('attached_insert_bbc', file: 'Post'), + 'text_attachUploaded' => Lang::getTxt('attached_file_uploaded', file: 'Post'), + 'text_attach_unlimited' => Lang::getTxt('attach_drop_unlimited', file: 'Post'), + 'text_totalMaxSize' => Lang::getTxt('attach_max_total_file_size_current', file: 'Post'), + 'text_max_size_progress' => '{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' => Lang::getTxt('more_attachments_error', file: 'Post'), + '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 +1861,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::getTxt('notify_replies', file: 'Post'), + ], + [ + 'can_show' => Utils::$context['can_lock'], + 'name' => 'lock', + 'id' => 'check_lock', + 'checked' => Utils::$context['locked'], + 'label' => Lang::getTxt('lock_topic', file: 'Post'), + 'hidden' => ['already_locked' => Utils::$context['already_locked']], + ], + [ + 'can_show' => Utils::$context['can_sticky'], + 'name' => 'sticky', + 'id' => 'check_sticky', + 'checked' => Utils::$context['sticky'], + 'label' => Lang::getTxt('sticky_after_posting', file: 'Post'), + '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::getTxt('move_after_posting', file: 'Post'), + ], + [ + 'can_show' => Utils::$context['can_announce'] && Utils::$context['is_first_post'], + 'name' => 'announce_topic', + 'id' => 'check_announce', + 'checked' => !empty(Utils::$context['announce']), + 'label' => Lang::getTxt('announce_topic', file: 'Post'), + ], + [ + 'can_show' => Utils::$context['show_approval'] === 2, + 'name' => 'approve', + 'id' => 'approve', + 'checked' => Utils::$context['show_approval'] === 2, + 'label' => Lang::getTxt('approve_this_post', file: 'Post'), + ], + [ + 'can_show' => true, + 'name' => 'goback', + 'id' => 'check_back', + 'checked' => Utils::$context['back_to_topic'] || !empty(Theme::$current->options['return_to_post']), + 'label' => Lang::getTxt('back_to_topic', file: 'Post'), + ], + [ + 'can_show' => true, + 'name' => 'ns', + 'id' => 'check_smileys', + 'checked' => !Utils::$context['use_smileys'], + 'label' => Lang::getTxt('dont_use_smileys', file: 'Post'), + '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 76a73fb46fd..2c9b66cd15f 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 b46a9fcc50a..76b9109a69b 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 962f30209c4..e820442da0e 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 61f428c1975..12281406b27 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 1016576f04b..d95cfb20ca4 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/Tracking.php b/Sources/Actions/Profile/Tracking.php index 56821e3b265..d698b1882b4 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 d79772522da..0348bd5f7d6 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/BBCode/Code1.php b/Sources/BBCode/Code1.php index ce2a6fcd102..4787b73e2fb 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); + $parts[$i] = Parser::highlightPhpCode($string . $parts[$i]); } if (\is_array($data)) { - $data[0] = $code; + $data[0] = implode('', $parts); } else { - $data = $code; + $data = implode('', $parts); } } } diff --git a/Sources/BBCode/Code2.php b/Sources/BBCode/Code2.php index bbf35ab00cf..c331d0a4c9c 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); + $parts[$i] = Parser::highlightPhpCode($string . $parts[$i]); } if (\is_array($data)) { - $data[0] = $code; + $data[0] = implode('', $parts); } else { - $data = $code; + $data = implode('', $parts); } } } diff --git a/Sources/Editor.php b/Sources/Editor.php index 610f834200a..5267870f362 100644 --- a/Sources/Editor.php +++ b/Sources/Editor.php @@ -134,9 +134,13 @@ class Editor implements \ArrayAccess, \Stringable /** * Determines whether the editor starts in rich text (WYSIWYG) mode. - * Set based on global config, user preferences, or explicit options. * - * @var bool True for WYSIWYG mode, false for source 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. + * + * @var bool True if the editor starts in WYSIWYG mode, false otherwise. */ public bool $rich_active; @@ -295,14 +299,74 @@ class Editor implements \ArrayAccess, \Stringable ****************/ /** - * Construct and configure a new Editor instance. + * Initializes a new instance of the editor class and configures its options and behavior. + * + * 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. * - * Initializes editor properties, toolbars, smileys, WYSIWYG support, and - * SCEditor options. + * Example bbc tag array: + * ```php + * [ + * 'code' => 'b', + * 'description' => Lang::getTxt('bold', var: 'editortxt'), // Optional + * 'image' => 'bold', // Optional + * 'before' => '[b]', // Optional + * 'after' => '[/b]', // Optional + * ] + * ``` * - * Applies default values and merges user-supplied $options where provided. + * Example editor tag map: + * ```php + * [ + * 'bbcode' => 'sceditorCommand', + * ] + * ``` * - * Sets up integration points for mods via hooks. + * 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. @@ -533,7 +597,7 @@ public static function getMessageIcons(int $board_id): array $icons[$row['filename']] = [ 'value' => $row['filename'], 'name' => $row['title'], - 'url' => ($icon_exists ? $images_url : $default_images_url) . '/post/' . $row['filename'] . '.png', + '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', ]; } Db::$db->free_result($request); @@ -583,7 +647,7 @@ protected function init(): void Theme::loadCSSFile('jquery.sceditor.theme.css', ['force_current' => true, 'validate' => true], 'smf_jquery_sceditor_theme'); Theme::loadJavaScriptFile('jquery.sceditor.bbcode.min.js', [], 'smf_sceditor_bbcode'); - Theme::loadJavaScriptFile('sceditor.plugins.smf.js', ['minimize' => true], 'smf_sceditor_smf'); + Theme::loadJavaScriptFile('sceditor.plugins.smf.js', ['minimize' => true], 'smf_sceditor_smf_plugin'); $locale_key = Lang::getTxt('lang_dictionary', file: 'General'); @@ -609,7 +673,6 @@ protected function init(): void $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'), "'") . '\'; @@ -666,11 +729,19 @@ protected function buildButtons(): void } /** - * Initializes and constructs the BBC button toolbar for the editor. + * Initializes and constructs the BBC (Bulletin Board Code) button toolbar for the editor. * - * Sets up available BBC tags, disables tags as required, applies integration hooks, - * and builds the toolbar structure for rendering. + * 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 { @@ -683,6 +754,7 @@ protected function buildBbcToolbar(): void Utils::$context['bbc_toolbar'] = &self::$bbc_toolbar; Utils::$context['bbcodes_handlers'] = &self::$bbc_handlers; + // Map BBC tags to SCEditor commands. $editor_tag_map = [ 'b' => 'bold', 'i' => 'italic', @@ -710,6 +782,17 @@ protected function buildBbcToolbar(): void } } + // Allow mods to modify BBC buttons. + IntegrationHook::call('integrate_bbc_buttons', [&self::$bbc_tags, &$editor_tag_map, &self::$disabled_tags]); + + // 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); @@ -815,12 +898,21 @@ protected function buildSmileysToolbar(): void } /** - * Configures SCEditor options for this instance. + * Configures the options for the SCEditor instance and applies + * necessary plugins, styles, and other customizations. * - * Sets default dimensions, plugins, toolbar, emoticons, localization, and - * applies integration hooks and user-supplied overrides. + * 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 SCEditor options/overrides. + * @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(array $editorOptions) { @@ -828,17 +920,22 @@ protected function setSCEditorOptions(array $editorOptions) $editorOptions['plugins'] = []; } - if (!empty(Config::$modSettings['autoLinkUrls']) && empty($editorOptions['disable_url_autolinking'])) { + 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('autolinker.js', ['minimize' => true], 'smf_autolinker'); - Theme::loadJavaScriptFile('sceditor.plugins.autolinker.js', ['minimize' => true], 'smf_autolinker_plugin'); + 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, 'emoticons' => [], 'emoticonsEnabled' => !$this->disable_smiley_box, @@ -918,7 +1015,7 @@ protected function setSCEditorOptions(array $editorOptions) *************************/ /** - * Initializes default BBC tags for the toolbar. + * Initializes BBC tags for the toolbar. */ protected static function initBbcTags(): void { @@ -927,7 +1024,7 @@ protected static function initBbcTags(): void /* array( 'code' => 'b', // Required - 'description' => Lang::$editortxt['bold'], // Required + 'description' => Lang::getTxt('bold', var: 'editortxt'), // Required 'image' => 'bold', // Optional 'before' => '[b]', // Optional 'after' => '[/b]', // Optional @@ -964,11 +1061,6 @@ protected static function initBbcTags(): void 'code' => 'tt', 'description' => Lang::getTxt('tt', var: 'editortxt'), ], - [ - 'image' => 'hidden', - 'code' => 'spoiler', - 'description' => Lang::getTxt('spoiler', var: 'editortxt'), - ], [], [ 'code' => 'pre', @@ -1052,17 +1144,12 @@ protected static function initBbcTags(): void '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'), diff --git a/Sources/PersonalMessage/PM.php b/Sources/PersonalMessage/PM.php index eb9166b7670..204934e0276 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::getTxt('preview_title', file: 'General')), + 'sTxtPreviewFetch' => Utils::escapeJavaScript(Lang::getTxt('preview_fetch', file: 'General')), + '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'] = ''; @@ -2163,8 +2195,7 @@ public static function reportErrors(array $error_types, array $named_recipients, } } - // Create it... - new Editor([ + $editorOptions = [ 'id' => 'message', 'value' => Utils::$context['message'], 'width' => '90%', @@ -2172,8 +2203,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::getTxt('preview_title', file: 'General')), + 'sTxtPreviewFetch' => Utils::escapeJavaScript(Lang::getTxt('preview_fetch', file: 'General')), + '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/Profile.php b/Sources/Profile.php index 45cc848530d..0aef2625853 100644 --- a/Sources/Profile.php +++ b/Sources/Profile.php @@ -304,7 +304,7 @@ public function loadStandardFields(bool $force_reload = false) * - text: A string of some description. * * string $label: The label for this item. Default will be - * Lang::$txt[$key] if this isn't set. + * Lang::getTxt($key) if this isn't set. * * string $subtext: The subtext (Small label) for this item. * @@ -1269,12 +1269,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); @@ -1488,20 +1483,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::getTxt('required_security_reasons', file: 'Profile'), true); + Theme::addJavaScriptVar('autodetect', Lang::getTxt('timeoffset_autodetect', file: 'Profile'), 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'])) { @@ -2540,7 +2528,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 = []; @@ -2548,7 +2536,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 []; @@ -2580,10 +2568,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 . '/'), @@ -2597,32 +2587,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; @@ -2666,8 +2644,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 2edcc50bbc5..3c0326e0383 100644 --- a/Sources/Theme.php +++ b/Sources/Theme.php @@ -2269,6 +2269,10 @@ protected function loadVariant(): void if (Utils::$context['theme_variant'] == '' || !\in_array(Utils::$context['theme_variant'], $this->settings['theme_variants'])) { 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]; } + + 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']); + } } } @@ -2280,6 +2284,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'] . '"', @@ -2323,16 +2328,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 2be9b2150e3..50ade262c9a 100644 --- a/Themes/default/Admin.template.php +++ b/Themes/default/Admin.template.php @@ -75,12 +75,13 @@ function template_admin() - '; + +