From 924e846135907c22b4f7767561c2fa0b70d41433 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 11 Jan 2017 21:15:09 +0300 Subject: [PATCH] Small fixes --- build/owncloud/rainloop-app/appinfo/info.xml | 4 +- .../v/0.0.0/app/libraries/MailSo/Config.php | 221 +++++++++--------- .../app/libraries/MailSo/Mail/MailClient.php | 2 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 2 +- .../v/0.0.0/app/libraries/RainLoop/Api.php | 2 + .../libraries/RainLoop/Config/Application.php | 4 +- .../v/0.0.0/app/libraries/RainLoop/Social.php | 46 ++-- .../Views/Common/PopupsWelcomePage.html | 42 ++-- 8 files changed, 157 insertions(+), 166 deletions(-) diff --git a/build/owncloud/rainloop-app/appinfo/info.xml b/build/owncloud/rainloop-app/appinfo/info.xml index 7d687245b..a71679ce7 100644 --- a/build/owncloud/rainloop-app/appinfo/info.xml +++ b/build/owncloud/rainloop-app/appinfo/info.xml @@ -12,9 +12,9 @@ - + tools - http://www.rainloop.net/ + https://www.rainloop.net/ https://github.com/RainLoop/rainloop-webmail/issues diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Config.php b/rainloop/v/0.0.0/app/libraries/MailSo/Config.php index 3ffb0f5db..9901feb1c 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Config.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Config.php @@ -1,108 +1,113 @@ - $sUidNext, 'Flags' => $aFlags, 'HighestModSeq' => $sHighestModSeq, - 'NewMessages' => 'INBOX' === $sFolderName ? + 'NewMessages' => 'INBOX' === $sFolderName && \MailSo\Config::$CheckNewMessages ? $this->getFolderNextMessageInformation($sFolderName, $sPrevUidNext, $sUidNext) : array() ); diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 260e5ba46..c12ac53d0 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -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), diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php index a49e7b3fa..9013825df 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Api.php @@ -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( diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 873e9a0d6..e6e624936 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -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(''), diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php index 52c03c9fa..3b296bff6 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Social.php @@ -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}}' => '', - '{{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}}' => '', + '{{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 = ''; - } - 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}}' => '' - )); - } + $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}}' => '' + )); } return $sResult; diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html index a9f2a43bb..0edb0665b 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html +++ b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html @@ -1,22 +1,22 @@ -
-
- -
-
- -
-
- -
- -
- -
+
+
+ +
+
+ +
+
+ +
+ +
+ +
\ No newline at end of file