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

Added labs.allow_html_editor_biti_buttons setting (RTL/LTR html edito buttons) (#375)

Browse source
This commit is contained in:
RainLoop Team 2014-11-16 16:54:23 +04:00
parent 7b97a9f85d
commit 7aa8dcea6b
75 changed files with 865 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1030,6 +1030,7 @@ class Actions
'InIframe' => (bool) $oConfig->Get('labs', 'in_iframe', false),
'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),
'AllowHtmlEditorSourceButton' => (bool) $oConfig->Get('labs', 'allow_html_editor_source_button', false),
'AllowHtmlEditorBitiButtons' => (bool) $oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
'UseRsaEncryption' => (bool) $oConfig->Get('security', 'use_rsa_encryption', false),
'RsaPublicKey' => '',
'HideDangerousActions' => $oConfig->Get('labs', 'hide_dangerous_actions', false),
@ -2651,35 +2652,27 @@ class Actions
$oCacher = $this->Cacher();
$oHttp = \MailSo\Base\Http::SingletonInstance();
if ($oHttp->CheckLocalhost($sDomain))
if ($oHttp->CheckLocalhost($sDomain) || !$oCacher)
{
return 'NO';
}
$sDomainKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain);
$sDomainLongKeyValue = \RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain);
$sValue = '';
if (!$sForce && $oCacher)
if (!$sForce)
{
if (!$bLongCache)
$iTime = $oCacher->GetTimer($bLongCache ? $sDomainLongKeyValue : $sDomainKeyValue);
if (0 < $iTime && \time() < $iTime + (60 * ($bLongCache ? 60 * 24 : 1)) * ($bLongCache ? $iLongCacheTimeInDays : $iFastCacheTimeInMin))
{
$iTime = $oCacher->GetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
if ($iTime + 60 * $iFastCacheTimeInMin > \time())
{
$sValue = $oCacher->Get(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
}
}
else
{
$iTime = $oCacher->GetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain));
if ($iTime + (60 * 60 * 24) * $iLongCacheTimeInDays > \time())
{
$sValue = $oCacher->Get(\RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain));
}
$sValue = $oCacher->Get($bLongCache ? $sDomainLongKeyValue : $sDomainKeyValue);
}
}
if (0 === \strlen($sValue))
{
if ($bLongCache && (!$oCacher || !$oCacher->SetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain))))
if ($bLongCache && !$oCacher->SetTimer($sDomainLongKeyValue))
{
return 'NO';
}
@ -2698,13 +2691,10 @@ class Actions
$sValue = '';
}
if ($oCacher)
{
$oCacher->SetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
$oCacher->SetTimer($sDomainKeyValue);
$oCacher->Set(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain), $sValue);
$oCacher->Set(\RainLoop\KeyPathHelper::LicensingDomainKeyOtherValue($sDomain), $sValue);
}
$oCacher->Set($sDomainKeyValue, $sValue);
$oCacher->Set($sDomainLongKeyValue, $sValue);
}
return $sValue;

1
rainloop/v/0.0.0/app/src/RainLoop/Config/Application.php
View file

@ -241,6 +241,7 @@ Enables caching in the system'),
'login_fault_delay' => array(1),
'log_ajax_response_write_limit' => array(300),
'allow_html_editor_source_button' => array(false),
'allow_html_editor_biti_buttons' => array(false),
'hide_dangerous_actions' => array(false),
'use_app_debug_js' => array(false),
'use_app_debug_css' => array(false),