+ Multiple identities (#9)

- animation settings
* minor fixes

data/VERSION

@@ -1 +1 @@
-1.3.9.485
+1.3.10.490

index.php

@@ -1,13 +1,12 @@
 <?php
 
 	define('APP_INDEX_ROOT_PATH', rtrim(dirname(__FILE__), '\\/').'/');
-	define('APP_INDEX_FILE_NAME', !empty($_SERVER['PHP_SELF']) ? basename($_SERVER['PHP_SELF']) : 'index.php');
 
 	$sCustomDataPath = '';
 	if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
 	{
 		include_once APP_INDEX_ROOT_PATH.'include.php';
-		$sCustomDataPath = function_exists('__get_custom_data_full_path') ? trim(trim(__get_custom_data_full_path()), '\\/') : '';
+		$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : '';
 	}
 
 	define('APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/');
@@ -16,27 +15,19 @@
 	if (false !== $sVersion)
 	{
 		$sVersion = trim(preg_replace('/[\.]+/', '.', preg_replace('/[^a-zA-Z0-9\.\-_]/', '', $sVersion)));
-		if (0 < strlen($sVersion))
+		if (0 < strlen($sVersion) && file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.$sVersion.'/index.php'))
 		{
 			define('APP_VERSION', $sVersion);
-			if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php'))
-			{
-				include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php';
-			}
-			else
-			{
-				echo 'Can\'t find startup file (Error Code: 103)';
-				exit(103);
-			}
+			include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php';
 		}
 		else
 		{
-			echo 'Version file content error (Error Code: 102)';
+			echo '[102] Version file content error';
 			exit(102);
 		}
 	}
 	else
 	{
-		echo 'Can\'t read version file (Error Code: 101)';
+		echo '[101] Can\'t read version file';
 		exit(101);
 	}

rainloop/v/1.3.10.490/VERSION

@@ -0,0 +1 @@
+1.3.10.490

rainloop/v/1.3.9.485/app/libraries/MailSo/Base/Http.php → rainloop/v/1.3.10.490/app/libraries/MailSo/Base/Http.php

@@ -301,7 +301,7 @@ public function GetHost($bWithRemoteUserData = false, $bRemoveWWW = true)
 
 		if ($bRemoveWWW)
 		{
-			$sHost = 'www.' === \substr(\strtolower($sHost), 0, 4) ? \substr($sHost, 0, 4) : $sHost;
+			$sHost = 'www.' === \substr(\strtolower($sHost), 0, 4) ? \substr($sHost, 4) : $sHost;
 		}
 
 		if ($bWithRemoteUserData)

rainloop/v/1.3.9.485/app/libraries/MailSo/Base/Loader.php → rainloop/v/1.3.10.490/app/libraries/MailSo/Base/Loader.php

