Small fixes

dev/Common/Enums.js

@@ -36,7 +36,6 @@
 	 * @enum {string}
 	 */
 	Enums.Capa = {
-		'Prem': 'PREM',
 		'TwoFactor': 'TWO_FACTOR',
 		'OpenPGP': 'OPEN_PGP',
 		'Prefetch': 'PREFETCH',

dev/Settings/Admin/Branding.js

@@ -20,7 +20,7 @@
 			Settings = require('Storage/Settings')
 		;
 
-		this.capa = !!Settings.capa(Enums.Capa.Prem);
+		this.capa = !!Settings.settingsGet('PremType');
 		this.capa = true;
 
 		this.title = ko.observable(Settings.settingsGet('Title'));

dev/Settings/User/Themes.js

@@ -4,9 +4,7 @@
 	'use strict';
 
 	var
-		window = require('window'),
 		_ = require('_'),
-		$ = require('$'),
 		ko = require('ko'),
 
 		Enums = require('Common/Enums'),

dev/View/Admin/Settings/Pane.js

@@ -7,8 +7,6 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Common/Enums'),
-
 		Settings = require('Storage/Settings'),
 		Data = require('Storage/Admin/Data'),
 		Remote = require('Storage/Admin/Remote'),
@@ -29,7 +27,7 @@
 		this.version = ko.observable(Settings.settingsGet('Version'));
 
 		this.adminManLoadingVisibility = Data.adminManLoadingVisibility;
-		this.capa = !!Settings.capa(Enums.Capa.Prem);
+		this.capa = !!Settings.settingsGet('PremType');
 		this.capa = false;
 
 		kn.constructorEnd(this);

rainloop/v/0.0.0/app/src/RainLoop/Actions.php

@@ -953,6 +953,14 @@ class Actions
 		return $this->GetAccountFromCustomToken($this->getAuthToken(), $bThrowExceptionOnFalse);
 	}
 
+	/**
+	 * @return bool
+	 */
+	private function PremType()
+	{
+		return false;
+	}
+
 	/**
 	 * @param bool $bAdmin
 	 * @param string $sAuthAccountHash = ''
@@ -1003,6 +1011,7 @@ class Actions
 			'UseImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
 			'UseImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),
 			'AllowAppendMessage' => (bool) $oConfig->Get('labs', 'allow_message_append', false),
+			'PremType' => $this->PremType(),
 			'Capa' => array(),
 			'Plugins' => array()
 		);
@@ -1029,7 +1038,7 @@ class Actions
 			$aResult['AuthAccountHash'] = $sAuthAccountHash;
 		}
 
-		if ($this->GetCapa(true, \RainLoop\Enumerations\Capa::PREM))
+		if ($this->PremType() || true)
 		{
 			$aResult['Title'] = $oConfig->Get('webmail', 'title', '');
 			$aResult['LoadingDescription'] = $oConfig->Get('webmail', 'loading_description', '');
@@ -2452,7 +2461,7 @@ class Actions
 		$this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
 		$this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');
 
-		if ($this->GetCapa(true, \RainLoop\Enumerations\Capa::PREM))
+		if ($this->PremType() || true)
 		{
 			$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
 			$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
@@ -2557,32 +2566,28 @@ class Actions
 	}
 
 	/**
-	 * @return array
+	 * @return string
 	 */
-	public function DoAdminLicensing()
+	public function licenseHelper($sForce = false, $iCacheTimeInMin = 5)
 	{
-		$iStart = \time();
+		$sDomain = APP_SITE;
-		$this->IsAdminLoggined();
-
-		$sForce = '1' === (string) $this->GetActionParam('Force', '0');
-
-		$mResult = false;
-		$iErrorCode = -1;
 
+		$oCacher = $this->Cacher();
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
-		if ($oHttp->CheckLocalhost(APP_SITE))
+
+		if ($oHttp->CheckLocalhost($sDomain))
 		{
-			return $this->DefaultResponse(__FUNCTION__, $mResult);
+			return 'NO';
 		}
 
-		$sDomain = APP_SITE;
-		if (2 < \strlen($sDomain))
-		{
 		$sValue = '';
-			$iTime = $this->Cacher()->GetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
+		if (!$sForce && $oCacher)
-			if (!$sForce && $iTime + 60 * 5 > \time())
 		{
-				$sValue = $this->Cacher()->Get(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
+			$iTime = $oCacher->GetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
+			if ($iTime + 60 * $iCacheTimeInMin > \time())
+			{
+				$sValue = $oCacher->Get(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
+			}
 		}
 
 		if (0 === \strlen($sValue))
@@ -2591,7 +2596,7 @@ class Actions
 			$sContentType = '';
 
 			$sValue = $oHttp->GetUrlAsString(APP_API_PATH.'status/'.\urlencode($sDomain),
-					'RainLoop',	$sContentType, $iCode, $this->Logger(), 10,
+				'RainLoop/'.APP_VERSION, $sContentType, $iCode, $this->Logger(), 10,
 				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', ''),
 				array(), false
 			);
@@ -2601,17 +2606,40 @@ class Actions
 				$sValue = '';
 			}
 
+			if ($oCacher)
+			{
+				$oCacher->Set(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain), $sValue);
+				$oCacher->SetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
+			}
+		}
+
+		return $sValue;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function DoAdminLicensing()
+	{
+		$iStart = \time();
+		$this->IsAdminLoggined();
+
+		$bForce = '1' === (string) $this->GetActionParam('Force', '0');
+
+		$mResult = false;
+		$iErrorCode = -1;
+
+		if (2 < \strlen(APP_SITE))
+		{
+			$sValue = $this->licenseHelper($bForce);
+
 			if ($iStart === \time())
 			{
 				\sleep(1);
 			}
 
-				$this->Cacher()->Set(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain), $sValue);
-				$this->Cacher()->SetTimer(\RainLoop\KeyPathHelper::LicensingDomainKeyValue($sDomain));
-			}
-
 			$aMatch = array();
-			if (5 < \strlen($sValue) && \preg_match('/^EXPIRED:([\d]+)$/', $sValue, $aMatch))
+			if (\preg_match('/^EXPIRED:([\d]+)$/', $sValue, $aMatch))
 			{
 				$mResult = array(
 					'Banned' => false,
@@ -6406,7 +6434,6 @@ class Actions
 		$oConfig = $this->Config();
 
 		$aResult = array(
-			\RainLoop\Enumerations\Capa::PREM,
 //			\RainLoop\Enumerations\Capa::FILTERS
 		);
 

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSocial.html

@@ -138,7 +138,7 @@
 			<div class="controls">
 				<label data-bind="click: function () { dropboxEnable(!dropboxEnable()); }">
 					<i data-bind="css: dropboxEnable() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
-					Enable Dropbox Integration (Compose attachments)
+					Enable Dropbox Integration (Compose view)
 				</label>
 			</div>
 		</div>