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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2017-01-11 21:15:09 +03:00
parent be26cd248c
commit 924e846135
8 changed files with 157 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1457,7 +1457,7 @@ class Actions
'registrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')),
'loginGlassStyle' => (bool) $oConfig->Get('login', 'glass_style', true),
'hideSubmitButton' => (bool) $oConfig->Get('login', 'hide_submit_button', true),
'activeBackgroud' => (bool) $oConfig->Get('login', 'active_backgroud', true),
'activeBackgroud' => (bool) $oConfig->Get('login', 'active_backgroud', false),
'jsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
'useImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
'useImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),

2
rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -137,6 +137,8 @@ class Api
\MailSo\Config::$HtmlStrictDebug = !!\RainLoop\Api::Config()->Get('debug', 'enable', false);
\MailSo\Config::$CheckNewMessages = !!\RainLoop\Api::Config()->Get('labs', 'check_new_messages', true);
if (\RainLoop\Api::Config()->Get('labs', 'strict_html_parser', true))
{
\MailSo\Config::$HtmlStrictAllowedAttributes = array(

4
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -251,7 +251,7 @@ class Application extends \RainLoop\Config\AbstractConfig
'glass_style' => array(true),
'hide_submit_button' => array(true),
'active_backgroud' => array(true),
'active_backgroud' => array(false),
'forgot_password_link_url' => array('', ''),
'registration_link_url' => array('', ''),
@ -446,9 +446,9 @@ Enables caching in the system'),
'detect_image_exif_orientation' => array(true),
'cookie_default_path' => array(''),
'cookie_default_secure' => array(false),
'check_new_messages' => array(true),
'replace_env_in_configuration' => array(''),
'startup_url' => array(''),
'nice_social_redirect' => array(true),
'strict_html_parser' => array(false),
'allow_cmd' => array(false),
'dev_email' => array(''),

46
rainloop/v/0.0.0/app/libraries/RainLoop/Social.php
View file

@ -128,7 +128,6 @@ class Social
public function popupServiceResult($sTypeStr, $sLoginUrl, $bLogin, $iErrorCode)
{
$sResult = '';
$bNiceSocialRedirect = $this->oActions->Config()->Get('labs', 'nice_social_redirect', true);
$bAppCssDebug = !!$this->oActions->Config()->Get('labs', 'use_app_debug_css', false);
$sIcon = $sTypeStr;
@ -139,22 +138,15 @@ class Social
if ($sLoginUrl)
{
if (!$bNiceSocialRedirect)
{
$this->oActions->Location($sLoginUrl);
}
else
{
$this->oHttp->ServerNoCache();
@\header('Content-Type: text/html; charset=utf-8');
$this->oHttp->ServerNoCache();
@\header('Content-Type: text/html; charset=utf-8');
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Social.html'), array(
'{{RefreshMeta}}' => '<meta http-equiv="refresh" content="0; URL='.$sLoginUrl.'" />',
'{{Stylesheet}}' => $this->oActions->StaticPath('css/social'.($bAppCssDebug ? '' : '.min').'.css'),
'{{Icon}}' => $sIcon,
'{{Script}}' => ''
));
}
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Social.html'), array(
'{{RefreshMeta}}' => '<meta http-equiv="refresh" content="0; URL='.$sLoginUrl.'" />',
'{{Stylesheet}}' => $this->oActions->StaticPath('css/social'.($bAppCssDebug ? '' : '.min').'.css'),
'{{Icon}}' => $sIcon,
'{{Script}}' => ''
));
}
else
{
@ -164,21 +156,13 @@ class Social
$sCallBackType = $bLogin ? '_login' : '';
$sConnectionFunc = 'rl_'.\md5(\RainLoop\Utils::GetConnectionToken()).'_'.$sTypeStr.$sCallBackType.'_service';
if (!$bNiceSocialRedirect)
{
$sResult = '<script data-cfasync="false">opener && opener.'.$sConnectionFunc.' && opener.'.
$sConnectionFunc.'('.$iErrorCode.'); self && self.close && self.close();</script>';
}
else
{
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Social.html'), array(
'{{RefreshMeta}}' => '',
'{{Stylesheet}}' => $this->oActions->StaticPath('css/social'.($bAppCssDebug ? '' : '.min').'.css'),
'{{Icon}}' => $sIcon,
'{{Script}}' => '<script data-cfasync="false">opener && opener.'.$sConnectionFunc.' && opener.'.
$sConnectionFunc.'('.$iErrorCode.'); self && self.close && self.close();</script>'
));
}
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Social.html'), array(
'{{RefreshMeta}}' => '',
'{{Stylesheet}}' => $this->oActions->StaticPath('css/social'.($bAppCssDebug ? '' : '.min').'.css'),
'{{Icon}}' => $sIcon,
'{{Script}}' => '<script data-cfasync="false">opener && opener.'.$sConnectionFunc.' && opener.'.
$sConnectionFunc.'('.$iErrorCode.'); self && self.close && self.close();</script>'
));
}
return $sResult;