diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php index 3ce7101d0..0103872fe 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php @@ -1790,14 +1790,14 @@ END; return \is_string($mResult) && 0 < \strlen($mResult) ? $mResult : ''; } - public static function Md5Rand(string $sAdditionalSalt = '') : string - { + public static function Md5Rand(string $sAdditionalSalt = '') : string + { return \md5(\microtime(true).\rand(10000, 99999). \md5($sAdditionalSalt).\rand(10000, 99999).\microtime(true)); } - public static function Sha1Rand(string $sAdditionalSalt = '') : string - { + public static function Sha1Rand(string $sAdditionalSalt = '') : string + { return \sha1(\microtime(true).\rand(10000, 99999). \sha1($sAdditionalSalt).\rand(10000, 99999).\microtime(true)); } diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php index 7dc713fbb..fa44faad3 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php @@ -145,6 +145,13 @@ class ResponseCollection extends \MailSo\Base\Collection $sFullNameRaw = \implode('', $aFullNameRawList); + /** + * $oResponse->ResponseList[0] = * + * $oResponse->ResponseList[1] = LIST (all) | LSUB (subscribed) + * $oResponse->ResponseList[2] = Flags + * $oResponse->ResponseList[3] = Delimiter + * $oResponse->ResponseList[4] = FullNameRaw + */ $oFolder = new Folder($sFullNameRaw, $oResponse->ResponseList[3], $oResponse->ResponseList[2]); diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php index f63380edb..f94da8316 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php @@ -173,7 +173,7 @@ class Header ); return \iconv_mime_encode($this->Name(), $sResult, $aPreferences); - } + } } else if ($this->IsParameterized() && $this->oParameters && 0 < $this->oParameters->Count()) { diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php index 013e1f20b..cbcfd8f14 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php @@ -50,19 +50,19 @@ class CURL extends \SnappyMail\HTTP\Request if ($extra_headers) { \curl_setopt($c, CURLOPT_HTTPHEADER, $extra_headers); } - if ($this->auth['user'] && $this->auth['type']) { - $auth = 0; - if ($this->auth['type'] & self::AUTH_BASIC) { - $auth |= CURLAUTH_BASIC; - } - if ($this->auth['type'] & self::AUTH_DIGEST) { - $auth |= CURLAUTH_DIGEST; - } - \curl_setopt($c, CURLOPT_HTTPAUTH, $auth); - \curl_setopt($c, CURLOPT_USERPWD, $this->auth['user'] . ':' . $this->auth['pass']); - } + if ($this->auth['user'] && $this->auth['type']) { + $auth = 0; + if ($this->auth['type'] & self::AUTH_BASIC) { + $auth |= CURLAUTH_BASIC; + } + if ($this->auth['type'] & self::AUTH_DIGEST) { + $auth |= CURLAUTH_DIGEST; + } + \curl_setopt($c, CURLOPT_HTTPAUTH, $auth); + \curl_setopt($c, CURLOPT_USERPWD, $this->auth['user'] . ':' . $this->auth['pass']); + } if ($this->proxy) { - \curl_setopt($c, CURLOPT_PROXY, $this->proxy); + \curl_setopt($c, CURLOPT_PROXY, $this->proxy); } if ('HEAD' === $method) { \curl_setopt($c, CURLOPT_NOBODY, true); diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php index ef5a027e3..f1857e43b 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php @@ -244,7 +244,7 @@ class GD2 implements \SnappyMail\Image return true; } - public function setImageFormat($format) { $this->format = \strtolower($format); } + public function setImageFormat($format) { $this->format = \strtolower($format); } public function stripImage() { return $this; }