Split application data

This commit is contained in:
RainLoop Team 2016-04-30 02:42:18 +03:00
parent 3215c5f8d3
commit 1391648e1b
22 changed files with 186 additions and 130 deletions

View file

@ -53,8 +53,8 @@
this.logoPowered = !!Settings.settingsGet('LoginPowered');
this.loginDescription = Utils.trim(Settings.settingsGet('LoginDescription'));
this.forgotPasswordLinkUrl = Settings.settingsGet('ForgotPasswordLinkUrl');
this.registrationLinkUrl = Settings.settingsGet('RegistrationLinkUrl');
this.forgotPasswordLinkUrl = Settings.appSettingsGet('forgotPasswordLinkUrl');
this.registrationLinkUrl = Settings.appSettingsGet('registrationLinkUrl');
this.emailError = ko.observable(false);
this.passwordError = ko.observable(false);
@ -266,10 +266,9 @@
}, this)
;
if (!!Settings.settingsGet('UseRsaEncryption') && Utils.rsaEncode.supported &&
Settings.settingsGet('RsaPublicKey'))
if (Settings.appSettingsGet('rsaPublicKey') && Utils.rsaEncode.supported)
{
fLoginRequest(Utils.rsaEncode(sPassword, Settings.settingsGet('RsaPublicKey')));
fLoginRequest(Utils.rsaEncode(sPassword, Settings.appSettingsGet('rsaPublicKey')));
}
else
{