@@ -87,7 +87,7 @@ public static function Statistic()
 		{
 			$aResult = array(
 				'php' => array(
-					'phpversion' => \phpversion(),
+					'phpversion' => PHP_VERSION,
 					'ssl' => (int) \function_exists('openssl_open'),
 					'iconv' => (int) \function_exists('iconv')
 			));

rainloop/v/1.3.9.485/app/libraries/MailSo/Cache/Drivers/File.php → rainloop/v/1.3.10.490/app/libraries/MailSo/Cache/Drivers/File.php

@@ -1,126 +1,126 @@
-<?php
-
-namespace MailSo\Cache\Drivers;
-
-/**
- * @category MailSo
- * @package Cache
- * @subpackage Drivers
- */
-class File implements \MailSo\Cache\DriverInterface
-{
-	/**
-	 * @var string
-	 */
-	private $sCacheFolder;
-
-	/**
-	 * @access private
-	 *
-	 * @param string $sCacheFolder
-	 */
-	private function __construct($sCacheFolder)
-	{
-		$this->sCacheFolder = $sCacheFolder;
-		$this->sCacheFolder = rtrim(trim($this->sCacheFolder), '\\/').'/';
-		if (!\is_dir($this->sCacheFolder))
-		{
-			@\mkdir($this->sCacheFolder, 0777);
-		}
-	}
-
-	/**
-	 * @param string $sCacheFolder
-	 *
-	 * @return \MailSo\Cache\Drivers\File
-	 */
-	public static function NewInstance($sCacheFolder)
-	{
-		return new self($sCacheFolder);
-	}
-
-	/**
-	 * @param string $sKey
-	 * @param string $sValue
-	 *
-	 * @return bool
-	 */
-	public function Set($sKey, $sValue)
-	{
-		return false !== \file_put_contents($sPath = $this->generateCachedFileName($sKey, true), $sValue);
-	}
-
-	/**
-	 * @param string $sKey
-	 *
-	 * @return string
-	 */
-	public function Get($sKey)
-	{
-		$sValue = '';
-		$sPath = $this->generateCachedFileName($sKey);
-		if (\file_exists($sPath))
-		{
-			$sValue = \file_get_contents($sPath);
-		}
-
-		return \is_string($sValue) ? $sValue : '';
-	}
-
-	/**
-	 * @param string $sKey
-	 *
-	 * @return void
-	 */
-	public function Delete($sKey)
-	{
-		$sPath = $this->generateCachedFileName($sKey);
-		if (\file_exists($sPath))
-		{
-			\unlink($sPath);
-		}
-	}
-
-	/**
-	 * @param int $iTimeToClearInHours = 24
-	 * 
-	 * @return bool
-	 */
-	public function GC($iTimeToClearInHours = 24)
-	{
-		if (0 < $iTimeToClearInHours)
-		{
-			\MailSo\Base\Utils::RecTimeDirRemove($this->sCacheFolder, 60 * 60 * $iTimeToClearInHours, \time());
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $sKey
-	 * @param bool $bMkDir = false
-	 *
-	 * @return string
-	 */
-	private function generateCachedFileName($sKey, $bMkDir = false)
-	{
-		$sFilePath = '';
-		if (3 < \strlen($sKey))
-		{
-			$sKeyPath = \sha1($sKey);
-			$sKeyPath = \substr($sKeyPath, 0, 2).'/'.\substr($sKeyPath, 2, 2).'/'.$sKeyPath;
-
-			$sFilePath = $this->sCacheFolder.'/'.$sKeyPath;
-			if ($bMkDir && !\is_dir(\dirname($sFilePath)))
-			{
-				if (!\mkdir(\dirname($sFilePath), 0777, true))
-				{
-					$sFilePath = '';
-				}
-			}
-		}
-
-		return $sFilePath;
-	}
-}
+<?php
+
+namespace MailSo\Cache\Drivers;
+
+/**
+ * @category MailSo
+ * @package Cache
+ * @subpackage Drivers
+ */
+class File implements \MailSo\Cache\DriverInterface
+{
+	/**
+	 * @var string
+	 */
+	private $sCacheFolder;
+
+	/**
+	 * @access private
+	 *
+	 * @param string $sCacheFolder
+	 */
+	private function __construct($sCacheFolder)
+	{
+		$this->sCacheFolder = $sCacheFolder;
+		$this->sCacheFolder = rtrim(trim($this->sCacheFolder), '\\/').'/';
+		if (!\is_dir($this->sCacheFolder))
+		{
+			@\mkdir($this->sCacheFolder, 0755);
+		}
+	}
+
+	/**
+	 * @param string $sCacheFolder
+	 *
+	 * @return \MailSo\Cache\Drivers\File
+	 */
+	public static function NewInstance($sCacheFolder)
+	{
+		return new self($sCacheFolder);
+	}
+
+	/**
+	 * @param string $sKey
+	 * @param string $sValue
+	 *
+	 * @return bool
+	 */
+	public function Set($sKey, $sValue)
+	{
+		return false !== \file_put_contents($sPath = $this->generateCachedFileName($sKey, true), $sValue);
+	}
+
+	/**
+	 * @param string $sKey
+	 *
+	 * @return string
+	 */
+	public function Get($sKey)
+	{
+		$sValue = '';
+		$sPath = $this->generateCachedFileName($sKey);
+		if (\file_exists($sPath))
+		{
+			$sValue = \file_get_contents($sPath);
+		}
+
+		return \is_string($sValue) ? $sValue : '';
+	}
+
+	/**
+	 * @param string $sKey
+	 *
+	 * @return void
+	 */
+	public function Delete($sKey)
+	{
+		$sPath = $this->generateCachedFileName($sKey);
+		if (\file_exists($sPath))
+		{
+			\unlink($sPath);
+		}
+	}
+
+	/**
+	 * @param int $iTimeToClearInHours = 24
+	 * 
+	 * @return bool
+	 */
+	public function GC($iTimeToClearInHours = 24)
+	{
+		if (0 < $iTimeToClearInHours)
+		{
+			\MailSo\Base\Utils::RecTimeDirRemove($this->sCacheFolder, 60 * 60 * $iTimeToClearInHours, \time());
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $sKey
+	 * @param bool $bMkDir = false
+	 *
+	 * @return string
+	 */
+	private function generateCachedFileName($sKey, $bMkDir = false)
+	{
+		$sFilePath = '';
+		if (3 < \strlen($sKey))
+		{
+			$sKeyPath = \sha1($sKey);
+			$sKeyPath = \substr($sKeyPath, 0, 2).'/'.\substr($sKeyPath, 2, 2).'/'.$sKeyPath;
+
+			$sFilePath = $this->sCacheFolder.'/'.$sKeyPath;
+			if ($bMkDir && !\is_dir(\dirname($sFilePath)))
+			{
+				if (!\mkdir(\dirname($sFilePath), 0755, true))
+				{
+					$sFilePath = '';
+				}
+			}
+		}
+
+		return $sFilePath;
+	}
+}

rainloop/v/1.3.9.485/app/libraries/MailSo/Imap/ImapClient.php → rainloop/v/1.3.10.490/app/libraries/MailSo/Imap/ImapClient.php

@@ -1272,19 +1272,26 @@ public function MessageStoreFlag($sIndexRange, $bIndexIsUid, $aInputStoreItems,
 	 * @param int $iStreamSize
 	 * @param array	$aAppendFlags = null
 	 * @param int $iUid = null
+	 * @param int $sDateTime = 0
 	 *
 	 * @return \MailSo\Imap\ImapClient
 	 *
 	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
 	 * @throws \MailSo\Net\Exceptions\Exception
 	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
-	public function MessageAppendStream($sFolderName, $rMessageAppendStream, $iStreamSize, $aAppendFlags = null, &$iUid = null)
+	public function MessageAppendStream($sFolderName, $rMessageAppendStream, $iStreamSize, $aAppendFlags = null, &$iUid = null, $sDateTime = 0)
 	{
-		$this->SendRequest('APPEND',
-			array($this->EscapeString($sFolderName), $aAppendFlags, '{'.$iStreamSize.'}'));
+		$aData = array($this->EscapeString($sFolderName), $aAppendFlags);
+		if (0 < $sDateTime)
+		{
+			$aData[] = $this->EscapeString(\gmdate('d-M-Y H:i:s', $sDateTime).' +0000');
+		}
 
-		$this->parseResponseWithValidation('+');
+		$aData[] = '{'.$iStreamSize.'}';
+
+		$this->SendRequest('APPEND', $aData);
+		$this->parseResponseWithValidation();
 
 		$this->writeLog('Write to connection stream', \MailSo\Log\Enumerations\Type::NOTE);
 

rainloop/v/1.3.9.485/app/libraries/RainLoop/Account.php → rainloop/v/1.3.10.490/app/libraries/RainLoop/Account.php

@@ -175,7 +175,7 @@ public function GetAuthToken()
 			'0', // PasswordIsXOAuth2
 			$this->sSignMeToken,
 			$this->sParentEmail,
-			\microtime(true).\rand(1000, 9999)
+			\RainLoop\Utils::GetShortToken()
 		));
 	}
 }