diff --git a/dev/App/User.js b/dev/App/User.js index 2ad5c7b5c..bde7b3b5d 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -61,9 +61,7 @@ import { AskPopupView } from 'View/Popup/Ask'; import { folderInformation, folderInformationMultiply, - setRefreshFoldersInterval, - messagesMoveHelper, - messagesDeleteHelper + setRefreshFoldersInterval } from 'Common/Folders'; import { loadFolders } from 'Model/FolderCollection'; @@ -133,13 +131,11 @@ export class AppUser extends AbstractApp { showScreenPopup(AskPopupView, [ i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), () => { - messagesDeleteHelper(sFromFolderFullName, oUids); - MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids); + MessagelistUserStore.moveMessages(sFromFolderFullName, oUids); } ]); } else if (oMoveFolder) { - messagesMoveHelper(sFromFolderFullName, oMoveFolder.fullName, oUids); - MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids, oMoveFolder.fullName); + MessagelistUserStore.moveMessages(sFromFolderFullName, oUids, oMoveFolder.fullName); } } diff --git a/dev/Common/Folders.js b/dev/Common/Folders.js index b1ad903fb..6d53c6332 100644 --- a/dev/Common/Folders.js +++ b/dev/Common/Folders.js @@ -1,13 +1,11 @@ import { isArray, arrayLength } from 'Common/Utils'; import { - setFolderETag, getFolderInboxName, getFolderFromCacheList } from 'Common/Cache'; import { SettingsUserStore } from 'Stores/User/Settings'; import { FolderUserStore } from 'Stores/User/Folder'; import { MessagelistUserStore } from 'Stores/User/Messagelist'; -import { getNotification } from 'Common/Translator'; import Remote from 'Remote/User/Fetch'; @@ -197,76 +195,6 @@ folderInformationMultiply = (boot = false) => { } }, -moveOrDeleteResponseHelper = (iError, oData) => { - if (iError) { - setFolderETag(FolderUserStore.currentFolderFullName(), ''); - alert(getNotification(iError)); - } else if (FolderUserStore.currentFolder()) { - if (2 === arrayLength(oData.Result)) { - setFolderETag(oData.Result[0], oData.Result[1]); - } else { - setFolderETag(FolderUserStore.currentFolderFullName(), ''); - } - MessagelistUserStore.reload(!MessagelistUserStore.length); - } -}, - -messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => { - const - sSpamFolder = FolderUserStore.spamFolder(), - isSpam = sSpamFolder === toFolderFullName, - isHam = !isSpam && sSpamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName; - - Remote.abort('MessageList', 'reload').request('MessageMove', - moveOrDeleteResponseHelper, - { - fromFolder: fromFolderFullName, - toFolder: toFolderFullName, - uids: [...uidsForMove].join(','), - markAsRead: (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0, - learning: isSpam ? 'SPAM' : isHam ? 'HAM' : '' - } - ); -}, - -messagesDeleteHelper = (sFromFolderFullName, aUidForRemove) => { - Remote.abort('MessageList', 'reload').request('MessageDelete', - moveOrDeleteResponseHelper, - { - folder: sFromFolderFullName, - uids: [...aUidForRemove].join(',') - } - ); -}, - -/** - * @param {string} sFromFolderFullName - * @param {Set} oUids - * @param {string} sToFolderFullName - * @param {boolean=} bCopy = false - */ -moveMessagesToFolder = (sFromFolderFullName, oUids, sToFolderFullName, bCopy) => { - if (sFromFolderFullName !== sToFolderFullName && oUids?.size) { - const oFromFolder = getFolderFromCacheList(sFromFolderFullName), - oToFolder = getFolderFromCacheList(sToFolderFullName); - - if (oFromFolder && oToFolder) { - bCopy - ? Remote.request('MessageCopy', null, { - fromFolder: oFromFolder.fullName, - toFolder: oToFolder.fullName, - uids: [...oUids].join(',') - }) - : messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, oUids); - - MessagelistUserStore.removeMessagesFromList(oFromFolder.fullName, oUids, oToFolder.fullName, bCopy); - return true; - } - } - - return false; -}, - dropFilesInFolder = (sFolderFullName, files) => { let count = files.length; for (const file of files) { diff --git a/dev/Common/Html.js b/dev/Common/Html.js index 1af3a598d..063caaab7 100644 --- a/dev/Common/Html.js +++ b/dev/Common/Html.js @@ -50,7 +50,7 @@ const * https://github.com/M66B/FairEmail/blob/master/app/src/main/java/eu/faircode/email/UriHelper.java */ // eslint-disable-next-line max-len - stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc|ref|correlation_id|pd_|pf_|email_hash)/i, + stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc|ref|correlation_id|pd_|pf_|email_hash)$/i, urlGetParam = (url, name) => new URL(url).searchParams.get(name) || url, base64Url = data => atob(data.replace(/_/g,'/').replace(/-/g,'+')), decode = decodeURIComponent, @@ -99,7 +99,7 @@ const }, cleanCSS = source => - source.trim().replace(/-(ms|webkit)-[^;]+(;|$)/g, '') + source.trim().replace(/(^|;)\s*-(ms|webkit)-[^;]+(;|$)/g, '') .replace(/white-space[^;]+(;|$)/g, '') // Drop Microsoft Office style properties // .replace(/mso-[^:;]+:[^;]+/gi, '') @@ -346,7 +346,7 @@ export const let i = oElement.attributes.length; while (i--) { let sAttrName = oElement.attributes[i].name.toLowerCase(); - if (!allowedAttributes.includes(sAttrName)) { + if (!allowedAttributes.includes(sAttrName) && ('class' !== sAttrName || 'mail-body' !== className)) { delAttribute(sAttrName); aAttrsForRemove.push(sAttrName); } @@ -542,7 +542,7 @@ export const oStyle.removeProperty('color'); } - oStyle.cssText = cleanCSS(oStyle.cssText); + oStyle.cssText && (oStyle.cssText = cleanCSS(oStyle.cssText)); } if (debug && aAttrsForRemove.length) { diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index e4df8d466..88c044daf 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -65,8 +65,8 @@ export class Selector { this.listChecked.subscribe(items => { if (items.length) { koSelectedItem() ? koSelectedItem(null) : koSelectedItem.valueHasMutated?.(); - } else if (this.autoSelect()) { - koSelectedItem(koFocusedItem()); + } else { + this.autoSelect(); } }); @@ -174,9 +174,7 @@ export class Selector { this.iFocusedNextHelper = 0; } - if (this.autoSelect() && !isChecked && !koSelectedItem()) { - koSelectedItem(koFocusedItem()); - } + !isChecked && !koSelectedItem() && this.autoSelect(); } aCheckedCache = []; @@ -250,8 +248,10 @@ export class Selector { /** * @returns {boolean} */ - autoSelect() { - return (this.oCallbacks.AutoSelect || (()=>1))() && this.focusedItem(); + autoSelect(bForce) { + (bForce || (this.oCallbacks.AutoSelect || (()=>1))()) + && this.focusedItem() + && this.selectedItem(this.focusedItem()); } /** @@ -327,9 +327,7 @@ export class Selector { if (result) { this.focusedItem(result); - if ((this.autoSelect() || bForceSelect) && !this.list.hasChecked()) { - this.selectedItem(result); - } + !this.list.hasChecked() && this.autoSelect(bForceSelect); this.scrollToFocused(); } } diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js index be9c50fec..16d6f267b 100644 --- a/dev/External/SquireUI.js +++ b/dev/External/SquireUI.js @@ -69,6 +69,8 @@ class SquireUI clr.value = ''; clr.onchange = () => squire.setStyle({[name]:clr.value}); + // Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199 +// clr.oninput = () => squire.setStyle({[name]:clr.value}); setTimeout(()=>clr.click(),1); }, @@ -279,6 +281,27 @@ class SquireUI clr.type = 'color'; toolbar.append(clr); + // Chrome https://github.com/the-djmaze/snappymail/issues/1199 + let clrid = 'squire-colors', + colorlist = doc.getElementById(clrid), + add = hex => colorlist.append(new Option(hex)); + if (!colorlist) { + colorlist = createElement('datalist'); + colorlist.id = clrid; + // Color blind safe Tableau 10 by Maureen Stone + add('#4E79A7'); + add('#F28E2B'); + add('#E15759'); + add('#76B7B2'); + add('#59A14F'); + add('#EDC948'); + add('#B07AA1'); + add('#FF9DA7'); + add('#9C755F'); + add('#BAB0AC'); + doc.body.append(colorlist); + } + clr.setAttribute('list', clrid); browseImage.type = 'file'; browseImage.accept = 'image/*'; diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js index 2fd60a2a7..fc423232f 100644 --- a/dev/External/User/ko.js +++ b/dev/External/User/ko.js @@ -6,7 +6,7 @@ import { doc, elementById, addEventsListeners, dropdowns, leftPanelDisabled } fr import { dropdownsDetectVisibility } from 'Common/UtilsUser'; import { EmailAddressesComponent } from 'Component/EmailAddresses'; import { ThemeStore } from 'Stores/Theme'; -import { moveMessagesToFolder, dropFilesInFolder } from 'Common/Folders'; +import { dropFilesInFolder } from 'Common/Folders'; import { setExpandedFolder } from 'Model/FolderCollection'; import { FolderUserStore } from 'Stores/User/Folder'; import { MessagelistUserStore } from 'Stores/User/Messagelist'; @@ -63,7 +63,9 @@ const rlContentType = 'snappymail/action', dragDrop = (e, element, folder, dragData) => { dragStop(e, element); if (dragMessages() && 'copyMove' == e.dataTransfer.effectAllowed) { - moveMessagesToFolder(FolderUserStore.currentFolderFullName(), dragData.data, folder.fullName, e.ctrlKey); + MessagelistUserStore.moveMessages( + FolderUserStore.currentFolderFullName(), dragData.data, folder.fullName, e.ctrlKey + ); } else if (e.dataTransfer.types.includes('Files')) { dropFilesInFolder(folder.fullName, e.dataTransfer.files); } diff --git a/dev/Html/PreviewMessage.html b/dev/Html/PreviewMessage.html index c2255fd32..0aa25cfd0 100644 --- a/dev/Html/PreviewMessage.html +++ b/dev/Html/PreviewMessage.html @@ -45,6 +45,9 @@ body > * { border: 1px solid rgba(125,128,128,0.5); padding: 0.25em; margin-right: 1em; +} +#attachments > *::before { + content: '📎 '; } diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js index 4e9774f99..43ff02b26 100644 --- a/dev/Knoin/AbstractViews.js +++ b/dev/Knoin/AbstractViews.js @@ -1,7 +1,7 @@ import ko from 'ko'; import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko'; -import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, toggleLeftPanel, elementById } from 'Common/Globals'; +import { keyScope, addShortcut, SettingsGet, toggleLeftPanel, elementById } from 'Common/Globals'; import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin'; import { SaveSettingStatus } from 'Common/Enums'; @@ -95,7 +95,6 @@ export class AbstractViewLeft extends AbstractView constructor(templateID) { super(templateID, 'left'); - this.leftPanelDisabled = leftPanelDisabled; this.toggleLeftPanel = toggleLeftPanel; } } diff --git a/dev/Model/Message.js b/dev/Model/Message.js index 4ee9a5d2d..8e9e97bc7 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -464,7 +464,7 @@ export class MessageModel extends AbstractModel { clone.querySelectorAll('.sm-bq-switcher').forEach( node => node.replaceWith(node.lastElementChild) ); - return clone.innerHTML; + return (clone.querySelector('.mail-body') || clone).innerHTML; } let result = msgHtml(this); return result.html || plainToHtml(this.plain()); diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js index afaf78e65..887312946 100644 --- a/dev/Remote/AbstractFetch.js +++ b/dev/Remote/AbstractFetch.js @@ -36,7 +36,7 @@ abort = (sAction, sReason, bClearOnly) => { oRequests[sAction] = null; if (controller) { clearTimeout(controller.timeoutId); - bClearOnly || controller.abort(sReason || 'AbortError'); + bClearOnly || controller.abort(new DOMException(sAction, sReason || 'AbortError')); } }, @@ -61,7 +61,6 @@ fetchJSON = (action, sUrl, params, timeout, jsonCallback) => { }).catch(err => { clearTimeout(controller.timeoutId); err.aborted = signal.aborted; - err.reason = signal.reason; return Promise.reject(err); }); }; @@ -165,7 +164,7 @@ export class AbstractFetchRemote .catch(err => { console.error({fetchError:err}); fCallback && fCallback( - 'TimeoutError' == err.reason ? 3 : (err.name == 'AbortError' ? 2 : 1), + 'TimeoutError' == err.name ? 3 : (err.name == 'AbortError' ? 2 : 1), err ); }); diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js index 6d8764f7d..fddf66882 100644 --- a/dev/Stores/Theme.js +++ b/dev/Stores/Theme.js @@ -10,6 +10,8 @@ let __themeTimer = 0; export const // Also see Styles/_Values.less @maxMobileWidth isMobile = matchMedia('(max-width: 799px)'), + // https://github.com/the-djmaze/snappymail/issues/1150 +// isSmall = matchMedia('(max-width: 1400px)'), ThemeStore = { theme: ko.observable(''), @@ -104,6 +106,9 @@ addSubscribablesTo(ThemeStore, { isMobile.onchange = e => { ThemeStore.isMobile(e.matches); $htmlCL.toggle('rl-mobile', e.matches); - leftPanelDisabled(e.matches); + /*$htmlCL.contains('sm-msgView-side') || */leftPanelDisabled(e.matches); }; isMobile.onchange(isMobile); + +//isSmall.onchange = e => $htmlCL.contains('sm-msgView-side') && leftPanelDisabled(e.matches); +//isSmall.onchange(isSmall); diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js index 8cc2c364a..c9ada4545 100644 --- a/dev/Stores/User/Messagelist.js +++ b/dev/Stores/User/Messagelist.js @@ -166,9 +166,9 @@ MessagelistUserStore.notifyNewMessages = (folder, newMessages) => { } MessagelistUserStore.canAutoSelect = () => - !/is:unseen/.test(MessagelistUserStore.mainSearch()) - && !disableAutoSelect() + !disableAutoSelect() && SettingsUserStore.usePreviewPane(); +// && !SettingsUserStore.showNextMessage(); let prevFolderName; @@ -222,7 +222,7 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach fCallback = (iError, oData, bCached) => { let error = ''; if (iError) { - if ('reload' != oData?.reason) { + if ('reload' != oData?.name) { error = getNotification(iError); MessagelistUserStore.loading(false); // if (Notifications.RequestAborted !== iError) { @@ -399,53 +399,92 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => { * @param {string=} toFolderFullName = '' * @param {boolean=} copy = false */ -MessagelistUserStore.removeMessagesFromList = ( +MessagelistUserStore.moveMessages = ( fromFolderFullName, oUids, toFolderFullName = '', copy = false ) => { + const fromFolder = getFolderFromCacheList(fromFolderFullName); + + if (!fromFolder || !oUids?.size) return; + let unseenCount = 0, setPage = 0, currentMessage = MessageUserStore.message(); - const trashFolder = FolderUserStore.trashFolder(), + const toFolder = toFolderFullName ? getFolderFromCacheList(toFolderFullName) : null, + trashFolder = FolderUserStore.trashFolder(), spamFolder = FolderUserStore.spamFolder(), - fromFolder = getFolderFromCacheList(fromFolderFullName), - toFolder = toFolderFullName ? getFolderFromCacheList(toFolderFullName) : null, + page = MessagelistUserStore.page(), messages = FolderUserStore.currentFolderFullName() === fromFolderFullName ? MessagelistUserStore.filter(item => item && oUids.has(item.uid)) - : []; + : [], + moveOrDeleteResponseHelper = (iError, oData) => { + if (iError) { + setFolderETag(FolderUserStore.currentFolderFullName(), ''); + alert(getNotification(iError)); + } else if (FolderUserStore.currentFolder()) { + if (2 === arrayLength(oData.Result)) { + setFolderETag(oData.Result[0], oData.Result[1]); + } else { + setFolderETag(FolderUserStore.currentFolderFullName(), ''); + } + + MessagelistUserStore.count(MessagelistUserStore.count() - oUids.size); + if (page > MessagelistUserStore.pageCount()) { + setPage = MessagelistUserStore.pageCount(); + } + if (MessagelistUserStore.threadUid() + && MessagelistUserStore.length + && MessagelistUserStore.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid()) + ) { + const message = MessagelistUserStore.find(item => item && !item.deleted()); + if (!message) { + if (1 < page) { + setPage = page - 1; + } else { + MessagelistUserStore.threadUid(0); + setPage = MessagelistUserStore.pageBeforeThread(); + } + } else if (MessagelistUserStore.threadUid() != message.uid) { + MessagelistUserStore.threadUid(message.uid); + setPage = page; + } + } + if (setPage) { + MessagelistUserStore.page(setPage); + replaceHash( + mailBox( + FolderUserStore.currentFolderFullNameHash(), + setPage, + MessagelistUserStore.listSearch(), + MessagelistUserStore.threadUid() + ) + ); + } + + MessagelistUserStore.reload(!MessagelistUserStore.count()); + } + }; messages.forEach(item => item?.isUnseen() && ++unseenCount); - if (fromFolder) { + if (!copy) { fromFolder.etag = ''; - if (!copy) { - fromFolder.totalEmails( - 0 <= fromFolder.totalEmails() - oUids.size ? fromFolder.totalEmails() - oUids.size : 0 - ); - - if (0 < unseenCount) { - fromFolder.unreadEmails(Math.max(0, fromFolder.unreadEmails() - unseenCount)); - } - } + fromFolder.totalEmails(Math.max(0, fromFolder.totalEmails() - oUids.size)); + fromFolder.unreadEmails(Math.max(0, fromFolder.unreadEmails() - unseenCount)); } if (toFolder) { toFolder.etag = ''; - - if (trashFolder === toFolder.fullName || spamFolder === toFolder.fullName) { - unseenCount = 0; - } - toFolder.totalEmails(toFolder.totalEmails() + oUids.size); - if (0 < unseenCount) { + if (trashFolder !== toFolder.fullName && spamFolder !== toFolder.fullName) { toFolder.unreadEmails(toFolder.unreadEmails() + unseenCount); } - toFolder.actionBlink(true); } if (messages.length) { + disableAutoSelect(true); if (copy) { messages.forEach(item => item.checked(false)); } else { @@ -468,49 +507,37 @@ MessagelistUserStore.removeMessagesFromList = ( currentMessage = null; MessageUserStore.message(null); } - item.deleted(true); + MessagelistUserStore.remove(item); }); - - setTimeout(() => messages.forEach(item => MessagelistUserStore.remove(item)), 350); - - const - count = MessagelistUserStore.count() - messages.length, - page = MessagelistUserStore.page(); - MessagelistUserStore.count(count); - if (page > MessagelistUserStore.pageCount()) { - setPage = MessagelistUserStore.pageCount(); - } } } - if (MessagelistUserStore.threadUid() - && MessagelistUserStore.length - && MessagelistUserStore.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid()) - ) { - const message = MessagelistUserStore.find(item => item && !item.deleted()); - if (!message) { - if (1 < MessagelistUserStore.page()) { - setPage = MessagelistUserStore.page() - 1; + if (toFolderFullName) { + if (toFolder && fromFolderFullName != toFolderFullName) { + const params = { + fromFolder: fromFolderFullName, + toFolder: toFolderFullName, + uids: [...oUids].join(',') + }; + if (copy) { + Remote.request('MessageCopy', null, params); } else { - MessagelistUserStore.threadUid(0); - setPage = MessagelistUserStore.pageBeforeThread(); + const + isSpam = spamFolder === toFolderFullName, + isHam = !isSpam && spamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName; + params.markAsRead = (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0; + params.learning = isSpam ? 'SPAM' : isHam ? 'HAM' : ''; + Remote.abort('MessageList', 'reload').request('MessageMove', moveOrDeleteResponseHelper, params); } - } else if (MessagelistUserStore.threadUid() != message.uid) { - MessagelistUserStore.threadUid(message.uid); - setPage = MessagelistUserStore.page(); } - } - - if (setPage) { - MessagelistUserStore.page(setPage); - replaceHash( - mailBox( - FolderUserStore.currentFolderFullNameHash(), - setPage, - MessagelistUserStore.listSearch(), - MessagelistUserStore.threadUid() - ) + } else { + Remote.abort('MessageList', 'reload').request('MessageDelete', + moveOrDeleteResponseHelper, + { + folder: fromFolderFullName, + uids: [...oUids].join(',') + } ); } }; diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less index e9bc2afa1..8df8433ee 100644 --- a/dev/Styles/Main.less +++ b/dev/Styles/Main.less @@ -4,6 +4,13 @@ html.list-loading body { cursor: progress; } +.toggleLeft::before { + content: '❮'; +} +html.rl-left-panel-disabled .toggleLeft::before { + content: '❯'; +} + @media screen and (min-width: @maxMobileWidth + 1px) { #rl-app { background-image: var(--main-bg-image); diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less index d0503e54e..f139ca5cc 100644 --- a/dev/Styles/User/Layout.less +++ b/dev/Styles/User/Layout.less @@ -15,6 +15,7 @@ .b-toolbar { padding: 10px 0 10px @rlLowMargin; + white-space: nowrap; } } @@ -189,7 +190,7 @@ html.rl-left-panel-disabled { /* desktop */ @media screen and (min-width: @maxMobileWidth + 1px) { - .toggleLeft, + #rl-right .toggleLeft, #V-MailMessageList .buttonCompose { display: none !important; } diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js index c19c1d7d7..9f85b60eb 100644 --- a/dev/View/Admin/Settings/Pane.js +++ b/dev/View/Admin/Settings/Pane.js @@ -2,12 +2,11 @@ import Remote from 'Remote/Admin/Fetch'; import { AbstractViewRight } from 'Knoin/AbstractViews'; -import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals'; +import { toggleLeftPanel } from 'Common/Globals'; export class PaneSettingsAdminView extends AbstractViewRight { constructor() { super('AdminPane'); - this.leftPanelDisabled = leftPanelDisabled; this.toggleLeftPanel = toggleLeftPanel; } diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 3af776059..183e5b831 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -15,7 +15,7 @@ import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html'; import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko'; import { UNUSED_OPTION_VALUE } from 'Common/Consts'; -import { folderInformation, messagesDeleteHelper } from 'Common/Folders'; +import { folderInformation } from 'Common/Folders'; import { serverRequest } from 'Common/Links'; import { i18n, getNotification, getUploadErrorDescByCode, timestampToString } from 'Common/Translator'; import { setFolderETag } from 'Common/Cache'; @@ -586,8 +586,7 @@ export class ComposePopupView extends AbstractViewPopup { const sFromFolderFullName = this.draftsFolder(), oUids = new Set([this.draftUid()]); - messagesDeleteHelper(sFromFolderFullName, oUids); - MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids); + MessagelistUserStore.moveMessages(sFromFolderFullName, oUids); this.close(); } ]); diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 9c4860886..393f23a27 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -20,8 +20,6 @@ import { FolderCreatePopupView } from 'View/Popup/FolderCreate'; import { ContactsPopupView } from 'View/Popup/Contacts'; import { ComposePopupView } from 'View/Popup/Compose'; -import { moveMessagesToFolder } from 'Common/Folders'; - import { setExpandedFolder, foldersFilter } from 'Model/FolderCollection'; export class MailFolderList extends AbstractViewLeft { @@ -92,7 +90,7 @@ export class MailFolderList extends AbstractViewLeft { if (folder) { if (moveAction()) { moveAction(false); - moveMessagesToFolder( + MessagelistUserStore.moveMessages( FolderUserStore.currentFolderFullName(), MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(), folder.fullName, diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 84b1529ab..cf409f3b7 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -88,8 +88,6 @@ export class MailMessageList extends AbstractViewRight { this.composeInEdit = ComposePopupView.inEdit; this.isMobile = ThemeStore.isMobile; // Obsolete - this.leftPanelDisabled = leftPanelDisabled; - this.toggleLeftPanel = toggleLeftPanel; this.popupVisibility = arePopupsVisible; @@ -582,7 +580,11 @@ export class MailMessageList extends AbstractViewRight { addEventsListeners(dom, { click: event => { - ThemeStore.isMobile() && !eqs(event, '.toggleLeft') && leftPanelDisabled(true); + if (eqs(event, '.toggleLeft')) { + toggleLeftPanel(); + } else { + ThemeStore.isMobile() && leftPanelDisabled(true); + } if (eqs(event, '.messageList') && ScopeMessageView === AppUserStore.focusedState()) { AppUserStore.focusedState(ScopeMessageList); diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js index dccaf9de0..049e444b4 100644 --- a/dev/View/User/Settings/Pane.js +++ b/dev/View/User/Settings/Pane.js @@ -8,9 +8,6 @@ import { AbstractViewRight } from 'Knoin/AbstractViews'; export class SettingsPaneUserView extends AbstractViewRight { constructor() { super(); - - this.leftPanelDisabled = leftPanelDisabled; - this.toggleLeftPanel = toggleLeftPanel; } onShow() { @@ -18,8 +15,12 @@ export class SettingsPaneUserView extends AbstractViewRight { } onBuild(dom) { - dom.addEventListener('click', () => - ThemeStore.isMobile() && !event.target.closestWithin('.toggleLeft', dom) && leftPanelDisabled(true) - ); + dom.addEventListener('click', () => { + if (event.target.closestWithin('.toggleLeft', dom)) { + toggleLeftPanel(); + } else { + ThemeStore.isMobile() && leftPanelDisabled(true); + } + }); } } diff --git a/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/images/preview.png b/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/images/preview.png new file mode 100644 index 000000000..4e57a8824 Binary files /dev/null and b/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/images/preview.png differ diff --git a/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/styles.css b/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/styles.css new file mode 100644 index 000000000..808925808 --- /dev/null +++ b/integrations/nextcloud/snappymail/app/themes/NextcloudV25+/styles.css @@ -0,0 +1,2551 @@ +/** + * Nextcloud - SnappyMail mail plugin + * + * @author Rene Hampölz (@hampoelz), SnappyMail, Nextcloud Team + */ + +/* + * Default Nextcloud (v25+) theme variables and colors + * based on https://github.com/nextcloud/server/blob/master/core/css/variables.scss + */ +/* #region theme */ + +:root { + --border-color: var(--nc-color-border); + --dialog-border-clr: var(--nc-color-border); + + --nc-vs-selected-bg: var(--vs-selected-bg, var(--nc-color-background-dark)); + --nc-vs-selected-color: var(--vs-selected-color, var(--nc-color-main-text)); + --nc-vs-border-radius: var(--vs-border-radius, var(--nc-border-radius-large)); + --nc-vs-controls-color: var(--vs-controls-color, var(--nc-color-text-maxcontrast)); + --nc-vs-line-height: var(--vs-line-height, var(--nc-default-line-height)); + --nc-vs-search-input-bg: var(--vs-search-input-bg, var(--nc-color-main-background)); + --nc-vs-search-input-color: var(--vs-search-input-color, var(--nc-color-main-text)); + --nc-vs-font-size: var(--vs-font-size, var(--nc-default-font-size)); +} + +:not([data-themes~="dark"]) { + --nc-color-main-background: var(--color-main-background, #ffffff); + --nc-color-main-background-rgb: var(--color-main-background-rgb, 255, 255, 255); + --nc-color-main-background-blur: var(--color-main-background-blur, rgba(var(--nc-color-main-background-rgb), .8)); + --nc-filter-background-blur: var(--filter-background-blur, blur(25px)); + --nc-color-background-hover: var(--color-background-hover, #f5f5f5); + --nc-color-background-dark: var(--color-background-dark, #ededed); + --nc-color-background-darker: var(--color-background-darker, #dbdbdb); + --nc-color-placeholder-light: var(--color-placeholder-light, #e6e6e6); + --nc-color-placeholder-dark: var(--color-placeholder-dark, #cccccc); + --nc-color-main-text: var(--color-main-text, #222222); + --nc-color-text-light: var(--color-text-light, #222222); + --nc-color-text-lighter: var(--color-text-lighter, #767676); + --nc-color-text-maxcontrast: var(--color-text-maxcontrast, #767676); + --nc-color-scrollbar: var(--color-scrollbar, rgba(34, 34, 34, .15)); + --nc-color-error: var(--color-error, #e9322d); + --nc-color-error-rgb: var(--color-error-rgb, 233, 50, 45); + --nc-color-error-hover: var(--color-error-hover, #ed5a56); + --nc-color-warning: var(--color-warning, #eca700); + --nc-color-warning-rgb: var(--color-warning-rgb, 236, 167, 0); + --nc-color-warning-hover: var(--color-warning-hover, #efb832); + --nc-color-success: var(--color-success, #46ba61); + --nc-color-success-rgb: var(--color-success-rgb, 70, 186, 97); + --nc-color-success-hover: var(--color-success-hover, #6ac780); + --nc-color-loading-light: var(--color-loading-light, #cccccc); + --nc-color-loading-dark: var(--color-loading-dark, #444444); + --nc-color-box-shadow-rgb: var(--color-box-shadow-rgb, 77, 77, 77); + --nc-color-box-shadow: var(--color-box-shadow, rgba(var(--nc-color-box-shadow-rgb), 0.5)); + --nc-color-border: var(--color-border, #ededed); + --nc-color-border-dark: var(--color-border-dark, #dbdbdb); + --nc-color-border-maxcontrast: var(--color-border-maxcontrast, #949494); + --nc-font-face: var(--font-face, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'); + --nc-default-font-size: var(--default-font-size, 15px); + --nc-default-line-height: var(--default-line-height, 24px); + --nc-animation-quick: var(--animation-quick, 100ms); + --nc-animation-slow: var(--animation-slow, 300ms); + --nc-border-radius: var(--border-radius, 3px); + --nc-border-radius-large: var(--border-radius-large, 10px); + --nc-border-radius-pill: var(--border-radius-pill, 100px); + --nc-default-grid-baseline: var(--default-grid-baseline, 4px); + --nc-navigation-width: var(--navigation-width, 300px); + --nc-sidebar-min-width: var(--sidebar-min-width, 300px); + --nc-sidebar-max-width: var(--sidebar-max-width, 500px); + --nc-list-min-width: var(--list-min-width, 200px); + --nc-list-max-width: var(--list-max-width, 300px); + --nc-breakpoint-mobile: var(--breakpoint-mobile, 1024px); + --nc-color-primary: var(--color-primary, #00639a); + --nc-color-primary-default: var(--color-primary-default, #0082c9); + --nc-color-primary-text: var(--color-primary-text, #ffffff); + --nc-color-primary-hover: var(--color-primary-hover, #3282ae); + --nc-color-primary-light: var(--color-primary-light, #e5eff4); + --nc-color-primary-light-text: var(--color-primary-light-text, #00273d); + --nc-color-primary-light-hover: var(--color-primary-light-hover, #dbe4e9); + --nc-color-primary-text-dark: var(--color-primary-text-dark, #ededed); + --nc-color-primary-element: var(--color-primary-element, #00639a); + --nc-color-primary-element-text: var(--color-primary-element-text, #ffffff); + --nc-color-primary-element-hover: var(--color-primary-element-hover, #3282ae); + --nc-color-primary-element-light: var(--color-primary-element-light, #e5eff4); + --nc-color-primary-element-light-text: var(--color-primary-element-light-text, #00273d); + --nc-color-primary-element-light-hover: var(--color-primary-element-light-hover, #dbe4e9); + --nc-color-primary-element-text-dark: var(--color-primary-element-text-dark, #ededed); +} + +@media (prefers-color-scheme: dark) { + :not([data-themes~="light"]) { + --nc-color-main-background: var(--color-main-background, #171717); + --nc-color-main-background-rgb: var(--color-main-background-rgb, 23, 23, 23); + --nc-color-main-background-blur: var(--color-main-background-blur, rgba(var(--nc-color-main-background-rgb), .8)); + --nc-filter-background-blur: var(--filter-background-blur, blur(25px)); + --nc-color-background-hover: var(--color-background-hover, #212121); + --nc-color-background-dark: var(--color-background-dark, #292929); + --nc-color-background-darker: var(--color-background-darker, #3b3b3b); + --nc-color-placeholder-light: var(--color-placeholder-light, #313131); + --nc-color-placeholder-dark: var(--color-placeholder-dark, #4a4a4a); + --nc-color-main-text: var(--color-main-text, #D8D8D8); + --nc-color-text-light: var(--color-text-light, #bfbfbf); + --nc-color-text-lighter: var(--color-text-lighter, #a5a5a5); + --nc-color-text-maxcontrast: var(--color-text-maxcontrast, #8c8c8c); + --nc-color-scrollbar: var(--color-scrollbar, #3d3d3d); + --nc-color-error: var(--color-error, #e9322d); + --nc-color-error-rgb: var(--color-error-rgb, 233, 50, 45); + --nc-color-error-hover: var(--color-error-hover, #ed5a56); + --nc-color-warning: var(--color-warning, #eca700); + --nc-color-warning-rgb: var(--color-warning-rgb, 236, 167, 0); + --nc-color-warning-hover: var(--color-warning-hover, #efb832); + --nc-color-success: var(--color-success, #46ba61); + --nc-color-success-rgb: var(--color-success-rgb, 70, 186, 97); + --nc-color-success-hover: var(--color-success-hover, #6ac780); + --nc-color-loading-light: var(--color-loading-light, #777); + --nc-color-loading-dark: var(--color-loading-dark, #CCC); + --nc-color-box-shadow-rgb: var(--color-box-shadow-rgb, 0, 0, 0); + --nc-color-box-shadow: var(--color-box-shadow, #000000); + --nc-color-border: var(--color-border, #292929); + --nc-color-border-dark: var(--color-border-dark, #3b3b3b); + --nc-color-border-maxcontrast: var(--color-border-maxcontrast, #646464); + --nc-font-face: var(--font-face, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'); + --nc-default-font-size: var(--default-font-size, 15px); + --nc-default-line-height: var(--default-line-height, 24px); + --nc-animation-quick: var(--animation-quick, 100ms); + --nc-animation-slow: var(--animation-slow, 300ms); + --nc-border-radius: var(--border-radius, 3px); + --nc-border-radius-large: var(--border-radius-large, 10px); + --nc-border-radius-pill: var(--border-radius-pill, 100px); + --nc-default-grid-baseline: var(--default-grid-baseline, 4px); + --nc-navigation-width: var(--navigation-width, 300px); + --nc-sidebar-min-width: var(--sidebar-min-width, 300px); + --nc-sidebar-max-width: var(--sidebar-max-width, 500px); + --nc-list-min-width: var(--list-min-width, 200px); + --nc-list-max-width: var(--list-max-width, 300px); + --nc-breakpoint-mobile: var(--breakpoint-mobile, 1024px); + --nc-color-primary: var(--color-primary, #00639a); + --nc-color-primary-default: var(--color-primary-default, #0082c9); + --nc-color-primary-text: var(--color-primary-text, #ffffff); + --nc-color-primary-hover: var(--color-primary-hover, #04537f); + --nc-color-primary-light: var(--color-primary-light, #141e24); + --nc-color-primary-light-text: var(--color-primary-light-text, #99c0d6); + --nc-color-primary-light-hover: var(--color-primary-light-hover, #1d272d); + --nc-color-primary-text-dark: var(--color-primary-text-dark, #ededed); + --nc-color-primary-element: var(--color-primary-element, #00639a); + --nc-color-primary-element-text: var(--color-primary-element-text, #ffffff); + --nc-color-primary-element-hover: var(--color-primary-element-hover, #04537f); + --nc-color-primary-element-light: var(--color-primary-element-light, #141e24); + --nc-color-primary-element-light-text: var(--color-primary-element-light-text, #99c0d6); + --nc-color-primary-element-light-hover: var(--color-primary-element-light-hover, #1d272d); + --nc-color-primary-element-text-dark: var(--color-primary-element-text-dark, #ededed); + } +} +/* #endregion */ + +/* + * Icons + */ +/* #region icons */ + +#rl-app .iconcolor-green { + color: var(--nc-color-success) !important; +} + +#rl-app .iconcolor-red { + color: var(--nc-color-error) !important; +} + +#rl-app i.fontastic { + line-height: unset; +} + +#rl-app [data-icon]::before { + vertical-align: -10%; +} + +#rl-app .drag-handle { + color: var(--nc-color-text-lighter); +} + +/* #endregion */ + +/* + * Elements + */ + +/* #region elements */ + +/* #region link */ + +:root { + --link-color: var(--nc-color-primary-element-light-text); +} + +#rl-app a[target="_blank"] { + color: var(--nc-color-primary-element-light-text); +} + +#rl-app a[target="_blank"]:visited, +#rl-app a[target="_blank"]:active { + color: var(--nc-color-primary-element); +} + +/* #endregion */ + +/* #region scrollbar */ + +::-webkit-scrollbar { + width: 12px; + height: 12px; +} + +::-webkit-scrollbar-thumb { + background: var(--nc-color-scrollbar); + border-radius: var(--nc-border-radius-large); + border: 2px solid transparent; + background-clip: content-box; +} + +::-webkit-scrollbar-corner, +::-webkit-scrollbar-track-piece { + background-color: transparent; +} + +/* #endregion */ + +/* #region resizer */ + +#rl-app .resizer { + opacity: 1; + background-color: unset; + border-right: solid 1px var(--nc-color-border); +} + +::-webkit-resizer { + border: 10px solid transparent; + border-radius: var(--nc-border-radius); + border-bottom-color: var(--nc-color-border-dark); +} + +::-webkit-resizer { + border-right-color: var(--nc-color-border-dark); +} + +[dir="rtl"] ::-webkit-resizer { + border-right-color: transparent; + border-left-color: var(--nc-color-border-dark); +} + +/* #endregion */ + +/* #region meter */ + +#rl-app meter::-webkit-meter-bar { + background-color: var(--nc-color-border-dark); + border-color: var(--nc-color-border-dark); + border-width: 2px; + height: 10px; +} + +/* #endregion */ + +/* #region horizontal rule */ + +:root { + --hr-color: var(--nc-color-border-dark); +} + +#rl-app hr { + border-color: var(--nc-color-border-dark); +} + +/* #endregion */ + +/* #region tooltip */ + +#rl-app [data-rainloopErrorTip]::before, +#rl-app .help-block span { + border: 1px solid var(--nc-color-border); + border-radius: var(--nc-border-radius); + box-shadow: 0 0 2px var(--nc-color-box-shadow); + background-color: var(--nc-color-background-dark); + font-size: 13px; + color: unset; + left: 10px; + right: unset; + padding: 5px; + margin: 7px; +} + +#rl-app [data-rainloopErrorTip]::before { + color: var(--nc-color-error); + font-weight: 700; +} + +/* #endregion */ + +/* #region alert */ + +#rl-app .alert { + text-shadow: unset; + border: unset; + color: var(--nc-color-main-text); + background-color: rgba(var(--nc-color-warning-rgb), 0.1); + border-inline-start: 4px solid var(--nc-color-warning); + border-radius: var(--nc-border-radius); + margin: 1rem; + padding: 1rem; +} + +#rl-app .alert h4 { + font-weight: bold; + font-size: 20px; + margin-top: unset; + margin-bottom: 12px; + line-height: 30px; + color: var(--nc-color-text-light); +} + +#rl-app .alert.alert-info { + background-color: var(--nc-color-background-dark); + border-color: var(--nc-color-background-darker); +} + +#rl-app .alert.alert-warning { + background-color: rgba(var(--nc-color-warning-rgb), 0.1); + border-color: var(--nc-color-warning); +} + +#rl-app .alert.alert-success { + background-color: rgba(var(--nc-color-success-rgb), 0.1); + border-color: var(--nc-color-success); +} + +#rl-app .alert.alert-error { + background-color: rgba(var(--nc-color-error-rgb), 0.1); + border-color: var(--nc-color-error); +} + +#rl-app .alert .close { + top: -0.6rem; + right: unset; +} + +#rl-app .alert br { + display: none; +} + +/* #endregion */ + +/* #region button */ + +#rl-app .btn, +#rl-app button, +#rl-app button.btn:not(.button-vue) { + min-height: 36px; + height: 36px; + box-sizing: border-box; + padding: 8px 14px; + line-height: 20px; + color: var(--nc-color-main-text); + background-color: var(--nc-color-background-dark); + border: 1px solid var(--nc-color-border-dark) !important; + border-radius: var(--nc-border-radius-pill); + font-size: var(--nc-default-font-size); + text-shadow: none; + box-shadow: none; +} + +#rl-app .btn:hover, +#rl-app .btn:focus, +#rl-app .btn:active, +#rl-app .btn.active, +#rl-app button:hover, +#rl-app button:focus, +#rl-app button:active, +#rl-app button.active, +#rl-app span.fontastic:hover, +#rl-app span.fontastic:focus, +#rl-app span.fontastic:active { + outline: none; + opacity: unset; +} + +#rl-app .btn.fontastic, +#rl-app button.fontastic { + border-radius: var(--nc-border-radius-large); +} + +#rl-app .btn.btn-thin, +#rl-app button.btn-thin { + padding-right: 9px; + padding-left: 9px; +} + +#rl-app .btn.btn-transparent, +#rl-app button.btn-transparent { + background: unset !important; + border: unset !important; + opacity: 0.6; +} + +#rl-app .btn.btn-warning, +#rl-app button.btn-warning { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-warning); + border-color: var(--nc-color-warning) !important; +} + +#rl-app .btn.btn-warning:hover, +#rl-app .btn.btn-warning:focus, +#rl-app button.btn-warning:hover, +#rl-app button.btn-warning:focus { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-warning-hover); + border-color: var(--nc-color-warning-hover) !important; +} + +#rl-app .btn.btn-danger, +#rl-app button.btn-danger { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-error); + border-color: var(--nc-color-error) !important; +} + +#rl-app .btn.btn-danger:hover, +#rl-app .btn.btn-danger:focus, +#rl-app button.btn-danger:hover, +#rl-app button.btn-danger:focus { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-error-hover); + border-color: var(--nc-color-error-hover) !important; +} + +#rl-app .btn.btn-success, +#rl-app button.btn-success, +#rl-app button.btn.buttonLogin { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-primary-element); + border-color: var(--nc-color-primary-element) !important; +} + +#rl-app .btn.btn-success:hover, +#rl-app .btn.btn-success:focus, +#rl-app button.btn-success:hover, +#rl-app button.btn-success:focus, +#rl-app button.btn.buttonLogin:hover, +#rl-app button.btn.buttonLogin:focus { + color: var(--nc-color-primary-element-text); + background-color: var(--nc-color-primary-element-hover); + border-color: var(--nc-color-primary-element-hover) !important; +} + +#rl-app span.fontastic { + padding: 6px; + height: fit-content; + border-radius: var(--nc-border-radius); +} + +#rl-app span.fontastic:hover { + background-color: var(--nc-color-background-hover); +} + +#rl-app span.fontastic:active { + background-color: var(--nc-color-primary-light); +} + +#rl-app .btn.disabled, .btn[disabled], +#rl-app .btn.disabled:hover, .btn[disabled]:hover, +#rl-app .btn.disabled:focus, .btn[disabled]:focus, +#rl-app .btn.disabled:active, .btn[disabled]:active, +#rl-app button.disabled, button[disabled], +#rl-app button.disabled:hover, button[disabled]:hover, +#rl-app button.disabled:focus, button[disabled]:focus, +#rl-app button.disabled:active, button[disabled]:active, +#rl-app span.fontastic.disabled, span.fontastic[disabled], +#rl-app span.fontastic.disabled:hover, span.fontastic[disabled]:hover, +#rl-app span.fontastic.disabled:focus, span.fontastic[disabled]:focus, +#rl-app span.fontastic.disabled:active, span.fontastic[disabled]:active { + opacity: .5; + filter: saturate(0.7); +} + +#rl-app .btn:not(.disabled, [disabled]):hover, +#rl-app .btn:not(.disabled, [disabled]):focus, +#rl-app button:not(.disabled, [disabled]):hover, +#rl-app button:not(.disabled, [disabled]):focus, +#rl-app span.fontastic:not(.disabled, [disabled]):hover, +#rl-app span.fontastic:not(.disabled, [disabled]):focus { + border-color: var(--nc-color-primary-element) !important; +} + +#rl-app .btn:not(.disabled, [disabled]):active, +#rl-app .btn:not(.disabled, [disabled]).active, +#rl-app button:not(.disabled, [disabled]):active, +#rl-app button:not(.disabled, [disabled]).active, +#rl-app span.fontastic:not(.disabled, [disabled]):active, +#rl-app span.fontastic:not(.disabled, [disabled]).active { + background-color: var(--nc-color-main-background); + color: var(--nc-color-text-light); +} + +/* #endregion */ + +/* #region button group */ + +#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])) { + margin-right: 0.5px; +} + +/* fallback */ +#rl-app .btn-group .btn:first-of-type { + margin-right: 0.5px; +} + +#rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])) { + margin-left: 0.5px; +} + +/* fallback */ +#rl-app .btn-group .btn:last-of-type { + margin-left: 0.5px; +} + +#rl-app .btn-group .btn:nth-child(n+2 of :not([style*="display: none;"])):nth-last-child(n+2 of :not([style*="display: none;"])) { + border-radius: 0 !important; + margin-right: 0.5px; + margin-left: 0.5px; +} + +/* fallback */ +#rl-app .btn-group .btn:not(:first-of-type):not(:last-of-type) { + border-radius: 0; + margin: 0 0.5px; +} + +#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])) { + border-radius: 0 !important; + border-top-left-radius: var(--nc-border-radius-pill) !important; + border-bottom-left-radius: var(--nc-border-radius-pill) !important; +} + +/* fallback */ +#rl-app .btn-group .btn:first-of-type, +[dir="rtl"] #rl-app .btn-group .btn:last-of-type { + border-radius: 0; + border-top-left-radius: var(--nc-border-radius-pill); + border-bottom-left-radius: var(--nc-border-radius-pill); +} + +#rl-app .btn-group .btn:nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])) { + border-radius: 0 !important; + border-top-right-radius: var(--nc-border-radius-pill) !important; + border-bottom-right-radius: var(--nc-border-radius-pill) !important; +} + +/* fallback */ +#rl-app .btn-group .btn:last-of-type, +[dir="rtl"] #rl-app .btn-group .btn:first-of-type { + border-radius: 0; + border-top-right-radius: var(--nc-border-radius-pill); + border-bottom-right-radius: var(--nc-border-radius-pill); +} + +#rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) { + border-radius: var(--nc-border-radius-pill) !important; +} + +/* fallback */ +#rl-app .btn-group .btn:first-of-type:last-of-type, +[dir="rtl"] #rl-app .btn-group .btn:first-of-type:last-of-type { + border-radius: var(--nc-border-radius-pill) !important; +} + +#rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-last-child(1 of :not([style*="display: none;"])) { + border-radius: 0 !important; + border-top-left-radius: var(--nc-border-radius-large) !important; + border-bottom-left-radius: var(--nc-border-radius-large) !important; +} + +/* fallback */ +#rl-app .btn-group .btn.fontastic:first-of-type, +[dir="rtl"] #rl-app .btn-group .btn.fontastic:last-of-type { + border-radius: 0; + border-top-left-radius: var(--nc-border-radius-large); + border-bottom-left-radius: var(--nc-border-radius-large); +} + +#rl-app .btn-group .btn.fontastic:nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])) { + border-radius: 0 !important; + border-top-right-radius: var(--nc-border-radius-large) !important; + border-bottom-right-radius: var(--nc-border-radius-large) !important; +} + +/* fallback */ +#rl-app .btn-group .btn.fontastic:last-of-type, +[dir="rtl"] #rl-app .btn-group .btn.fontastic:first-of-type { + border-radius: 0; + border-top-right-radius: var(--nc-border-radius-large); + border-bottom-right-radius: var(--nc-border-radius-large); +} + +#rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) { + border-radius: var(--nc-border-radius-large) !important; +} + +/* fallback */ +#rl-app .btn-group .btn.fontastic:first-of-type:last-of-type, +[dir="rtl"] #rl-app .btn-group .btn.fontastic:first-of-type:last-of-type { + border-radius: var(--nc-border-radius-large) !important; +} + +/* #endregion */ + +/* #region input & select */ + +#rl-app select, +#rl-app .select, +#rl-app .emailaddresses, +#rl-app input:not([type="checkbox"]) { + padding: 0 12px; + font-size: var(--nc-default-font-size); + color: var(--nc-color-main-text); + background-color: unset; + height: 36px; + border: 2px solid var(--nc-color-border-maxcontrast); + border-radius: var(--nc-border-radius-large); + line-height: 32px; + outline: none; +} + +#rl-app select:hover, +#rl-app select:active, +#rl-app select:focus, +#rl-app .select:hover, +#rl-app .select:active, +#rl-app .select:focus, +#rl-app .emailaddresses:hover, +#rl-app .emailaddresses:active, +#rl-app .emailaddresses:focus, +#rl-app input:hover, +#rl-app input:active, +#rl-app input:focus, +#rl-app input:not([type="checkbox"]):hover, +#rl-app input:not([type="checkbox"]):active, +#rl-app input:not([type="checkbox"]):focus { + border-color: var(--nc-color-primary-element); +} + +/* #endregion */ + +/* #region input */ + +#rl-app input { + box-shadow: none; +} + +#rl-app input[type="search"]::-webkit-search-decoration, +#rl-app input[type="search"]::-webkit-search-cancel-button, +#rl-app input[type="search"]::-webkit-search-results-button, +#rl-app input[type="search"]::-webkit-search-results-decoration { + -webkit-appearance: none; +} + +#rl-app input::-webkit-outer-spin-button, +#rl-app input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; +} + +#rl-app input[type=number] { + -moz-appearance: textfield; + -webkit-appearance: textfield; + appearance: textfield; + margin: 0; + /* ? margin: 0 5px 0 0; */ +} + +#rl-app .search-input-wrp a { + position: absolute; + top: 2px; + right: 1px; + min-width: unset; + min-height: unset; + height: 32px; + font-size: 20px; + line-height: 30px; +} + +/* #endregion */ + +/* #region checkbox */ + +#rl-app .e-checkbox.material-design { + width: fit-content !important; + width: -moz-fit-content !important; + display: flex; + position: relative; + align-items: center; + user-select: none; + height: 44px; + border-radius: 44px; + padding: 0 14px; + margin: 0; +} + +#rl-app .e-checkbox.material-design:hover, +#rl-app .e-checkbox.material-design:focus-within { + background-color: var(--nc-color-primary-light); + outline: none; +} + +#rl-app .e-checkbox.material-design:focus { + outline: none; +} + +#rl-app .e-checkbox input[type="checkbox"] { + display: none; +} + +input[type="checkbox"] { + background-color: transparent; + -webkit-appearance: none; + appearance: none; +} + +#rl-app .e-checkbox.material-design>div { + position: relative; + width: 18px; + top: 2px; +} + +#rl-app input[type="checkbox"], +#rl-app .e-checkbox.material-design input+div { + position: unset; + height: 18px !important; + width: 18px !important; + min-width: 18px !important; + flex-shrink: 0 !important; + border: 2px solid var(--nc-color-primary-element); + border-radius: 2px; + box-sizing: border-box; + animation: none; + transform: unset; +} + +#rl-app input[type="checkbox"]:checked, +#rl-app .e-checkbox.material-design input:checked+div { + --nc-svg-checked: url("data:image/svg+xml,"); + -webkit-mask-image: var(--nc-svg-checked); + mask-image: var(--nc-svg-checked); + background: var(--nc-color-primary-element); + border-width: 0; + animation: none; + transform: unset; +} + +/* #endregion */ + +/* #region select */ + +#rl-app select option, +#rl-app select::-webkit-scrollbar-corner, +#rl-app select::-webkit-scrollbar-track-piece { + background-color: var(--nc-color-main-background); + color: var(--nc-color-main-text); +} + +/* #endregion */ + +/* #region select email address */ + +#rl-app .emailaddresses { + display: flex; + flex-wrap: wrap; + align-items: center; + padding: 0 0 4px; + width: 100%; + height: auto; + min-height: 44px; + max-height: calc(44px*2); + line-height: var(--nc-vs-line-height); + background-color: var(--nc-vs-search-input-bg); + white-space: normal; +} + +#rl-app .emailaddresses.emailaddresses-focused { + border: 2px solid var(--nc-color-primary-element); +} + +#rl-app .emailaddresses li { + margin: 4px 2px 0; +} + +#rl-app .emailaddresses li.emailaddresses-input>input[type="text"], +#rl-app .emailaddresses li.emailaddresses-input>input[type="text"]:focus, +#rl-app .emailaddresses li.emailaddresses-input>input[type="text"]:hover { + padding: 0 7px; + height: 36px; + max-width: 390px; + color: var(--nc-vs-search-input-color); + font-size: var(--nc-vs-font-size); + line-height: var(--nc-vs-line-height); +} + +#rl-app .emailaddresses li[draggable] { + display: flex; + align-items: center; + padding: 0 0.5em; + min-height: 36px; + line-height: var(--nc-vs-line-height); + color: var(--nc-vs-selected-color); + border: 0; + border-radius: var(--nc-vs-border-radius); + background-color: var(--nc-vs-selected-bg); + box-shadow: none; +} + +#rl-app .emailaddresses li[draggable]>span { + max-width: calc(100vw - 140px); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +#rl-app .emailaddresses li[draggable]>a.ficon { + position: unset; + color: transparent; + text-shadow: 0 0 0 var(--nc-vs-controls-color); + background: none; + border: 0; + cursor: pointer; + display: inline-flex; + margin-left: 4px; + padding: 0; +} + +@media screen and (max-width: 480px) { + #rl-app .emailaddresses li.emailaddresses-input>input[type="text"] { + max-width: calc(100vw - 116px) !important; + } +} + +/* #endregion */ + +/* #region textarea */ + +#rl-app .squire-toolbar { + height: 50px; + padding: 5px; + box-sizing: content-box; + border: none; +} + +#rl-app textarea, +#rl-app div[contenteditable], +#rl-app .squire-wysiwyg, +#rl-app .squire-plain { + padding: 8px 12px; + margin: unset; + font-size: var(--nc-default-font-size); + color: var(--nc-color-main-text); + background-color: unset; + outline: none; + border: 2px solid var(--nc-color-border-dark); + border-radius: var(--nc-border-radius-large); +} + +#rl-app textarea:hover, +#rl-app textarea:active, +#rl-app textarea:focus, +#rl-app div[contenteditable=true]:hover, +#rl-app div[contenteditable=true]:active, +#rl-app div[contenteditable=true]:focus, +#rl-app .squire-wysiwyg:hover, +#rl-app .squire-wysiwyg:active, +#rl-app .squire-wysiwyg:focus, +#rl-app .squire-plain:hover, +#rl-app .squire-plain:active, +#rl-app .squire-plain:focus { + border-color: var(--nc-color-primary-element); +} + +/* #endregion */ + +/* #region dropdown */ + +#rl-app .dropdown.show { + box-shadow: none; +} + +#rl-app .dropdown-menu { + background-color: var(--nc-color-main-background); + filter: drop-shadow(0 1px 5px var(--nc-color-box-shadow)); + border-radius: var(--nc-border-radius-large); + color: var(--nc-color-main-text); + padding: 4px; +} + +#rl-app .dropdown-menu a { + background-color: unset; + color: unset; + height: 22px; + line-height: 22px; + border-radius: 3px; + margin: 2px; + box-sizing: content-box; + text-align: start; +} + +#rl-app .dropdown-menu li.disabled>a, +#rl-app .dropdown-menu li.disabled>a:hover, +#rl-app .dropdown-menu li.disabled>a:focus, +#rl-app .dropdown-menu li.disabled>a:active { + opacity: .5; + filter: saturate(0.7); +} + +#rl-app .dropdown-menu li:not(.disabled)>a:hover, +#rl-app .dropdown-menu li:not(.disabled)>a:focus { + background-color: var(--nc-color-background-hover); + color: unset; + opacity: unset; +} + +#rl-app .dropdown-menu li:not(.disabled)>a:active { + background-color: var(--nc-color-primary-element-light); +} + +#rl-app .dropdown-menu *+.dividerbar { + border-color: var(--nc-color-border); +} + +#rl-app .dropdown-menu::-webkit-scrollbar-track-piece { + background-color: inherit; + border-top-right-radius: inherit; + border-bottom-right-radius: inherit; +} + +.rl-left-panel-disabled #rl-app .dropdown-menu:not(.right-edge) { + position: fixed; + top: auto; + left: 5px; + right: auto; +} + +/* #endregion */ + +/* #region dropdown account */ + +#rl-app #V-SystemDropDown { + margin: 2px 5px 0 5px; +} + +#rl-app #V-SystemDropDown .btn-toolbar { + border: solid 1px var(--nc-color-border-dark); + border-radius: var(--nc-border-radius-large); + height: 36px; + padding: 2px; + display: flex; + flex-direction: row; + align-items: center; + box-sizing: content-box; +} + +#rl-app #V-SystemDropDown .accountPlace { + background: unset; + color: unset; + text-shadow: none; + border-color: var(--nc-color-border); +} + +#rl-app #V-SystemDropDown #top-system-dropdown-id { + background-color: unset; + border: unset !important; + border-radius: var(--nc-border-radius-large) !important; + height: 20px; +} + +#rl-app #V-SystemDropDown #top-system-dropdown-id:hover, +#rl-app #V-SystemDropDown #top-system-dropdown-id:focus { + background-color: var(--nc-color-background-hover); +} + +#rl-app #V-SystemDropDown #top-system-dropdown-id:active { + background-color: var(--nc-color-background-dark); +} + +/* #endregion */ + +/* #region tab */ + +#rl-app .tabs>[id^=tab]:checked+label { + background-color: var(--nc-color-main-background); + border-color: var(--nc-color-primary-element); + border-bottom-color: transparent; +} + +#rl-app .tabs>label { + margin: 0 2px -1px 2px; + border-radius: 0; + border-top-left-radius: var(--nc-border-radius); + border-top-right-radius: var(--nc-border-radius); + overflow-wrap: anywhere; +} + +#rl-app .tabs>label:hover { + border-color: transparent; + border-bottom-color: var(--nc-color-primary-element); + background-color: var(--nc-color-background-hover) +} + +#rl-app .tabs .tab-content { + border-top: solid 1px; + border-radius: 4px; + border-color: var(--nc-color-primary-element); +} + +@media screen and (max-width: 480px) { + #rl-app .tabs>label>i, + #rl-app .tabs>label::before { + display: none; + } +} + +/* #endregion */ + +/* #region table */ + +#rl-app .table td, +#rl-app .table th, +#rl-app .table-bordered { + border-color: var(--nc-color-border-dark); +} + +#rl-app .table-hover tbody tr:hover td, +#rl-app .table-hover tbody tr:hover th { + background-color: var(--nc-color-background-hover); +} + +#rl-app .table-striped tbody tr:nth-child(odd) td, +#rl-app .table-striped tbody tr:nth-child(odd) th { + background-color: var(--nc-color-background-dark); +} + +/* #endregion */ + +/* #region attachment */ + +#rl-app .attachmentItem { + background-color: var(--nc-color-background-dark); + border-radius: var(--nc-border-radius); + box-shadow: none; + padding: 2px; +} + +#rl-app .attachmentItem:hover, +#rl-app .attachmentItem:active { + background-color: var(--nc-color-background-darker); +} + +#rl-app .attachmentItem:focus { + outline: none; +} + +#rl-app .attachmentItem .iconProgress { + background-color: var(--nc-color-background-darker); +} + +#rl-app .attachmentItem .iconBG { + font-weight: 700; + line-height: 48px; + font-size: unset; + text-shadow: unset; +} + +#rl-app .attachmentItem .attachmentNameParent { + border-color: var(--nc-color-border-dark); +} + +#rl-app .attachmentItem .iconMain, +#rl-app .attachmentItem .iconPreview { + color: var(--nc-color-text-light); +} + +/* #endregion */ + +/* #endregion */ + +/* + * Views + */ + +/* #region views */ + +/* #region app */ + +#rl-app { + color: var(--nc-color-main-text); + background-color: transparent; + font-family: var(--nc-font-face); + font-size: var(--nc-default-font-size); +} + +#rl-app #rl-left { + background-color: var(--nc-color-main-background-blur, var(--nc-color-main-background)); + -webkit-backdrop-filter: var(--nc-filter-background-blur, none); + backdrop-filter: var(--nc-filter-background-blur, none); + border-color: var(--nc-color-border); + width: 300px; +} + +html:not(.rl-left-panel-disabled) #rl-left { + max-width: var(--nc-sidebar-max-width); +} + +html.rl-left-panel-disabled #rl-app #rl-left { + width: 65px !important; +} + +html.rl-mobile.rl-left-panel-disabled #rl-app #rl-left { + width: 0px !important; +} + +#rl-app #rl-right { + background-color: var(--nc-color-main-background); +} + +#rl-app::selection { + background-color: var(--nc-color-primary); + color: var(--nc-color-primary-text); +} + +:not(#rl-app) ol, ul { + margin: unset; +} + +#rl-app .control-group { + margin-bottom: 0.5em; +} + +#rl-app .form-horizontal .control-group { + display: flex; + align-items: center; + margin-left: 0; +} + +#rl-app .form-horizontal .control-group { + margin-bottom: 1em; +} + +@media screen and (max-width: 799px) { + #rl-app .form-horizontal .control-group>label { + text-align: right; + } +} + +/* #endregion */ + +/* #region login & loading */ + +#rl-app #V-Login, +#rl-app #rl-loading, +#rl-app #rl-loading-error { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 10px; + + top: unset; + position: unset; + min-width: unset; + max-width: unset; + transform: unset; + text-shadow: none; + transition: none; + + background-color: var(--nc-color-main-background-blur, var(--nc-color-main-background)); + -webkit-backdrop-filter: var(--nc-filter-background-blur, none); + backdrop-filter: var(--nc-filter-background-blur, none); + + color: var(--nc-color-main-text); + width: 100%; + height: 100%; +} + +#rl-app .LoginView .descWrapper { + color: var(--nc-color-main-text); +} + +#rl-app .LoginView .alert { + position: unset; +} + +#rl-app .LoginView form { + min-width: 250px; + max-width: 500px; + width: 90%; + + background-color: var(--nc-color-main-background); + border: unset; + border-radius: var(--nc-border-radius-large); + box-shadow: 0 0 10px var(--nc-color-box-shadow); + color: var(--nc-color-main-text); +} + +#rl-app .LoginView .controls>.fontastic:first-child { + padding: unset; + left: 10px; +} + +#rl-app .LoginView .controls span.fontastic { + user-select: none; +} + +#rl-app .LoginView .controls span.fontastic:active, +#rl-app .LoginView .controls span.fontastic:hover { + background: unset; +} + +#rl-app #rl-loading[hidden], +#rl-app #rl-loading-error[hidden], +#rl-app .LoginView .alert[hidden] { + display: none; +} + +/* #endregion */ + +/* #region side panel */ + +html.rl-left-panel-disabled #rl-app #rl-left:has(#V-SettingsMenu:not([hidden])) { + width: 250px !important; +} + +#rl-app #V-AdminPane>.b-toolbar, +#rl-app #V-SettingsMenu>.b-toolbar { + top: 0; + left: 0; + height: auto !important; + padding-top: calc(var(--nc-default-grid-baseline) * 2) !important; + padding-bottom: calc(var(--nc-default-grid-baseline) * 2) !important; + font-weight: bold; +} + +#rl-app .b-folders .b-toolbar { + height: unset; + display: flex; + flex-direction: row; + padding: 8px; +} + +html.rl-left-panel-disabled #rl-app .b-folders .b-toolbar { + flex-direction: column; +} + +#rl-app .b-folders .b-toolbar .btn.buttonCompose, +#rl-app .b-folders .b-toolbar .btn.buttonContacts, +#rl-app .b-footer .btn { + box-sizing: border-box; + padding: 4px 14px; + line-height: 36px; + height: 44px; + min-width: fit-content; + width: stretch; + width: -moz-available; + width: -webkit-fill-available; + margin: 3px !important; + + font-size: var(--nc-default-font-size); +} + +#rl-app .b-folders .b-toolbar .btn.buttonCompose { + min-width: 16px; + max-width: 100%; + font-weight: bold; + box-sizing: content-box !important; +} + +#rl-app .b-folders .b-toolbar .btn.buttonContacts { + width: 44px; + min-width: 44px; +} + +#rl-app #V-AdminMenu nav, +#rl-app #V-SettingsMenu nav, +#rl-app .b-folders .b-content { + padding: calc(var(--nc-default-grid-baseline) * 2); +} + +#rl-app .b-folders .b-content { + top: 60px; + bottom: 162px; +} + +#rl-app .b-folders .b-content.show-on-panel-disabled { + bottom: 56px; +} + +#rl-app #V-AdminMenu nav a, +#rl-app #V-AdminPane>.b-toolbar, +#rl-app #V-SettingsMenu nav a, +#rl-app #V-SettingsMenu>.b-toolbar, +#rl-app .b-folders li a.selectable { + margin: 2px; + padding: 0 2em 0 15px; + height: 38px; + line-height: 38px !important; + border-radius: var(--nc-border-radius-pill); + color: unset; + border: none; +} + +#rl-app #V-AdminMenu nav a, +#rl-app #V-AdminPane>.b-toolbar, +#rl-app #V-SettingsMenu nav a, +#rl-app #V-SettingsMenu>.b-toolbar { + height: 44px; + min-height: 44px; + line-height: 44px !important; +} + +#rl-app #V-AdminMenu nav a.selected, +#rl-app #V-SettingsMenu nav a.selected, +#rl-app .b-folders li a.selectable.selected { + color: unset; + background-color: var(--nc-color-primary-light); +} + +#rl-app #V-AdminMenu nav a:not(.selected):hover, +#rl-app #V-AdminMenu nav a:not(.selected):focus, +#rl-app #V-SettingsMenu nav a:not(.selected):hover, +#rl-app #V-SettingsMenu nav a:not(.selected):focus, +#rl-app .b-folders li a.selectable:not(.selected):hover, +#rl-app .b-folders li a.selectable:not(.selected):focus { + color: unset; + background-color: var(--nc-color-background-hover); +} + +#rl-app .b-folders .b-folders-system a[data-unread]::after, +#rl-app .b-folders .b-folders-user a[data-unread]::after { + display: block; + margin: 0; + padding: 2px 6px; + top: 50%; + transform: translateY(-50%); + + color: var(--nc-color-primary-element); + background-color: var(--nc-color-primary-element-light); + + font-size: 12px; + text-shadow: none; +} + +html.rl-left-panel-disabled #rl-app .b-folders .b-folders-system a.selectable { + text-overflow: clip; +} + +#rl-app .b-folders hr { + border-top: solid var(--nc-color-main-text); + border-radius: var(--nc-border-radius-pill); + opacity: .1; +} + +#rl-app .b-folders .search-input-wrp { + width: calc(100% - 20px); + margin: 5px 10px; + opacity: .7; +} + +#rl-app .b-folders .search-input-wrp input { + width: 100%; +} + +#rl-app .b-footer.btn-toolbar.hide-mobile, +#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled { + display: flex; + flex-direction: column; + align-content: stretch; + justify-content: flex-start; + height: unset; + box-sizing: border-box; +} + +#rl-app .b-footer.btn-toolbar.hide-mobile, +#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled { + margin: 0; + padding: 0; + bottom: 0; +} + +#rl-app .b-footer.btn-toolbar { + overflow: unset; + padding: 3px; +} + +#rl-app .b-footer.btn-toolbar .btn { + background: transparent; + border: unset !important; +} + +#rl-app .b-footer.btn-toolbar .btn { + text-align: left; + font-size: 22px; + user-select: none; +} + +#rl-app .b-footer.btn-toolbar .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])), +#rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])), +[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic:nth-child(1 of :not([style*="display: none;"])):nth-last-child(1 of :not([style*="display: none;"])) { + border-radius: var(--nc-border-radius-pill) !important; +} + +/* fallback */ +#rl-app .b-footer.btn-toolbar .btn-group .btn, +#rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic, +[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn, +[dir="rtl"] #rl-app .b-footer.btn-toolbar .btn-group .btn.fontastic { + border-radius: var(--nc-border-radius-pill) !important; +} + +#rl-app .b-footer.btn-toolbar .btn:hover, +#rl-app .b-footer.btn-toolbar .btn.fontastic:hover { + background-color: var(--nc-color-background-hover); +} + +#rl-app .b-footer.btn-toolbar .btn:active, +#rl-app .b-footer.btn-toolbar .btn.fontastic:active { + background-color: var(--nc-color-primary-light); +} + +#rl-app .b-footer.btn-toolbar .btn:focus, +#rl-app .b-footer.btn-toolbar .btn.fontastic:focus { + outline: none; +} + +#rl-app .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn { + width: -webkit-fill-available; + width: -moz-available; + width: fill-available; + overflow: hidden; +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic { + background-color: var(--nc-color-main-background); +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after, +[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:before { + font-family: var(--nc-font-face); + font-size: var(--nc-default-font-size); + margin-left: 15px; +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after { + position: absolute; +} + +[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn:after { + position: unset; +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:after, +[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:before { + content: 'Folder-Settings'; + width: inherit; + overflow: hidden; + text-overflow: ellipsis; +} + +[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group.hide-on-panel-disabled .btn.fontastic:after { + content: unset; +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:before { + line-height: unset; +} + +#rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:after { + content: 'Create new folder'; + width: inherit; + overflow: hidden; + text-overflow: ellipsis; +} + +html.rl-left-panel-disabled #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.fontastic:after, +html.rl-left-panel-disabled #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.icon-folder-add:after, +html.rl-left-panel-disabled[dir="rtl"] #rl-app #V-MailFolderList .b-footer.btn-toolbar .btn-group .btn.fontastic:before { + content: ''; +} + +#rl-app #V-MailFolderList .b-footer .btn[data-bind*="toggleLeftPanel"] { + width: unset !important; +} + +/* #endregion */ + +/* #region message list & view */ + +#rl-app .messageList, +#rl-app .messageView { + height: calc(100% - 65px); + margin: 0 5px; + border: none; + box-shadow: none !important; + background: var(--nc-color-main-background); +} + +#rl-app #V-MailMessageList .btn-toolbar, +#rl-app #V-MailMessageView .btn-toolbar { + padding: 10px; + margin-top: 5px; +} + +/* fallback */ +#rl-app #V-MailMessageList .btn-toolbar .btn-group .btn, +#rl-app #V-MailMessageView .btn-toolbar .btn-group .btn { + border-radius: var(--nc-border-radius-large); +} + +/* #endregion */ + +/* #region message list */ + +#rl-app #V-MailMessageList { + overflow: unset; +} + +#rl-app #V-MailMessageList .btn-toolbar { + background: var(--nc-color-primary-light); + border-radius: var(--nc-border-radius-large); + margin: 5px 5px 0 5px; + text-align: center; +} + +#rl-app #V-MailMessageList .btn-toolbar .btn:not(.btn-success) { + background: var(--nc-color-main-background); +} + +html.rl-mobile #rl-app #V-MailMessageList .btn-toolbar { + text-align: start; +} + +#rl-app #V-MailMessageList .messageList { + min-width: 370px; +} + +html.sm-msgView-bottom #rl-app .messageList { + height: 35vh; +} + +#rl-app .messageList .second-toolbar, +#rl-app .messageList .b-footer { + border-color: var(--nc-color-border); + background: unset !important; +} + +#rl-app .messageList .second-toolbar { + align-items: center; +} + +#rl-app .messageList .b-footer { + padding-bottom: 10px; +} + +#rl-app .messageList .inputSearch { + max-width: unset; +} + +#rl-app .messageList .checkboxCheckAll { + margin: 0 12px; +} + +#rl-app .messageList .checkboxCheckAll:hover, +#rl-app .messageList .checkboxCheckAll:focus { + color: var(--nc-color-primary-element); +} + +#rl-app .messageList .checkboxCheckAll:active { + color: var(--nc-color-primary-element-hover); +} + +html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll { + display: none; +} + +#rl-app .messageList .btn.buttonMoreSearch { + background: unset; + border-radius: var(--nc-border-radius-large); + margin: 0 0 0 8px; + line-height: 20px !important; +} + +#rl-app .messageList .checkboxCheckAll, +#rl-app .messageList .btn.buttonMoreSearch { + font-size: var(--nc-default-font-size); + height: 28px; + line-height: 28px; +} + +#rl-app .messageList .b-content .listThreadUidDesc { + margin: 8px; + color: var(--nc-color-main-text); + background: unset; + border: solid 1px; + border-radius: var(--nc-border-radius-large); + border-color: var(--nc-color-border-dark); +} + +#rl-app .messageList .b-content .listThreadUidDesc:hover, +#rl-app .messageList .b-content .listThreadUidDesc:focus { + background: var(--nc-color-background-hover); +} + +#rl-app .messageList .b-content .listThreadUidDesc:active { + background-color: var(--nc-color-primary-element-light); +} + +#rl-app .messageList .b-content .listSearchDesc { + border-color: var(--nc-color-border); +} + +#rl-app .messageList .b-content .listError { + color: var(--nc-color-error); +} + +#rl-app .messageList .b-content .listDragOver.dragOverEnter { + background-color: var(--nc-color-background-dark); + border-radius: var(--nc-border-radius); + margin: 5px; +} + +#rl-app .messageList .b-content .listDragOver, +#rl-app .messageList .b-content .listEmptyMessage, +#rl-app .messageList .b-content .listError, +#rl-app .messageList .b-content .listLoading { + color: var(--nc-color-text-lighter); +} + +#rl-app .messageList .groupLabel { + background-color: var(--nc-color-background-dark); + border-radius: var(--nc-border-radius); + margin: 2px 0; +} + +/* #endregion */ + +/* #region message list item */ + +#rl-app .messageListItem .checkboxMessage { + border-color: var(--nc-color-text-lighter); + color: var(--nc-color-text-lighter); +} + +#rl-app .messageListItem .checkboxMessage:hover, +#rl-app .messageListItem .checkboxMessage:focus { + background-color: var(--nc-color-background-darker); +} + +#rl-app .messageListItem .checkboxMessage:active { + background-color: var(--nc-color-primary-light-hover); +} + +#rl-app .messageListItem .threads-len { + color: var(--nc-color-text-light); + border-color: var(--nc-color-text-light); + padding: 0 4px; + margin-right: 5px; +} + +#rl-app .messageListItem .threads-len:hover, +#rl-app .messageListItem .threads-len:focus { + background-color: var(--nc-color-background-darker); + border-color: unset; +} + +#rl-app .messageListItem .threads-len:active { + background-color: var(--nc-color-primary-element-light-hover); +} + +#rl-app .messageListItem { + padding: 8px; + margin: 2px 0; + border-bottom: unset; + border-radius: var(--nc-border-radius); +} + +#rl-app .messageListItem, +#rl-app .messageListItem.focused { + background-color: var(--nc-color-background); + border-color: var(--nc-color-border); +} + +#rl-app .messageListItem:hover, +#rl-app .messageListItem.focused:hover { + background-color: var(--nc-color-background-hover); + border-color: var(--nc-color-primary-light-hover); +} + +#rl-app .messageListItem.selected, +#rl-app .messageListItem.selected:hover { + background-color: var(--nc-color-primary-light) !important; + border-color: var(--nc-color-primary-light-text) !important; +} + +#rl-app .messageListItem.unseen { + background-color: unset; + border-color: var(--nc-color-primary); +} + +#rl-app .messageListItem.unseen.focused, +#rl-app .messageListItem.unseen.focused:hover { + background-color: var(--nc-color-primary-light); + border-color: var(--nc-color-primary); +} + +#rl-app .messageListItem.unseen:hover { + background-color: var(--nc-color-background-hover); + border-color: var(--nc-color-primary-hover); +} + +#rl-app .messageListItem [data-unseen] { + border-color: var(--nc-color-primary-element); + background-color: var(--nc-color-primary-element-light); + border-width: 2px; + font-weight: 700; +} + +#rl-app .messageListItem [data-unseen]:hover { + border-color: var(--nc-color-primary-element-hover); + background-color: var(--nc-color-primary-element-light-hover); +} + +#rl-app .messageListItem.checked { + background-color: unset; + border-color: var(--nc-color-primary-light-text); +} + +#rl-app .messageListItem.checked.focused { + background-color: inherit; + border-color: var(--nc-color-primary-light-text); +} + +#rl-app .messageListItem.checked:hover, +#rl-app .messageListItem.checked.focused:hover { + background-color: var(--nc-color-background-hover); + border-color: inherit; +} + +#rl-app #messagesDragImage { + padding: 5px 5px 5px 10px; + color: var(--nc-color-text-lighter); + background-color: var(--nc-color-background-darker); + border-radius: var(--nc-border-radius); + box-shadow: 0 0 4px var(--nc-color-box-shadow); + height: unset; + min-width: unset; +} + +/* #endregion */ + +/* #region message view */ + +#rl-app #V-MailMessageView { + bottom: 0; +} + +html.sm-msgView-bottom #rl-app .messageView { + height: 100%; +} + +#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit { + padding: 4px 8px; + min-height: 28px; + height: 28px; + opacity: 0.8; +} + +#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:hover, +#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:focus, +#rl-app .messageView .b-message .message-fixed-button-toolbar .btn.buttonEdit:active { + opacity: unset; +} + +#rl-app .messageView .b-message-view-desc, +#rl-app .messageView .b-message-view-checked-helper { + color: var(--nc-color-text-lighter); +} + +#rl-app .messageView .b-message-view-desc.error { + color: var(--nc-color-error); +} + +#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-optimum-value { + background-color: var(--nc-color-success); + border-radius: var(--nc-border-radius-pill); +} + +#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-suboptimum-value { + background-color: var(--nc-color-warning); + border-radius: var(--nc-border-radius-pill); +} + +#rl-app .messageView .messageItemHeader .informationShort meter::-webkit-meter-even-less-good-value { + background-color: var(--nc-color-error); + border-radius: var(--nc-border-radius-pill); +} + +#rl-app .messageView .messageItemHeader .hasVirus { + background: unset; + border: solid 2px var(--nc-color-error); + border-radius: var(--nc-border-radius); + margin: 5px; +} + +#rl-app .messageView .messageItemHeader .subject { + line-height: 30px; + height: 30px; +} + +#rl-app .messageView .openpgp-control.encrypted, +#rl-app .messageView .openpgp-control.signed { + border-radius: var(--nc-border-radius); +} + +#rl-app #V-MailMessageView .b-message-view-backdrop { + background-color: var(--nc-color-main-background-blur); + -webkit-backdrop-filter: blur(2px); + backdrop-filter: blur(2px); +} + +#rl-app #V-MailMessageView .b-message-view-backdrop .backdrop-message { + background-color: var(--nc-color-main-background); + border: solid 1px var(--nc-color-primary); + border-radius: var(--nc-border-radius-large); + text-shadow: none; + margin: 10px; + color: unset; +} + +#rl-app .messageView .messageAssignedTags { + margin: 0 5px; +} + +#rl-app .messageView .messageAssignedTags span { + border-radius: var(--nc-border-radius-pill); + background: unset; + padding: 2px 5px; +} + +#rl-app #messageItem .bodySubHeader { + background-color: unset; +} + +#rl-app #messageItem .bodySubHeader>* { + border-color: var(--nc-color-border); +} + +.rl-left-panel-disabled #rl-app #messageItem .dropdown-menu { + position: absolute; +} + +#rl-app #messageItem .readReceipt, +#rl-app #messageItem .showImages { + margin: 8px; + padding: 10px; + color: var(--nc-color-main-text); + border: solid 1px var(--nc-color-primary); + background-color: var(--nc-color-primary-light); + border-radius: var(--nc-border-radius-large); +} + +#rl-app #messageItem .showImages>.btn, +#rl-app #messageItem .showImages>.btn-group { + margin: 2px; +} + +#rl-app #messageItem .readReceipt:hover { + background-color: var(--nc-color-primary-light-hover); +} + +#rl-app .messageView .messageItemHeader, +#rl-app #messageItem .attachmentsPlace { + background-color: unset; + border-color: var(--nc-color-border); + color: var(--nc-color-main-text); +} + +#rl-app #messageItem .attachmentsPlace { + border-top: 1px solid var(--nc-color-border); + top: -1px; +} + +#rl-app #messageItem .attachmentsPlace .controls-handle { + -webkit-user-select: none; + user-select: none; +} + +#rl-app #messageItem .attachmentsControls { + background-color: unset; + border-color: var(--nc-color-border); + -webkit-user-select: none; + user-select: none; +} + +#rl-app #messageItem .attachmentsControls .icon-file-archive, +#rl-app #messageItem .attachmentsControls .fontastic { + color: var(--nc-color-main-text); +} + +#rl-app #messageItem .attachmentListSimple .attachmentName { + margin: 5px; +} + +/* #endregion */ + +/* #region settings */ + +#rl-app #V-SettingsPane { + margin: 62px 0 8px 0; + height: calc(100% - 62px - 8px); + background-color: unset; + box-shadow: none; + border: none; +} + +#rl-app #V-SettingsPane .btn-toolbar { + padding: 8px; +} + +#rl-app .row { + margin-left: unset; +} + +#rl-app .legend, +#rl-app #V-AdminPane hr, +#rl-app #V-SettingsPane hr { + color: unset; + border-color: var(--nc-color-border); +} + +#rl-app #V-Settings-Themes figure, +#rl-app #V-Settings-Themes img { + border-radius: var(--nc-border-radius-large); +} + +#rl-app #V-Settings-Themes figure:not(.selected):hover { + background-color: var(--nc-color-background-hover); + border-color: transparent; +} + +#rl-app #V-Settings-Themes figure:not(.selected):active { + background-color: var(--nc-color-primary-element-light); +} + +#rl-app #V-Settings-Themes figure:not(.selected):focus { + outline: none; +} + +#rl-app #V-Settings-Themes figure.selected { + background-color: var(--nc-color-primary-element); + border-color: transparent; + color: var(--nc-color-primary-element-text); +} + +/* hide additional theme settings, as these are made via Nextcloud theming */ + +/* fonts */ +#rl-app #V-SettingsPane #V-Settings-Themes .form-horizontal:nth-of-type(3) { + display: none !important; +} + +/* background */ +#content.app-snappymail #rl-app #V-SettingsPane #V-Settings-Themes .form-horizontal:nth-of-type(4) { + display: none !important; +} + +/* #endregion */ + +/* #region settings admin */ + +#rl-app #V-AdminPane { + margin: 8px 0px; + height: calc(100% - 2*8px); + background-color: unset; + box-shadow: none; + border: none; +} + +#rl-app #V-AdminPane>.b-toolbar { + width: 300px; + text-shadow: none; +} + +html.rl-mobile #rl-app #V-AdminPane { + margin: 60px 0px 8px 0px; + height: calc(100% - 60px - 8px); +} + +html.rl-mobile #rl-app #V-AdminPane>.b-toolbar { + width: unset; +} + +#rl-app #V-Settings-Config th { + background-color: var(--nc-color-background-dark); +} + +#rl-app #V-Settings-Config em { + word-break: break-word; +} + +#rl-app #V-Settings-General label[data-i18n="TAB_GENERAL/LABEL_ATTACHMENT_SIZE_LIMIT"] { + align-self: self-start; +} + +#rl-app #V-Settings-General label[data-i18n="TAB_GENERAL/LABEL_ATTACHMENT_SIZE_LIMIT"]~div .alert.alert-info { + margin-left: -130px; +} + +#rl-app #V-Settings-Domains .btn[data-i18n="GLOBAL/TEST"] { + margin-left: 1rem; +} + +@media screen and (max-width: 1024px) { + #rl-app #V-AdminPane table { + width: 100%; + } + + #rl-app #V-AdminPane [class*="span"] { + width: unset; + } +} + +@media screen and (max-width: 480px) { + #rl-app #V-Settings-Config .table { + border-collapse: collapse; + } + + #rl-app #V-Settings-Config .table tr { + border-top: 10px solid transparent; + } + + #rl-app #V-Settings-Config .table td, + #rl-app #V-Settings-Config .table th { + display: block; + border-style: solid; + border-width: 1px 0px; + } +} + +/* #endregion */ + +/* #region popup */ + +#rl-app dialog { + background: var(--nc-color-main-background); + color: var(--nc-color-main-text); + border-radius: var(--nc-border-radius-large); + filter: drop-shadow(0 1px 5px var(--nc-color-box-shadow)); + box-shadow: none; + border-color: var(--nc-color-border); +} + +#rl-app dialog>header, +#rl-app dialog>footer { + border-color: var(--nc-color-border); +} + +#rl-app dialog>footer .btn+.btn, +#rl-app dialog>footer button+button { + margin: 0 0 0 5px; +} + +#rl-app #V-PopupsPlugin .help-block { + margin-left: 5px; +} + +#rl-app #V-PopupsIdentity .e-signature-place { + border: none; +} + +#rl-app #V-PopupsLanguages label { + background-color: var(--nc-color-background-dark) !important; + border-color: var(--nc-color-border); + border-radius: var(--nc-border-radius); + padding: 8px 15px; +} + +#rl-app #V-PopupsLanguages label:hover { + border-color: var(--nc-color-primary-element); + background-color: unset; +} + +#rl-app #V-PopupsLanguages label.user { + background-color: var(--nc-color-main-background) !important; + color: var(--nc-color-text-light); +} + +#rl-app #V-PopupsLanguages label.selected { + background-color: var(--nc-color-primary-element-light) !important; + border-color: var(--nc-color-primary-element); +} + +@media screen and (max-width: 480px) { + #rl-app #V-PopupsAdvancedSearch .e-component.e-checkbox { + margin-left: -100%; + } + + #rl-app #V-PopupsLanguages label { + margin-left: 0; + margin-right: 0; + } + + #rl-app #V-PopupsKeyboardShortcutsHelp .modal-body, + #rl-app #V-PopupsDomain .modal-body { + padding-left: 0; + padding-right: 0; + overflow-x: hidden; + } +} + +#rl-app #V-PopupsOpenPgpImport textarea { + width: 100%; +} + +/* #endregion */ + +/* #region popup contacts */ + +#rl-app #V-PopupsContacts .right, +#rl-app #V-PopupsContacts .b-list-toolbar, +#rl-app #V-PopupsContacts .b-list-footer-toolbar, +#rl-app #V-PopupsContacts .b-view-content-toolbar { + border-color: var(--nc-color-border); +} + +#rl-app #V-PopupsContacts .b-list-toolbar { + height: 55px; +} + +#rl-app #V-PopupsContacts .b-list-toolbar .e-search { + margin: 9px 5px; + width: calc(100% - 2*5px); +} + +#rl-app #V-PopupsContacts .b-view-content { + margin-top: 20px; + height: calc(100% - 72px); + overflow: hidden; +} + +#rl-app #V-PopupsContacts .b-list-content { + height: calc(100% - 35px - 72px); +} + +#rl-app #V-PopupsContacts .b-list-content .listClear { + box-shadow: none; +} + +#rl-app #V-PopupsContacts .tabs { + height: 100%; +} + +#rl-app #V-PopupsContacts .tab-content { + overflow: auto; +} + +#rl-app #V-PopupsContacts .e-contact-item { + padding: 4px; + margin: 2px 4px; + max-height: unset; + border-bottom: 0 !important; + border-radius: var(--nc-border-radius); +} + +#rl-app #V-PopupsContacts .e-contact-item, +#rl-app #V-PopupsContacts .e-contact-item.focused { + background-color: var(--nc-color-background); + border-color: var(--nc-color-border); +} + +#rl-app #V-PopupsContacts .e-contact-item:hover, +#rl-app #V-PopupsContacts .e-contact-item.focused:hover { + background-color: var(--nc-color-background-hover); + border-color: var(--nc-color-primary-light-hover); +} + +#rl-app #V-PopupsContacts .e-contact-item.selected, +#rl-app #V-PopupsContacts .e-contact-item.selected:hover { + background-color: var(--nc-color-primary-light); + border-color: var(--nc-color-primary-light-text); +} + +#rl-app #V-PopupsContacts .e-contact-item.checked { + background-color: unset; + border-color: var(--nc-color-primary-light-text); +} + +#rl-app #V-PopupsContacts .e-contact-item.checked.focused { + background-color: inherit; + border-color: var(--nc-color-primary-light-text); +} + +#rl-app #V-PopupsContacts .e-contact-item.checked:hover, +#rl-app #V-PopupsContacts .e-contact-item.checked.focused:hover { + background-color: var(--nc-color-background-hover); + border-color: inherit; +} + +@media screen and (max-width: 799px) { + #rl-app #V-PopupsContacts .modal-body { + flex-direction: column; + } + + #rl-app #V-PopupsContacts .left { + max-width: unset; + height: 40%; + } + + #rl-app #V-PopupsContacts .b-list-footer-toolbar { + display: none; + } + + #rl-app #V-PopupsContacts .b-list-content { + height: calc(100% - 55px); + border-bottom: 1px solid var(--nc-color-border); + } + + #rl-app #V-PopupsContacts .right { + height: 60%; + border-left: unset; + } + + #rl-app #V-PopupsContacts .control-group { + margin-right: 1em; + } +} + +/* #endregion */ + +/* #region popup compose */ + +#rl-app #V-PopupsCompose header { + background-color: unset; + color: unset; +} + +#rl-app #V-PopupsCompose header .close, +#rl-app #V-PopupsCompose header .minimize-custom { + border-color: unset; +} + +#rl-app #V-PopupsCompose .b-header { + background: unset; +} + +#rl-app #V-PopupsCompose .b-header .error-to { + color: var(--nc-color-error); +} + +#rl-app #V-PopupsCompose .pull-right>.btn, +#rl-app #V-PopupsCompose .pull-right>.btn-group { + margin-left: 3px; +} + +#rl-app #V-PopupsCompose .no-attachments-desc { + text-shadow: unset; +} + +#rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:hover, +#rl-app #V-PopupsCompose .attachmentAreaParent .attachmentItem:active { + background-color: var(--nc-color-background-dark); +} + +#rl-app #V-PopupsCompose .b-attachment-place { + border-color: var(--nc-color-border); + background-color: var(--nc-color-background-dark); +} + +#rl-app #V-PopupsCompose .b-attachment-place.dragAndDropOver { + border-color: var(--nc-color-border); +} + +#rl-app #V-PopupsCompose .tabs label[for="tab-attachments"] b { + padding: 2px 6px; + border-radius: 1em; + color: var(--nc-color-primary-element); + background-color: var(--nc-color-primary-element-light); + font-size: 12px; +} + +/* #endregion */ + +/* #region popup nextcloud files */ + +#rl-app #V-PopupsCompose .btn[data-bind*="nextcloudAttach"] { + font-size: 0; +} + +#rl-app #V-PopupsCompose .btn[data-bind*="nextcloudAttach"]::before { + display: block; + content: ""; + height: 100%; + width: 30px; + --nc-logo: url("data:image/svg+xml,"); + -webkit-mask-image: var(--nc-logo); + mask-image: var(--nc-logo); + -webkit-mask-position: center; + mask-position: center; + -webkit-mask-repeat: no-repeat; + mask-repeat: no-repeat; + -webkit-mask-size: 30px; + mask-size: 30px; + background-color: var(--nc-color-main-text); +} + +#rl-app #V-PopupsNextcloudFiles { + user-select: none; +} + +#rl-app #V-PopupsNextcloudFiles li { + line-height: unset; +} + +#rl-app #V-PopupsNextcloudFiles li[data-icon], +#rl-app #V-PopupsNextcloudFiles li:has(>button[name="create"]), +#rl-app #V-PopupsNextcloudFiles li details summary { + padding: 5px 10px; + display: flex; + align-items: center !important; + overflow-wrap: anywhere; +} + +#rl-app #V-PopupsNextcloudFiles li button, +#rl-app #V-PopupsNextcloudFiles li input { + margin-left: auto !important; + align-self: center; +} + +#rl-app #V-PopupsNextcloudFiles li input { + min-width: 100px; + flex-shrink: 1; +} + +#rl-app #V-PopupsNextcloudFiles li button { + flex-shrink: 0; +} + +#rl-app #V-PopupsNextcloudFiles li button[name="create"] { + margin-left: 10px !important; +} + +#rl-app #V-PopupsNextcloudFiles li:not(:last-child), +#rl-app #V-PopupsNextcloudFiles li details[open]>summary { + border-bottom: 1px solid var(--nc-color-border); +} + +#rl-app #V-PopupsNextcloudFiles li details[open]>summary { + background-color: var(--nc-color-primary-element-light); + border-bottom-color: var(--nc-color-primary-element-hover); +} + +#rl-app #V-PopupsNextcloudFiles li:hover { + background-color: unset; +} + +#rl-app #V-PopupsNextcloudFiles li[data-icon]:hover, +#rl-app #V-PopupsNextcloudFiles li details:not([open]):hover, +#rl-app #V-PopupsNextcloudFiles li details[open]>summary:hover { + background-color: var(--nc-color-background-hover); +} + +#rl-app #V-PopupsNextcloudFiles li details summary[data-icon] { + list-style-type: none; +} + +#rl-app #V-PopupsNextcloudFiles li details summary[data-icon]::before { + color: var(--nc-color-primary); + font-size: 20px; +} + +#rl-app #V-PopupsNextcloudFiles li[data-icon]::before, +#rl-app #V-PopupsNextcloudFiles li details summary[data-icon]::before { + margin: 5px 10px 5px 0; +} + +/* #endregion */ + +/* #region popup nextcloud calendars */ + +#rl-app #V-PopupsNextcloudCalendars li { + padding: 5px; + display: flex; + align-items: center !important; + border-bottom: solid 1px var(--nc-color-border); +} + +#rl-app #V-PopupsNextcloudCalendars li button { + margin-left: auto !important; + align-self: center; +} + +/* #endregion */ + +/* #endregion */ + +/* + * Extensions + */ + +/* #region extensions */ + +/* #region avatars */ + +#rl-app .messageCheckbox .fromPic { + margin: -5px 0 -9px 8px; + height: 32px; + width: 32px; +} + +/* #endregion */ + +/* #endregion */ + +/* + * Message Flags + */ + +/* #region message flags */ + +:root { + --msgflag-\$label1-color: #ae2c35; + --msgflag-\$label1-color-hover: #e13a45; + --msgflag-\$label2-color: #cc9827; + --msgflag-\$label2-color-hover: #ffbf31; + --msgflag-\$label3-color: #005235; + --msgflag-\$label3-color-hover: #008557; + --msgflag-\$label4-color: #005cc4; + --msgflag-\$label4-color-hover: #0074f8; + --msgflag-\$label5-color: #5631c0; + --msgflag-\$label5-color-hover: #6d3ff3; + + --msgflag-\\flagged-color: #ffca32; +} + +#rl-app .msgflag-\$label5:not(.focused) { border-color: var(--msgflag-\$label5-color); } +#rl-app .msgflag-\$label4:not(.focused) { border-color: var(--msgflag-\$label4-color); } +#rl-app .msgflag-\$label3:not(.focused) { border-color: var(--msgflag-\$label3-color); } +#rl-app .msgflag-\$label2:not(.focused) { border-color: var(--msgflag-\$label2-color); } +#rl-app .msgflag-\$label1:not(.focused) { border-color: var(--msgflag-\$label1-color); } + +#rl-app .msgflag-\$label5.focused:not(.selected) { border-color: var(--msgflag-\$label5-color) !important; } +#rl-app .msgflag-\$label4.focused:not(.selected) { border-color: var(--msgflag-\$label4-color) !important; } +#rl-app .msgflag-\$label3.focused:not(.selected) { border-color: var(--msgflag-\$label3-color) !important; } +#rl-app .msgflag-\$label2.focused:not(.selected) { border-color: var(--msgflag-\$label2-color) !important; } +#rl-app .msgflag-\$label1.focused:not(.selected) { border-color: var(--msgflag-\$label1-color) !important; } + +#rl-app .msgflag-\$label5:not(.focused):hover { border-color: var(--msgflag-\$label5-color-hover); } +#rl-app .msgflag-\$label4:not(.focused):hover { border-color: var(--msgflag-\$label4-color-hover); } +#rl-app .msgflag-\$label3:not(.focused):hover { border-color: var(--msgflag-\$label3-color-hover); } +#rl-app .msgflag-\$label2:not(.focused):hover { border-color: var(--msgflag-\$label2-color-hover); } +#rl-app .msgflag-\$label1:not(.focused):hover { border-color: var(--msgflag-\$label1-color-hover); } + +#rl-app .msgflag-\$label1:not(.focused), #rl-app .msgflag-\$label1 .checkboxMessage, +#rl-app .msgflag-\$label2:not(.focused), #rl-app .msgflag-\$label2 .checkboxMessage, +#rl-app .msgflag-\$label3:not(.focused), #rl-app .msgflag-\$label3 .checkboxMessage, +#rl-app .msgflag-\$label4:not(.focused), #rl-app .msgflag-\$label4 .checkboxMessage, +#rl-app .msgflag-\$label5:not(.focused), #rl-app .msgflag-\$label5 .checkboxMessage { + background-color: unset; + color: unset; +} + +#rl-app .messageListItem.msgflag-\$label1:hover, +#rl-app .messageListItem.msgflag-\$label2:hover, +#rl-app .messageListItem.msgflag-\$label3:hover, +#rl-app .messageListItem.msgflag-\$label4:hover, +#rl-app .messageListItem.msgflag-\$label5:hover { + background-color: var(--nc-color-background-hover); +} + +#rl-app a.msgflag-\$label1, +#rl-app a.msgflag-\$label2, +#rl-app a.msgflag-\$label3, +#rl-app a.msgflag-\$label4, +#rl-app a.msgflag-\$label5 { + border-left: solid 5px; +} + +#rl-app .btn-group.show .dropdown-menu div li a[class^='msgflag-']:not(.msgflag-\$label1, .msgflag-\$label2, .msgflag-\$label3, .msgflag-\$label4, .msgflag-\$label5), +#rl-app .btn-group.show .dropdown-menu div li a[class*='msgflag-']:not(.msgflag-\$label1, .msgflag-\$label2, .msgflag-\$label3, .msgflag-\$label4, .msgflag-\$label5) { + border-left: solid 5px gray; +} + +#rl-app .b-folders .is-flagged .flag-icon::after, +#rl-app .messageListItem.hasFlaggedSubMessage .flagParent::after, +#rl-app .messageListItem.msgflag-\\flagged .flagParent::after { + color: var(--msgflag-\\flagged-color); +} + +/* #endregion */ + +/* #endregion */ + +/* + * Tablet Layout + */ + +/* #region tablet layout */ + +@media screen and (min-width: 800px) and (max-width: 1024px) { + #rl-app #rl-left { + width: 250px; + } + + html:not(.rl-left-panel-disabled) #rl-left { + max-width: calc(var(--nc-sidebar-max-width) / 2); + } + + #rl-app #V-SystemDropDown .accountPlace { + display: none; + } +} + +/* #endregion */ + +/* + * Keyframes + */ + +/* #region keyframes */ + +@keyframes highlight-folder-row { + 0% { + transform: scale(1) + } + + 50% { + transform: scale(.95) + } + + 100% { + transform: scale(1) + } +} \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/js/snappymail.js b/integrations/nextcloud/snappymail/js/snappymail.js index f3aae6f49..38a915ab7 100644 --- a/integrations/nextcloud/snappymail/js/snappymail.js +++ b/integrations/nextcloud/snappymail/js/snappymail.js @@ -1,7 +1,7 @@ /** * Nextcloud - SnappyMail mail plugin * - * @author RainLoop Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b), SnappyMail + * @author RainLoop Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b), SnappyMail, Rene Hampölz (@hampoelz) * * Based initially on https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud/rainloop-app */ @@ -10,11 +10,47 @@ document.onreadystatechange = () => { if (document.readyState === 'complete') { watchIFrameTitle(); + passThemesToIFrame(); let form = document.querySelector('form.snappymail'); form && SnappyMailFormHelper(form); } }; +// Pass Nextcloud themes and theme attributes to SnappyMail on +// first load and when the SnappyMail iframe is reloaded. +function passThemesToIFrame() { + const iframe = document.getElementById('rliframe'); + if (!iframe) return; + + let firstLoad = true; + + iframe.addEventListener('load', event => { + // repass theme styles when iframe is reloaded + if (!firstLoad) { + passThemes(event.target); + } + firstLoad = false; + }); + + passThemes(iframe); +} + +// Pass Nextcloud themes and theme attributes to SnappyMail. +function passThemes(iframe) { + if (!iframe) return; + + const target = iframe.contentWindow.document; + + const ncStylesheets = [...document.querySelectorAll('link.theme')]; + ncStylesheets.forEach(ncSheet => { + const smSheet = target.importNode(ncSheet, true); + target.head.appendChild(smSheet); + }); + + const themes = [...document.body.attributes].filter(att => att.name.startsWith('data-theme')); + themes.forEach(theme => target.body.setAttribute(theme.name, theme.value)); +} + // The SnappyMail application is already configured to modify the element // of its root document with the number of unread messages in the inbox. // However, its document is the SnappyMail iframe. This function sets up a diff --git a/plugins/view-ics/LICENSE b/plugins/view-ics/LICENSE new file mode 100644 index 000000000..9e5e56cdd --- /dev/null +++ b/plugins/view-ics/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2022 SnappyMail + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/view-ics/index.php b/plugins/view-ics/index.php new file mode 100644 index 000000000..febaeb875 --- /dev/null +++ b/plugins/view-ics/index.php @@ -0,0 +1,18 @@ +<?php + +class ViewICSPlugin extends \RainLoop\Plugins\AbstractPlugin +{ + const + NAME = 'View ICS', + VERSION = '2.0', + RELEASE = '2023-08-28', + CATEGORY = 'Messages', + DESCRIPTION = 'Display ICS attachment details', + REQUIRED = '2.27.0'; + + public function Init() : void + { +// $this->UseLangs(true); + $this->addJs('message.js'); + } +} diff --git a/plugins/view-ics/message.js b/plugins/view-ics/message.js new file mode 100644 index 000000000..cb768402e --- /dev/null +++ b/plugins/view-ics/message.js @@ -0,0 +1,113 @@ +(rl => { + const templateId = 'MailMessageView'; + + addEventListener('rl-view-model.create', e => { + if (templateId === e.detail.viewModelTemplateID) { + + const + template = document.getElementById(templateId), + view = e.detail, + attachmentsPlace = template.content.querySelector('.attachmentsPlace'), + dateRegEx = /(TZID=(?<tz>[^:]+):)?(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/; + + attachmentsPlace.after(Element.fromHTML(` + <details data-bind="if: viewICS, visible: viewICS"> + <summary data-icon="📅" data-bind="text: viewICS().SUMMARY"></summary> + <table><tbody style="white-space:pre"> + <tr data-bind="visible: viewICS().ORGANIZER"><td>Organizer</td><td data-bind="text: viewICS().ORGANIZER"></td></tr> + <tr><td>Start</td><td data-bind="text: viewICS().DTSTART"></td></tr> + <tr><td>End</td><td data-bind="text: viewICS().DTEND"></td></tr> +<!-- <tr><td>Transparency</td><td data-bind="text: viewICS().TRANSP"></td></tr>--> + <tr data-bind="foreach: viewICS().ATTENDEE"> + <td></td><td data-bind="text: $data.replace(/;/g,';\\n')"></td> + </tr> + </tbody></table> + </details>`)); + + view.viewICS = ko.observable(null); + + /** + * TODO + */ + view.message.subscribe(msg => { + view.viewICS(null); + if (msg) { +// let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType); + let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType); + if (ics && ics.download) { + // fetch it and parse the VEVENT + rl.fetch(ics.linkDownload()) + .then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response }))) + .then(text => { + let VEVENT, + VALARM, + multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE', + 'EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE'], + lines = text.split(/\r?\n/), + i = lines.length; + while (i--) { + let line = lines[i]; + if (VEVENT) { + while (line.startsWith(' ') && i--) { + line = lines[i] + line.slice(1); + } + if (line.startsWith('END:VALARM')) { + VALARM = {}; + continue; + } else if (line.startsWith('BEGIN:VALARM')) { + VEVENT.VALARM || (VEVENT.VALARM = []); + VEVENT.VALARM.push(VALARM); + VALARM = null; + continue; + } else if (line.startsWith('BEGIN:VEVENT')) { + break; + } + line = line.match(/^([^:;]+)[:;](.+)$/); + if (line) { + if (VALARM) { + VALARM[line[1]] = line[2]; + } else if (multiple.includes(line[1]) || 'X-' == line[1].slice(0,2)) { + VEVENT[line[1]] || (VEVENT[line[1]] = []); + VEVENT[line[1]].push(line[2]); + } else { + if ('DTSTART' === line[1] || 'DTEND' === line[1]) { + let parts = dateRegEx.exec(line[2])?.groups, + options = {dateStyle: 'long', timeStyle: 'short'}; + parts.tz && (options.timeZone = parts.tz); + line[2] = new Date( + parseInt(parts.year, 10), + parseInt(parts.month, 10) - 1, + parseInt(parts.day, 10), + parseInt(parts.hour, 10), + parseInt(parts.minute, 10), + parseInt(parts.second, 10) + ).format(options); + } + VEVENT[line[1]] = line[2]; + } + } + } else if (line.startsWith('END:VEVENT')) { + VEVENT = {}; + } + } +// METHOD:REPLY || METHOD:REQUEST +// console.dir({VEVENT:VEVENT}); + if (VEVENT) { + VEVENT.rawText = text; + VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED'); + VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED'); + VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY'); + console.dir({ + isCancelled: VEVENT.isCancelled(), + shouldReply: VEVENT.shouldReply() + }); + view.viewICS(VEVENT); + } + }); + } + } + }); + } + }); + +})(window.rl); diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php index d83fb5ff4..9a9498511 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php @@ -384,14 +384,17 @@ trait Messages * @throws \MailSo\Net\Exceptions\* * @throws \MailSo\Imap\Exceptions\* */ - public function MessageSimpleESearch(string $sSearchCriterias = 'ALL', array $aSearchReturn = null, bool $bReturnUid = true, string $sCharset = '', string $sLimit = '') : array + public function MessageSimpleESearch(string $sSearchCriterias = 'ALL', array $aSearchReturn = null, bool $bReturnUid = true, string $sLimit = '') : array { $oESearch = new \MailSo\Imap\Requests\ESEARCH($this); $oESearch->sCriterias = $sSearchCriterias; $oESearch->aReturn = $aSearchReturn; $oESearch->bUid = $bReturnUid; $oESearch->sLimit = $sLimit; - $oESearch->sCharset = $sCharset; +// if (!$this->UTF8 && !\mb_check_encoding($sSearchCriterias, 'UTF-8')) { + if (!$this->UTF8 && !\MailSo\Base\Utils::IsAscii($sSearchCriterias)) { + $oESearch->sCharset = 'UTF-8'; + } $oESearch->SendRequest(); return $this->getSimpleESearchOrESortResult($bReturnUid); } @@ -420,12 +423,13 @@ trait Messages * @throws \MailSo\Net\Exceptions\* * @throws \MailSo\Imap\Exceptions\* */ - public function MessageSimpleSearch(string $sSearchCriterias = 'ALL', bool $bReturnUid = true, string $sCharset = '') : array + public function MessageSimpleSearch(string $sSearchCriterias = 'ALL', bool $bReturnUid = true) : array { $aRequest = array(); - if (\strlen($sCharset)) { +// if (!$this->UTF8 && !\mb_check_encoding($sSearchCriterias, 'UTF-8')) { + if (!$this->UTF8 && !\MailSo\Base\Utils::IsAscii($sSearchCriterias)) { $aRequest[] = 'CHARSET'; - $aRequest[] = \strtoupper($sCharset); + $aRequest[] = 'UTF-8'; } $aRequest[] = !\strlen($sSearchCriterias) || '*' === $sSearchCriterias ? 'ALL' : $sSearchCriterias; diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php index 078c91940..0e7a1c747 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php @@ -49,6 +49,9 @@ class ImapClient extends \MailSo\Net\NetClient private bool $bIsLoggined = false; + /** + * RFC 6855 UTF8 mode + */ private bool $UTF8 = false; public function Hash() : string @@ -685,5 +688,4 @@ class ImapClient extends \MailSo\Net\NetClient { return $this->UTF8 ? $sText : \MailSo\Base\Utils::Utf7ModifiedToUtf8($sText); } - } diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php index ca5d4a67e..e097d87af 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php @@ -77,7 +77,8 @@ class MailClient MimeHeader::AUTOCRYPT, // SPAM MimeHeader::X_SPAM_STATUS, -// MimeHeader::X_SPAM_FLAG, + MimeHeader::X_SPAM_FLAG, + MimeHeader::X_SPAM_INFO, MimeHeader::X_SPAMD_RESULT, MimeHeader::X_BOGOSITY, // Virus @@ -606,8 +607,8 @@ class MailClient $aResultUids = $this->oImapClient->MessageSimpleSort($aSortTypes, $sSearchCriterias, $bReturnUid); } else { // $this->oImapClient->hasCapability('ESEARCH') -// $aResultUids = $this->oImapClient->MessageSimpleESearch($sSearchCriterias, null, $bReturnUid, \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? '' : 'UTF-8') - $aResultUids = $this->oImapClient->MessageSimpleSearch($sSearchCriterias, $bReturnUid, \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? '' : 'UTF-8'); +// $aResultUids = $this->oImapClient->MessageSimpleESearch($sSearchCriterias, null, $bReturnUid) + $aResultUids = $this->oImapClient->MessageSimpleSearch($sSearchCriterias, $bReturnUid); } if ($bUseCacheAfterSearch) { diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php index 26bece670..0e3ade98a 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php @@ -13,6 +13,7 @@ namespace MailSo\Mail; use MailSo\Base\Utils; use MailSo\Imap\Enumerations\FetchType; +use MailSo\Mime\Enumerations\Header as MimeHeader; /** * @category MailSo @@ -160,7 +161,7 @@ class Message implements \JsonSerializable $oHeaders = \strlen($sHeaders) ? new \MailSo\Mime\HeaderCollection($sHeaders, false, $sCharset) : null; if ($oHeaders) { $sContentTypeCharset = $oHeaders->ParameterValue( - \MailSo\Mime\Enumerations\Header::CONTENT_TYPE, + MimeHeader::CONTENT_TYPE, \MailSo\Mime\Enumerations\Parameter::CHARSET ); @@ -174,31 +175,31 @@ class Message implements \JsonSerializable $bCharsetAutoDetect = !\strlen($sCharset); - $oMessage->sSubject = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::SUBJECT, $bCharsetAutoDetect); - $oMessage->sMessageId = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::MESSAGE_ID); - $oMessage->sContentType = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE); + $oMessage->sSubject = $oHeaders->ValueByName(MimeHeader::SUBJECT, $bCharsetAutoDetect); + $oMessage->sMessageId = $oHeaders->ValueByName(MimeHeader::MESSAGE_ID); + $oMessage->sContentType = $oHeaders->ValueByName(MimeHeader::CONTENT_TYPE); - $oMessage->oFrom = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::FROM_, $bCharsetAutoDetect); - $oMessage->oTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::TO_, $bCharsetAutoDetect); - $oMessage->oCc = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::CC, $bCharsetAutoDetect); - $oMessage->oBcc = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::BCC, $bCharsetAutoDetect); + $oMessage->oFrom = $oHeaders->GetAsEmailCollection(MimeHeader::FROM_, $bCharsetAutoDetect); + $oMessage->oTo = $oHeaders->GetAsEmailCollection(MimeHeader::TO_, $bCharsetAutoDetect); + $oMessage->oCc = $oHeaders->GetAsEmailCollection(MimeHeader::CC, $bCharsetAutoDetect); + $oMessage->oBcc = $oHeaders->GetAsEmailCollection(MimeHeader::BCC, $bCharsetAutoDetect); - $oMessage->oSender = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::SENDER, $bCharsetAutoDetect); - $oMessage->oReplyTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::REPLY_TO, $bCharsetAutoDetect); - $oMessage->oDeliveredTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::DELIVERED_TO, $bCharsetAutoDetect); + $oMessage->oSender = $oHeaders->GetAsEmailCollection(MimeHeader::SENDER, $bCharsetAutoDetect); + $oMessage->oReplyTo = $oHeaders->GetAsEmailCollection(MimeHeader::REPLY_TO, $bCharsetAutoDetect); + $oMessage->oDeliveredTo = $oHeaders->GetAsEmailCollection(MimeHeader::DELIVERED_TO, $bCharsetAutoDetect); - $oMessage->InReplyTo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::IN_REPLY_TO); + $oMessage->InReplyTo = $oHeaders->ValueByName(MimeHeader::IN_REPLY_TO); $oMessage->References = Utils::StripSpaces( - $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::REFERENCES)); + $oHeaders->ValueByName(MimeHeader::REFERENCES)); $oMessage->iHeaderTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString( - $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DATE) + $oHeaders->ValueByName(MimeHeader::DATE) ); // Priority - $sPriority = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_MSMAIL_PRIORITY) - ?: $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::IMPORTANCE) - ?: $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_PRIORITY); + $sPriority = $oHeaders->ValueByName(MimeHeader::X_MSMAIL_PRIORITY) + ?: $oHeaders->ValueByName(MimeHeader::IMPORTANCE) + ?: $oHeaders->ValueByName(MimeHeader::X_PRIORITY); if (\strlen($sPriority)) { switch (\substr(\trim($sPriority), 0, 1)) { @@ -217,16 +218,16 @@ class Message implements \JsonSerializable } // Delivery Receipt - $oMessage->sDeliveryReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::RETURN_RECEIPT_TO)); + $oMessage->sDeliveryReceipt = \trim($oHeaders->ValueByName(MimeHeader::RETURN_RECEIPT_TO)); // Read Receipt - $oMessage->ReadReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DISPOSITION_NOTIFICATION_TO)); + $oMessage->ReadReceipt = \trim($oHeaders->ValueByName(MimeHeader::DISPOSITION_NOTIFICATION_TO)); if (empty($oMessage->ReadReceipt)) { - $oMessage->ReadReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO)); + $oMessage->ReadReceipt = \trim($oHeaders->ValueByName(MimeHeader::X_CONFIRM_READING_TO)); } // Unsubscribe links - $UnsubsribeLinks = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE); + $UnsubsribeLinks = $oHeaders->ValueByName(MimeHeader::LIST_UNSUBSCRIBE); if ($UnsubsribeLinks) { $oMessage->UnsubsribeLinks = \array_map( function ($link) { @@ -236,7 +237,7 @@ class Message implements \JsonSerializable ); } - if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT)) { + if ($spam = $oHeaders->ValueByName(MimeHeader::X_SPAMD_RESULT)) { if (\preg_match('/\\[([\\d\\.-]+)\\s*\\/\\s*([\\d\\.]+)\\];/', $spam, $match)) { if ($threshold = \floatval($match[2])) { $oMessage->setSpamScore(100 * \floatval($match[1]) / $threshold); @@ -244,13 +245,13 @@ class Message implements \JsonSerializable } } $oMessage->bIsSpam = false !== \stripos($oMessage->sSubject, '*** SPAM ***'); - } else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_BOGOSITY)) { + } else if ($spam = $oHeaders->ValueByName(MimeHeader::X_BOGOSITY)) { $oMessage->sSpamResult = $spam; $oMessage->bIsSpam = !\str_contains($spam, 'Ham'); if (\preg_match('/spamicity=([\\d\\.]+)/', $spam, $spamicity)) { $oMessage->setSpamScore(100 * \floatval($spamicity[1])); } - } else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS)) { + } else if ($spam = $oHeaders->ValueByName(MimeHeader::X_SPAM_STATUS)) { $oMessage->sSpamResult = $spam; if (\preg_match('/(?:hits|score)=([\\d\\.-]+)/', $spam, $value) && \preg_match('/required=([\\d\\.-]+)/', $spam, $required)) { @@ -259,26 +260,33 @@ class Message implements \JsonSerializable $oMessage->sSpamResult = "{$value[1]} / {$required[1]}"; } } - $oMessage->bIsSpam = 'Yes' === \substr($spam, 0, 3); -// $spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG); -// $oMessage->bIsSpam = false !== \stripos($spam, 'YES'); + // https://github.com/the-djmaze/snappymail/issues/1228 + else if (\preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $spam, $value) + || \preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $oHeaders->ValueByName(MimeHeader::X_SPAM_INFO), $value) + ) { + $oMessage->sSpamResult = "{$value[1]} / {$value[2]}"; + $oMessage->setSpamScore(100 * \floatval($value[1]) / \floatval($value[2])); + } + + $oMessage->bIsSpam = 'Yes' === \substr($spam, 0, 3) + || false !== \stripos($oHeaders->ValueByName(MimeHeader::X_SPAM_FLAG), 'YES'); } - if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS)) { + if ($virus = $oHeaders->ValueByName(MimeHeader::X_VIRUS)) { $oMessage->bHasVirus = true; } - if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS)) { + if ($virus = $oHeaders->ValueByName(MimeHeader::X_VIRUS_STATUS)) { if (false !== \stripos($spam, 'infected')) { $oMessage->bHasVirus = true; } else if (false !== \stripos($spam, 'clean')) { $oMessage->bHasVirus = false; } } - if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS_SCANNED)) { + if ($virus = $oHeaders->ValueByName(MimeHeader::X_VIRUS_SCANNED)) { $oMessage->sVirusScanned = $virus; } - $sDraftInfo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO); + $sDraftInfo = $oHeaders->ValueByName(MimeHeader::X_DRAFT_INFO); if (\strlen($sDraftInfo)) { $sType = ''; $sFolder = ''; @@ -320,7 +328,7 @@ class Message implements \JsonSerializable } } - $oMessage->sAutocrypt = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::AUTOCRYPT); + $oMessage->sAutocrypt = $oHeaders->ValueByName(MimeHeader::AUTOCRYPT); } else if ($oFetchResponse->GetEnvelope()) { @@ -360,7 +368,7 @@ class Message implements \JsonSerializable // /?/Raw/&q[]=/0/View/&q[]=/... 'bodyPartId' => $oPart->SubParts()[0]->PartID(), 'sigPartId' => $oPgpSignaturePart->PartID(), - 'micAlg' => $oHeaders ? (string) $oHeaders->ParameterValue(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'micalg') : '' + 'micAlg' => $oHeaders ? (string) $oHeaders->ParameterValue(MimeHeader::CONTENT_TYPE, 'micalg') : '' ]; /* // An empty section specification refers to the entire message, including the header. diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php index db239c2a8..53c74daeb 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php @@ -60,6 +60,7 @@ abstract class Header X_SPAM_STATUS = 'X-Spam-Status', // Yes|No X_SPAM_BAR = 'X-Spam-Bar', // ++ | -- X_SPAM_REPORT = 'X-Spam-Report', + X_SPAM_INFO = 'X-Spam-Info', // v4.0.0 // Rspamd X_SPAMD_RESULT = 'X-Spamd-Result', // default: False [7.13 / 9.00], X_SPAMD_BAR = 'X-Spamd-Bar', // +++++++ diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php index 805484bb8..b5c77755f 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php @@ -225,7 +225,7 @@ abstract class Parser $oSubPart = new Part; - $oSubPart->parseStreamRecursive($rStreamHandle, + static::parseStreamRecursive($oSubPart, $rStreamHandle, $iOffset, $sPrevBuffer, $sBuffer, $aBoundaryStack, $bIsOef, true); $oPart->SubParts->append($oSubPart); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php index d369e20bc..e560f99cb 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php @@ -4,17 +4,45 @@ namespace RainLoop\Model; use RainLoop\Utils; use RainLoop\Exceptions\ClientException; +use RainLoop\Providers\Storage\Enumerations\StorageType; class MainAccount extends Account { /** * @var string */ - private $sCryptKey; - + private string $sCryptKey = ''; +/* + public function resealCryptKey(string $sOldPass, string $sNewPass) : string + { + $oStorage = \RainLoop\Api::Actions()->StorageProvider(); + $sKey = $oStorage->Get($this, StorageType::ROOT, 'cryptkey'); + if ($sKey) { + $sKey = \SnappyMail\Crypt::DecryptUrlSafe($sKey, $sOldPass); + $sKey = \SnappyMail\Crypt::EncryptUrlSafe($sKey, $sNewPass); + $oStorage->Put($this, StorageType::ROOT, 'cryptkey', $sKey); + $sKey = \SnappyMail\Crypt::DecryptUrlSafe($sKey, $sNewPass); + $this->SetCryptKey($sKey); + } + } +*/ public function CryptKey() : string { if (!$this->sCryptKey) { +/* + // Seal the cryptkey so that people who change their login password + // can use the old password to re-seal the cryptkey + $oStorage = \RainLoop\Api::Actions()->StorageProvider(); + $sKey = $oStorage->Get($this, StorageType::ROOT, 'cryptkey'); + if (!$sKey) { + $sKey = $this->IncPassword(); +// $sKey = \random_bytes(32); + $sKey = \SnappyMail\Crypt::EncryptUrlSafe($sKey, $this->IncPassword()); + $oStorage->Put($this, StorageType::ROOT, 'cryptkey', $sKey); + } + $sKey = \SnappyMail\Crypt::DecryptUrlSafe($sKey, $this->IncPassword()); + $this->SetCryptKey($sKey); +*/ $this->SetCryptKey($this->IncPassword()); } return $this->sCryptKey; diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php index 3f1790b84..eb9fa58c3 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php @@ -66,6 +66,9 @@ class Storage extends \RainLoop\Providers\AbstractProvider return $this->oDriver->DeleteStorage($mAccount); } + /** + * @param \RainLoop\Model\Account|string|null $mAccount + */ public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string { return $this->oDriver->GenerateFilePath($mAccount, $iStorageType, $bMkDir); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php index a9369b391..04f9948fd 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php @@ -85,6 +85,9 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage return $this->bLocal; } + /** + * @param \RainLoop\Model\Account|string|null $mAccount + */ public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string { $sEmail = $sSubFolder = ''; diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html index d9f410e46..4eb307041 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html @@ -1,5 +1,5 @@ <div class="b-toolbar g-ui-user-select-none"> - <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a> + <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a> <h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4> <a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a> </div> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html index f0badedfa..2c7147e5f 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -29,7 +29,7 @@ </div> <div class="b-footer btn-toolbar"> <div class="btn-group"> - <a class="btn fontastic" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a> + <a class="btn fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a> </div> <div class="btn-group hide-on-panel-disabled"> <a class="btn icon-folder-add" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></a> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 971bdeea1..4a4dd3701 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -1,5 +1,5 @@ <div class="btn-toolbar" data-bind="css: {'hasChecked':checkAll}"> - <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'">❮</a> + <a class="btn btn-thin fontastic toggleLeft"></a> <a class="btn buttonCompose onCheckedHide" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE"> <i class="icon-paper-plane"></i> </a> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html index b99833618..ecb58d083 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html @@ -1,5 +1,5 @@ <div class="b-toolbar btn-toolbar"> - <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel, text: leftPanelDisabled() ? '❯' : '❮'"></a> + <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a> <a class="btn" data-bind="click: backToInbox" data-icon="⬅" data-i18n="GLOBAL/BACK"></a> </div> <nav data-bind="foreach: menu"> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html index a892c53d9..08a1805ff 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html @@ -1,3 +1,3 @@ -<div class="btn-toolbar" data-bind="visible: leftPanelDisabled"> - <a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel">❯</a> +<div class="btn-toolbar"> + <a class="btn btn-thin fontastic toggleLeft"></a> </div> diff --git a/snappymail/v/0.0.0/setup.php b/snappymail/v/0.0.0/setup.php index 1c708b407..1f460b1f9 100644 --- a/snappymail/v/0.0.0/setup.php +++ b/snappymail/v/0.0.0/setup.php @@ -1,59 +1,59 @@ <?php -if (defined('APP_VERSION')) { - if (PHP_VERSION_ID < 70400) { - echo '<p style="color: red">'; - echo '[301] Your PHP version ('.PHP_VERSION.') is lower than the minimal required 7.4.0!'; - echo '</p>'; - exit(301); - } +if (PHP_VERSION_ID < 70400) { + echo '<p style="color: red">'; + echo '[301] Your PHP version ('.PHP_VERSION.') is lower than the minimal required 7.4.0!'; + echo '</p>'; + exit(301); +} - $aOptional = array( - 'cURL' => extension_loaded('curl'), - 'exif' => extension_loaded('exif'), - 'finfo' => class_exists('finfo'), - 'gd' => extension_loaded('gd'), - 'gnupg' => extension_loaded('gnupg'), - 'gmagick' => extension_loaded('gmagick'), - 'imagick' => extension_loaded('imagick'), - 'iconv' => function_exists('iconv'), - 'intl' => function_exists('idn_to_ascii'), - 'ldap' => extension_loaded('ldap'), - 'OpenSSL' => extension_loaded('openssl'), - 'mysql' => extension_loaded('pdo_mysql'), - 'pgsql' => extension_loaded('pdo_pgsql'), - 'redis' => extension_loaded('redis'), - 'Sodium' => extension_loaded('sodium'), - 'sqlite' => extension_loaded('pdo_sqlite'), - 'tidy' => extension_loaded('tidy'), - 'uuid' => extension_loaded('uuid'), - 'xxtea' => extension_loaded('xxtea'), - 'zip' => extension_loaded('zip') - ); +$aOptional = array( + 'cURL' => extension_loaded('curl'), + 'exif' => extension_loaded('exif'), + 'finfo' => class_exists('finfo'), + 'gd' => extension_loaded('gd'), + 'gnupg' => extension_loaded('gnupg'), + 'gmagick' => extension_loaded('gmagick'), + 'imagick' => extension_loaded('imagick'), + 'iconv' => function_exists('iconv'), + 'intl' => function_exists('idn_to_ascii'), + 'ldap' => extension_loaded('ldap'), + 'OpenSSL' => extension_loaded('openssl'), + 'mysql' => extension_loaded('pdo_mysql'), + 'pgsql' => extension_loaded('pdo_pgsql'), + 'redis' => extension_loaded('redis'), + 'Sodium' => extension_loaded('sodium'), + 'sqlite' => extension_loaded('pdo_sqlite'), + 'tidy' => extension_loaded('tidy'), + 'uuid' => extension_loaded('uuid'), + 'xxtea' => extension_loaded('xxtea'), + 'zip' => extension_loaded('zip') +); - $aRequirements = array( - 'mbstring' => extension_loaded('mbstring'), - 'Zlib' => extension_loaded('zlib'), - // enabled by default: - 'json' => function_exists('json_decode'), - 'libxml' => function_exists('libxml_use_internal_errors'), - 'dom' => class_exists('DOMDocument') - // https://github.com/the-djmaze/snappymail/issues/392 -// 'phar' => class_exists('PharData') - ); +$aRequirements = array( + 'mbstring' => extension_loaded('mbstring'), + 'Zlib' => extension_loaded('zlib'), + // enabled by default: + 'json' => function_exists('json_decode'), + 'libxml' => function_exists('libxml_use_internal_errors'), + 'dom' => class_exists('DOMDocument') + // https://github.com/the-djmaze/snappymail/issues/392 +// 'phar' => class_exists('PharData') +); - if (in_array(false, $aRequirements)) { - echo '<p>[302] The following PHP extensions are not available in your PHP configuration!</p>'; - echo '<ul>'; - foreach ($aRequirements as $sKey => $bValue) { - if (!$bValue) { - echo '<li>'.$sKey.'</li>'; - } +if (in_array(false, $aRequirements)) { + echo '<p>[302] The following PHP extensions are not available in your PHP configuration!</p>'; + echo '<ul>'; + foreach ($aRequirements as $sKey => $bValue) { + if (!$bValue) { + echo '<li>'.$sKey.'</li>'; } - echo '</ul>'; - exit(302); } + echo '</ul>'; + exit(302); +} +if (defined('APP_VERSION')) { $sCheckName = 'delete_if_you_see_it_after_install'; $sCheckFolder = APP_DATA_FOLDER_PATH.$sCheckName; $sCheckFilePath = APP_DATA_FOLDER_PATH.$sCheckName.'/'.$sCheckName.'.file'; diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js index 864294acf..a12152ce4 100644 --- a/vendors/squire/build/squire-raw.js +++ b/vendors/squire/build/squire-raw.js @@ -220,52 +220,36 @@ const }, fixCursor = (node, root) => { - // In Webkit and Gecko, block level elements are collapsed and - // unfocusable if they have no content (:empty). To remedy this, a <BR> must be - // inserted. In Opera and IE, we just need a textnode in order for the - // cursor to appear. - let self = root.__squire__; - let originalNode = node; - let fixer, child; - - if (node === root) { - if (!(child = node.firstChild) || child.nodeName === 'BR') { - fixer = self.createDefaultBlock(); - if (child) { - child.replaceWith(fixer); - } - else { - node.append(fixer); - } - node = fixer; - fixer = null; - } + let fixer = null; + if (node instanceof Text) { + return node; } - - if (node.nodeType === TEXT_NODE) { - return originalNode; - } - if (isInline(node)) { - child = node.firstChild; - while (isWebKit && child?.nodeType === TEXT_NODE && !child.data) { - child.remove(); - child = node.firstChild; + let child = node.firstChild; + if (cantFocusEmptyTextNodes) { + while (child && child instanceof Text && !child.data) { + node.removeChild(child); + child = node.firstChild; + } } if (!child) { - fixer = self._addZWS(); + if (cantFocusEmptyTextNodes) { + fixer = document.createTextNode(ZWS); + } else { + fixer = document.createTextNode(""); + } } -// } else if (!node.querySelector('BR')) { -// } else if (!node.innerText.trim().length) { - } else if (node.matches(':empty')) { - fixer = createElement('BR'); - while ((child = node.lastElementChild) && !isInline(child)) { - node = child; + } else if (node instanceof Element && !node.querySelector("BR")) { + fixer = createElement("BR"); + let parent = node; + let child; + while ((child = parent.lastElementChild) && !isInline(child)) { + parent = child; } } if (fixer) { try { - node.append(fixer); + node.appendChild(fixer); } catch (error) { didError({ name: 'Squire: fixCursor – ' + error, @@ -274,8 +258,7 @@ const }); } } - - return originalNode; + return node; }, // Recursively examine container nodes and wrap any inline children. @@ -959,36 +942,30 @@ const let startBlock = getStartBlockOfRange(range, root); let nodeAfterCursor; - if (!startBlock) { - return false; - } - - // If in the middle or end of a text node, we're not at the boundary. - if (startContainer.nodeType === TEXT_NODE) { - if (startOffset) { - return false; - } - nodeAfterCursor = startContainer; - } else { - nodeAfterCursor = getNodeAfter(startContainer, startOffset); - if (nodeAfterCursor && !root.contains(nodeAfterCursor)) { - nodeAfterCursor = null; - } - // The cursor was right at the end of the document - if (!nodeAfterCursor) { - nodeAfterCursor = getNodeBefore(startContainer, startOffset); - if (nodeAfterCursor.nodeType === TEXT_NODE && - nodeAfterCursor.length) { + if (startBlock) { + // If in the middle or end of a text node, we're not at the boundary. + if (startContainer.nodeType === TEXT_NODE) { + if (startOffset) { return false; } + nodeAfterCursor = startContainer; + } else { + nodeAfterCursor = getNodeAfter(startContainer, startOffset); + // The cursor was right at the end of the document + if (!nodeAfterCursor || !root.contains(nodeAfterCursor)) { + nodeAfterCursor = getNodeBefore(startContainer, startOffset); + if (nodeAfterCursor.nodeType === TEXT_NODE && nodeAfterCursor.length) { + return false; + } + } } + + // Otherwise, look for any previous content in the same block. + contentWalker = newContentWalker(getStartBlockOfRange(range, root)); + contentWalker.currentNode = nodeAfterCursor; + + return !contentWalker.previousNode(); } - - // Otherwise, look for any previous content in the same block. - contentWalker = newContentWalker(getStartBlockOfRange(range, root)); - contentWalker.currentNode = nodeAfterCursor; - - return !contentWalker.previousNode(); }, rangeDoesEndAtBlockBoundary = (range, root) => { @@ -1823,7 +1800,8 @@ function onKey(event) { let key = event.key.toLowerCase(), modifiers = '', - range = this.getSelection(); + range = this.getSelection(), + root = this._root; // We need to apply the backspace/delete handlers regardless of // control key modifiers. @@ -1842,10 +1820,37 @@ function onKey(event) { // Record undo checkpoint. this.saveUndoState(range); // Delete the selection - deleteContentsOfRange(range, this._root); + deleteContentsOfRange(range, root); this._ensureBottomLine(); this.setSelection(range); this._updatePath(range, true); + } else if (range.collapsed + && range.startContainer === root + && root.children.length > 0) { + + // Under certain conditions, cursor/range can be positioned directly + // under this._root (not wrapped) and when this happens, an inline(TEXT) + // element is attached directly to this._root. There might be other + // issues, but squire.makeUnorderedList(), squire.makeOrderedList() and + // maybe other functions that call squire.modifyBlocks() do NOT work + // on inline(TEXT) nodes that are direct children of this._root. + // Therefor, we try to detect this case here and wrap the cursor/range + // before the text is inserted. + + const nextElement = root.children[range.startOffset]; + if (nextElement && !isBlock(nextElement)) { + // create a new wrapper + range = createRange(root.insertBefore( + this.createDefaultBlock(), nextElement + ), 0); + if (nextElement.tagName === 'BR') { + // delete it because a new <br> is created by createDefaultBlock() + root.removeChild(nextElement); + } + const restore = this._restoreSelection; + this.setSelection(range); + this._restoreSelection = restore; + } } }