From d17f249f451c3ab85d25ecea89bf07a1acd642bb Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sat, 18 Oct 2014 19:19:37 +0400
Subject: [PATCH] Small fixes

---
 dev/Common/Utils.js                           |  4 +++-
 dev/Settings/Admin/General.js                 | 16 +++++++---------
 dev/Settings/Admin/Security.js                |  4 ++++
 dev/Storage/AbstractData.js                   |  2 ++
 rainloop/v/0.0.0/app/src/RainLoop/Actions.php |  3 ++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 838496cc9..7ceefbdf3 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -1050,6 +1050,8 @@
 		oData.determineUserLanguage = ko.observable(false);
 		oData.determineUserDomain = ko.observable(false);
 
+		oData.weakPassword = ko.observable(false);
+
 		oData.messagesPerPage = ko.observable(Consts.Defaults.MessagesPerPage);//.extend({'throttle': 200});
 
 		oData.mainMessagesPerPage = oData.messagesPerPage;
@@ -2055,7 +2057,7 @@
 
 	Utils.__themeTimer = 0;
 	Utils.__themeAjax = null;
-	
+
 	Utils.changeTheme = function (sValue, themeTrigger)
 	{
 		var
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index 0e8274461..3f25f6a5d 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -32,14 +32,14 @@
 		this.capaAdditionalAccounts = Data.capaAdditionalAccounts;
 		this.capaAdditionalIdentities = Data.capaAdditionalIdentities;
 
+		this.weakPassword = Data.weakPassword;
+
 		this.mainAttachmentLimit = ko.observable(Utils.pInt(Settings.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25});
 		this.uploadData = Settings.settingsGet('PhpUploadSizes');
-		this.uploadDataDesc = this.uploadData && (this.uploadData['upload_max_filesize'] || this.uploadData['post_max_size']) ?
-			[
-				this.uploadData['upload_max_filesize'] ? 'upload_max_filesize = ' + this.uploadData['upload_max_filesize'] + '; ' : '',
-				this.uploadData['post_max_size'] ? 'post_max_size = ' + this.uploadData['post_max_size'] : ''
-			].join('')
-				: '';
+		this.uploadDataDesc = this.uploadData && (this.uploadData['upload_max_filesize'] || this.uploadData['post_max_size']) ? [
+			this.uploadData['upload_max_filesize'] ? 'upload_max_filesize = ' + this.uploadData['upload_max_filesize'] + '; ' : '',
+			this.uploadData['post_max_size'] ? 'post_max_size = ' + this.uploadData['post_max_size'] : ''
+		].join('') : '';
 
 		this.themesOptions = ko.computed(function () {
 			return _.map(Data.themes(), function (sTheme) {
@@ -54,8 +54,6 @@
 			return Utils.convertLangName(this.mainLanguage());
 		}, this);
 
-		this.weakPassword = !!Settings.settingsGet('WeakPassword');
-
 		this.attachmentLimitTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 		this.languageTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 		this.themeTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@@ -89,7 +87,7 @@
 			});
 
 			self.theme.subscribe(function (sValue) {
-				
+
 				Utils.changeTheme(sValue, self.themeTrigger);
 
 				Remote.saveAdminConfig(f3, {
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index a8966c813..816e896a5 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -23,6 +23,8 @@
 	{
 		this.useLocalProxyForExternalImages = Data.useLocalProxyForExternalImages;
 
+		this.weakPassword = Data.weakPassword;
+
 		this.capaOpenPGP = ko.observable(Settings.capa(Enums.Capa.OpenPGP));
 		this.capaTwoFactorAuth = ko.observable(Settings.capa(Enums.Capa.TwoFactor));
 
@@ -96,6 +98,8 @@
 			this.adminPasswordNew2('');
 
 			this.adminPasswordUpdateSuccess(true);
+
+			this.weakPassword(!!oData.Result.Weak);
 		}
 		else
 		{
diff --git a/dev/Storage/AbstractData.js b/dev/Storage/AbstractData.js
index dd9fe8caa..cb965ef0e 100644
--- a/dev/Storage/AbstractData.js
+++ b/dev/Storage/AbstractData.js
@@ -46,6 +46,8 @@
 		this.determineUserLanguage(!!Settings.settingsGet('DetermineUserLanguage'));
 		this.determineUserDomain(!!Settings.settingsGet('DetermineUserDomain'));
 
+		this.weakPassword(!!Settings.settingsGet('WeakPassword'));
+
 		this.capaThemes(Settings.capa(Enums.Capa.Themes));
 		this.allowLanguagesOnLogin(!!Settings.settingsGet('AllowLanguagesOnLogin'));
 		this.allowLanguagesOnSettings(!!Settings.settingsGet('AllowLanguagesOnSettings'));
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
index 37b17eb89..b7397467c 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
@@ -2728,7 +2728,8 @@ class Actions
 			$bResult = true;
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $bResult ? $oConfig->Save() : false);
+		return $this->DefaultResponse(__FUNCTION__, $bResult ?
+			($oConfig->Save() ? array('Weak' => $oConfig->ValidatePassword('12345')) : false) : false);
 	}
 
 	/**