', $sHtml);
+
return $sHtml;
}
@@ -255,7 +258,7 @@ class HtmlUtils
$sHtml = \MailSo\Base\HtmlUtils::ClearTags($sHtml);
$sHtml = \MailSo\Base\HtmlUtils::ClearOn($sHtml);
- $sHtml = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sHtml);
+// $sHtml = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sHtml);
// Dom Part
$oDom = \MailSo\Base\HtmlUtils::GetDomFromText($sHtml);
@@ -361,7 +364,7 @@ class HtmlUtils
unset($oDom);
$sResult = \MailSo\Base\HtmlUtils::ClearTags($sResult);
- $sResult = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sResult);
+ $sResult = \MailSo\Base\HtmlUtils::ClearBodyAndHtmlTag($sResult, true);
return \trim($sResult);
}
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Http.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Http.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Http.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Http.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/LinkFinder.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/LinkFinder.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/LinkFinder.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/LinkFinder.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Loader.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Loader.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Loader.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Loader.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/ResourceRegistry.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/ResourceRegistry.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/ResourceRegistry.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/ResourceRegistry.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Binary.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Binary.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Binary.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Binary.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Literal.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Literal.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Literal.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Literal.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Test.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Test.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/StreamWrappers/Test.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/StreamWrappers/Test.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Utils.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Utils.php
similarity index 95%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Utils.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Utils.php
index 38c563643..83b1eb67a 100644
--- a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Utils.php
+++ b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Utils.php
@@ -1611,8 +1611,7 @@ class Utils
{
foreach (array('utf-8', 'iso-8859-1', 'windows-1251') as $sCharsetItem)
{
- $sSample = @\iconv($sCharsetItem, $sCharsetItem.'//IGNORE', $sStr);
- if (\md5($sSample) === \md5($sStr))
+ if (\md5(@\iconv($sCharsetItem, $sCharsetItem.'//IGNORE', $sStr)) === \md5($sStr))
{
$mResult = $sCharsetItem;
break;
@@ -1621,6 +1620,19 @@ class Utils
}
}
- return !empty($mResult) && \is_string($mResult) ? $mResult : '';
+ return \is_string($mResult) && 0 < \strlen($mResult) ? $mResult : '';
+ }
+
+ /**
+ * @param string $sDomain
+ *
+ * @return bool
+ */
+ public static function ValidateDomain($sDomain)
+ {
+ $aMatch = array();
+ return \preg_match('/.+(\.[a-zA-Z]+)$/', $sDomain, $aMatch) && !empty($aMatch[1]) && \in_array($aMatch[1], \explode(' ',
+ '.aero .asia .biz .cat .com .coop .edu .gov .info .int .jobs .mil .mobi .museum .name .net .org .pro .tel .travel .xxx .ac .ad .ae .af .ag .ai .al .am .an .ao .aq .ar .as .at .au .aw .ax .az .ba .bb .bd .be .bf .bg .bh .bi .bj .bm .bn .bo .br .bs .bt .bv .bw .by .bz .ca .cc .cd .cf .cg .ch .ci .ck .cl .cm .cn .co .cr .cs .cu .cv .cx .cy .cz .dd .de .dj .dk .dm .do .dz .ec .ee .eg .er .es .et .eu .fi .fj .fk .fm .fo .fr .ga .gb .gd .ge .gf .gg .gh .gi .gl .gm .gn .gp .gq .gr .gs .gt .gu .gw .gy .hk .hm .hn .hr .ht .hu .id .ie .il .im .in .io .iq .ir .is .it .je .jm .jo .jp .ke .kg .kh .ki .km .kn .kp .kr .kw .ky .kz .la .lb .lc .li .lk .lr .ls .lt .lu .lv .ly .ma .mc .md .me .mg .mh .mk .ml .mm .mn .mo .mp .mq .mr .ms .mt .mu .mv .mw .mx .my .mz .na .nc .ne .nf .ng .ni .nl .no .np .nr .nu .nz .om .pa .pe .pf .pg .ph .pk .pl .pm .pn .pr .ps .pt .pw .py .qa .re .ro .rs .ru . .rw .sa .sb .sc .sd .se .sg .sh .si .sj .sk .sl .sm .sn .so .sr .st .su .sv .sy .sz .tc .td .tf .tg .th .tj .tk .tl .tm .tn .to .tp .tr .tt .tv .tw .tz .ua .ug .uk .us .uy .uz .va .vc .ve .vg .vi .vn .vu .wf .ws .ye .yt .za .zm .zw'
+ ));
}
}
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Validator.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Validator.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Base/Validator.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Base/Validator.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/CacheClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/CacheClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/CacheClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/CacheClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/DriverInterface.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/DriverInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/DriverInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/DriverInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/APC.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/APC.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/APC.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/APC.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/File.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/File.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/File.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/File.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/Memcache.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/Memcache.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Cache/Drivers/Memcache.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Cache/Drivers/Memcache.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/BodyStructure.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/BodyStructure.php
similarity index 99%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/BodyStructure.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/BodyStructure.php
index de30db5be..3e09c6279 100644
--- a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/BodyStructure.php
@@ -204,7 +204,8 @@ class BodyStructure
*/
public function IsInline()
{
- return (null === $this->sDisposition) ? false : ('inline' === strtolower($this->sDisposition));
+ return (null === $this->sDisposition) ?
+ (0 < strlen($this->ContentID())) : ('inline' === strtolower($this->sDisposition));
}
/**
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FetchType.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FetchType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FetchType.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FetchType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderType.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/FolderType.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/FolderType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/ResponseStatus.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/ResponseStatus.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/ResponseStatus.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/ResponseStatus.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/ResponseType.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/ResponseType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/ResponseType.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/ResponseType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/StoreAction.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/LoginException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/LoginException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/ResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/FetchResponse.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/FetchResponse.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/FetchResponse.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/FetchResponse.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Folder.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Folder.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Folder.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Folder.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/FolderInformation.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/FolderInformation.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/FolderInformation.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/FolderInformation.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/ImapClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/ImapClient.php
similarity index 99%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/ImapClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/ImapClient.php
index cc05d661d..4d68ec469 100644
--- a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/ImapClient.php
+++ b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/ImapClient.php
@@ -129,7 +129,7 @@ class ImapClient extends \MailSo\Net\NetClient
public function Connect($sServerName, $iPort = 143,
$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT)
{
- $this->aTagTimeouts['*'] = microtime(true);
+ $this->aTagTimeouts['*'] = \microtime(true);
parent::Connect($sServerName, $iPort, $iSecurityType);
@@ -139,7 +139,7 @@ class ImapClient extends \MailSo\Net\NetClient
$this->IsSupported('STARTTLS'), $this->iSecurityType))
{
$this->SendRequestWithCheck('STARTTLS');
- if (!@stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
+ if (!@\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
{
$this->writeLogException(
new \MailSo\Imap\Exceptions\RuntimeException('Cannot enable STARTTLS'),
@@ -179,22 +179,14 @@ class ImapClient extends \MailSo\Net\NetClient
\MailSo\Log\Enumerations\Type::ERROR, true);
}
- $sLogin = trim($sLogin);
+ $sLogin = \trim($sLogin);
$sPassword = $sPassword;
$this->sLogginedUser = $sLogin;
try
{
- if ($this->IsSupported('AUTH=LOGIN') || !$this->IsSupported('AUTH=PLAIN'))
- {
- $this->SendRequestWithCheck('LOGIN',
- array(
- $this->EscapeString($sLogin),
- $this->EscapeString($sPassword)
- ));
- }
- else if ($this->IsSupported('AUTH=PLAIN'))
+ if ($this->IsSupported('AUTH=PLAIN'))
{
if ($this->oLogger)
{
@@ -206,10 +198,18 @@ class ImapClient extends \MailSo\Net\NetClient
}
else
{
- $this->writeLogException(
- new \MailSo\Imap\Exceptions\LoginBadMethodException(),
- \MailSo\Log\Enumerations\Type::NOTICE, true);
+ $this->SendRequestWithCheck('LOGIN',
+ array(
+ $this->EscapeString($sLogin),
+ $this->EscapeString($sPassword)
+ ));
}
+// else
+// {
+// $this->writeLogException(
+// new \MailSo\Imap\Exceptions\LoginBadMethodException(),
+// \MailSo\Log\Enumerations\Type::NOTICE, true);
+// }
if (0 < \strlen($sProxyAuthUser))
{
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/NamespaceResult.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/NamespaceResult.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/NamespaceResult.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/NamespaceResult.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Response.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Response.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/Response.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/Response.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/SearchBuilder.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/SearchBuilder.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Imap/SearchBuilder.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Imap/SearchBuilder.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Driver.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Driver.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Driver.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Driver.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/Callback.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/Callback.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/Callback.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/Callback.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/File.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/File.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/File.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/File.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/Inline.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/Inline.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Drivers/Inline.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Drivers/Inline.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Enumerations/Type.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Enumerations/Type.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Enumerations/Type.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Enumerations/Type.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Logger.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Logger.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Log/Logger.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Log/Logger.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Attachment.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Attachment.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Attachment.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Attachment.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/AttachmentCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/AttachmentCollection.php
similarity index 71%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/AttachmentCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/AttachmentCollection.php
index 44a57062a..f317d70db 100644
--- a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/AttachmentCollection.php
+++ b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/AttachmentCollection.php
@@ -35,4 +35,16 @@ class AttachmentCollection extends \MailSo\Base\Collection
return \is_array($aList) ? \count($aList) : 0;
}
+
+ /**
+ * @return int
+ */
+ public function NonInlineCount()
+ {
+ $aList = $this->FilterList(function ($oAttachment) {
+ return $oAttachment && !$oAttachment->IsInline();
+ });
+
+ return \is_array($aList) ? \count($aList) : 0;
+ }
}
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Folder.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Folder.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Folder.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Folder.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/FolderCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/FolderCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/FolderCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/FolderCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/MailClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/MailClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/MailClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Message.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Message.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/Message.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/Message.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/MessageCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/MessageCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mail/MessageCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mail/MessageCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/MailSo.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/MailSo.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/MailSo.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/MailSo.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Attachment.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Attachment.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Attachment.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Attachment.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/AttachmentCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/AttachmentCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/AttachmentCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/AttachmentCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Email.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Email.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Email.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Email.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/EmailCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/EmailCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/EmailCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/EmailCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Constants.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Constants.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Constants.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Constants.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Header.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Header.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Header.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Header.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/MessagePriority.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/MessagePriority.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/MessagePriority.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/MessagePriority.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/MimeType.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/MimeType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/MimeType.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/MimeType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Parameter.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Parameter.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Parameter.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Parameter.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Sensitivity.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Sensitivity.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Enumerations/Sensitivity.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Enumerations/Sensitivity.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Header.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Header.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Header.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Header.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/HeaderCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/HeaderCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/HeaderCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/HeaderCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Message.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Message.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Message.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Message.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parameter.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parameter.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parameter.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parameter.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/ParameterCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/ParameterCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/ParameterCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/ParameterCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserEmpty.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserEmpty.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserEmpty.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserEmpty.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserInterface.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserMemory.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserMemory.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Parser/ParserMemory.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Parser/ParserMemory.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Part.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Part.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/Part.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/Part.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/PartCollection.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/PartCollection.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Mime/PartCollection.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Mime/PartCollection.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/ConnectionException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketReadException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Net/NetClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Net/NetClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Net/NetClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Net/NetClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/LoginBadCredentialsException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/LoginBadCredentialsException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/LoginBadCredentialsException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/LoginBadCredentialsException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/NegativeResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/NegativeResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/NegativeResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/NegativeResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/ResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/ResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/ResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/ResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Pop3Client.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Pop3Client.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Pop3/Pop3Client.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Pop3/Pop3Client.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/LoginBadCredentialsException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/LoginBadCredentialsException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/LoginBadCredentialsException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/LoginBadCredentialsException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/NegativeResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/NegativeResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/NegativeResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/NegativeResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/ResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/ResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/ResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/ResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/PoppassdClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/PoppassdClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Poppassd/PoppassdClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Poppassd/PoppassdClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/ManageSieveClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/ManageSieveClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Sieve/ManageSieveClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Sieve/ManageSieveClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/SmtpClient.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/SmtpClient.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Smtp/SmtpClient.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Smtp/SmtpClient.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/MailSo/Version.php b/rainloop/v/1.2.12.435/app/libraries/MailSo/Version.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/MailSo/Version.php
rename to rainloop/v/1.2.12.435/app/libraries/MailSo/Version.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/Client.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/Client.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/Client.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/Client.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/ClientCredentials.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/ClientCredentials.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/ClientCredentials.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/ClientCredentials.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/IGrantType.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/IGrantType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/IGrantType.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/IGrantType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/Password.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/Password.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/Password.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/Password.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/RefreshToken.php b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/RefreshToken.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/GrantType/RefreshToken.php
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/GrantType/RefreshToken.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/README b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/README
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/README
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/README
diff --git a/rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/composer.json b/rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/composer.json
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/PHP-OAuth2/composer.json
rename to rainloop/v/1.2.12.435/app/libraries/PHP-OAuth2/composer.json
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Account.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Account.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Account.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Account.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Actions.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Actions.php
similarity index 99%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Actions.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Actions.php
index 7442451d9..6eef70d3c 100644
--- a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Actions.php
@@ -865,7 +865,6 @@ class Actions
'UseImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
'AllowAppendMessage' => (bool) $oConfig->Get('labs', 'allow_message_append', false),
'CdnStaticDomain' => $oConfig->Get('labs', 'cdn_static_domain', ''),
- 'IndexFile' => \APP_SHORT_INDEX_FILE_NAME,
'Plugins' => array()
);
@@ -949,14 +948,16 @@ class Actions
$aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false);
$aResult['DropboxApiKey'] = (string) $oConfig->Get('social', 'dropbox_api_key', '');
+
+ $aResult['SubscriptionEnabled'] = \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain']);
}
- $aResult['ProjectHash'] = md5($aResult['AccountHash'].APP_VERSION);
+ $aResult['ProjectHash'] = \md5($aResult['AccountHash'].APP_VERSION.$this->Plugins()->Hash());
$sLanguage = $oConfig->Get('webmail', 'language', 'en');
$sTheme = $oConfig->Get('webmail', 'theme', 'Default');
- $aResult['Domains'] = $this->DomainProvider()->GetList(1);
+// $aResult['Domains'] = $this->DomainProvider()->GetList(1);
$aResult['Themes'] = $this->GetThemes($bAdmin);
$aResult['Languages'] = $this->GetLanguages();
$aResult['AllowCustomLogin'] = (bool) $oConfig->Get('login', 'allow_custom_login', false);
@@ -1026,11 +1027,11 @@ class Actions
$aResult['Theme'] = $this->ValidateTheme($sTheme);
$aResult['Language'] = $this->ValidateLanguage($sLanguage);
- $aResult['PluginsLink'] = APP_SHORT_INDEX_FILE_NAME.'?/Plugins/0/'.
+ $aResult['PluginsLink'] = './?/Plugins/0/'.
($bAdmin ? 'Admin' : 'User').'/'.$sStaticCache.'/';
- $aResult['NewThemeLink'] = APP_SHORT_INDEX_FILE_NAME.'?/Css/0/'.
+ $aResult['NewThemeLink'] = './?/Css/0/'.
($bAdmin ? 'Admin' : 'User').'/-/'.($bAdmin ? 'Default' : $aResult['Theme']).'/-/'.$sStaticCache.'/';
- $aResult['LangLink'] = APP_SHORT_INDEX_FILE_NAME.'?/Lang/0/'.
+ $aResult['LangLink'] = './?/Lang/0/'.
($bAdmin ? 'en' : $aResult['Language']).'/'.$sStaticCache.'/';
$aResult['EditorDefaultType'] = 'Html' === $aResult['EditorDefaultType'] ? 'Html' : 'Plain';
@@ -1379,7 +1380,9 @@ class Actions
{
if ($this->CacherFile()->SetTimer('Statistic/Activity'))
{
- $this->KeenIO('Stat');
+ $this->KeenIO('Stat', array(
+ 'rainloop' => $this->setupInformation()
+ ));
}
}
}
@@ -1904,7 +1907,7 @@ class Actions
private function rainLoopUpdatable()
{
- return @file_exists(APP_INDEX_ROOT_PATH.APP_INDEX_FILE_NAME) && @is_writable(APP_INDEX_ROOT_PATH.APP_INDEX_FILE_NAME);
+ return @file_exists(APP_INDEX_ROOT_PATH.'index.php') && @is_writable(APP_INDEX_ROOT_PATH.'index.php');
}
private function rainLoopCoreAccess()
@@ -2312,7 +2315,9 @@ class Actions
// 'result' => $bResult ? 1 : 0
// ));
- return $this->DefaultResponse(__FUNCTION__, $bResult);
+ return $this->DefaultResponse(__FUNCTION__, $bResult ? (
+ 'plugin' !== $sType ? array('Reload' => true) : true
+ ) : false);
}
/**
@@ -2631,7 +2636,15 @@ class Actions
$sFileName = $this->GetActionParam('FileName', '');
$iLineNo = $this->GetActionParam('LineNo', '');
+ $oHttp = $this->Http();
+
$this->Logger()->Write($sMessage.' ('.$sFileName.' ~ '.$iLineNo.')', \MailSo\Log\Enumerations\Type::ERROR, 'JS');
+ $this->Logger()->WriteDump(array(
+ 'HTTP_USER_AGENT' => $oHttp->GetServer('HTTP_USER_AGENT', ''),
+ 'HTTP_ACCEPT' => $oHttp->GetServer('HTTP_ACCEPT', ''),
+ 'HTTP_ACCEPT_ENCODING' => $oHttp->GetServer('HTTP_ACCEPT_ENCODING', ''),
+ 'HTTP_ACCEPT_LANGUAGE' => $oHttp->GetServer('HTTP_ACCEPT_LANGUAGE', '')
+ ));
}
return $this->DefaultResponse(__FUNCTION__, true);
@@ -4774,8 +4787,7 @@ class Actions
'date' => array(
'month' => \gmdate('m.Y'),
'day' => \gmdate('d.m.Y')
- ),
- 'rainloop' => $this->setupInformation()
+ )
))),
CURLOPT_TIMEOUT => 10
);
@@ -4951,7 +4963,7 @@ class Actions
'{{ErrorDesc}}' => $sDesc,
'{{BackLinkVisibility}}' => $bShowBackLink ? 'inline-block' : 'none',
'{{BackLink}}' => $this->StaticI18N('STATIC/BACK_LINK'),
- '{{BackHref}}' => APP_SHORT_INDEX_FILE_NAME
+ '{{BackHref}}' => './'
));
}
@@ -5099,7 +5111,7 @@ class Actions
));
$oAttachments = $mResponse->Attachments();
- $mResult['HasAttachments'] = $oAttachments && 0 < $oAttachments->Count();
+ $mResult['HasAttachments'] = $oAttachments && 0 < $oAttachments->NonInlineCount();
$mResult['RequestHash'] = \RainLoop\Utils::EncodeKeyValues(array(
'V' => APP_VERSION,
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/AbstractConfig.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/AbstractConfig.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/AbstractConfig.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/AbstractConfig.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/Application.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/Application.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/Application.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/Application.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/Plugin.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/Plugin.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Config/Plugin.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Config/Plugin.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Domain.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Domain.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Domain.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Domain.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/CustomThemeType.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/CustomThemeType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/CustomThemeType.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/CustomThemeType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/PluginPropertyType.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/SignMeType.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/SignMeType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/SignMeType.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/SignMeType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/TimeFormat.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/TimeFormat.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Enumerations/TimeFormat.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Enumerations/TimeFormat.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/AuthException.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/AuthException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/AuthException.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/AuthException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/ClientException.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/ClientException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/ClientException.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/ClientException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/Exception.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/Exception.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/Exception.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/Exception.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/InvalidArgumentException.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/InvalidArgumentException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/InvalidArgumentException.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/InvalidArgumentException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/RuntimeException.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/RuntimeException.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Exceptions/RuntimeException.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Exceptions/RuntimeException.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Notifications.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Notifications.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Notifications.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Notifications.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/AbstractPlugin.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/AbstractPlugin.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/AbstractPlugin.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/AbstractPlugin.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/Manager.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/Manager.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/Manager.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/Manager.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/Property.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/Property.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Plugins/Property.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Plugins/Property.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/AbstractProvider.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/AbstractProvider.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/AbstractProvider.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/AbstractProvider.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/ChangePassword.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/ChangePassword.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/ChangePassword.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/ChangePassword.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/Classes/Contact.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/Classes/Contact.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/Classes/Contact.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/Classes/Contact.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/Classes/Db.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/Classes/Db.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/Classes/Db.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/Classes/Db.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/ContactsInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/ContactsInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/ContactsInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/ContactsInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/DefaultContacts.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/DefaultContacts.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Contacts/DefaultContacts.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Contacts/DefaultContacts.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainAdminInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainSimpleInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainSimpleInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Domain/DomainSimpleInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Domain/DomainSimpleInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login/DefaultLogin.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login/DefaultLogin.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login/DefaultLogin.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login/DefaultLogin.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login/LoginInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login/LoginInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Login/LoginInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Login/LoginInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings/SettingsInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings/SettingsInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Settings/SettingsInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Settings/SettingsInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/DefaultStorage.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/DefaultStorage.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/DefaultStorage.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/DefaultStorage.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadClientError.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadClientError.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadClientError.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadClientError.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadError.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadError.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadError.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/Enumerations/UploadError.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/StorageInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/StorageInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Storage/StorageInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Storage/StorageInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Suggestions.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Suggestions.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Suggestions.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Suggestions.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Suggestions/SuggestionsInterface.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Suggestions/SuggestionsInterface.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Providers/Suggestions/SuggestionsInterface.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Providers/Suggestions/SuggestionsInterface.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Service.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Service.php
similarity index 85%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Service.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Service.php
index d81d068f8..a346b9802 100644
--- a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Service.php
@@ -52,10 +52,18 @@ class Service
return new self();
}
- public function LogPhpErrorHandler($errno, $errstr, $errfile, $errline)
+ /**
+ * @param int $iErrNo
+ * @param string $sErrStr
+ * @param string $sErrFile
+ * @param int $iErrLine
+ *
+ * @return bool
+ */
+ public function LogPhpErrorHandler($iErrNo, $sErrStr, $sErrFile, $iErrLine)
{
$iType = \MailSo\Log\Enumerations\Type::NOTICE;
- switch ($errno)
+ switch ($iErrNo)
{
case E_USER_ERROR:
$iType = \MailSo\Log\Enumerations\Type::ERROR;
@@ -65,9 +73,11 @@ class Service
break;
}
-
- $this->oActions->Logger()->Write($errfile.' [line:'.$errline.', code:'.$errno.']', $iType, 'PHP');
- $this->oActions->Logger()->Write('Error: '.$errstr, $iType, 'PHP');
+ if (!\in_array($sErrStr, array('iconv(): Detected an illegal character in input string')))
+ {
+ $this->oActions->Logger()->Write($sErrFile.' [line:'.$iErrLine.', code:'.$iErrNo.']', $iType, 'PHP');
+ $this->oActions->Logger()->Write('Error: '.$sErrStr, $iType, 'PHP');
+ }
return false;
}
@@ -84,12 +94,16 @@ class Service
$this->oActions->ParseQueryAuthString();
-// if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') && APP_INSTALLED_START)
-// {
-// $this->oActions->KeenIO('CoreInstallation', array(
-// 'previos-version' => false !== APP_INSTALLED_VERSION ? APP_INSTALLED_VERSION : ''
-// ));
-// }
+ if (defined('APP_INSTALLED_START') && defined('APP_INSTALLED_VERSION') && APP_INSTALLED_START &&
+ $this->Config()->Get('labs', 'activity_statistic', true))
+ {
+ $this->oActions->KeenIO('CoreInstallation', array(
+ 'rainloop' => array(
+ 'previos-version' => APP_INSTALLED_VERSION,
+ 'new-version' => APP_VERSION
+ )
+ ));
+ }
$bCached = false;
$sResult = '';
@@ -140,8 +154,7 @@ class Service
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'), array(
'{{BaseTemplates}}' => \RainLoop\Utils::CompileTemplates(APP_VERSION_ROOT_PATH.'app/templates/Views', $this->oActions).
$this->oActions->Plugins()->CompileTemplate($bAdmin),
- '{{BaseIndexFile}}' => APP_SHORT_INDEX_FILE_NAME,
- '{{BaseAppDataScriptLink}}' => APP_SHORT_INDEX_FILE_NAME.($bAdmin ? '?/AdminAppData/' : '?/AppData/'),
+ '{{BaseAppDataScriptLink}}' => ($bAdmin ? './?/AdminAppData/' : './?/AppData/'),
'{{BaseAppFaviconFile}}' => $aData['FaviconLink'],
'{{BaseAppMainCssLink}}' => $aData['AppCssLink'],
'{{BaseAppBootScriptLink}}' => $aData['BootJsLink'],
@@ -184,7 +197,7 @@ class Service
*/
private function generateIndexCacheHash($bAppJsDebug, $bAdmin)
{
- return \md5(APP_WEB_PATH.APP_SHORT_INDEX_FILE_NAME.
+ return \md5(APP_WEB_PATH.
$this->oActions->Config()->Get('labs', 'cdn_static_domain', '').
\md5($this->oActions->Config()->Get('cache', 'index', '')).
$this->oActions->Plugins()->Hash().
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/ServiceActions.php
similarity index 95%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/ServiceActions.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/ServiceActions.php
index 22bcd86da..a3b1c0bde 100644
--- a/rainloop/v/1.2.11.431/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/1.2.12.435/app/libraries/RainLoop/ServiceActions.php
@@ -727,7 +727,7 @@ class ServiceActions
}
}
- $this->oActions->Location(APP_SHORT_INDEX_FILE_NAME);
+ $this->oActions->Location('./');
return '';
}
@@ -759,7 +759,7 @@ class ServiceActions
}
}
- $this->oActions->Location(APP_SHORT_INDEX_FILE_NAME);
+ $this->oActions->Location('./');
return '';
}
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Settings.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Settings.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Settings.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Settings.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Social.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Social.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Social.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Social.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/RainLoop/Utils.php b/rainloop/v/1.2.12.435/app/libraries/RainLoop/Utils.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/RainLoop/Utils.php
rename to rainloop/v/1.2.12.435/app/libraries/RainLoop/Utils.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/facebook/base_facebook.php b/rainloop/v/1.2.12.435/app/libraries/facebook/base_facebook.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/facebook/base_facebook.php
rename to rainloop/v/1.2.12.435/app/libraries/facebook/base_facebook.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/facebook/facebook.php b/rainloop/v/1.2.12.435/app/libraries/facebook/facebook.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/facebook/facebook.php
rename to rainloop/v/1.2.12.435/app/libraries/facebook/facebook.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/facebook/fb_ca_chain_bundle.crt b/rainloop/v/1.2.12.435/app/libraries/facebook/fb_ca_chain_bundle.crt
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/facebook/fb_ca_chain_bundle.crt
rename to rainloop/v/1.2.12.435/app/libraries/facebook/fb_ca_chain_bundle.crt
diff --git a/rainloop/v/1.2.11.431/app/libraries/lessphp/LICENSE b/rainloop/v/1.2.12.435/app/libraries/lessphp/LICENSE
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/lessphp/LICENSE
rename to rainloop/v/1.2.12.435/app/libraries/lessphp/LICENSE
diff --git a/rainloop/v/1.2.11.431/app/libraries/lessphp/README.md b/rainloop/v/1.2.12.435/app/libraries/lessphp/README.md
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/lessphp/README.md
rename to rainloop/v/1.2.12.435/app/libraries/lessphp/README.md
diff --git a/rainloop/v/1.2.11.431/app/libraries/lessphp/ctype.php b/rainloop/v/1.2.12.435/app/libraries/lessphp/ctype.php
similarity index 70%
rename from rainloop/v/1.2.11.431/app/libraries/lessphp/ctype.php
rename to rainloop/v/1.2.12.435/app/libraries/lessphp/ctype.php
index 5464168e7..74a12d147 100644
--- a/rainloop/v/1.2.11.431/app/libraries/lessphp/ctype.php
+++ b/rainloop/v/1.2.12.435/app/libraries/lessphp/ctype.php
@@ -29,4 +29,12 @@ if (!function_exists('ctype_space'))
return !!preg_match('/^[\s]+$/m', $text);
}
+}
+
+if (!function_exists('ctype_alnum'))
+{
+ function ctype_alnum($sVar)
+ {
+ return !!preg_match('/^[a-zA-Z0-9]+$/', $sVar);
+ }
}
\ No newline at end of file
diff --git a/rainloop/v/1.2.11.431/app/libraries/lessphp/lessc.inc.php b/rainloop/v/1.2.12.435/app/libraries/lessphp/lessc.inc.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/lessphp/lessc.inc.php
rename to rainloop/v/1.2.12.435/app/libraries/lessphp/lessc.inc.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/pclzip/gnu-lgpl.txt b/rainloop/v/1.2.12.435/app/libraries/pclzip/gnu-lgpl.txt
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/pclzip/gnu-lgpl.txt
rename to rainloop/v/1.2.12.435/app/libraries/pclzip/gnu-lgpl.txt
diff --git a/rainloop/v/1.2.11.431/app/libraries/pclzip/pclzip.lib.php b/rainloop/v/1.2.12.435/app/libraries/pclzip/pclzip.lib.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/pclzip/pclzip.lib.php
rename to rainloop/v/1.2.12.435/app/libraries/pclzip/pclzip.lib.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/pclzip/readme.txt b/rainloop/v/1.2.12.435/app/libraries/pclzip/readme.txt
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/pclzip/readme.txt
rename to rainloop/v/1.2.12.435/app/libraries/pclzip/readme.txt
diff --git a/rainloop/v/1.2.11.431/app/libraries/tmhOAuth/LICENSE b/rainloop/v/1.2.12.435/app/libraries/tmhOAuth/LICENSE
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/tmhOAuth/LICENSE
rename to rainloop/v/1.2.12.435/app/libraries/tmhOAuth/LICENSE
diff --git a/rainloop/v/1.2.11.431/app/libraries/tmhOAuth/README.md b/rainloop/v/1.2.12.435/app/libraries/tmhOAuth/README.md
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/tmhOAuth/README.md
rename to rainloop/v/1.2.12.435/app/libraries/tmhOAuth/README.md
diff --git a/rainloop/v/1.2.11.431/app/libraries/tmhOAuth/cacert.pem b/rainloop/v/1.2.12.435/app/libraries/tmhOAuth/cacert.pem
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/tmhOAuth/cacert.pem
rename to rainloop/v/1.2.12.435/app/libraries/tmhOAuth/cacert.pem
diff --git a/rainloop/v/1.2.11.431/app/libraries/tmhOAuth/tmhOAuth.php b/rainloop/v/1.2.12.435/app/libraries/tmhOAuth/tmhOAuth.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/tmhOAuth/tmhOAuth.php
rename to rainloop/v/1.2.12.435/app/libraries/tmhOAuth/tmhOAuth.php
diff --git a/rainloop/v/1.2.11.431/app/libraries/tmhOAuth/tmhUtilities.php b/rainloop/v/1.2.12.435/app/libraries/tmhOAuth/tmhUtilities.php
similarity index 100%
rename from rainloop/v/1.2.11.431/app/libraries/tmhOAuth/tmhUtilities.php
rename to rainloop/v/1.2.12.435/app/libraries/tmhOAuth/tmhUtilities.php
diff --git a/rainloop/v/1.2.11.431/app/templates/BadBrowser.html b/rainloop/v/1.2.12.435/app/templates/BadBrowser.html
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/BadBrowser.html
rename to rainloop/v/1.2.12.435/app/templates/BadBrowser.html
diff --git a/rainloop/v/1.2.11.431/app/templates/Error.html b/rainloop/v/1.2.12.435/app/templates/Error.html
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Error.html
rename to rainloop/v/1.2.12.435/app/templates/Error.html
diff --git a/rainloop/v/1.2.11.431/app/templates/Index.html b/rainloop/v/1.2.12.435/app/templates/Index.html
similarity index 91%
rename from rainloop/v/1.2.11.431/app/templates/Index.html
rename to rainloop/v/1.2.12.435/app/templates/Index.html
index 3b5b18364..1d1496c39 100644
--- a/rainloop/v/1.2.11.431/app/templates/Index.html
+++ b/rainloop/v/1.2.12.435/app/templates/Index.html
@@ -6,14 +6,14 @@
diff --git a/rainloop/v/1.2.11.431/app/templates/Themes/custom-values-dark.less b/rainloop/v/1.2.12.435/app/templates/Themes/custom-values-dark.less
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Themes/custom-values-dark.less
rename to rainloop/v/1.2.12.435/app/templates/Themes/custom-values-dark.less
diff --git a/rainloop/v/1.2.11.431/app/templates/Themes/custom-values-light.less b/rainloop/v/1.2.12.435/app/templates/Themes/custom-values-light.less
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Themes/custom-values-light.less
rename to rainloop/v/1.2.12.435/app/templates/Themes/custom-values-light.less
diff --git a/rainloop/v/1.2.11.431/app/templates/Themes/template.less b/rainloop/v/1.2.12.435/app/templates/Themes/template.less
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Themes/template.less
rename to rainloop/v/1.2.12.435/app/templates/Themes/template.less
diff --git a/rainloop/v/1.2.11.431/app/templates/Themes/values.less b/rainloop/v/1.2.12.435/app/templates/Themes/values.less
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Themes/values.less
rename to rainloop/v/1.2.12.435/app/templates/Themes/values.less
diff --git a/rainloop/v/1.2.11.431/app/templates/Views/AdminDomainListItem.html b/rainloop/v/1.2.12.435/app/templates/Views/AdminDomainListItem.html
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Views/AdminDomainListItem.html
rename to rainloop/v/1.2.12.435/app/templates/Views/AdminDomainListItem.html
diff --git a/rainloop/v/1.2.11.431/app/templates/Views/AdminDomains.html b/rainloop/v/1.2.12.435/app/templates/Views/AdminDomains.html
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Views/AdminDomains.html
rename to rainloop/v/1.2.12.435/app/templates/Views/AdminDomains.html
diff --git a/rainloop/v/1.2.11.431/app/templates/Views/AdminGeneral.html b/rainloop/v/1.2.12.435/app/templates/Views/AdminGeneral.html
similarity index 100%
rename from rainloop/v/1.2.11.431/app/templates/Views/AdminGeneral.html
rename to rainloop/v/1.2.12.435/app/templates/Views/AdminGeneral.html
diff --git a/rainloop/v/1.2.11.431/app/templates/Views/AdminLicensing.html b/rainloop/v/1.2.12.435/app/templates/Views/AdminLicensing.html
similarity index 76%
rename from rainloop/v/1.2.11.431/app/templates/Views/AdminLicensing.html
rename to rainloop/v/1.2.12.435/app/templates/Views/AdminLicensing.html
index e4c1331ec..e1e43fdfc 100644
--- a/rainloop/v/1.2.11.431/app/templates/Views/AdminLicensing.html
+++ b/rainloop/v/1.2.12.435/app/templates/Views/AdminLicensing.html
@@ -6,7 +6,9 @@
You are free to use it for your personal or non-profit projects.
- Commercial use of RainLoop Webmail requires getting a permission.
+ Commercial use of RainLoop Webmail requires getting a
+
+ permission (Coming soon).
@@ -20,7 +22,14 @@
-
+
+
+
+ This domain can't be licensed for commercial use.
+