Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 21:19:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code refactoring

Browse source
This commit is contained in:
RainLoop Team 2014-08-27 19:59:44 +04:00
parent 36329110e5
commit b4f416b6f8
105 changed files with 4331 additions and 4339 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/Settings/Admin/AdminSettingsAbout.js
View file

@ -14,12 +14,12 @@
function AdminSettingsAbout()
{
var
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
this.version = ko.observable(AppSettings.settingsGet('Version'));
this.access = ko.observable(!!AppSettings.settingsGet('CoreAccess'));
this.version = ko.observable(Settings.settingsGet('Version'));
this.access = ko.observable(!!Settings.settingsGet('CoreAccess'));
this.errorDesc = ko.observable('');
this.coreReal = Data.coreReal;
@ -72,7 +72,7 @@
{
if (this.access())
{
require('../../Apps/AdminApp.js').reloadCoreData();
require('App:Admin').reloadCoreData();
}
};
@ -80,7 +80,7 @@
{
if (!this.coreUpdating())
{
require('../../Apps/AdminApp.js').updateCoreData();
require('App:Admin').updateCoreData();
}
};

14
dev/Settings/Admin/AdminSettingsBranding.js
View file

@ -18,22 +18,22 @@
{
var
Enums = require('Enums'),
AppSettings = require('../../Storages/AppSettings.js')
Settings = require('Storage:Settings')
;
this.title = ko.observable(AppSettings.settingsGet('Title'));
this.title = ko.observable(Settings.settingsGet('Title'));
this.title.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loadingDesc = ko.observable(AppSettings.settingsGet('LoadingDescription'));
this.loadingDesc = ko.observable(Settings.settingsGet('LoadingDescription'));
this.loadingDesc.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginLogo = ko.observable(AppSettings.settingsGet('LoginLogo'));
this.loginLogo = ko.observable(Settings.settingsGet('LoginLogo'));
this.loginLogo.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginDescription = ko.observable(AppSettings.settingsGet('LoginDescription'));
this.loginDescription = ko.observable(Settings.settingsGet('LoginDescription'));
this.loginDescription.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.loginCss = ko.observable(AppSettings.settingsGet('LoginCss'));
this.loginCss = ko.observable(Settings.settingsGet('LoginCss'));
this.loginCss.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
}
@ -41,7 +41,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {

28
dev/Settings/Admin/AdminSettingsContacts.js
View file

@ -11,7 +11,7 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js')
Settings = require('Storage:Settings')
;
/**
@ -20,13 +20,13 @@
function AdminSettingsContacts()
{
var
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
this.enableContacts = ko.observable(!!AppSettings.settingsGet('ContactsEnable'));
this.contactsSharing = ko.observable(!!AppSettings.settingsGet('ContactsSharing'));
this.contactsSync = ko.observable(!!AppSettings.settingsGet('ContactsSync'));
this.enableContacts = ko.observable(!!Settings.settingsGet('ContactsEnable'));
this.contactsSharing = ko.observable(!!Settings.settingsGet('ContactsSharing'));
this.contactsSync = ko.observable(!!Settings.settingsGet('ContactsSync'));
var
aTypes = ['sqlite', 'mysql', 'pgsql'],
@ -49,15 +49,15 @@
}
;
if (!!AppSettings.settingsGet('SQLiteIsSupported'))
if (!!Settings.settingsGet('SQLiteIsSupported'))
{
aSupportedTypes.push('sqlite');
}
if (!!AppSettings.settingsGet('MySqlIsSupported'))
if (!!Settings.settingsGet('MySqlIsSupported'))
{
aSupportedTypes.push('mysql');
}
if (!!AppSettings.settingsGet('PostgreSqlIsSupported'))
if (!!Settings.settingsGet('PostgreSqlIsSupported'))
{
aSupportedTypes.push('pgsql');
}
@ -105,9 +105,9 @@
this.testContactsErrorMessage('');
}, this);
this.pdoDsn = ko.observable(AppSettings.settingsGet('ContactsPdoDsn'));
this.pdoUser = ko.observable(AppSettings.settingsGet('ContactsPdoUser'));
this.pdoPassword = ko.observable(AppSettings.settingsGet('ContactsPdoPassword'));
this.pdoDsn = ko.observable(Settings.settingsGet('ContactsPdoDsn'));
this.pdoUser = ko.observable(Settings.settingsGet('ContactsPdoUser'));
this.pdoPassword = ko.observable(Settings.settingsGet('ContactsPdoPassword'));
this.pdoDsnTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.pdoUserTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -137,7 +137,7 @@
return '' !== this.pdoDsn() && '' !== this.pdoUser();
});
this.contactsType(AppSettings.settingsGet('ContactsPdoType'));
this.contactsType(Settings.settingsGet('ContactsPdoType'));
this.onTestContactsResponse = _.bind(this.onTestContactsResponse, this);
}
@ -179,7 +179,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {
@ -233,7 +233,7 @@
});
});
self.contactsType(AppSettings.settingsGet('ContactsPdoType'));
self.contactsType(Settings.settingsGet('ContactsPdoType'));
}, 50);
};

14
dev/Settings/Admin/AdminSettingsDomains.js
View file

@ -11,10 +11,10 @@
Enums = require('Enums'),
PopupsDomainViewModel = require('../../ViewModels/Popups/PopupsDomainViewModel.js'),
PopupsDomainViewModel = require('View:Popup:Domain'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -58,7 +58,7 @@
AdminSettingsDomains.prototype.createDomain = function ()
{
require('kn').showScreenPopup(PopupsDomainViewModel);
require('App:Knoin').showScreenPopup(PopupsDomainViewModel);
};
AdminSettingsDomains.prototype.deleteDomain = function (oDomain)
@ -86,20 +86,20 @@
})
;
require('../../Apps/AdminApp.js').reloadDomainList();
require('App:Admin').reloadDomainList();
};
AdminSettingsDomains.prototype.onDomainLoadRequest = function (sResult, oData)
{
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('kn').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
require('App:Knoin').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
}
};
AdminSettingsDomains.prototype.onDomainListChangeRequest = function ()
{
require('../../Apps/AdminApp.js').reloadDomainList();
require('App:Admin').reloadDomainList();
};
module.exports = AdminSettingsDomains;

16
dev/Settings/Admin/AdminSettingsGeneral.js
View file

@ -12,10 +12,8 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsLanguagesViewModel = require('../../ViewModels/Popups/PopupsLanguagesViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -35,8 +33,8 @@
this.capaAdditionalAccounts = Data.capaAdditionalAccounts;
this.capaAdditionalIdentities = Data.capaAdditionalIdentities;
this.mainAttachmentLimit = ko.observable(Utils.pInt(AppSettings.settingsGet('AttachmentLimit')) / (1024 * 1024)).extend({'posInterer': 25});
this.uploadData = AppSettings.settingsGet('PhpUploadSizes');
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'] + '; ' : '',
@ -57,7 +55,7 @@
return Utils.convertLangName(this.mainLanguage());
}, this);
this.weakPassword = !!AppSettings.settingsGet('WeakPassword');
this.weakPassword = !!Settings.settingsGet('WeakPassword');
this.attachmentLimitTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.languageTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -68,7 +66,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {
@ -132,7 +130,7 @@
AdminSettingsGeneral.prototype.selectLanguage = function ()
{
require('kn').showScreenPopup(PopupsLanguagesViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Languages'));
};
/**

16
dev/Settings/Admin/AdminSettingsLicensing.js
View file

@ -8,10 +8,8 @@
ko = require('ko'),
moment = require('moment'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
PopupsActivateViewModel = require('../../ViewModels/Popups/PopupsActivateViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -27,12 +25,12 @@
this.licenseTrigger = Data.licenseTrigger;
this.adminDomain = ko.observable('');
this.subscriptionEnabled = ko.observable(!!AppSettings.settingsGet('SubscriptionEnabled'));
this.subscriptionEnabled = ko.observable(!!Settings.settingsGet('SubscriptionEnabled'));
this.licenseTrigger.subscribe(function () {
if (this.subscriptionEnabled())
{
require('../../Apps/AdminApp.js').reloadLicensing(true);
require('App:Admin').reloadLicensing(true);
}
}, this);
}
@ -41,18 +39,18 @@
{
if (this.subscriptionEnabled())
{
require('../../Apps/AdminApp.js').reloadLicensing(false);
require('App:Admin').reloadLicensing(false);
}
};
AdminSettingsLicensing.prototype.onShow = function ()
{
this.adminDomain(AppSettings.settingsGet('AdminDomain'));
this.adminDomain(Settings.settingsGet('AdminDomain'));
};
AdminSettingsLicensing.prototype.showActivationForm = function ()
{
require('kn').showScreenPopup(PopupsActivateViewModel);
require('App:Knoin').showScreenPopup(require('View:Popup:Activate'));
};
/**

8
dev/Settings/Admin/AdminSettingsLogin.js
View file

@ -11,8 +11,8 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data')
;
/**
@ -23,7 +23,7 @@
this.determineUserLanguage = Data.determineUserLanguage;
this.determineUserDomain = Data.determineUserDomain;
this.defaultDomain = ko.observable(AppSettings.settingsGet('LoginDefaultDomain'));
this.defaultDomain = ko.observable(Settings.settingsGet('LoginDefaultDomain'));
this.allowLanguagesOnLogin = Data.allowLanguagesOnLogin;
this.defaultDomainTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
@ -33,7 +33,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {

8
dev/Settings/Admin/AdminSettingsPackages.js
View file

@ -11,8 +11,8 @@
Enums = require('Enums'),
Utils = require('Utils'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -51,7 +51,7 @@
AdminSettingsPackages.prototype.onBuild = function ()
{
require('../../Apps/AdminApp.js').reloadPackagesList();
require('App:Admin').reloadPackagesList();
};
AdminSettingsPackages.prototype.requestHelper = function (oPackage, bInstall)
@ -86,7 +86,7 @@
}
else
{
require('../../Apps/AdminApp.js').reloadPackagesList();
require('App:Admin').reloadPackagesList();
}
};
};

16
dev/Settings/Admin/AdminSettingsPlugins.js
View file

@ -11,11 +11,9 @@
Enums = require('Enums'),
Utils = require('Utils'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
PopupsPluginViewModel = require('../../ViewModels/Popups/PopupsPluginViewModel.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -23,7 +21,7 @@
*/
function AdminSettingsPlugins()
{
this.enabledPlugins = ko.observable(!!AppSettings.settingsGet('EnabledPlugins'));
this.enabledPlugins = ko.observable(!!Settings.settingsGet('EnabledPlugins'));
this.pluginsError = ko.observable('');
@ -80,14 +78,14 @@
AdminSettingsPlugins.prototype.onShow = function ()
{
this.pluginsError('');
require('../../Apps/AdminApp.js').reloadPluginList();
require('App:Admin').reloadPluginList();
};
AdminSettingsPlugins.prototype.onPluginLoadRequest = function (sResult, oData)
{
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
require('kn').showScreenPopup(PopupsPluginViewModel, [oData.Result]);
require('App:Knoin').showScreenPopup(require('View:Popup:Plugin'), [oData.Result]);
}
};
@ -108,7 +106,7 @@
}
}
require('../../Apps/AdminApp.js').reloadPluginList();
require('App:Admin').reloadPluginList();
};
module.exports = AdminSettingsPlugins;

