Small fixes

build/owncloud/rainloop-app/appinfo/info.xml

@@ -12,9 +12,9 @@
 	<dependencies>
 		<php min-version="5.4" />
 		<owncloud min-version="6" max-version="9.2" />
-		<nextcloud min-version="10" />
+		<nextcloud min-version="8" max-version="11" />
 	</dependencies>
 	<category>tools</category>
-	<website>http://www.rainloop.net/</website>
+	<website>https://www.rainloop.net/</website>
 	<bugs>https://github.com/RainLoop/rainloop-webmail/issues</bugs>
 </info>

rainloop/v/0.0.0/app/libraries/MailSo/Config.php

@@ -86,6 +86,11 @@ class Config
 	 */
 	public static $LogSimpleLiterals = false;
 
+	/**
+	 * @var bool
+	 */
+	public static $CheckNewMessages = true;
+
 	/**
 	 * @var bool
 	 */

rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php

@@ -933,7 +933,7 @@ class MailClient
 			'UidNext' => $sUidNext,
 			'Flags' => $aFlags,
 			'HighestModSeq' => $sHighestModSeq,
-			'NewMessages' => 'INBOX' === $sFolderName ?
+			'NewMessages' => 'INBOX' === $sFolderName && \MailSo\Config::$CheckNewMessages ?
 				$this->getFolderNextMessageInformation($sFolderName, $sPrevUidNext, $sUidNext) : array()
 		);
 

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),

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(

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(''),

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

rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html

@@ -3,7 +3,7 @@
 			data-bind="modal: modalVisibility" style="width: 600px">
 
 		<div class="modal-body" style="height: 450px; padding: 0">
-			<div data-bind="if:welcomePageURL" style="height: 100%; width: 100%; margin: 0; padding: 0; position: relative">
+			<div data-bind="if: welcomePageURL" style="height: 100%; width: 100%; margin: 0; padding: 0; position: relative">
 				<iframe src="javascript:1;" tabindex="-1" frameborder="0"
 					style="border: none; width: 100%; height: 100%; position: absolute; top: 0px; left: 0px; right: 0px; bottom: 0px;"
 					data-bind="attr: {'src': welcomePageURL}"></iframe>