Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 04:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release commit

Browse source
This commit is contained in:
RainLoop Team 2015-02-26 18:47:37 +04:00
parent 19f089d0bf
commit 053fd1c60b
5 changed files with 49 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/App/Admin.js
View file

@ -206,7 +206,9 @@
LicenseStore.licenseError('');
Remote.licensing(function (sResult, oData) {
LicenseStore.licensingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && Utils.isNormal(oData.Result['Expired']))
{
LicenseStore.licenseValid(true);

30
dev/Common/Utils.js
View file

@ -1548,36 +1548,6 @@
}
};
/**
* @param {string} sStr
* @return {string}
*/
Utils.FullHtmlEncode = function (sStr)
{
var
iIndex = 0,
sChr = '',
iChrCode = 0,
sResult = '';
;
for (iIndex = 0; iIndex < sStr.length; iIndex++)
{
sChr = sStr[iIndex];
if (-1 < Utils.inArray(sChr, ['&', '<', '>', '"', '`', '\'']))
{
sResult += _.escape(sChr);
}
else
{
iChrCode = sChr.charCodeAt(0);
sResult += (iChrCode > 128) ? '&#' + iChrCode + ';' : sChr;
}
}
return sResult;
};
/**
* @param {Object|Array} mObjectOrObjects
*/

13
dev/View/Popup/Compose.js
View file

@ -1170,6 +1170,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
else if (Enums.ComposeType.Empty === sComposeType)
@ -1192,6 +1194,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
else if (Utils.isNonEmptyArray(oMessageOrArray))
@ -1214,6 +1218,8 @@
{
self.setSignatureFromIdentity(oIdentity);
}
self.setFocusInPopup();
});
}
@ -1261,12 +1267,13 @@
this.resizerTrigger();
};
ComposePopupView.prototype.onShowWithDelay = function ()
ComposePopupView.prototype.setFocusInPopup = function ()
{
if (!Globals.bMobileDevice)
{
if ('' === this.to())
{
this.to.focused(false);
this.to.focused(true);
}
else if (this.oEditor)
@ -1274,7 +1281,11 @@
this.oEditor.focus();
}
}
};
ComposePopupView.prototype.onShowWithDelay = function ()
{
this.setFocusInPopup();
this.resizerTrigger();
};

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.8.1",
"release": "274",
"release": "276",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",

66
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -3339,27 +3339,27 @@ class Actions
*
* @return string
*/
public function domainPathHelper($sDomain)
{
$sDomain = \strtolower(\trim($sDomain));
$sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
if (false === \strpos($sTempDomain, '.'))
{
$sTempDomain = $sDomain;
}
$sDomainPrefix = $sTempDomain;
if (false === \strpos($sDomainPrefix, '.'))
{
$sDomainPrefix = $sTempDomain;
}
$sDomainPrefix = \substr(\preg_replace('/[^a-z0-9]+/', '', $sDomainPrefix), 0, 2);
$sDomainPrefix = \str_pad($sDomainPrefix, 2, '_');
return 'd/'.\substr($sDomainPrefix, 0, 1).'/'.$sDomainPrefix.'/'.\urlencode($sTempDomain);
}
// public function domainPathHelper($sDomain)
// {
// $sDomain = \strtolower(\trim($sDomain));
//
// $sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
// if (false === \strpos($sTempDomain, '.'))
// {
// $sTempDomain = $sDomain;
// }
//
// $sDomainPrefix = $sTempDomain;
// if (false === \strpos($sDomainPrefix, '.'))
// {
// $sDomainPrefix = $sTempDomain;
// }
//
// $sDomainPrefix = \substr(\preg_replace('/[^a-z0-9]+/', '', $sDomainPrefix), 0, 2);
// $sDomainPrefix = \str_pad($sDomainPrefix, 2, '_');
//
// return 'd/'.\substr($sDomainPrefix, 0, 1).'/'.$sDomainPrefix.'/'.\urlencode($sTempDomain);
// }
/**
* @return string
@ -3417,23 +3417,25 @@ class Actions
$iCode = 0;
$sContentType = '';
$sValue = $oHttp->GetUrlAsString(APP_STATUS_PATH.$this->domainPathHelper($sDomain),
'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
array(), false
);
// $sValue = $oHttp->GetUrlAsString(APP_API_PATH.'status/'.\urlencode($sDomain),
// 'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
// $sValue = $oHttp->GetUrlAsString(APP_STATUS_PATH.$this->domainPathHelper($sDomain),
// 'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 5,
// $this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
// array(), false
// );
if (404 === $iCode)
$sValue = $oHttp->GetUrlAsString(APP_API_PATH.'status/'.\urlencode($sDomain),
'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 5,
$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
array(), false
);
$this->Logger()->Write($sValue);
/*if (404 === $iCode)
{
$sValue = 'NO';
}
else if (200 !== $iCode)
else */if (200 !== $iCode)
{
$sValue = '';
}
@ -3545,7 +3547,7 @@ class Actions
\sleep(1);
$sValue = $oHttp->GetUrlAsString(APP_API_PATH.'activate/'.\urlencode($sDomain).'/'.\urlencode($sKey),
'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
array(), false
);