Release commit (1.7)

dev/Settings/Admin/Licensing.js

@@ -52,6 +52,14 @@
 		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Activate'));
 	};
 
+	/**
+	 * @returns {boolean}
+	 */
+	LicensingAdminSettings.prototype.licenseIsUnlim = function ()
+	{
+		return 1898625600 === this.licenseExpired();
+	};
+
 	/**
 	 * @returns {string}
 	 */
@@ -62,7 +70,8 @@
 			oDate = moment.unix(iTime)
 		;
 
-		return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
+		return this.licenseIsUnlim() ? 'Never' :
+			(iTime && (oDate.format('LL') + ' (' + oDate.from(moment()) + ')'));
 	};
 
 	module.exports = LicensingAdminSettings;

dev/Styles/AdminBranding.less

@@ -1,7 +1,7 @@
 
 .b-admin-branding {
 	.disabled-form {
-		opacity: 0.4;
+		opacity: 0.8;
 	}
 }
 

dev/View/Admin/Settings/Pane.js

@@ -28,7 +28,6 @@
 
 		this.adminManLoadingVisibility = Data.adminManLoadingVisibility;
 		this.capa = !!Settings.settingsGet('PremType');
-		this.capa = false; // TODO
 
 		kn.constructorEnd(this);
 	}

dev/View/User/Login.js

