| Administer rights | +||
| Select folder | +||
| Show messages | +||
| Insert messages | +||
| \SEEN flag | +||
| \DELETED flag | +||
| Other flags | +||
| Send mail | +||
| Create sub-folders | +||
| Delete/Rename folder | +||
| Expunge | +
\n安全起見，請立即將密碼\n更改<\/a><\/strong>\n為其他的字串。\n" - }, - "TAB_LOGIN": { - "LEGEND_LOGIN_SCREEN": "登入介面", - "LABEL_DEFAULT_DOMAIN": "預設域名", - "LABEL_DETERMINE_USER_DOMAIN": "嘗試判斷使用者使用的域名", - "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允許在登入介面選擇語言", - "LABEL_DETERMINE_USER_LANGUAGE": "嘗試判斷使用者使用語言" - }, - "TAB_BRANDING": { - "LEGEND_BRANDING": "Logo", - "LABEL_PAGE_TITLE": "頁面標題", - "LABEL_LOADING_DESCRIPTION": "載入介面文字", - "LABEL_FAVICON_URL": "網站圖示" - }, - "TAB_CONTACTS": { - "LEGEND_CONTACTS": "聯絡人", - "LEGEND_STORAGE": "儲存(PDO)", - "LABEL_ENABLE_CONTACTS": "啟用聯絡人", - "LABEL_ALLOW_SYNC": "允許同步聯絡人(依靠外部CardDAV伺服器)", - "LABEL_STORAGE_TYPE": "型別", - "LABEL_STORAGE_DSN": "Dsn", - "LABEL_STORAGE_USER": "使用者", - "LABEL_STORAGE_PASSWORD": "密碼", - "SQLITE_GLOBAL": "使用全域性資料庫替代各賬號的資料庫", - "ALERT_NOTICE": "提示!", - "SUGGESTIONS_LIMIT": "建議數量上限", - "HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活躍使用者，請不要選擇此資料庫型別。", - "HTML_ALERT_DOES_NOT_SUPPORTED": "您的系統不支援聯絡人\n
\n您需要在您的伺服器上安裝或啟用PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 元件。\n" - }, - "TAB_DOMAINS": { - "LEGEND_DOMAINS": "域名", - "BUTTON_ADD_DOMAIN": "新增域名", - "BUTTON_ADD_ALIAS": "新增別名", - "DELETE_ARE_YOU_SURE": "您確定嗎？", - "HTML_DOMAINS_HELPER": "允許訪問的域名列表。\n
\n點選域名進行設定。\n" - }, - "TAB_SECURITY": { - "LEGEND_SECURITY": "安全", - "LABEL_USE_IMAGE_PROXY": "對外部圖片使用本地代理", - "LABEL_AUTO_VERIFY": "自動驗證簽名", - "LABEL_SHOW_PHP_INFO": "顯示 PHP 資訊", - "LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理員面板訪問憑據", - "LABEL_CURRENT_PASSWORD": "當前密碼", - "LABEL_NEW_PASSWORD": "新密碼", - "LABEL_REPEAT_PASSWORD": "重複輸入新密碼", - "LABEL_REQUIRE_VERIFICATION": "要求驗證 SSL 證書", - "CRYPTO": "加密", - "LABEL_ALLOW_SELF_SIGNED": "允許自簽名證書" - }, - "TAB_PACKAGES": { - "LABEL_ENABLE_PLUGINS": "啟用外掛", - "LEGEND_AVAILABLE_FOR_UPDATE": "有更新可用", - "LEGEND_AVAILABLE_FOR_INSTALLATION": "可用於安裝", - "LEGEND_INSTALLED_PACKAGES": "已安裝的外掛包", - "ALERT_CANNOT_ACCESS_REPOSITORY": "目前無法訪問外掛倉庫" - }, - "TAB_ABOUT": { - "LEGEND_ABOUT": "關於", - "LABEL_TAG_HINT": "簡潔、現代化、快速的網頁郵件客戶端", - "LABEL_ALL_RIGHTS_RESERVED": "保留所有權利", - "HINT_READ_CHANGE_LOG": "請在更新前閱讀更新日誌", - "HINT_IS_UP_TO_DATE": "SnappyMail已是最新版本", - "HTML_NEW_VERSION": "有新的%VERSION%<\/b> 版本可用.", - "LABEL_UPDATING": "更新中", - "LABEL_CHECKING": "檢查更新", - "BUTTON_RELEASES": "發行版" - }, - "POPUPS_DOMAIN_ALIAS": { - "TITLE_ADD_DOMAIN_ALIAS": "新增別名", - "LABEL_ALIAS": "別名", - "LABEL_DOMAIN": "域名" - }, - "POPUPS_DOMAIN": { - "TITLE_ADD_DOMAIN": "新增域名", - "TITLE_ADD_DOMAIN_WITH_NAME": "新增域名 \"%NAME%\"", - "TITLE_EDIT_DOMAIN": "編輯域名 \"%NAME%\"", - "LABEL_NAME": "名字", - "NAME_HELPER": "支援萬用字元", - "LABEL_SERVER": "伺服器", - "LABEL_PORT": "埠", - "LABEL_SECURE": "加密", - "TIMEOUT": "超時", - "DISABLE_CAPABILITIES": "禁用能力", - "LIMITS": "限制", - "FOLDERS": "資料夾", - "MESSAGES": "訊息", - "SECURE_OPTION_NONE": "無", - "LABEL_ALLOW_SIEVE_SCRIPTS": "可使用篩選指令碼", - "LABEL_USE_SHORT_LOGIN": "使用短使用者名稱登入", - "LABEL_LOWERCASE_LOGIN": "小寫登入 (大小寫敏感)", - "LABEL_USE_AUTH": "使用驗證", - "LABEL_SET_SENDER": "使用登入名作為發件人", - "LABEL_AUTH_PLAIN_LINE": "強制單一 AUTH PLAIN 命令登入", - "LABEL_USE_PHP_MAIL": "使用 php mail() 函式", - "BUTTON_WHITE_LIST": "白名單", - "NEW_DOMAIN_DESC": "此域名配置將允許您和%NAME%<\/strong>電子郵件地址一起工作.", - "WHITE_LIST_ALERT": "允許訪問的域使用者；使用空格分隔。\n", - "VALID_SPAM_HEADERS": "Valid SPAM headers", - "VALID_VIRUS_HEADERS": "Valid virus headers" - }, - "POPUPS_PLUGIN": { - "TITLE_PLUGIN": "外掛", - "DESC_NOTHING_TO_CONFIGURE": "無可用配置" - }, - "POPUPS_ASK": { - "BUTTON_YES": "是", - "BUTTON_NO": "否", - "DESC_WANT_CLOSE_THIS_WINDOW": "您確定要關閉此視窗嗎？" - }, - "POPUPS_LANGUAGES": { - "TITLE_LANGUAGES": "選擇您的語言" - }, - "HINTS": { - "BETA": "測試版本", - "WARNING": "警告" - }, - "ERRORS": { - "DOMAIN_ALREADY_EXISTS": "域名已經存在", - "UNKNOWN_ERROR": "未知錯誤" - }, - "NOTIFICATIONS": { - "RequestError": "請求失敗", - "RequestAborted": "請求中止", - "RequestTimeout": "請求超時", - "InvalidToken": "標記無效", - "AuthError": "驗證失敗", - "DomainAlreadyExists": "域名已經存在", - "CantSavePluginSettings": "無法儲存設定", - "CantInstallPackage": "安裝外掛包失敗", - "CantDeletePackage": "移除外掛包失敗", - "InvalidPluginPackage": "無效外掛包", - "UnsupportedPluginPackage": "不支援的外掛包", - "UnknownError": "未知錯誤" - } -} \ No newline at end of file +{ + "GLOBAL": { + "ADD": "新增", + "CLOSE": "關閉", + "SAVE": "儲存", + "TEST": "測試", + "UPDATE": "更新", + "USERNAME": "使用者名稱", + "PASSWORD": "密碼", + "CANCEL": "取消", + "SEARCH": "搜尋" + }, + "LOGIN": { + "LABEL_LOGIN": "登入", + "LABEL_TOTP": "TOTP 密碼", + "BUTTON_LOGIN": "登入到控制面板" + }, + "TOP_PANEL": { + "LABEL_ADMIN_PANEL": "控制面板" + }, + "SETTINGS_LABELS": { + "GENERAL": "常規", + "LOGIN": "登入", + "BRANDING": "Logo", + "CONTACTS": "聯絡人", + "DOMAINS": "域名", + "SECURITY": "安全", + "PACKAGES": "外掛包", + "CONFIG": "配置", + "ABOUT": "關於" + }, + "TAB_GENERAL": { + "LEGEND_INTERFACE": "介面", + "LABEL_LANGUAGE": "語言", + "LABEL_LANGUAGE_ADMIN": "語言(後臺)", + "LABEL_THEME": "主題", + "LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "允許在設定介面中選擇語言", + "LABEL_ALLOW_THEMES_ON_SETTINGS": "允許在設定介面中選擇主題", + "LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "允許在設定介面中選擇背景", + "LABEL_SHOW_THUMBNAILS": "顯示縮圖(附件)", + "LEGEND_MAIN": "主要設定", + "LABEL_ATTACHMENT_SIZE_LIMIT": "附件大小限制", + "LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "允許額外的賬戶", + "LABEL_ALLOW_IDENTITIES": "允許多重身份", + "ALERT_DATA_ACCESS": "資料資料夾可被訪問。請配置您的 Web 伺服器以阻止從外部訪問資料資料夾。獲取更多幫助：", + "ALERT_WARNING": "警告！", + "HTML_ALERT_WEAK_PASSWORD": "您正在使用預設的管理員密碼\n
\n安全起見，請立即將密碼\n更改<\/a><\/strong>\n為其他的字串。\n" + }, + "TAB_LOGIN": { + "LEGEND_LOGIN_SCREEN": "登入介面", + "LABEL_DEFAULT_DOMAIN": "預設域名", + "LABEL_DETERMINE_USER_DOMAIN": "嘗試判斷使用者使用的域名", + "LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允許在登入介面選擇語言", + "LABEL_DETERMINE_USER_LANGUAGE": "嘗試判斷使用者使用語言" + }, + "TAB_BRANDING": { + "LEGEND_BRANDING": "Logo", + "LABEL_PAGE_TITLE": "頁面標題", + "LABEL_LOADING_DESCRIPTION": "載入介面文字", + "LABEL_FAVICON_URL": "網站圖示" + }, + "TAB_CONTACTS": { + "LEGEND_CONTACTS": "聯絡人", + "LEGEND_STORAGE": "儲存(PDO)", + "LABEL_ENABLE_CONTACTS": "啟用聯絡人", + "LABEL_ALLOW_SYNC": "允許同步聯絡人(依靠外部CardDAV伺服器)", + "LABEL_STORAGE_TYPE": "型別", + "LABEL_STORAGE_DSN": "Dsn", + "LABEL_STORAGE_USER": "使用者", + "LABEL_STORAGE_PASSWORD": "密碼", + "SQLITE_GLOBAL": "使用全域性資料庫替代各賬號的資料庫", + "ALERT_NOTICE": "提示!", + "SUGGESTIONS_LIMIT": "建議數量上限", + "HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活躍使用者，請不要選擇此資料庫型別。", + "HTML_ALERT_DOES_NOT_SUPPORTED": "您的系統不支援聯絡人\n
\n您需要在您的伺服器上安裝或啟用PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 元件。\n" + }, + "TAB_DOMAINS": { + "LEGEND_DOMAINS": "域名", + "BUTTON_ADD_DOMAIN": "新增域名", + "BUTTON_ADD_ALIAS": "新增別名", + "DELETE_ARE_YOU_SURE": "您確定嗎？", + "HTML_DOMAINS_HELPER": "允許訪問的域名列表。\n
\n點選域名進行設定。\n" + }, + "TAB_SECURITY": { + "LEGEND_SECURITY": "安全", + "LABEL_USE_IMAGE_PROXY": "對外部圖片使用本地代理", + "LABEL_AUTO_VERIFY": "自動驗證簽名", + "LABEL_SHOW_PHP_INFO": "顯示 PHP 資訊", + "LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理員面板訪問憑據", + "LABEL_CURRENT_PASSWORD": "當前密碼", + "LABEL_NEW_PASSWORD": "新密碼", + "LABEL_REPEAT_PASSWORD": "重複輸入新密碼", + "LABEL_REQUIRE_VERIFICATION": "要求驗證 SSL 證書", + "CRYPTO": "加密", + "LABEL_ALLOW_SELF_SIGNED": "允許自簽名證書" + }, + "TAB_PACKAGES": { + "LABEL_ENABLE_PLUGINS": "啟用外掛", + "LEGEND_AVAILABLE_FOR_UPDATE": "有更新可用", + "LEGEND_AVAILABLE_FOR_INSTALLATION": "可用於安裝", + "LEGEND_INSTALLED_PACKAGES": "已安裝的外掛包", + "ALERT_CANNOT_ACCESS_REPOSITORY": "目前無法訪問外掛倉庫" + }, + "TAB_ABOUT": { + "LEGEND_ABOUT": "關於", + "LABEL_TAG_HINT": "簡潔、現代化、快速的網頁郵件客戶端", + "LABEL_ALL_RIGHTS_RESERVED": "保留所有權利", + "HINT_READ_CHANGE_LOG": "請在更新前閱讀更新日誌", + "HINT_IS_UP_TO_DATE": "SnappyMail已是最新版本", + "HTML_NEW_VERSION": "有新的%VERSION%<\/b> 版本可用.", + "LABEL_UPDATING": "更新中", + "LABEL_CHECKING": "檢查更新", + "BUTTON_RELEASES": "發行版" + }, + "POPUPS_DOMAIN_ALIAS": { + "TITLE_ADD_DOMAIN_ALIAS": "新增別名", + "LABEL_ALIAS": "別名", + "LABEL_DOMAIN": "域名" + }, + "POPUPS_DOMAIN": { + "TITLE_ADD_DOMAIN": "新增域名", + "TITLE_ADD_DOMAIN_WITH_NAME": "新增域名 \"%NAME%\"", + "TITLE_EDIT_DOMAIN": "編輯域名 \"%NAME%\"", + "LABEL_NAME": "名字", + "NAME_HELPER": "支援萬用字元", + "LABEL_SERVER": "伺服器", + "LABEL_PORT": "埠", + "LABEL_SECURE": "加密", + "TIMEOUT": "超時", + "DISABLE_CAPABILITIES": "禁用能力", + "LIMITS": "限制", + "FOLDERS": "資料夾", + "MESSAGES": "訊息", + "SECURE_OPTION_NONE": "無", + "LABEL_ALLOW_SIEVE_SCRIPTS": "可使用篩選指令碼", + "LABEL_USE_SHORT_LOGIN": "使用短使用者名稱登入", + "LABEL_LOWERCASE_LOGIN": "小寫登入 (大小寫敏感)", + "LABEL_USE_AUTH": "使用驗證", + "LABEL_SET_SENDER": "使用登入名作為發件人", + "LABEL_AUTH_PLAIN_LINE": "強制單一 AUTH PLAIN 命令登入", + "LABEL_USE_PHP_MAIL": "使用 php mail() 函式", + "BUTTON_WHITE_LIST": "白名單", + "NEW_DOMAIN_DESC": "此域名配置將允許您和%NAME%<\/strong>電子郵件地址一起工作.", + "WHITE_LIST_ALERT": "允許訪問的域使用者；使用空格分隔。\n", + "VALID_SPAM_HEADERS": "Valid SPAM headers", + "VALID_VIRUS_HEADERS": "Valid virus headers" + }, + "POPUPS_PLUGIN": { + "TITLE_PLUGIN": "外掛", + "DESC_NOTHING_TO_CONFIGURE": "無可用配置" + }, + "POPUPS_ASK": { + "BUTTON_YES": "是", + "BUTTON_NO": "否", + "DESC_WANT_CLOSE_THIS_WINDOW": "您確定要關閉此視窗嗎？" + }, + "POPUPS_LANGUAGES": { + "TITLE_LANGUAGES": "選擇您的語言" + }, + "HINTS": { + "BETA": "測試版本", + "WARNING": "警告" + }, + "ERRORS": { + "DOMAIN_ALREADY_EXISTS": "域名已經存在", + "UNKNOWN_ERROR": "未知錯誤" + }, + "NOTIFICATIONS": { + "RequestError": "請求失敗", + "RequestAborted": "請求中止", + "RequestTimeout": "請求超時", + "InvalidToken": "標記無效", + "AuthError": "驗證失敗", + "DomainAlreadyExists": "域名已經存在", + "CantSavePluginSettings": "無法儲存設定", + "CantInstallPackage": "安裝外掛包失敗", + "CantDeletePackage": "移除外掛包失敗", + "InvalidPluginPackage": "無效外掛包", + "UnsupportedPluginPackage": "不支援的外掛包", + "UnknownError": "未知錯誤" + } +} From cb7dafba4d59b55ba82382e2fe1a9dc95947ec8f Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sun, 25 Aug 2024 17:35:14 +0200 Subject: [PATCH 04/26] Cleanup Cacher handling and added some documentation --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index d3f3914ea..bed876eb2 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -213,6 +213,13 @@ class Actions case 'suggestions': $mResult = []; break; +/* // See function Cacher + case 'cache': + $mResult = new \MailSo\Cache\Drivers\File( + \trim($this->oConfig->Get('cache', 'path', '')) ?: APP_PRIVATE_DATA . 'cache' + ); + break; +*/ } } @@ -460,6 +467,9 @@ class Actions return $this->oDomainProvider; } + /** + * bForceFile is only used by admin session token + */ public function Cacher(?Model\Account $oAccount = null, bool $bForceFile = false): \MailSo\Cache\CacheClient { $sKey = ''; @@ -481,7 +491,6 @@ class Actions \trim($this->oConfig->Get('cache', 'path', '')) ?: APP_PRIVATE_DATA . 'cache' ); } -// $sDriver = \strtoupper(\trim($this->oConfig->Get('cache', 'fast_cache_driver', 'files'))); $oDriver->setPrefix($sKey); $this->aCachers[$sIndexKey]->SetDriver($oDriver); From 34f730a196d3c571fbdfa011466ba16f230efc6d Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sun, 25 Aug 2024 18:04:59 +0200 Subject: [PATCH 05/26] Added markedjs for #1604 --- .eslintrc.js | 6 +- vendors/marked/marked.js | 2483 ++++++++++++++++++++++++++++++++++ vendors/turndown/turndown.js | 1 - 3 files changed, 2488 insertions(+), 2 deletions(-) create mode 100644 vendors/marked/marked.js diff --git a/.eslintrc.js b/.eslintrc.js index 93b9fc12e..e22cb986d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,11 @@ module.exports = { // Mailvelope 'mailvelope': "readonly", // Punycode - 'IDN': "readonly" + 'IDN': "readonly", + // Turndown + 'TurndownService': "readonly", + // Marked + 'marked': "readonly" }, // http://eslint.org/docs/rules/ rules: { diff --git a/vendors/marked/marked.js b/vendors/marked/marked.js new file mode 100644 index 000000000..46ed21302 --- /dev/null +++ b/vendors/marked/marked.js @@ -0,0 +1,2483 @@ +/*eslint max-len: "off"*/ +/*eslint no-control-regex: "off"*/ +/** + * marked v14.0.0 - a markdown parser + * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed) + * https://github.com/markedjs/marked + * + * modified for SnappyMail + */ + +const marked = (() => { + + /** + * Gets the original marked default options. + */ + const _getDefaults = () => ({ + async: false, + breaks: false, + extensions: null, + gfm: true, + hooks: null, + pedantic: false, + renderer: null, + silent: false, + tokenizer: null, + walkTokens: null, + }); + var exports_defaults = _getDefaults(); + + /** + * Helpers + */ + const escapeTest = /[&<>"']/; + const escapeReplace = new RegExp(escapeTest.source, 'g'); + const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/; + const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g'); + const escapeReplacements = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + }; + const getEscapeReplacement = (ch) => escapeReplacements[ch]; + const escape$1 = (html, encode) => { + if (encode) { + if (escapeTest.test(html)) { + return html.replace(escapeReplace, getEscapeReplacement); + } + } + else { + if (escapeTestNoEncode.test(html)) { + return html.replace(escapeReplaceNoEncode, getEscapeReplacement); + } + } + return html; + }; + const caret = /(^|[^[])\^/g; + const edit = (regex, opt) => { + let source = typeof regex === 'string' ? regex : regex.source; + opt = opt || ''; + const obj = { + replace: (name, val) => { + let valSource = typeof val === 'string' ? val : val.source; + valSource = valSource.replace(caret, '$1'); + source = source.replace(name, valSource); + return obj; + }, + getRegex: () => { + return new RegExp(source, opt); + }, + }; + return obj; + }; + const cleanUrl = (href) => { + try { + href = encodeURI(href).replace(/%25/g, '%'); + } + catch { + return null; + } + return href; + }; + const noopTest = { exec: () => null }; + const splitCells = (tableRow, count) => { + // ensure that every cell-delimiting pipe has a space + // before it to distinguish it from an escaped pipe + const row = tableRow.replace(/\|/g, (match, offset, str) => { + let escaped = false; + let curr = offset; + while (--curr >= 0 && str[curr] === '\\') + escaped = !escaped; + if (escaped) { + // odd number of slashes means | is escaped + // so we leave it alone + return '|'; + } + else { + // add space before unescaped | + return ' |'; + } + }), cells = row.split(/ \|/); + let i = 0; + // First/last cell in a row cannot be empty if it has no leading/trailing pipe + if (!cells[0].trim()) { + cells.shift(); + } + if (cells.length > 0 && !cells[cells.length - 1].trim()) { + cells.pop(); + } + if (count) { + if (cells.length > count) { + cells.splice(count); + } + else { + while (cells.length < count) + cells.push(''); + } + } + for (; i < cells.length; i++) { + // leading or trailing whitespace is ignored per the gfm spec + cells[i] = cells[i].trim().replace(/\\\|/g, '|'); + } + return cells; + }; + /** + * Remove trailing 'c's. Equivalent to str.replace(/c*$/, ''). + * /c*$/ is vulnerable to REDOS. + * + * @param str + * @param c + * @param invert Remove suffix of non-c chars instead. Default falsey. + */ + const rtrim = (str, c, invert) => { + const l = str.length; + if (l === 0) { + return ''; + } + // Length of suffix matching the invert condition. + let suffLen = 0; + // Step left until we fail to match the invert condition. + while (suffLen < l) { + const currChar = str.charAt(l - suffLen - 1); + if (currChar === c && !invert) { + suffLen++; + } + else if (currChar !== c && invert) { + suffLen++; + } + else { + break; + } + } + return str.slice(0, l - suffLen); + }; + const findClosingBracket = (str, b) => { + if (str.indexOf(b[1]) === -1) { + return -1; + } + let level = 0; + for (let i = 0; i < str.length; i++) { + if (str[i] === '\\') { + i++; + } + else if (str[i] === b[0]) { + level++; + } + else if (str[i] === b[1]) { + level--; + if (level < 0) { + return i; + } + } + } + return -1; + }; + + const outputLink = (cap, link, raw, lexer) => { + const href = link.href; + const title = link.title ? escape$1(link.title) : null; + const text = cap[1].replace(/\\([[\]])/g, '$1'); + if (cap[0].charAt(0) !== '!') { + lexer.state.inLink = true; + const token = { + type: 'link', + raw, + href, + title, + text, + tokens: lexer.inlineTokens(text), + }; + lexer.state.inLink = false; + return token; + } + return { + type: 'image', + raw, + href, + title, + text: escape$1(text), + }; + }; + const indentCodeCompensation = (raw, text) => { + const matchIndentToCode = raw.match(/^(\s+)(?:```)/); + if (matchIndentToCode === null) { + return text; + } + const indentToCode = matchIndentToCode[1]; + return text + .split('\n') + .map(node => { + const matchIndentInNode = node.match(/^\s+/); + if (matchIndentInNode === null) { + return node; + } + const [indentInNode] = matchIndentInNode; + if (indentInNode.length >= indentToCode.length) { + return node.slice(indentToCode.length); + } + return node; + }) + .join('\n'); + }; + + /** + * Tokenizer + */ + class _Tokenizer { + constructor(options) { + this.options = options || exports_defaults; +// this.rules; // set by the lexer +// this.lexer; // set by the lexer + } + space(src) { + const cap = this.rules.block.newline.exec(src); + if (cap && cap[0].length > 0) { + return { + type: 'space', + raw: cap[0], + }; + } + } + code(src) { + const cap = this.rules.block.code.exec(src); + if (cap) { + const text = cap[0].replace(/^ {1,4}/gm, ''); + return { + type: 'code', + raw: cap[0], + codeBlockStyle: 'indented', + text: !this.options.pedantic + ? rtrim(text, '\n') + : text, + }; + } + } + fences(src) { + const cap = this.rules.block.fences.exec(src); + if (cap) { + const raw = cap[0]; + const text = indentCodeCompensation(raw, cap[3] || ''); + return { + type: 'code', + raw, + lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, '$1') : cap[2], + text, + }; + } + } + heading(src) { + const cap = this.rules.block.heading.exec(src); + if (cap) { + let text = cap[2].trim(); + // remove trailing #s + if (/#$/.test(text)) { + const trimmed = rtrim(text, '#'); + if (this.options.pedantic) { + text = trimmed.trim(); + } + else if (!trimmed || / $/.test(trimmed)) { + // CommonMark requires space before trailing #s + text = trimmed.trim(); + } + } + return { + type: 'heading', + raw: cap[0], + depth: cap[1].length, + text, + tokens: this.lexer.inline(text), + }; + } + } + hr(src) { + const cap = this.rules.block.hr.exec(src); + if (cap) { + return { + type: 'hr', + raw: rtrim(cap[0], '\n'), + }; + } + } + blockquote(src) { + const cap = this.rules.block.blockquote.exec(src); + if (cap) { + let lines = rtrim(cap[0], '\n').split('\n'); + let raw = ''; + let text = ''; + const tokens = []; + while (lines.length > 0) { + let inBlockquote = false; + const currentLines = []; + let i; + for (i = 0; i < lines.length; i++) { + // get lines up to a continuation + if (/^ {0,3}>/.test(lines[i])) { + currentLines.push(lines[i]); + inBlockquote = true; + } + else if (!inBlockquote) { + currentLines.push(lines[i]); + } + else { + break; + } + } + lines = lines.slice(i); + const currentRaw = currentLines.join('\n'); + const currentText = currentRaw + // precede setext continuation with 4 spaces so it isn't a setext + .replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, '\n $1') + .replace(/^ {0,3}>[ \t]?/gm, ''); + raw = raw ? `${raw}\n${currentRaw}` : currentRaw; + text = text ? `${text}\n${currentText}` : currentText; + // parse blockquote lines as top level tokens + // merge paragraphs if this is a continuation + const top = this.lexer.state.top; + this.lexer.state.top = true; + this.lexer.blockTokens(currentText, tokens, true); + this.lexer.state.top = top; + // if there is no continuation then we are done + if (lines.length === 0) { + break; + } + const lastToken = tokens[tokens.length - 1]; + if (lastToken?.type === 'code') { + // blockquote continuation cannot be preceded by a code block + break; + } + else if (lastToken?.type === 'blockquote') { + // include continuation in nested blockquote + const oldToken = lastToken; + const newText = oldToken.raw + '\n' + lines.join('\n'); + const newToken = this.blockquote(newText); + tokens[tokens.length - 1] = newToken; + raw = raw.substring(0, raw.length - oldToken.raw.length) + newToken.raw; + text = text.substring(0, text.length - oldToken.text.length) + newToken.text; + break; + } + else if (lastToken?.type === 'list') { + // include continuation in nested list + const oldToken = lastToken; + const newText = oldToken.raw + '\n' + lines.join('\n'); + const newToken = this.list(newText); + tokens[tokens.length - 1] = newToken; + raw = raw.substring(0, raw.length - lastToken.raw.length) + newToken.raw; + text = text.substring(0, text.length - oldToken.raw.length) + newToken.raw; + lines = newText.substring(tokens[tokens.length - 1].raw.length).split('\n'); + continue; + } + } + return { + type: 'blockquote', + raw, + tokens, + text, + }; + } + } + list(src) { + let cap = this.rules.block.list.exec(src); + if (cap) { + let bull = cap[1].trim(); + const isordered = bull.length > 1; + const list = { + type: 'list', + raw: '', + ordered: isordered, + start: isordered ? +bull.slice(0, -1) : '', + loose: false, + items: [], + }; + bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`; + if (this.options.pedantic) { + bull = isordered ? bull : '[*+-]'; + } + // Get next list item + const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`); + let endsWithBlankLine = false; + // Check if current bullet point can start a new List Item + while (src) { + let endEarly = false; + let raw = ''; + let itemContents = ''; + if (!(cap = itemRegex.exec(src))) { + break; + } + if (this.rules.block.hr.test(src)) { // End list if bullet was actually HR (possibly move into itemRegex?) + break; + } + raw = cap[0]; + src = src.substring(raw.length); + let line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length)); + let nextLine = src.split('\n', 1)[0]; + let blankLine = !line.trim(); + let indent = 0; + if (this.options.pedantic) { + indent = 2; + itemContents = line.trimStart(); + } + else if (blankLine) { + indent = cap[1].length + 1; + } + else { + indent = cap[2].search(/[^ ]/); // Find first non-space char + indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent + itemContents = line.slice(indent); + indent += cap[1].length; + } + if (blankLine && /^ *$/.test(nextLine)) { // Items begin with at most one blank line + raw += nextLine + '\n'; + src = src.substring(nextLine.length + 1); + endEarly = true; + } + if (!endEarly) { + const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`); + const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`); + const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`); //` + const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`); + // Check if following lines should be included in List Item + while (src) { + const rawLine = src.split('\n', 1)[0]; + nextLine = rawLine; + // Re-align to follow commonmark nesting rules + if (this.options.pedantic) { + nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, ' '); + } + // End list item if found code fences + if (fencesBeginRegex.test(nextLine)) { + break; + } + // End list item if found start of new heading + if (headingBeginRegex.test(nextLine)) { + break; + } + // End list item if found start of new bullet + if (nextBulletRegex.test(nextLine)) { + break; + } + // Horizontal rule found + if (hrRegex.test(src)) { + break; + } + if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible + itemContents += '\n' + nextLine.slice(indent); + } + else { + // not enough indentation + if (blankLine) { + break; + } + // paragraph continuation unless last line was a different block level element + if (line.search(/[^ ]/) >= 4) { // indented code block + break; + } + if (fencesBeginRegex.test(line)) { + break; + } + if (headingBeginRegex.test(line)) { + break; + } + if (hrRegex.test(line)) { + break; + } + itemContents += '\n' + nextLine; + } + if (!blankLine && !nextLine.trim()) { // Check if current line is blank + blankLine = true; + } + raw += rawLine + '\n'; + src = src.substring(rawLine.length + 1); + line = nextLine.slice(indent); + } + } + if (!list.loose) { + // If the previous item ended with a blank line, the list is loose + if (endsWithBlankLine) { + list.loose = true; + } + else if (/\n *\n *$/.test(raw)) { + endsWithBlankLine = true; + } + } + let istask = null; + let ischecked; + // Check for task list items + if (this.options.gfm) { + istask = /^\[[ xX]\] /.exec(itemContents); + if (istask) { + ischecked = istask[0] !== '[ ] '; + itemContents = itemContents.replace(/^\[[ xX]\] +/, ''); + } + } + list.items.push({ + type: 'list_item', + raw, + task: !!istask, + checked: ischecked, + loose: false, + text: itemContents, + tokens: [], + }); + list.raw += raw; + } + // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic + list.items[list.items.length - 1].raw = list.items[list.items.length - 1].raw.trimEnd(); + list.items[list.items.length - 1].text = list.items[list.items.length - 1].text.trimEnd(); + list.raw = list.raw.trimEnd(); + // Item child tokens handled here at end because we needed to have the final item to trim it first + for (let i = 0; i < list.items.length; i++) { + this.lexer.state.top = false; + list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []); + if (!list.loose) { + // Check if list should be loose + const spacers = list.items[i].tokens.filter(t => t.type === 'space'); + const hasMultipleLineBreaks = spacers.length > 0 && spacers.some(t => /\n.*\n/.test(t.raw)); + list.loose = hasMultipleLineBreaks; + } + } + // Set all items to loose if list is loose + if (list.loose) { + for (let i = 0; i < list.items.length; i++) { + list.items[i].loose = true; + } + } + return list; + } + } + html(src) { + const cap = this.rules.block.html.exec(src); + if (cap) { + const token = { + type: 'html', + block: true, + raw: cap[0], + pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style', + text: cap[0], + }; + return token; + } + } + def(src) { + const cap = this.rules.block.def.exec(src); + if (cap) { + const tag = cap[1].toLowerCase().replace(/\s+/g, ' '); + const href = cap[2] ? cap[2].replace(/^<(.*)>$/, '$1').replace(this.rules.inline.anyPunctuation, '$1') : ''; + const title = cap[3] ? cap[3].substring(1, cap[3].length - 1).replace(this.rules.inline.anyPunctuation, '$1') : cap[3]; + return { + type: 'def', + tag, + raw: cap[0], + href, + title, + }; + } + } + table(src) { + const cap = this.rules.block.table.exec(src); + if (!cap) { + return; + } + if (!/[:|]/.test(cap[2])) { + // delimiter row must have a pipe (|) or colon (:) otherwise it is a setext heading + return; + } + const headers = splitCells(cap[1]); + const aligns = cap[2].replace(/^\||\| *$/g, '').split('|'); + const rows = cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : []; + const item = { + type: 'table', + raw: cap[0], + header: [], + align: [], + rows: [], + }; + if (headers.length !== aligns.length) { + // header and align columns must be equal, rows can be different. + return; + } + for (const align of aligns) { + if (/^ *-+: *$/.test(align)) { + item.align.push('right'); + } + else if (/^ *:-+: *$/.test(align)) { + item.align.push('center'); + } + else if (/^ *:-+ *$/.test(align)) { + item.align.push('left'); + } + else { + item.align.push(null); + } + } + for (let i = 0; i < headers.length; i++) { + item.header.push({ + text: headers[i], + tokens: this.lexer.inline(headers[i]), + header: true, + align: item.align[i], + }); + } + for (const row of rows) { + item.rows.push(splitCells(row, item.header.length).map((cell, i) => { + return { + text: cell, + tokens: this.lexer.inline(cell), + header: false, + align: item.align[i], + }; + })); + } + return item; + } + lheading(src) { + const cap = this.rules.block.lheading.exec(src); + if (cap) { + return { + type: 'heading', + raw: cap[0], + depth: cap[2].charAt(0) === '=' ? 1 : 2, + text: cap[1], + tokens: this.lexer.inline(cap[1]), + }; + } + } + paragraph(src) { + const cap = this.rules.block.paragraph.exec(src); + if (cap) { + const text = cap[1].charAt(cap[1].length - 1) === '\n' + ? cap[1].slice(0, -1) + : cap[1]; + return { + type: 'paragraph', + raw: cap[0], + text, + tokens: this.lexer.inline(text), + }; + } + } + text(src) { + const cap = this.rules.block.text.exec(src); + if (cap) { + return { + type: 'text', + raw: cap[0], + text: cap[0], + tokens: this.lexer.inline(cap[0]), + }; + } + } + escape(src) { + const cap = this.rules.inline.escape.exec(src); + if (cap) { + return { + type: 'escape', + raw: cap[0], + text: escape$1(cap[1]), + }; + } + } + tag(src) { + const cap = this.rules.inline.tag.exec(src); + if (cap) { + if (!this.lexer.state.inLink && /^/i.test(cap[0])) { + this.lexer.state.inLink = false; + } + if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) { + this.lexer.state.inRawBlock = true; + } + else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) { + this.lexer.state.inRawBlock = false; + } + return { + type: 'html', + raw: cap[0], + inLink: this.lexer.state.inLink, + inRawBlock: this.lexer.state.inRawBlock, + block: false, + text: cap[0], + }; + } + } + link(src) { + const cap = this.rules.inline.link.exec(src); + if (cap) { + const trimmedUrl = cap[2].trim(); + if (!this.options.pedantic && /^$/.test(trimmedUrl))) { + return; + } + // ending angle bracket cannot be escaped + const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\'); + if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) { + return; + } + } + else { + // find closing parenthesis + const lastParenIndex = findClosingBracket(cap[2], '()'); + if (lastParenIndex > -1) { + const start = cap[0].indexOf('!') === 0 ? 5 : 4; + const linkLen = start + cap[1].length + lastParenIndex; + cap[2] = cap[2].substring(0, lastParenIndex); + cap[0] = cap[0].substring(0, linkLen).trim(); + cap[3] = ''; + } + } + let href = cap[2]; + let title = ''; + if (this.options.pedantic) { + // split pedantic href and title + const link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href); + if (link) { + href = link[1]; + title = link[3]; + } + } + else { + title = cap[3] ? cap[3].slice(1, -1) : ''; + } + href = href.trim(); + if (/^$/.test(trimmedUrl))) { + // pedantic allows starting angle bracket without ending angle bracket + href = href.slice(1); + } + else { + href = href.slice(1, -1); + } + } + return outputLink(cap, { + href: href ? href.replace(this.rules.inline.anyPunctuation, '$1') : href, + title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title, + }, cap[0], this.lexer); + } + } + reflink(src, links) { + let cap; + if ((cap = this.rules.inline.reflink.exec(src)) + || (cap = this.rules.inline.nolink.exec(src))) { + const linkString = (cap[2] || cap[1]).replace(/\s+/g, ' '); + const link = links[linkString.toLowerCase()]; + if (!link) { + const text = cap[0].charAt(0); + return { + type: 'text', + raw: text, + text, + }; + } + return outputLink(cap, link, cap[0], this.lexer); + } + } + emStrong(src, maskedSrc, prevChar = '') { + let match = this.rules.inline.emStrongLDelim.exec(src); + if (!match) + return; + // _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well + if (match[3] && prevChar.match(/[\p{L}\p{N}]/u)) + return; + const nextChar = match[1] || match[2] || ''; + if (!nextChar || !prevChar || this.rules.inline.punctuation.exec(prevChar)) { + // unicode Regex counts emoji as 1 char; spread into array for proper count (used multiple times below) + const lLength = [...match[0]].length - 1; + let rDelim, rLength, delimTotal = lLength, midDelimTotal = 0; + const endReg = match[0][0] === '*' ? this.rules.inline.emStrongRDelimAst : this.rules.inline.emStrongRDelimUnd; + endReg.lastIndex = 0; + // Clip maskedSrc to same section of string as src (move to lexer?) + maskedSrc = maskedSrc.slice(-1 * src.length + lLength); + while ((match = endReg.exec(maskedSrc)) != null) { + rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6]; + if (!rDelim) + continue; // skip single * in __abc*abc__ + rLength = [...rDelim].length; + if (match[3] || match[4]) { // found another Left Delim + delimTotal += rLength; + continue; + } + else if (match[5] || match[6]) { // either Left or Right Delim + if (lLength % 3 && !((lLength + rLength) % 3)) { + midDelimTotal += rLength; + continue; // CommonMark Emphasis Rules 9-10 + } + } + delimTotal -= rLength; + if (delimTotal > 0) + continue; // Haven't found enough closing delimiters + // Remove extra characters. *a*** -> *a* + rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); + // char length can be >1 for unicode characters; + const lastCharLength = [...match[0]][0].length; + const raw = src.slice(0, lLength + match.index + lastCharLength + rLength); + // Create `em` if smallest delimiter has odd char count. *a*** + if (Math.min(lLength, rLength) % 2) { + const text = raw.slice(1, -1); + return { + type: 'em', + raw, + text, + tokens: this.lexer.inlineTokens(text), + }; + } + // Create 'strong' if smallest delimiter has even char count. **a*** + const text = raw.slice(2, -2); + return { + type: 'strong', + raw, + text, + tokens: this.lexer.inlineTokens(text), + }; + } + } + } + codespan(src) { + const cap = this.rules.inline.code.exec(src); + if (cap) { + let text = cap[2].replace(/\n/g, ' '); + const hasNonSpaceChars = /[^ ]/.test(text); + const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text); + if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) { + text = text.substring(1, text.length - 1); + } + text = escape$1(text, true); + return { + type: 'codespan', + raw: cap[0], + text, + }; + } + } + br(src) { + const cap = this.rules.inline.br.exec(src); + if (cap) { + return { + type: 'br', + raw: cap[0], + }; + } + } + del(src) { + const cap = this.rules.inline.del.exec(src); + if (cap) { + return { + type: 'del', + raw: cap[0], + text: cap[2], + tokens: this.lexer.inlineTokens(cap[2]), + }; + } + } + autolink(src) { + const cap = this.rules.inline.autolink.exec(src); + if (cap) { + let text, href; + if (cap[2] === '@') { + text = escape$1(cap[1]); + href = 'mailto:' + text; + } + else { + text = escape$1(cap[1]); + href = text; + } + return { + type: 'link', + raw: cap[0], + text, + href, + tokens: [ + { + type: 'text', + raw: text, + text, + }, + ], + }; + } + } + url(src) { + let cap; + if (cap = this.rules.inline.url.exec(src)) { + let text, href; + if (cap[2] === '@') { + text = escape$1(cap[0]); + href = 'mailto:' + text; + } + else { + // do extended autolink path validation + let prevCapZero; + do { + prevCapZero = cap[0]; + cap[0] = this.rules.inline._backpedal.exec(cap[0])?.[0] ?? ''; + } while (prevCapZero !== cap[0]); + text = escape$1(cap[0]); + if (cap[1] === 'www.') { + href = 'http://' + cap[0]; + } + else { + href = cap[0]; + } + } + return { + type: 'link', + raw: cap[0], + text, + href, + tokens: [ + { + type: 'text', + raw: text, + text, + }, + ], + }; + } + } + inlineText(src) { + const cap = this.rules.inline.text.exec(src); + if (cap) { + let text; + if (this.lexer.state.inRawBlock) { + text = cap[0]; + } + else { + text = escape$1(cap[0]); + } + return { + type: 'text', + raw: cap[0], + text, + }; + } + } + } + + /** + * Block-Level Grammar + */ + const newline = /^(?: *(?:\n|$))+/; + const blockCode = /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/; + const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/; + const hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/; + const heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/; + const bullet = /(?:[*+-]|\d{1,9}[.)])/; + const lheading = edit(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/) + .replace(/bull/g, bullet) // lists can interrupt + .replace(/blockCode/g, / {4}/) // indented code blocks can interrupt + .replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt + .replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt + .replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt + .replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt + .getRegex(); + const _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/; + const blockText = /^[^\n]+/; + const _blockLabel = /(?!\s*\])(?:\\.|[^[\]\\])+/; + const def = edit(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/) + .replace('label', _blockLabel) + .replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/) + .getRegex(); + const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/) + .replace(/bull/g, bullet) + .getRegex(); + const _tag = 'address|article|aside|base|basefont|blockquote|body|caption' + + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + + '|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title' + + '|tr|track|ul'; + const _comment = /|$))/; + const html = edit('^ {0,3}(?:' // optional indentation + + '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)' // (1) + + '|comment[^\\n]*(\\n+|$)' // (2) + + '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3) + + '|\\n*|$)' // (4) + + '|\\n*|$)' // (5) + + '|)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6) + + '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag + + '|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag + + ')', 'i') + .replace('comment', _comment) + .replace('tag', _tag) + .replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/) + .getRegex(); + const paragraph = edit(_paragraph) + .replace('hr', hr) + .replace('heading', ' {0,3}#{1,6}(?:\\s|$)') + .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs + .replace('|table', '') + .replace('blockquote', ' {0,3}>') + .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n') + .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt + .replace('html', ')|<(?:script|pre|style|textarea|!--)') + .replace('tag', _tag) // pars can be interrupted by type (6) html blocks + .getRegex(); + const blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/) + .replace('paragraph', paragraph) + .getRegex(); + /** + * Normal Block Grammar + */ + const blockNormal = { + blockquote, + code: blockCode, + def, + fences, + heading, + hr, + html, + lheading, + list, + newline, + paragraph, + table: noopTest, + text: blockText, + }; + /** + * GFM Block Grammar + */ + const gfmTable = edit('^ *([^\\n ].*)\\n' // Header + + ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align + + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells + .replace('hr', hr) + .replace('heading', ' {0,3}#{1,6}(?:\\s|$)') + .replace('blockquote', ' {0,3}>') + .replace('code', ' {4}[^\\n]') + .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n') + .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt + .replace('html', ')|<(?:script|pre|style|textarea|!--)') + .replace('tag', _tag) // tables can be interrupted by type (6) html blocks + .getRegex(); + const blockGfm = { + ...blockNormal, + table: gfmTable, + paragraph: edit(_paragraph) + .replace('hr', hr) + .replace('heading', ' {0,3}#{1,6}(?:\\s|$)') + .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs + .replace('table', gfmTable) // interrupt paragraphs with table + .replace('blockquote', ' {0,3}>') + .replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n') + .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt + .replace('html', ')|<(?:script|pre|style|textarea|!--)') + .replace('tag', _tag) // pars can be interrupted by type (6) html blocks + .getRegex(), + }; + /** + * Pedantic grammar (original John Gruber's loose markdown specification) + */ + const blockPedantic = { + ...blockNormal, + html: edit('^ *(?:comment *(?:\\n|\\s*$)' + + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag + + '|
'
+ + (escaped ? code : escape$1(code, true))
+ + ''
+ + (escaped ? code : escape$1(code, true))
+ + '\n${body}\n`; + } + html({ text }) { + return text; + } + heading({ tokens, depth }) { + return `
\n'; + } + list(token) { + const ordered = token.ordered; + const start = token.start; + let body = ''; + for (let j = 0; j < token.items.length; j++) { + const item = token.items[j]; + body += this.listitem(item); + } + const type = ordered ? 'ol' : 'ul'; + const startAttr = (ordered && start !== 1) ? (' start="' + start + '"') : ''; + return '<' + type + startAttr + '>\n' + body + '\n'; + } + listitem(item) { + let itemBody = ''; + if (item.task) { + const checkbox = this.checkbox({ checked: !!item.checked }); + if (item.loose) { + if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') { + item.tokens[0].text = checkbox + ' ' + item.tokens[0].text; + if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') { + item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text; + } + } + else { + item.tokens.unshift({ + type: 'text', + raw: checkbox + ' ', + text: checkbox + ' ', + }); + } + } + else { + itemBody += checkbox + ' '; + } + } + itemBody += this.parser.parse(item.tokens, !!item.loose); + return `
${this.parser.parseInline(tokens)}
\n`; + } + table(token) { + let header = ''; + // header + let cell = ''; + for (let j = 0; j < token.header.length; j++) { + cell += this.tablecell(token.header[j]); + } + header += this.tablerow({ text: cell }); + let body = ''; + for (let j = 0; j < token.rows.length; j++) { + const row = token.rows[j]; + cell = ''; + for (let k = 0; k < row.length; k++) { + cell += this.tablecell(row[k]); + } + body += this.tablerow({ text: cell }); + } + if (body) + body = `${body}`; + return '${text}`;
+ }
+ br() {
+ return ''; + } + del({ tokens }) { + return `
An error occurred:
' + + escape$1(e.message + '', true) + + ''; + if (async) { + return Promise.resolve(msg); + } + return msg; + } + if (async) { + return Promise.reject(e); + } + throw e; + }; + } + } + + const markedInstance = new Marked(); +/* + function changeDefaults(newDefaults) { + exports_defaults = newDefaults; + } + + function marked(src, opt) { + return markedInstance.parse(src, opt); + } + /** + * Sets the default options. + * + * @param options Hash of options + * / + marked.options = + marked.setOptions = (options) => { + markedInstance.setOptions(options); + marked.defaults = markedInstance.defaults; + changeDefaults(marked.defaults); + return marked; + }; + /** + * Gets the original marked default options. + * / + marked.defaults = exports_defaults; + /** + * Run callback for every token + * / + marked.walkTokens = (tokens, callback) => markedInstance.walkTokens(tokens, callback); + /** + * Expose + * / + marked.Parser = _Parser; + marked.parser = _Parser.parse; + marked.Renderer = _Renderer; + marked.TextRenderer = _TextRenderer; + marked.Lexer = _Lexer; + marked.lexer = _Lexer.lex; + marked.Tokenizer = _Tokenizer; + marked.Hooks = _Hooks; + marked.parse = marked; +*/ + + return { +/* + Hooks: _Hooks, + Lexer: _Lexer, + Marked: Marked, + Parser: _Parser, + Renderer: _Renderer, + TextRenderer: _TextRenderer, + Tokenizer: _Tokenizer, + getDefaults: _getDefaults, + lexer: _Lexer.lex, + marked: marked, + options: marked.options, +*/ + parse: (src, opt) => markedInstance.parse(src, opt), +/* + /** + * Compiles markdown to HTML without enclosing `p` tag. + * + * @param src String of markdown source to be compiled + * @param options Hash of options + * @return String of compiled HTML + * / + parseInline: markedInstance.parseInline, + parser: _Parser.parse, + setOptions: marked.setOptions, + /** + * Use Extension + * / + use: (...args) => { + markedInstance.use(...args); + marked.defaults = markedInstance.defaults; + changeDefaults(marked.defaults); + return marked; + }, + walkTokens: marked.walkTokens +*/ + }; +})(); diff --git a/vendors/turndown/turndown.js b/vendors/turndown/turndown.js index 7e5a535a4..bc5acf95c 100644 --- a/vendors/turndown/turndown.js +++ b/vendors/turndown/turndown.js @@ -4,7 +4,6 @@ */ const TurndownService = (() => { - 'use strict'; const repeat = (character, count) => Array(count + 1).join(character), From a442322729f703b9228c65c14fe997bfb725e027 Mon Sep 17 00:00:00 2001 From: hguilbert <51283484+hguilbert@users.noreply.github.com> Date: Mon, 26 Aug 2024 06:14:29 +0200 Subject: [PATCH 06/26] Update user.json --- .../v/0.0.0/app/localization/fr/user.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/snappymail/v/0.0.0/app/localization/fr/user.json b/snappymail/v/0.0.0/app/localization/fr/user.json index 060808481..0f594a582 100644 --- a/snappymail/v/0.0.0/app/localization/fr/user.json +++ b/snappymail/v/0.0.0/app/localization/fr/user.json @@ -89,18 +89,18 @@ "ARCHIVE_NAME": "Archive" }, "IMAP": { - "ACL_RIGHTS": "Rights", - "ACL_A": "Administer", - "ACL_E": "Expunge", - "ACL_I": "Insert messages", - "ACL_K": "Create sub-folders", - "ACL_L": "Show messages", - "ACL_P": "Send mail", - "ACL_R": "Select folder", - "ACL_S": "\\SEEN tag", - "ACL_T": "\\DELETED tag", - "ACL_W": "Other tags", - "ACL_X": "Delete\/Rename folder" + "ACL_RIGHTS": "Droits", + "ACL_A": "Administrer", + "ACL_E": "Supprimer", + "ACL_I": "Insérer des messages", + "ACL_K": "Créer des sous-dossiers", + "ACL_L": "Afficher les messages", + "ACL_P": "Envoyer un courrier", + "ACL_R": "Sélectionner un dossier", + "ACL_S": "\\VUE balise", + "ACL_T": "\\SUPPRIMÉE balise", + "ACL_W": "Autres balises", + "ACL_X": "Supprimer\/Renommer le dossier" }, "MESSAGE_LIST": { "BUTTON_RELOAD": "Recharger la liste des messages", From daf02e53f33414a7ae51fc04a9426b79ac171890 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 26 Aug 2024 11:20:07 +0200 Subject: [PATCH 07/26] Resolve #1706 --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php | 1 + 1 file changed, 1 insertion(+) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php index 7cf2a82d7..6b2eb99aa 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php @@ -176,6 +176,7 @@ trait UserAuth $this->Plugins()->RunHook('login.success', array($oAccount)); $this->SetAuthToken($oAccount); + $this->SetAdditionalAuthToken(null); } return $oAccount; From 59652d2d61bec2583e27ec51f7b534f55c0d43fb Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 26 Aug 2024 13:22:41 +0200 Subject: [PATCH 08/26] Mark images with width=1 as tracking pixel --- dev/Common/Html.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/Common/Html.js b/dev/Common/Html.js index 88dcde274..0557204dd 100644 --- a/dev/Common/Html.js +++ b/dev/Common/Html.js @@ -469,6 +469,7 @@ export const else if (detectHiddenImages && ((oStyle.maxHeight && 3 > pInt(oStyle.maxHeight)) // TODO: issue with 'in' || (oStyle.maxWidth && 3 > pInt(oStyle.maxWidth)) // TODO: issue with 'in' + || (oStyle.width && 2 > pInt(oStyle.width)) || [ 'email.microsoftemail.com/open', 'github.com/notifications/beacon/', From 547953eb313b798f7712bee58c59782fe6337e98 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 26 Aug 2024 20:45:32 +0200 Subject: [PATCH 09/26] Resolve #1718 --- plugins/avatars/avatars.js | 4 ++++ plugins/avatars/index.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js index 8aef7fa69..464c4f1cc 100644 --- a/plugins/avatars/avatars.js +++ b/plugins/avatars/avatars.js @@ -186,6 +186,10 @@ if (msg?.from?.[0]) { let url = getAvatar(msg), fn = url=>{element.src = url}; + element.onerror = ()=>{ + element.onerror = null; + setIdenticon(msg.from[0], fn); + }; if (url) { fn(url); } else if (msg.avatar?.startsWith('data:')) { diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php index a1a5b921f..4baae52ce 100644 --- a/plugins/avatars/index.php +++ b/plugins/avatars/index.php @@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin NAME = 'Avatars', AUTHOR = 'SnappyMail', URL = 'https://snappymail.eu/', - VERSION = '1.19', - RELEASE = '2024-07-08', + VERSION = '1.20', + RELEASE = '2024-08-26', REQUIRED = '2.33.0', CATEGORY = 'Contacts', LICENSE = 'MIT', From 780e1f9b9284609406d9f7c023e08a063a54e371 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Aug 2024 11:49:11 +0200 Subject: [PATCH 10/26] Make sure only scalar values are allowed in $_ENV #1719 --- snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php | 1 + 1 file changed, 1 insertion(+) diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php index 7d56a35fa..2815c8010 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php @@ -867,6 +867,7 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface // Don't localize GnuPG results. $env = $_ENV; $env['LC_ALL'] = 'C'; + $env = \array_filter($env, fn($var) => \is_scalar($var)); $proc_pipes = []; From 9e2b9a9fcd77edf7a149a37f5d7d22294ef4992f Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Aug 2024 12:12:33 +0200 Subject: [PATCH 11/26] Show GnuPG version for #1560 --- dev/Settings/Admin/Security.js | 2 ++ snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php | 3 +++ .../0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js index 8bcac6e48..c9e9d8276 100644 --- a/dev/Settings/Admin/Security.js +++ b/dev/Settings/Admin/Security.js @@ -32,6 +32,8 @@ export class AdminSettingsSecurity extends AbstractViewSettings { capaOpenPGP: SettingsCapa('OpenPGP') }); + this.gnuPGversion = 'GnuPG v' + SettingsGet('gnupg'); + const reset = () => { this.saveError(false); this.saveSuccess(false); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php index 6d3fac5aa..54a550d35 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php @@ -456,6 +456,9 @@ class ActionsAdmin extends Actions $aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true); $aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true); $aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true); + + $gnupg = \SnappyMail\PGP\GnuPG::getInstance(''); + $aResult['gnupg'] = $gnupg ? $gnupg->getEngineInfo()['version'] : null; } else { $passfile = APP_PRIVATE_DATA.'admin_password.txt'; $sPassword = $oConfig->Get('security', 'admin_password', ''); diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html index e29fcd06c..d96bf34bf 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html @@ -17,7 +17,7 @@ From 3306fadc472368685f44d2262cc78eb8a3633194 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Aug 2024 13:19:30 +0200 Subject: [PATCH 12/26] MS autodiscover priorities DNS over subdomain --- .../RainLoop/Providers/Domain/Autoconfig.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php index 75d94a651..b104276d8 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php @@ -168,16 +168,6 @@ abstract class Autoconfig */ private static function autodiscover(string $domain) : ?array { - foreach ([ - "https://{$domain}", - "https://autodiscover.{$domain}", - "http://autodiscover.{$domain}" - ] as $host) { - $result = static::autodiscover_resolve($host, $domain); - if ($result) { - return $result; - } - } foreach (\SnappyMail\DNS::SRV("_autodiscover._tcp.{$domain}") as $record) { if (443 == $record['port']) { $result = static::autodiscover_resolve("https://{$record['target']}", $domain); @@ -190,6 +180,16 @@ abstract class Autoconfig return $result; } } + foreach ([ + "https://{$domain}", + "https://autodiscover.{$domain}", + "http://autodiscover.{$domain}" + ] as $host) { + $result = static::autodiscover_resolve($host, $domain); + if ($result) { + return $result; + } + } return null; } From 9e3d6c6e239599497ec3e2d1e9719e5323822614 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Aug 2024 13:38:42 +0200 Subject: [PATCH 13/26] Show warning in Admin -> About when PHP runs in 32bit --- dev/Settings/Admin/About.js | 2 ++ .../app/templates/Views/Admin/AdminSettingsAbout.html | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js index ef381683e..456fa250d 100644 --- a/dev/Settings/Admin/About.js +++ b/dev/Settings/Admin/About.js @@ -16,6 +16,7 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ { coreWarning: false, coreVersion: '', coreVersionCompare: -2, + php64: true, load1: 0, load5: 0, load15: 0, @@ -69,6 +70,7 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ { this.coreWarning(!!data.core.warning); this.coreVersion(data.core.version || ''); this.coreVersionCompare(data.core.versionCompare); + this.php64(data.php[1].loaded); } else { this.coreReal(false); this.coreWarning(false); diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html index 8b5a03115..b83ea9345 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html @@ -75,7 +75,12 @@ -
PHP optional extensions
+PHP
+
+ ⚠
+ PHP is running in 32bit mode. read here
+
+
| Extension | Loaded | From 1ac4f05d912ad8d4c700b8f1c4bee87fec2af8c8 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 27 Aug 2024 15:27:44 +0200 Subject: [PATCH 14/26] Sabre/Xml v4.0.5 --- .../libraries/Sabre/Xml/Deserializer/functions.php | 7 +++++-- .../0.0.0/app/libraries/Sabre/Xml/LibXMLException.php | 2 +- snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php | 4 ++-- .../v/0.0.0/app/libraries/Sabre/Xml/Service.php | 11 +++++------ .../v/0.0.0/app/libraries/Sabre/Xml/Version.php | 2 +- snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php | 2 -- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php index 5531f7621..949aa720e 100644 --- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php +++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php @@ -57,7 +57,7 @@ use Sabre\Xml\Reader; * * @phpstan-return array
|---|