14
dev/Settings/Admin/AdminSettingsSecurity.js
View file

@ -12,9 +12,9 @@
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
AppSettings = require('../../Storages/AppSettings.js'),
Data = require('../../Storages/AdminDataStorage.js'),
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Settings = require('Storage:Settings'),
Data = require('Storage:Admin:Data'),
Remote = require('Storage:Admin:Remote')
;
/**
@ -24,10 +24,10 @@
{
this.useLocalProxyForExternalImages = Data.useLocalProxyForExternalImages;
this.capaOpenPGP = ko.observable(AppSettings.capa(Enums.Capa.OpenPGP));
this.capaTwoFactorAuth = ko.observable(AppSettings.capa(Enums.Capa.TwoFactor));
this.capaOpenPGP = ko.observable(Settings.capa(Enums.Capa.OpenPGP));
this.capaTwoFactorAuth = ko.observable(Settings.capa(Enums.Capa.TwoFactor));
this.adminLogin = ko.observable(AppSettings.settingsGet('AdminLogin'));
this.adminLogin = ko.observable(Settings.settingsGet('AdminLogin'));
this.adminPassword = ko.observable('');
this.adminPasswordNew = ko.observable('');
this.adminPasswordNew2 = ko.observable('');
@ -95,7 +95,7 @@
AdminSettingsSecurity.prototype.onBuild = function ()
{
var
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
this.capaOpenPGP.subscribe(function (bValue) {

4
dev/Settings/Admin/AdminSettingsSocial.js
View file

@ -17,7 +17,7 @@
*/
function AdminSettingsSocial()
{
var Data = require('../../Storages/AdminDataStorage.js');
var Data = require('Storage:Admin:Data');
this.googleEnable = Data.googleEnable;
this.googleClientID = Data.googleClientID;
@ -49,7 +49,7 @@
{
var
self = this,
Remote = require('../../Storages/AdminAjaxRemoteStorage.js')
Remote = require('Storage:Admin:Remote')
;
_.delay(function () {