diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js index b7a075ad6..469efeaac 100644 --- a/dev/Stores/User/Messagelist.js +++ b/dev/Stores/User/Messagelist.js @@ -205,7 +205,6 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached); if (collection) { error = ''; - let unreadCountChange = false; const folder = getFolderFromCacheList(collection.folder), @@ -222,7 +221,6 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach if (null != folderInfo.unreadEmails) { if (pInt(folder.unreadEmails()) !== pInt(folderInfo.unreadEmails)) { - unreadCountChange = true; MessageFlagsCache.clearFolder(folder.fullName); } folder.unreadEmails(folderInfo.unreadEmails); @@ -279,10 +277,6 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach MessagelistUserStore(collection); MessagelistUserStore.isIncomplete(false); - - if (folder && (bCached || unreadCountChange || SettingsUserStore.useThreads())) { - rl.app.folderInformation(folder.fullName, collection); - } } else { MessagelistUserStore.count(0); MessagelistUserStore([]); diff --git a/dev/Styles/Admin/Config.less b/dev/Styles/Admin/Config.less index 1314fd14f..b8100460e 100644 --- a/dev/Styles/Admin/Config.less +++ b/dev/Styles/Admin/Config.less @@ -4,7 +4,7 @@ em { display: block; - white-space: pre; + white-space: pre-wrap; } th { diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less index ed5bfde7b..3b7d9363e 100644 --- a/dev/Styles/User/MessageList.less +++ b/dev/Styles/User/MessageList.less @@ -230,14 +230,15 @@ html:not(rl-mobile) { } time, .sizeParent { - margin: 0 5px; + margin: 0 5px 0 0; opacity: 0.7; font-size: 11px; white-space: nowrap; + min-width: 3.5em; + text-align: right; } .attachmentParent { - line-height: 1 !important; margin: 0 10px 0 5px; } diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php index 9ce6ca532..7e0332dab 100644 --- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php +++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php @@ -26,7 +26,10 @@ class InstallStep implements IRepairStep \OCA\SnappyMail\Util\SnappyMailHelper::loadApp(); + \SnappyMail\Upgrade::fixPermissions(); + $app_dir = \dirname(\dirname(__DIR__)) . '/app'; +// $app_dir = \rtrim(APP_INDEX_ROOT_PATH, '\\/'); // https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884 if (!\file_exists($app_dir . '/.htaccess') && \file_exists($app_dir . '/_htaccess')) { diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php index eeef6c521..4914ce05a 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php @@ -209,6 +209,9 @@ abstract class Upgrade if (!$bResult) { throw new \Exception('Extract core files failed'); } + + static::fixPermissions(); + \error_log('Update success'); // opcache_reset is a terrible solution // \is_callable('opcache_reset') && \opcache_reset(); @@ -219,4 +222,33 @@ abstract class Upgrade } return $bResult; } + + // Prevents Apache access error due to directories being 0700 + public static function fixPermissions($mode = 0755) : void + { + $target = \rtrim(APP_INDEX_ROOT_PATH, '\\/'); + // Prevent Apache access error due to directories being 0700 + foreach (\glob("{$target}/snappymail/v/*", \GLOB_ONLYDIR) as $dir) { + \chmod($dir, 0755); + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator("{$dir}/static", \FilesystemIterator::SKIP_DOTS), + \RecursiveIteratorIterator::SELF_FIRST + ); + foreach ($items as $item) { + if ($item->isDir()) { + \chmod($item, 0755); + } + } + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator("{$dir}/themes", \FilesystemIterator::SKIP_DOTS), + \RecursiveIteratorIterator::SELF_FIRST + ); + foreach ($items as $item) { + if ($item->isDir()) { + \chmod($item, 0755); + } + } + } + } + } 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 acca3dcf8..e6487eb4e 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 @@ -140,11 +140,11 @@
+
-
@@ -160,11 +160,11 @@
+
-