@@ -141,6 +141,11 @@
 							else if (oData.ErrorCode)
 							{
 								this.submitRequest(false);
+								if (-1 < Utils.inArray(oData.ErrorCode, [Enums.Notification.InvalidInputArgument]))
+								{
+									oData.ErrorCode = Enums.Notification.AuthError;
+								}
+
 								this.submitError(Utils.getNotification(oData.ErrorCode));
 
 								if ('' === this.submitError())
@@ -190,7 +195,7 @@
 
 			window.open(Links.socialFacebook(), 'Facebook',
 				'left=200,top=100,width=650,height=450,menubar=no,status=no,resizable=yes,scrollbars=yes');
-				
+
 			return true;
 
 		}, function () {

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
-	"version": "1.6.11",
+	"version": "1.7.0",
-	"release": "192",
+	"release": "200",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",

plugins/change-password-example/ChangePasswordExampleDriver.php

@@ -19,7 +19,7 @@ class ChangePasswordExampleDriver implements \RainLoop\Providers\ChangePassword\
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -30,7 +30,7 @@ class ChangePasswordExampleDriver implements \RainLoop\Providers\ChangePassword\
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/change-smtp-ehlo-message/index.php

@@ -8,12 +8,12 @@ class ChangeSmtpEhloMessagePlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param array $aSmtpCredentials
 	 */
 	public function FilterSmtpCredentials($oAccount, &$aSmtpCredentials)
 	{
-		if ($oAccount instanceof \RainLoop\Account && \is_array($aSmtpCredentials))
+		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
 		{
 			// Default:
 			// $aSmtpCredentials['Ehlo'] = \MailSo\Smtp\SmtpClient::EhloHelper();

plugins/cpanel-change-password/CpanelChangePasswordDriver.php

@@ -84,7 +84,7 @@ class CpanelChangePasswordDriver implements \RainLoop\Providers\ChangePassword\C
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -95,7 +95,7 @@ class CpanelChangePasswordDriver implements \RainLoop\Providers\ChangePassword\C
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/custom-system-folders/index.php

@@ -40,7 +40,7 @@ class CustomSystemFoldersPlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param array $aSystemTypes
 	 */
 	public function FilterFoldersSystemTypes($oAccount, &$aSystemTypes)
@@ -88,7 +88,7 @@ class CustomSystemFoldersPlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param array $aSystemFolderNames
 	 */
 	public function FilterSystemFoldersNames($oAccount, &$aSystemFolderNames)
@@ -110,7 +110,7 @@ class CustomSystemFoldersPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 			$this->helperFolderType($this->sArchiveFolder, \MailSo\Imap\Enumerations\FolderType::ALL,
 				$aPrepend, $aSystemFolderNames);
-			
+
 			if (0 < \count($aPrepend))
 			{
 				$aSystemFolderNames = \array_merge($aPrepend, $aSystemFolderNames);

plugins/hmailserver-change-password/HmailserverChangePasswordDriver.php

@@ -63,7 +63,7 @@ class HmailserverChangePasswordDriver implements \RainLoop\Providers\ChangePassw
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -74,7 +74,7 @@ class HmailserverChangePasswordDriver implements \RainLoop\Providers\ChangePassw
 	}
 
 	/**
-	 * @param \RainLoop\Account $oHmailAccount
+	 * @param \RainLoop\Model\Account $oHmailAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/ispconfig-change-password/IspConfigChangePasswordDriver.php

@@ -70,7 +70,7 @@ class IspConfigChangePasswordDriver implements \RainLoop\Providers\ChangePasswor
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -81,7 +81,7 @@ class IspConfigChangePasswordDriver implements \RainLoop\Providers\ChangePasswor
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/override-smtp-credentials/index.php

@@ -8,12 +8,12 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param array $aSmtpCredentials
 	 */
 	public function FilterSmtpCredentials($oAccount, &$aSmtpCredentials)
 	{
-		if ($oAccount instanceof \RainLoop\Account && \is_array($aSmtpCredentials))
+		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
 		{
 			$sEmail = $oAccount->Email();
 

plugins/poppassd-change-password/ChangePasswordPoppassdDriver.php

@@ -71,7 +71,7 @@ class ChangePasswordPoppassdDriver implements \RainLoop\Providers\ChangePassword
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -82,7 +82,7 @@ class ChangePasswordPoppassdDriver implements \RainLoop\Providers\ChangePassword
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/postfixadmin-change-password/ChangePasswordPostfixAdminDriver.php

@@ -135,7 +135,7 @@ class ChangePasswordPostfixAdminDriver implements \RainLoop\Providers\ChangePass
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 *
 	 * @return bool
 	 */
@@ -146,7 +146,7 @@ class ChangePasswordPostfixAdminDriver implements \RainLoop\Providers\ChangePass
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Model\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *

plugins/proxyauth-login-example/index.php

@@ -8,11 +8,20 @@ class ProxyauthLoginExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
+	 * @param string $sLogin
+	 * @param string $sPassword
+	 */
+	public function isValidAccount($sLogin, $sPassword)
+	{
+		return !empty($sLogin) && !empty($sPassword);
+	}
+
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
 	 */
 	public function EventLoginPostLoginProvide(&$oAccount)
 	{
-		if ($oAccount instanceof \RainLoop\Account)
+		if ($oAccount instanceof \RainLoop\Model\Account)
 		{
 			// Verify logic
 			$bValid = isValidAccount($oAccount->Login(), $oAccount->Password());
@@ -23,10 +32,10 @@ class ProxyauthLoginExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 			 * $oAccount->Password();		// IMAP password
 			 * $oAccount->DomainIncHost();  // IMAP host
 			 *
-			 * @see \RainLoo\Account for more
+			 * @see \RainLoo\Model\Account for more
 			 */
 
-			if ($bValid) // if verify failed
+			if (!$bValid) // if verify failed
 			{
 				// throw a Auth Error Exception
 				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);

rainloop/v/0.0.0/app/libraries/MailSo/Base/Http.php

@@ -587,10 +587,10 @@ class Http
 		if ($oLogger)
 		{
 			$oLogger->Write('cUrl: URL: '.$sUrl);
-			if (isset($aOptions[CURLOPT_HTTPHEADER]) && \is_array($aOptions[CURLOPT_HTTPHEADER]) && 0 < \count($aOptions[CURLOPT_HTTPHEADER]))
+//			if (isset($aOptions[CURLOPT_HTTPHEADER]) && \is_array($aOptions[CURLOPT_HTTPHEADER]) && 0 < \count($aOptions[CURLOPT_HTTPHEADER]))
-			{
+//			{
-				$oLogger->Write('cUrl: Headers: '.\print_r($aOptions[CURLOPT_HTTPHEADER], true));
+//				$oLogger->Write('cUrl: Headers: '.\print_r($aOptions[CURLOPT_HTTPHEADER], true));
-			}
+//			}
 		}
 
 		\MailSo\Base\Http::DetectAndHackFollowLocationUrl($sUrl, $aOptions, $oLogger);

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

@@ -986,8 +986,7 @@ class Actions
 		static $bResult = null;
 		if (null === $bResult)
 		{
-//			$bResult = $this->licenseParser($this->licenseHelper(false, true));
+			$bResult = $this->licenseParser($this->licenseHelper(false, true));
-			$bResult = true;
 		}
 
 		return $bResult;
@@ -2645,7 +2644,7 @@ class Actions
 	/**
 	 * @return string
 	 */
-	public function licenseHelper($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 5, $iLongCacheTimeInDays = 2)
+	public function licenseHelper($sForce = false, $bLongCache = false, $iFastCacheTimeInMin = 10, $iLongCacheTimeInDays = 3)
 	{
 		$sDomain = APP_SITE;
 
@@ -2713,16 +2712,17 @@ class Actions
 
 	/**
 	 * @param string $sInput
+	 * @param int $iExpired = 0
 	 *
 	 * @return bool
 	 */
-	public function licenseParser($sInput)
+	public function licenseParser($sInput, &$iExpired = 0)
 	{
 		$aMatch = array();
 		if (\preg_match('/^EXPIRED:([\d]+)$/', $sInput, $aMatch))
 		{
-			$iTime = (int) $aMatch[1];
+			$iExpired = (int) $aMatch[1];
-			return \time() < $iTime;
+			return \time() < $iExpired;
 		}
 
 		return false;
@@ -2750,15 +2750,15 @@ class Actions
 				\sleep(1);
 			}
 
-			$aMatch = array();
+			$iExpired = 0;
-			if (\preg_match('/^EXPIRED:([\d]+)$/', $sValue, $aMatch))
+			if ($this->licenseParser($sValue, $iExpired))
 			{
 				$mResult = array(
 					'Banned' => false,
-					'Expired' => (int) $aMatch[1],
+					'Expired' => $iExpired,
 				);
 			}
-			else if ($sValue === 'NO')
+			else if ($sValue === 'NO' || \preg_match('/^EXPIRED:[\d]+$/', $sValue))
 			{
 				$iErrorCode = -1;
 			}

rainloop/v/0.0.0/app/src/RainLoop/Providers/ChangePassword.php

@@ -34,24 +34,24 @@ class ChangePassword extends \RainLoop\Providers\AbstractProvider
 	}
 
 	/**
-	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \RainLoop\Account $oAccount
 	 *
 	 * @return bool
 	 */
 	public function PasswordChangePossibility($oAccount)
 	{
 		return $this->IsActive() &&
-			$oAccount instanceof \RainLoop\Model\Account &&
+			$oAccount instanceof \RainLoop\Account &&
 			$this->oDriver && $this->oDriver->PasswordChangePossibility($oAccount)
 		;
 	}
 
 	/**
-	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \RainLoop\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 */
-	public function ChangePassword(\RainLoop\Model\Account $oAccount, $sPrevPassword, $sNewPassword)
+	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword)
 	{
 		if ($this->oDriver instanceof \RainLoop\Providers\ChangePassword\ChangePasswordInterface &&
 			$this->PasswordChangePossibility($oAccount))

rainloop/v/0.0.0/app/src/RainLoop/Providers/ChangePassword/ChangePasswordInterface.php

@@ -5,18 +5,18 @@ namespace RainLoop\Providers\ChangePassword;
 interface ChangePasswordInterface
 {
 	/**
-	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \RainLoop\Account $oAccount
 	 *
 	 * @return bool
 	 */
 	public function PasswordChangePossibility($oAccount);
 
 	/**
-	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \RainLoop\Account $oAccount
 	 * @param string $sPrevPassword
 	 * @param string $sNewPassword
 	 *
 	 * @return bool
 	 */
-	public function ChangePassword(\RainLoop\Model\Account $oAccount, $sPrevPassword, $sNewPassword);
+	public function ChangePassword(\RainLoop\Account $oAccount, $sPrevPassword, $sNewPassword);
 }

rainloop/v/0.0.0/app/src/RainLoop/Providers/Suggestions.php

@@ -20,12 +20,12 @@ class Suggestions extends \RainLoop\Providers\AbstractProvider
 	}
 
 	/**
-	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \RainLoop\Account $oAccount
 	 * @param string $sQuery
 	 *
 	 * @return array
 	 */
-	public function Process(\RainLoop\Model\Account $oAccount, $sQuery)
+	public function Process(\RainLoop\Account $oAccount, $sQuery)
 	{
 		return $this->oDriver && $this->IsActive() && 0 < \strlen($sQuery) ? $this->oDriver->Process($oAccount, $sQuery) : array();
 	}

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

@@ -33,9 +33,9 @@
 					</button>
 				</div>
 			</form>
-<!--			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
+			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
 				Powered by <a href="http://rainloop.net" target="_blank">RainLoop</a>
-			</div>-->
+			</div>
 		</center>
 	</div>
 	<div class="loginAfter"></div>

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

@@ -1,7 +1,7 @@
 <div class="b-admin-branding">
 	<div class="row" data-bind="visible: !capa">
 		<div class="alert span8" style="margin-top: 10px;">
-			Full functionality available in <strong><a href="#/licensing">Premium version</a></strong> only.
+			This functionality is available for <strong><a href="#/licensing">Premium</a></strong> subscribers.
 		</div>
 	</div>
 	<div class="form-horizontal" data-bind="css: {'disabled-form': !capa}">
@@ -77,17 +77,18 @@
 				}"></div>
 			</div>
 		</div>
-<!--		<div class="control-group">
+		<div class="control-group">
 			<div class="controls">
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'Show &quot;Powered by RainLoop&quot; link',
+						enable: capa,
+						label: 'Show &quot;Powered by RainLoop&quot; link (White Labeling)',
 						value: loginPowered
 					}
 				}"></div>
 			</div>
-		</div>-->
+		</div>
 		<div class="control-group">
 			<label class="control-label">
 				Custom CSS

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

@@ -6,17 +6,18 @@
 			Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)</strong> license.
 			<br />
 			<br />
-			You are <strong>free</strong> to use it for your <strong>personal</strong> or <strong>non-profit</strong> projects.
+			You are <strong>free</strong> to use it for your <strong>personal</strong> projects.
 			<br />
 			<br />
-			Commercial use of <strong>RainLoop Webmail</strong> requires getting a
+			Commercial use (with additional features) of <strong>RainLoop Webmail</strong> requires getting a
-			<a href="http://rainloop.net/purchase/" target="_blank">permission</a>.
+			<a href="http://rainloop.net/purchase/" target="_blank">subscription</a>.
 		</div>
 	</div>
+	<br />
 	<div class="form-horizontal">
 		<div class="control-group">
 			<label class="control-label">
-				Your Domain
+				Your domain
 			</label>
 			<div class="controls">
 				<span class="help-inline" style="padding-top: 5px;">
@@ -25,29 +26,49 @@
 			</div>
 		</div>
 		<div class="control-group" data-bind="visible: !subscriptionEnabled()">
+			<label class="control-label" style="padding-top: 20px">
+				Version
+			</label>
 			<div class="controls">
 				<div class="alert alert-block span8" style="margin-left: 0">
-					This domain can't be licensed for commercial use.
+					<h4>
+						Basic
+						<span data-bind="visible: licenseIsUnlim()">&nbsp;(Unlim)</span>
+					</h4>
+					<br />
+					<p>
+						This domain can't be licensed.
+					</p>
 				</div>
 			</div>
 		</div>
 		<div class="control-group" data-bind="visible: subscriptionEnabled">
+			<label class="control-label" style="padding-top: 20px">
+				Version
+			</label>
 			<div class="controls">
-				<div data-bind="visible: licensingProcess()">
+				<div data-bind="visible: licensingProcess()" style="padding-top: 20px">
 					<i class="icon-spinner animated"></i>
 					&nbsp;&nbsp;
 					Checking&hellip;
 				</div>
 				<div data-bind="visible: !licensingProcess()">
-					<div class="alert alert-block span8" style="margin-left: 0" data-bind="visible: !licensing()">
+					<div class="alert alert-block span8" style="margin-left: 0;  padding-top: 20px" data-bind="visible: !licensing()">
-						This domain isn't licensed for commercial use.
+						<h4>
+							Basic
+						</h4>
+						<br />
+						<p>
+							This domain isn't licensed for commercial use (with additional features).
+						</p>
 					</div>
 					<div data-bind="visible: licensing()">
-						<div class="alert alert-success span8" style="margin-left: 0" data-bind="visible: licenseValid() && '' === licenseError()">
+						<div class="alert alert-success span8" style="margin-left: 0; padding-top: 20px" data-bind="visible: licenseValid() && '' === licenseError()">
-							<p>
+							<h4>
-								This domain is licensed for commercial use
+								<span data-bind="visible: licenseIsUnlim()">Lifetime (Premium)</span>
-							</p>
+								<span data-bind="visible: !licenseIsUnlim()">Premium</span>
-							<p data-bind="visible: 0 < licenseExpired()">
+							</h4>
+							<p data-bind="visible: 0 < licenseExpired()" style="padding-top: 10px">
 								<b>Subscription expires:</b>
 								&nbsp;
 								<span data-bind="text: licenseExpiredMomentValue()"></span>

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

@@ -34,7 +34,7 @@
 				<br />
 				<div class="alert">
 					<p>
-						After activation, commercial subscription for <strong data-bind="text: domain"></strong> will be extended.
+						After activation, premium subscription for <strong data-bind="text: domain"></strong> will be extended.
 						<br />
 						Note that subscription key can be activated for a single domain only.
 					</p>

rainloop/v/0.0.0/app/templates/Views/User/Login.html

@@ -84,9 +84,9 @@
 					</div>
 				</div>
 			</form>
-<!--			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
+			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
 				Powered by <a href="http://rainloop.net" target="_blank">RainLoop</a>
-			</div>-->
+			</div>
 			<div class="e-languages thm-languages" data-bind="visible: allowLanguagesOnLogin() && socialLoginEnabled()">
 				<label class="flag-selector">
 					<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>