+ Multiple identities (#9)

- animation settings
* minor fixes
This commit is contained in:
RainLoop Team 2013-11-12 02:01:44 +04:00
parent b2dafe9e5e
commit 0b7afb5b7b
438 changed files with 6049 additions and 5203 deletions

View file

@ -1 +1 @@
1.3.9.485 1.3.10.490

View file

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

View file

@ -0,0 +1 @@
1.3.10.490

View file

@ -301,7 +301,7 @@ class Http
if ($bRemoveWWW) 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) if ($bWithRemoteUserData)

View file

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

View file

@ -25,7 +25,7 @@ class File implements \MailSo\Cache\DriverInterface
$this->sCacheFolder = rtrim(trim($this->sCacheFolder), '\\/').'/'; $this->sCacheFolder = rtrim(trim($this->sCacheFolder), '\\/').'/';
if (!\is_dir($this->sCacheFolder)) if (!\is_dir($this->sCacheFolder))
{ {
@\mkdir($this->sCacheFolder, 0777); @\mkdir($this->sCacheFolder, 0755);
} }
} }
@ -114,7 +114,7 @@ class File implements \MailSo\Cache\DriverInterface
$sFilePath = $this->sCacheFolder.'/'.$sKeyPath; $sFilePath = $this->sCacheFolder.'/'.$sKeyPath;
if ($bMkDir && !\is_dir(\dirname($sFilePath))) if ($bMkDir && !\is_dir(\dirname($sFilePath)))
{ {
if (!\mkdir(\dirname($sFilePath), 0777, true)) if (!\mkdir(\dirname($sFilePath), 0755, true))
{ {
$sFilePath = ''; $sFilePath = '';
} }

Some files were not shown because too many files have changed in this diff Show more