+
From cfd9c11db6e11526a54926c6bf8404bca8d42283 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 13:52:46 +0100
Subject: [PATCH 0393/1012] Moved sort options "FROM" direct below "DATE" for
better understanding
---
.../app/templates/Views/User/MailMessageList.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 5597bf0b9..d13027a03 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
@@ -81,6 +81,12 @@
+
+
+
+
+
+
@@ -93,12 +99,6 @@
-
-
-
-
-
-
From 0e5ae38c58516276f2af0deee5746df7ff568717 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 14:15:09 +0100
Subject: [PATCH 0394/1012] More changes for #815
---
dev/View/User/MailBox/MessageList.js | 6 +++++-
.../v/0.0.0/app/templates/Views/User/MailMessageList.html | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 0a17250c3..104876975 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -818,10 +818,14 @@ export class MailMessageList extends AbstractViewRight {
showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
}
- groupSearchClick(group) {
+ groupSearch(group) {
group.search && MessagelistUserStore.mainSearch(group.search);
}
+ groupCheck(group) {
+ group.messages.forEach(message => message.checked(!message.checked()));
+ }
+
quotaTooltip() {
return i18n('MESSAGE_LIST/QUOTA_SIZE', {
SIZE: FileInfo.friendlySize(FolderUserStore.quotaUsage()),
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 d13027a03..e3458780b 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
@@ -131,7 +131,7 @@
-
+
From 19c0c5c98e6bb82eb68d2153197e088d57d03db1 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 15:11:17 +0100
Subject: [PATCH 0395/1012] Added DAV path error to log for #822
---
.../Providers/AddressBook/CardDAV.php | 201 ++++++------------
1 file changed, 63 insertions(+), 138 deletions(-)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
index 1ca58b5c1..eb03e96f3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
@@ -42,16 +42,12 @@ trait CardDAV
/**
* find every
*.vcf with empty
*/
- if (\is_array($aResponse))
- {
+ if (\is_array($aResponse)) {
$mResult = array();
- foreach ($aResponse as $sKey => $aItem)
- {
+ foreach ($aResponse as $sKey => $aItem) {
$sKey = \rtrim(\trim($sKey), '\\/');
- if (!empty($sKey) && is_array($aItem))
- {
- if (isset($aItem['{DAV:}getetag']))
- {
+ if (!empty($sKey) && is_array($aItem)) {
+ if (isset($aItem['{DAV:}getetag'])) {
$aMatch = array();
if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1])
&& !static::hasDAVCollection($aItem))
@@ -68,14 +64,11 @@ trait CardDAV
'changed' => 0
);
- if (isset($aItem['{DAV:}getlastmodified']))
- {
+ if (isset($aItem['{DAV:}getlastmodified'])) {
$mResult[$sKeyID]['lastmodified'] = $aItem['{DAV:}getlastmodified'];
$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
$aItem['{DAV:}getlastmodified']);
- }
- else
- {
+ } else {
$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::TryToParseSpecEtagFormat($mResult[$sKeyID]['etag']);
$mResult[$sKeyID]['lastmodified'] = 0 < $mResult[$sKeyID]['changed'] ?
\gmdate('c', $mResult[$sKeyID]['changed']) : '';
@@ -98,26 +91,15 @@ trait CardDAV
$this->oLogger->Write($sCmd.' '.$sUrl.(('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData ? ' ('.\strlen($mData).')' : ''),
\LOG_INFO, 'DAV');
-// if ('PUT' === $sCmd || 'POST' === $sCmd)
-// {
-// $this->oLogger->Write($mData, \LOG_INFO, 'DAV');
-// }
-
try
{
- if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData)
- {
+ if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData) {
return $oClient->request($sCmd, $sUrl, $mData, array(
'Content-Type' => 'text/vcard; charset=utf-8'
));
}
- else
- {
- return $oClient->request($sCmd, $sUrl);
- }
-
-// if ('GET' === $sCmd)
-// {
+ return $oClient->request($sCmd, $sUrl);
+// if ('GET' === $sCmd) {
// $this->oLogger->WriteDump($aResponse, \LOG_INFO, 'DAV');
// }
}
@@ -131,11 +113,9 @@ trait CardDAV
private function detectionPropFind(DAVClient $oClient, string $sPath) : ?array
{
- $aResponse = null;
-
try
{
- $aResponse = $oClient->propFind($sPath, array(
+ return $oClient->propFind($sPath, array(
'{DAV:}current-user-principal',
'{DAV:}resourcetype',
'{DAV:}displayname',
@@ -147,7 +127,7 @@ trait CardDAV
$this->oLogger->WriteException($oException);
}
- return $aResponse;
+ return null;
}
private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser, string $sPassword, string $sProxy = '') : array
@@ -162,10 +142,8 @@ trait CardDAV
$sNextPath = '';
$sFirstNextPath = '';
- if (\is_array($aResponse))
- {
- foreach ($aResponse as $sPropPath => $aItem)
- {
+ if (\is_array($aResponse)) {
+ foreach ($aResponse as $sPropPath => $aItem) {
if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'])
&& false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
{
@@ -173,23 +151,18 @@ trait CardDAV
continue;
}
- if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href']))
- {
+ if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href'])) {
$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
continue;
}
- if (!empty($sPropPath))
- {
- if (empty($sFirstNextPath))
- {
+ if (!empty($sPropPath)) {
+ if (empty($sFirstNextPath)) {
$sFirstNextPath = $sPropPath;
}
- if (empty($sNextPath))
- {
- if (static::hasDAVCollection($aItem))
- {
+ if (empty($sNextPath)) {
+ if (static::hasDAVCollection($aItem)) {
$sNextPath = $sPropPath;
continue;
}
@@ -197,23 +170,18 @@ trait CardDAV
}
}
- if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath))
- {
+ if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath)) {
$sNextPath = $sFirstNextPath;
}
}
- if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet))
- {
- if (empty($sNextPath))
- {
+ if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet)) {
+ if (empty($sNextPath)) {
return $aContactsPaths;
}
- if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
- {
+ if (\preg_match('/^http[s]?:\/\//i', $sNextPath)) {
$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
- if (!$oClient)
- {
+ if (!$oClient) {
return $aContactsPaths;
}
$sNextPath = $oClient->__UrlPath__;
@@ -221,10 +189,8 @@ trait CardDAV
if ($sPath != $sNextPath) {
$aResponse = $this->detectionPropFind($oClient, $sNextPath);
- if (\is_array($aResponse))
- {
- foreach ($aResponse as $aItem)
- {
+ if (\is_array($aResponse)) {
+ foreach ($aResponse as $aItem) {
if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
{
@@ -232,8 +198,7 @@ trait CardDAV
continue;
}
- if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href']))
- {
+ if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href'])) {
$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
continue;
}
@@ -242,30 +207,21 @@ trait CardDAV
}
}
- if (empty($sAddressbookHomeSet))
- {
- if (empty($sCurrentUserPrincipal))
- {
+ if (empty($sAddressbookHomeSet)) {
+ if (empty($sCurrentUserPrincipal)) {
return $aContactsPaths;
}
- if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
- {
+ if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal)) {
$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
- if ($oClient)
- {
- $sCurrentUserPrincipal = $oClient->__UrlPath__;
- }
- else
- {
+ if (!$oClient) {
return $aContactsPaths;
}
+ $sCurrentUserPrincipal = $oClient->__UrlPath__;
}
$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
- if (\is_array($aResponse))
- {
- foreach ($aResponse as $aItem)
- {
+ if (\is_array($aResponse)) {
+ foreach ($aResponse as $aItem) {
if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
{
@@ -276,28 +232,20 @@ trait CardDAV
}
}
- if (empty($sAddressbookHomeSet))
- {
+ if (empty($sAddressbookHomeSet)) {
return $aContactsPaths;
}
- if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
- {
+ if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet)) {
$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
- if ($oClient)
- {
- $sAddressbookHomeSet = $oClient->__UrlPath__;
- }
- else
- {
+ if (!$oClient) {
return $aContactsPaths;
}
+ $sAddressbookHomeSet = $oClient->__UrlPath__;
}
$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
- if (\is_array($aResponse))
- {
- foreach ($aResponse as $sPropPath => $aItem)
- {
+ if (\is_array($aResponse)) {
+ foreach ($aResponse as $sPropPath => $aItem) {
if (!empty($sPropPath) && static::hasDAVCollection($aItem)
&& \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
{
@@ -314,11 +262,6 @@ trait CardDAV
*/
private function checkContactsPath(DAVClient $oClient, string $sPath) : bool
{
- if (!$oClient)
- {
- return false;
- }
-
$aResponse = null;
try
{
@@ -332,21 +275,17 @@ trait CardDAV
}
$bGood = false;
- if (\is_array($aResponse))
- {
- foreach ($aResponse as $sKey => $aItem)
- {
+ if (\is_array($aResponse)) {
+ foreach ($aResponse as $sKey => $aItem) {
if (!empty($sKey) && static::hasDAVCollection($aItem)
&& \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
{
$bGood = true;
}
}
- }
-
- if ($bGood)
- {
- $oClient->__UrlPath__ = $sPath;
+ if ($bGood) {
+ $oClient->__UrlPath__ = $sPath;
+ }
}
return $bGood;
@@ -354,8 +293,7 @@ trait CardDAV
private function getDavClientFromUrl(string $sUrl, string $sUser, string $sPassword, string $sProxy = '') : DAVClient
{
- if (!\preg_match('/^http[s]?:\/\//i', $sUrl))
- {
+ if (!\preg_match('/^http[s]?:\/\//i', $sUrl)) {
$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
@@ -363,8 +301,7 @@ trait CardDAV
}
$aUrl = \parse_url($sUrl);
- if (!\is_array($aUrl))
- {
+ if (!\is_array($aUrl)) {
$aUrl = array();
}
@@ -381,8 +318,7 @@ trait CardDAV
$this->oLogger->AddSecret($sPassword);
- if (!empty($sProxy))
- {
+ if (!empty($sProxy)) {
$aSettings['proxy'] = $sProxy;
}
@@ -409,8 +345,7 @@ trait CardDAV
$aMatch = array();
$sUserAddressBookNameName = '';
- if (\preg_match('/\|(.+)$/', $sUrl, $aMatch) && !empty($aMatch[1]))
- {
+ if (\preg_match('/\|(.+)$/', $sUrl, $aMatch) && !empty($aMatch[1])) {
$sUserAddressBookNameName = \trim($aMatch[1]);
$sUserAddressBookNameName = \mb_strtolower($sUserAddressBookNameName);
@@ -422,8 +357,7 @@ trait CardDAV
$sPath = $oClient->__UrlPath__;
$bGood = true;
- if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath))
- {
+ if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath)) {
/**
* Path is not an addressbook, try to find it
*/
@@ -431,30 +365,22 @@ trait CardDAV
$this->oLogger->WriteDump($aPaths);
$sNewPath = '';
- if (\is_array($aPaths))
- {
- if (1 < \count($aPaths))
- {
- if ('' !== $sUserAddressBookNameName)
- {
- foreach ($aPaths as $sKey => $sValue)
- {
+ if (\is_array($aPaths)) {
+ if (1 < \count($aPaths)) {
+ if ('' !== $sUserAddressBookNameName) {
+ foreach ($aPaths as $sKey => $sValue) {
$sValue = \mb_strtolower(\trim($sValue));
- if ($sValue === $sUserAddressBookNameName)
- {
+ if ($sValue === $sUserAddressBookNameName) {
$sNewPath = $sKey;
break;
}
}
}
- if (empty($sNewPath))
- {
- foreach ($aPaths as $sKey => $sValue)
- {
+ if (empty($sNewPath)) {
+ foreach ($aPaths as $sKey => $sValue) {
$sValue = \mb_strtolower($sValue);
- if (\in_array($sValue, array('contacts', 'default', 'addressbook', 'address book')))
- {
+ if (\in_array($sValue, array('contacts', 'default', 'addressbook', 'address book'))) {
$sNewPath = $sKey;
break;
}
@@ -462,19 +388,18 @@ trait CardDAV
}
}
- if (empty($sNewPath))
- {
- foreach ($aPaths as $sKey => $sValue)
- {
+ if (empty($sNewPath)) {
+ foreach ($aPaths as $sKey => $sValue) {
$sNewPath = $sKey;
break;
}
}
}
- $sPath = $sNewPath;
-
- $bGood = $sPath && $this->checkContactsPath($oClient, $sPath);
+ $bGood = $sNewPath && $this->checkContactsPath($oClient, $sNewPath);
+ if (!$bGood) {
+ $this->oLogger->Write('Contacts path not found at: '.$sPath, \LOG_INFO, 'DAV');
+ }
}
return $bGood ? $oClient : null;
From 56c681bbd54294717c00cf7f75990347fa85f377 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 15:25:24 +0100
Subject: [PATCH 0396/1012]
https://github.com/the-djmaze/snappymail/issues/724#issuecomment-1369826672
---
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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 3053aaa82..dcca293d0 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
@@ -665,8 +665,8 @@ class MailClient
$oMessageCollection->FolderInfo = $oInfo;
$oMessageCollection->totalEmails = $oInfo->MESSAGES;
- $bUseThreads = $oParams->bUseThreads
- && ($this->oImapClient->hasCapability('THREAD=REFS') || $this->oImapClient->hasCapability('THREAD=REFERENCES') || $this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT'));
+ $bUseThreads = $oParams->bUseThreads && $this->oImapClient->CapabilityValue('THREAD');
+// && ($this->oImapClient->hasCapability('THREAD=REFS') || $this->oImapClient->hasCapability('THREAD=REFERENCES') || $this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT'));
if ($oParams->iThreadUid && !$bUseThreads) {
throw new \InvalidArgumentException('THREAD not supported');
}
@@ -686,6 +686,8 @@ class MailClient
$message_list_limit = $this->oImapClient->Settings->message_list_limit;
if (0 < $message_list_limit && $message_list_limit < $oInfo->MESSAGES) {
+// if ((0 < $message_list_limit && $message_list_limit < $oInfo->MESSAGES)
+// || (!$this->oImapClient->hasCapability('SORT') && !$this->oImapClient->CapabilityValue('THREAD'))) {
// Don't use THREAD for speed
$oMessageCollection->Limited = true;
if ($this->oLogger) {
From 1a71309b8188750212cea7f78ca0cac3d641a07d Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 15:46:26 +0100
Subject: [PATCH 0397/1012] Drop confusing oldpass from default change-password
query
---
plugins/change-password/drivers/pdo.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/change-password/drivers/pdo.php b/plugins/change-password/drivers/pdo.php
index 80fbc57dc..06a601f46 100644
--- a/plugins/change-password/drivers/pdo.php
+++ b/plugins/change-password/drivers/pdo.php
@@ -38,7 +38,7 @@ class ChangePasswordDriverPDO
\RainLoop\Plugins\Property::NewInstance('pdo_sql')->SetLabel('Statement')
->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
->SetDescription('SQL statement (allowed wildcards :email, :oldpass, :newpass, :domain, :username, :login_name).')
- ->SetDefaultValue('UPDATE table SET password = :newpass WHERE domain = :domain AND username = :username and oldpass = :oldpass'),
+ ->SetDefaultValue('UPDATE table SET password = :newpass WHERE domain = :domain AND username = :username'),
\RainLoop\Plugins\Property::NewInstance('pdo_encrypt')->SetLabel('Encryption')
->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
->SetDefaultValue(array('none', 'bcrypt', 'Argon2i', 'Argon2id', 'SHA256-CRYPT', 'SHA512-CRYPT'))
From e9504baa121ada7416f992668cefd9ee2d4a60c6 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 16:11:20 +0100
Subject: [PATCH 0398/1012] Bugfix: Typed property
MailSo\Mail\MessageListParams::$sSearch must not be accessed before
initialization
---
.../v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
index 27dc8a068..5a6ce68a3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
@@ -15,7 +15,7 @@ class MessageListParams
{
public string
$sFolderName,
- $sSearch,
+ $sSearch = '',
$sSort = '';
public ?\MailSo\Cache\CacheClient
From 5ff8b28a12bb08359521ec2c751bd7526ff7859a Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 16:22:57 +0100
Subject: [PATCH 0399/1012] Bugfix: Kolab AddressBook failed due to past
changes
---
plugins/kolab/KolabAddressBook.php | 4 ++--
plugins/kolab/index.php | 2 +-
.../v/0.0.0/app/libraries/MailSo/Mail/Message.php | 10 ++++++++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php
index 7ade62c11..475325ac9 100644
--- a/plugins/kolab/KolabAddressBook.php
+++ b/plugins/kolab/KolabAddressBook.php
@@ -58,12 +58,12 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
$xCard = null;
try {
foreach ($oMessage->Attachments() ?: [] as $oAttachment) {
- if ('application/vcard+xml' === $oAttachment->MimeType()) {
+ if ('application/vcard+xml' === $oAttachment->ContentType()) {
$result = $this->MailClient()->MessageMimeStream(function ($rResource) use (&$xCard) {
if (\is_resource($rResource)) {
$xCard = \Sabre\VObject\Reader::readXML($rResource);
}
- }, $this->sFolderName, $oMessage->Uid(), $oAttachment->MimeIndex());
+ }, $this->sFolderName, $oMessage->Uid(), $oAttachment->PartID());
break;
}
}
diff --git a/plugins/kolab/index.php b/plugins/kolab/index.php
index be93fb382..46581ee54 100644
--- a/plugins/kolab/index.php
+++ b/plugins/kolab/index.php
@@ -8,7 +8,7 @@ class KolabPlugin extends \RainLoop\Plugins\AbstractPlugin
RELEASE = '2023-01-03',
CATEGORY = 'Contacts',
DESCRIPTION = 'Use an Address Book of Kolab.',
- REQUIRED = '2.24.4';
+ REQUIRED = '2.24.5';
public function Init() : void
{
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 2efde4ad3..70e7c740b 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
@@ -107,6 +107,16 @@ class Message implements \JsonSerializable
return $this->Uid;
}
+ public function HeaderTimeStampInUTC() : int
+ {
+ return $this->HeaderTimeStampInUTC;
+ }
+
+ public function Attachments() : ?AttachmentCollection
+ {
+ return $this->Attachments;
+ }
+
public function Plain() : string
{
return $this->sPlain;
From a9c60137da0e04e6f5d3fdf52fdebeaa25cb00cd Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 17:00:58 +0100
Subject: [PATCH 0400/1012] Added untested KolabAddressBook autocreate contacts
#812
---
plugins/kolab/KolabAddressBook.php | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php
index 475325ac9..1876ee1d0 100644
--- a/plugins/kolab/KolabAddressBook.php
+++ b/plugins/kolab/KolabAddressBook.php
@@ -1,6 +1,7 @@
$sAddress) {
+ $sSearch = \MailSo\Imap\SearchCriterias::escapeSearchString($this->ImapClient(), $sEmail);
+ if (!$this->ImapClient()->MessageSimpleSearch("FROM {$sSearch}")) {
+ $oVCard = new VCard;
+ $oVCard->add('EMAIL', $sEmail);
+ $sFullName = \trim(\MailSo\Mime\Email::Parse(\trim($sAddress))->GetDisplayName());
+ if ('' !== $sFullName) {
+ $sFirst = $sLast = '';
+ if (false !== \strpos($sFullName, ' ')) {
+ $aNames = \explode(' ', $sFullName, 2);
+ $sFirst = isset($aNames[0]) ? $aNames[0] : '';
+ $sLast = isset($aNames[1]) ? $aNames[1] : '';
+ } else {
+ $sFirst = $sFullName;
+ }
+ if (\strlen($sFirst) || \strlen($sLast)) {
+ $oVCard->N = array($sLast, $sFirst, '', '', '');
+ }
+ }
+ $oContact = new Contact();
+ $oContact->setVCard($oVCard);
+ $this->ContactSave($oContact);
+ }
+ }
+ return true;
+ }
return false;
}
From 02a553c79feb2722d8e947289da3f018d1d246c9 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 20:56:38 +0100
Subject: [PATCH 0401/1012] Resolve #826
---
dev/External/SquireUI.js | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index e7f6e5343..04decb19b 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -14,7 +14,6 @@ const
createElement = name => doc.createElement(name),
tpl = createElement('template'),
- clr = createElement('input'),
trimLines = html => html.trim().replace(/^(\s*
\s*<\/div>)+/, '').trim(),
htmlToPlain = html => rl.Utils.htmlToPlain(html).trim(),
@@ -61,18 +60,21 @@ const
}
};
-clr.type = "color";
-clr.style.display = 'none';
-doc.body.append(clr);
-
class SquireUI
{
constructor(container) {
const
- doClr = name => () => {
+ clr = createElement('input'),
+ doClr = name => input => {
+ // https://github.com/the-djmaze/snappymail/issues/826
+ var rect = input.getBoundingClientRect();
+ clr.style.top = (rect.bottom - clr.offsetHeight) + 'px';
+ clr.style.left = rect.left + 'px';
+ clr.style.width = (rect.right - rect.left) + 'px';
+
clr.value = '';
clr.onchange = () => squire.setStyle({[name]:clr.value});
- clr.click();
+ setTimeout(()=>clr.click(),1);
},
actions = {
@@ -258,6 +260,11 @@ class SquireUI
browseImage = createElement('input'),
squire = new Squire(wysiwyg, SquireDefaultConfig);
+ clr.type = "color";
+ clr.style.opacity = 0;
+ clr.style.position = 'fixed';
+ container.append(clr);
+
browseImage.type = 'file';
browseImage.accept = 'image/*';
browseImage.style.display = 'none';
From e95b919c1e3c443f995d92d0d2c65154b0d301c8 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 4 Jan 2023 16:11:10 +0100
Subject: [PATCH 0402/1012] Resolve #825
---
plugins/nextcloud/index.php | 4 +-
plugins/nextcloud/js/message.js | 1 +
plugins/nextcloud/js/webdav.js | 87 +++++++++++--------
plugins/nextcloud/style.css | 1 +
.../templates/PopupsNextcloudFiles.html | 5 ++
5 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
index 71f23ab63..e91d91ef1 100644
--- a/plugins/nextcloud/index.php
+++ b/plugins/nextcloud/index.php
@@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{
const
NAME = 'Nextcloud',
- VERSION = '2.13',
- RELEASE = '2022-12-16',
+ VERSION = '2.14',
+ RELEASE = '2023-01-04',
CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.23.0';
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index 37f2956df..922fa8781 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -120,6 +120,7 @@
view.message.subscribe(msg => {
view.nextcloudICS(null);
if (msg && cfg.CalDAV) {
+// 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
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index 9915dd2b8..d5c77da61 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -149,31 +149,14 @@ const
items.forEach(item => {
if (item.isFile) {
let li = document.createElement('li'),
- btn = document.createElement('button');
+ cb = document.createElement('input');
li.item = item;
li.textContent = item.name.replace(/^.*\/([^/]+)$/, '$1');
li.dataset.icon = '🗎';
- btn.name = 'select';
- btn.dataset.icon = '📎';
- btn.textContent = 'attach';
- btn.className = 'button-vue';
- li.append(btn);
-
- btn = document.createElement('button');
- btn.name = 'share-internal';
- btn.dataset.icon = '🔗';
- btn.textContent = 'internal';
- btn.className = 'button-vue';
- li.append(btn);
-
- btn = document.createElement('button');
- btn.name = 'share-public';
- btn.dataset.icon = '🔗';
- btn.textContent = 'public';
- btn.className = 'button-vue';
- li.append(btn);
+ cb.type = 'checkbox';
+ li.append(cb);
parent.append(li);
}
@@ -203,28 +186,42 @@ class NextcloudFilesPopupView extends rl.pluginPopupView {
});
}
- onBuild(dom) {
- this.tree = dom.querySelector('#sm-nc-files-tree');
- this.tree.addEventListener('click', event => {
- let el = event.target;
- if (el.matches('button')) {
- let parent = el.parentNode,
- item = parent.item;
- if ('select' == el.name) {
- this.select = this.files() ? [item] : parent.item_name;
+ attach() {
+ this.select = [];
+ this.tree.querySelectorAll('input').forEach(input =>
+ input.checked && this.select.push(input.parentNode.item)
+ );
+ this.close();
+ }
+
+ shareInternal() {
+ this.select = [];
+ this.tree.querySelectorAll('input').forEach(input =>
+ input.checked && this.select.push({url:generateRemoteUrl(`/f/${input.parentNode.item.id}`)})
+ );
+ this.close();
+ }
+
+ sharePublic() {
+ const inputs = [...this.tree.querySelectorAll('input')],
+ loop = () => {
+ if (!inputs.length) {
this.close();
- } else if ('share-internal' == el.name) {
- this.select = [{url:generateRemoteUrl(`/f/${item.id}`)}];
- this.close();
- } else if ('share-public' == el.name) {
+ return;
+ }
+ const input = inputs.pop();
+ if (!input.checked) {
+ loop();
+ } else {
+ const item = input.parentNode.item;
if (item.shared) {
ncFetch(
shareUrl() + `?format=json&path=${encodeURIComponent(item.name)}&reshares=true`
)
.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
.then(json => {
- this.select = [{url:json.ocs.data[0].url}];
- this.close();
+ this.select.push({url:json.ocs.data[0].url});
+ loop();
// json.data[0].password
});
} else {
@@ -246,10 +243,26 @@ class NextcloudFilesPopupView extends rl.pluginPopupView {
.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
.then(json => {
// PUT /ocs/v2.php/apps/files_sharing/api/v1/shares/2 {"password":"ABC09"}
- this.select = [{url:json.ocs.data.url}];
- this.close();
+ this.select.push({url:json.ocs.data.url});
+ loop();
});
}
+ }
+ };
+
+ this.select = [];
+ loop();
+ }
+
+ onBuild(dom) {
+ this.tree = dom.querySelector('#sm-nc-files-tree');
+ this.tree.addEventListener('click', event => {
+ let el = event.target;
+ if (el.matches('button')) {
+ let parent = el.parentNode;
+ if ('select' == el.name) {
+ this.select = parent.item_name;
+ this.close();
} else if ('create' == el.name) {
let name = el.input.value.replace(/[|\\?*<":>+[]\/&\s]/g, '');
if (name.length) {
diff --git a/plugins/nextcloud/style.css b/plugins/nextcloud/style.css
index e99ac0767..4dd142992 100644
--- a/plugins/nextcloud/style.css
+++ b/plugins/nextcloud/style.css
@@ -5,6 +5,7 @@
clear: right;
line-height: 2.5em;
}
+#V-PopupsNextcloudFiles li input,
#V-PopupsNextcloudFiles li button {
cursor: pointer;
float: right;
diff --git a/plugins/nextcloud/templates/PopupsNextcloudFiles.html b/plugins/nextcloud/templates/PopupsNextcloudFiles.html
index f63656034..1be321dae 100644
--- a/plugins/nextcloud/templates/PopupsNextcloudFiles.html
+++ b/plugins/nextcloud/templates/PopupsNextcloudFiles.html
@@ -11,3 +11,8 @@
-->