Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-11-01 18:08:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release commit (1.7)

Browse source
This commit is contained in:
RainLoop Team 2014-11-15 00:23:46 +04:00
parent d5c68d1761
commit 7b97a9f85d
25 changed files with 118 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -986,8 +986,7 @@ class Actions
static $bResult = null;
if (null === $bResult)
{
// $bResult = $this->licenseParser($this->licenseHelper(false, true));
$bResult = true;
$bResult = $this->licenseParser($this->licenseHelper(false, true));
}
return $bResult;
@ -2645,7 +2644,7 @@ class Actions
/**
* @return string
*/
public function licenseHelper($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 5, $iLongCacheTimeInDays = 2)
public function licenseHelper($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 10, $iLongCacheTimeInDays = 3)
{
$sDomain = APP_SITE;
@ -2713,16 +2712,17 @@ class Actions
/**
* @param string $sInput
* @param int $iExpired = 0
*
* @return bool
*/
public function licenseParser($sInput)
public function licenseParser($sInput, &$iExpired = 0)
{
$aMatch = array();
if (\preg_match('/^EXPIRED:([\d]+)$/', $sInput, $aMatch))
{
$iTime = (int) $aMatch[1];
return \time() < $iTime;
$iExpired = (int) $aMatch[1];
return \time() < $iExpired;
}
return false;
@ -2750,15 +2750,15 @@ class Actions
\sleep(1);
}
$aMatch = array();
if (\preg_match('/^EXPIRED:([\d]+)$/', $sValue, $aMatch))
$iExpired = 0;
if ($this->licenseParser($sValue, $iExpired))
{
$mResult = array(
'Banned' => false,
'Expired' => (int) $aMatch[1],
'Expired' => $iExpired,
);
}
else if ($sValue === 'NO')
else if ($sValue === 'NO' || \preg_match('/^EXPIRED:[\d]+$/', $sValue))
{
$iErrorCode = -1;
}