Merge branch 'the-djmaze:master' into master

.docker/release/files/usr/local/include/application.ini

@@ -316,5 +316,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.27.0"
+current = "2.27.1"
 saved = "Sun, 18 Dec 2022 22:10:48 +0000"

CHANGELOG.md

@@ -1,4 +1,18 @@
-## 2.27.0 – 2023-03-14
+## 2.27.1 – 2023-03-21
+
+## Changed
+- Improved attachmentIcon glyph coloring
+- Better design for .accountPlace text
+  [#1025](https://github.com/the-djmaze/snappymail/pull/1025)
+
+## Fixed
+- Reply is broken
+  [#1027](https://github.com/the-djmaze/snappymail/pull/1027)
+- Endless loop at login - Cannot assign array to property MailSo\Imap\Folder::$MAILBOXID
+  [#1032](https://github.com/the-djmaze/snappymail/pull/1032)
+
+
+## 2.27.0 – 2023-03-20
 
 ## Added
 - Unique attachments.zip filename

dev/Model/Attachment.js

@@ -163,7 +163,7 @@ export class AttachmentModel extends AbstractModel {
 	thumbnailStyle() {
 		return this.hasThumbnail()
 			? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')'
-			: '';
+			: null;
 	}
 
 	/**

dev/Styles/User/Attachments.less

@@ -31,7 +31,7 @@
 		}
 	}
 
-	.attachmentIconParent {
+	.attachmentIcon {
 		position: absolute;
 		height: 48px;
 		width: 48px;
@@ -85,7 +85,9 @@
 	.iconMain, .iconPreview {
 		padding: 6px 0 0;
 		font-size: 36px;
-		color: #aaa;
+		color: var(--main-color);
+		filter: invert(33%);
+		mix-blend-mode: difference;
 
 		&.icon-none {
 			display: none;
@@ -100,21 +102,21 @@
 	}
 */
 
-	.showPreview, .showPreplay,
+	.showPreview,
 	.hasPreview:hover .iconMain,
-	.hasPreplay:hover .iconMain,
+	.hasPreview .hidePreview {
-	.hasPreview .hidePreview,
-	.hasPreplay .hidePreview {
 		display: none;
 	}
 
-	.hasPreview:hover .iconPreview,
+	.hasPreview:hover .iconPreview {
-	.hasPreplay:hover .iconPreview {
 		display: inline-block;
 	}
 
-	.hasPreview .showPreview,
+	.hasPreplay:hover .iconMain::before {
-	.hasPreplay .showPreplay {
+		content: "▶";
+	}
+
+	.hasPreview .showPreview {
 		display: inline;
 		cursor: pointer;
 	}

dev/Styles/User/SystemDropDown.less

@@ -51,15 +51,13 @@
 		border-right: 1px solid var(--btn-border-clr, rgba(0, 0, 0, 0.2));
 		display: inline-block;
 		font-weight: 600;
-		font-size: 16px;
+		line-height: 1.3;
-		line-height: 22px;
+		margin: 0 6px -4px 0;
-		margin: 0 6px -3px 0;
 		max-width: 25vw;
-		overflow-x: hidden;
+/*		max-width: calc(100vw - 300px);*/
+		overflow: hidden;
 		padding-right: 6px;
 		text-overflow: ellipsis;
-		text-shadow: 0 1px 0 #000;
-		white-space: nowrap;
 	}
 
 	a[data-unread]::after {

integrations/cloudron/DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.27.0</upstream>.
+This app packages SnappyMail <upstream>2.27.1</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 

integrations/cloudron/Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.27.0
+VERSION=2.27.1
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \

integrations/nextcloud/snappymail/appinfo/info.xml

@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.27.0</version>
+	<version>2.27.1</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**

integrations/virtualmin/snappymail.pl

@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.27.0" );
+return ( "2.27.1" );
 }
 
 sub script_snappymail_version_desc

package.json

@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.27.0",
+  "version": "2.27.1",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",

snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php

@@ -117,10 +117,11 @@ trait Status
 			$name = 'MAILBOXID';
 		}
 		if (\property_exists(__TRAIT__, $name)) {
-			if ('MAILBOXID' !== $name) {
+			if ('MAILBOXID' === $name) {
-				$value = (int) $value;
+				$this->MAILBOXID = \base64_encode(\is_array($value) ? $value[0] : $value);
+			} else {
+				$this->$name = (int) $value;
 			}
-			$this->$name = $value;
 			return true;
 		}
 		return false;

snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html

@@ -231,19 +231,14 @@
 							<ul class="attachmentList" data-bind="foreach: listAttachments">
 								<li class="attachmentItem" draggable="true"
 										data-bind="event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
-									<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
+									<div class="attachmentIcon" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }, attr: { 'style': thumbnailStyle() }">
 										<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
 										<div class="showPreview">
 											<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
 												<i class="iconMain" data-bind="visible: !hasThumbnail(), css: iconClass()"></i>
-												<div class="iconBG" data-bind="attr: { 'style': thumbnailStyle() }"></div>
 												<div class="iconPreview fontastic">👁</div>
 											</a>
 										</div>
-										<div class="showPreplay">
-											<i class="iconMain" data-bind="css: iconClass()"></i>
-											<div class="iconPreview fontastic">▶</div>
-										</div>
 									</div>
 									<div class="attachmentNameParent">
 										<div class="attachmentName" data-bind="text: fileName"></div>

snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html

@@ -175,7 +175,7 @@
 			data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
 		<ul class="attachmentList" data-bind="foreach: attachments">
 			<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
-				<div class="attachmentIconParent">
+				<div class="attachmentIcon">
 					<i class="iconMain" data-bind="css: iconClass, visible: !uploading() || 0 === progress()"></i>
 					<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
 					<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>

vendors/fontastic/styles.css

@@ -38,7 +38,7 @@
   content: "\e005";
 }
 .icon-paper-plane::before {
-  content: "\e007";
+  content: "📧";
 }
 .icon-right-mini::before {
   content: "›";
@@ -59,31 +59,31 @@
   content: "\e030";
 }
 .icon-file-presentation::before {
-  content: "\e031"; /* 📊 */
+  content: "📊";
 }
 .icon-file-archive::before {
-  content: "\e032";
+  content: "📦";
 }
 .icon-file-audio::before {
-  content: "\e033";
+  content: "🔊";
 }
 .icon-file-text::before {
   content: "📄";
 }
 .icon-file-image::before {
-  content: "\e036"; /* 🖻 */
+  content: "🖻";
 }
 .icon-file-certificate::before {
-  content: "\e038";
+  content: "\e038"; /* 🔏 🔐 */
 }
 .icon-attachment::before {
   content: "📎";
 }
 .icon-file-spreadsheet::before {
-  content: "\e03a";
+  content: "▦";
 }
 .icon-file-video::before {
-  content: "\e03b";
+  content: "🎬";
 }
 .icon-folder-add::before {
   content: "\e03c";