Code refactoring

Fixed owncloud password encoder/decoder (#291)
Fixed ckeditor in ownCloud iframe (Closes #302)
Release commit

dev/Settings/Admin/About.js

@@ -10,11 +10,11 @@
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsAbout()
+	function AboutAdminSetting()
 	{
 		var
-			Settings = require('Storage:Settings'),
-			Data = require('Storage:Admin:Data')
+			Settings = require('Storage/Settings'),
+			Data = require('Storage/Admin/Data')
 		;
 
 		this.version = ko.observable(Settings.settingsGet('Version'));
@@ -67,22 +67,22 @@
 		}, this);
 	}
 
-	AdminSettingsAbout.prototype.onBuild = function ()
+	AboutAdminSetting.prototype.onBuild = function ()
 	{
 		if (this.access())
 		{
-			require('App:Admin').reloadCoreData();
+			require('App/Admin').reloadCoreData();
 		}
 	};
 
-	AdminSettingsAbout.prototype.updateCoreData = function ()
+	AboutAdminSetting.prototype.updateCoreData = function ()
 	{
 		if (!this.coreUpdating())
 		{
-			require('App:Admin').updateCoreData();
+			require('App/Admin').updateCoreData();
 		}
 	};
 
-	module.exports = AdminSettingsAbout;
+	module.exports = AboutAdminSetting;
 
 }());

dev/Settings/Admin/Branding.js

@@ -13,11 +13,11 @@
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsBranding()
+	function BrandingAdminSetting()
 	{
 		var
 			Enums = require('Common/Enums'),
-			Settings = require('Storage:Settings')
+			Settings = require('Storage/Settings')
 		;
 
 		this.title = ko.observable(Settings.settingsGet('Title'));
@@ -36,11 +36,11 @@
 		this.loginCss.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	}
 
-	AdminSettingsBranding.prototype.onBuild = function ()
+	BrandingAdminSetting.prototype.onBuild = function ()
 	{
 		var
 			self = this,
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		_.delay(function () {
@@ -86,6 +86,6 @@
 		}, 50);
 	};
 
-	module.exports = AdminSettingsBranding;
+	module.exports = BrandingAdminSetting;
 
 }());

dev/Settings/Admin/Contacts.js

@@ -10,16 +10,16 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Settings = require('Storage:Settings')
+		Settings = require('Storage/Settings')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsContacts()
+	function ContactsAdminSetting()
 	{
 		var
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
@@ -141,7 +141,7 @@
 		this.onTestContactsResponse = _.bind(this.onTestContactsResponse, this);
 	}
 
-	AdminSettingsContacts.prototype.onTestContactsResponse = function (sResult, oData)
+	ContactsAdminSetting.prototype.onTestContactsResponse = function (sResult, oData)
 	{
 		this.testContactsSuccess(false);
 		this.testContactsError(false);
@@ -167,18 +167,18 @@
 		this.testing(false);
 	};
 
-	AdminSettingsContacts.prototype.onShow = function ()
+	ContactsAdminSetting.prototype.onShow = function ()
 	{
 		this.testContactsSuccess(false);
 		this.testContactsError(false);
 		this.testContactsErrorMessage('');
 	};
 
-	AdminSettingsContacts.prototype.onBuild = function ()
+	ContactsAdminSetting.prototype.onBuild = function ()
 	{
 		var
 			self = this,
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		_.delay(function () {
@@ -237,6 +237,6 @@
 		}, 50);
 	};
 
-	module.exports = AdminSettingsContacts;
+	module.exports = ContactsAdminSetting;
 
 }());

dev/Settings/Admin/Domains.js

@@ -10,16 +10,16 @@
 
 		Enums = require('Common/Enums'),
 
-		PopupsDomainViewModel = require('View:Popup:Domain'),
+		PopupsDomainViewModel = require('View/Popup/Domain'),
 
-		Data = require('Storage:Admin:Data'),
-		Remote = require('Storage:Admin:Remote')
+		Data = require('Storage/Admin/Data'),
+		Remote = require('Storage/Admin/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsDomains()
+	function DomainsAdminSetting()
 	{
 		this.domains = Data.domains;
 		this.domainsLoading = Data.domainsLoading;
@@ -46,7 +46,7 @@
 		]});
 	}
 
-	AdminSettingsDomains.prototype.startDomainForDeletionTimeout = function ()
+	DomainsAdminSetting.prototype.startDomainForDeletionTimeout = function ()
 	{
 		var self = this;
 		window.clearInterval(this.iDomainForDeletionTimeout);
@@ -55,24 +55,24 @@
 		}, 1000 * 3);
 	};
 
-	AdminSettingsDomains.prototype.createDomain = function ()
+	DomainsAdminSetting.prototype.createDomain = function ()
 	{
-		require('App:Knoin').showScreenPopup(PopupsDomainViewModel);
+		require('Knoin/Knoin').showScreenPopup(PopupsDomainViewModel);
 	};
 
-	AdminSettingsDomains.prototype.deleteDomain = function (oDomain)
+	DomainsAdminSetting.prototype.deleteDomain = function (oDomain)
 	{
 		this.domains.remove(oDomain);
 		Remote.domainDelete(_.bind(this.onDomainListChangeRequest, this), oDomain.name);
 	};
 
-	AdminSettingsDomains.prototype.disableDomain = function (oDomain)
+	DomainsAdminSetting.prototype.disableDomain = function (oDomain)
 	{
 		oDomain.disabled(!oDomain.disabled());
 		Remote.domainDisable(_.bind(this.onDomainListChangeRequest, this), oDomain.name, oDomain.disabled());
 	};
 
-	AdminSettingsDomains.prototype.onBuild = function (oDom)
+	DomainsAdminSetting.prototype.onBuild = function (oDom)
 	{
 		var self = this;
 		oDom
@@ -85,22 +85,22 @@
 			})
 		;
 
-		require('App:Admin').reloadDomainList();
+		require('App/Admin').reloadDomainList();
 	};
 
-	AdminSettingsDomains.prototype.onDomainLoadRequest = function (sResult, oData)
+	DomainsAdminSetting.prototype.onDomainLoadRequest = function (sResult, oData)
 	{
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
-			require('App:Knoin').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
+			require('Knoin/Knoin').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
 		}
 	};
 
-	AdminSettingsDomains.prototype.onDomainListChangeRequest = function ()
+	DomainsAdminSetting.prototype.onDomainListChangeRequest = function ()
 	{
-		require('App:Admin').reloadDomainList();
+		require('App/Admin').reloadDomainList();
 	};
 
-	module.exports = AdminSettingsDomains;
+	module.exports = DomainsAdminSetting;
 
 }());

dev/Settings/Admin/General.js

@@ -11,14 +11,14 @@
 		Utils = require('Common/Utils'),
 		LinkBuilder = require('Common/LinkBuilder'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:Admin:Data')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/Admin/Data')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsGeneral()
+	function GeneralAdminSetting()
 	{
 		this.mainLanguage = Data.mainLanguage;
 		this.mainTheme = Data.mainTheme;
@@ -61,11 +61,11 @@
 		this.themeTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	}
 
-	AdminSettingsGeneral.prototype.onBuild = function ()
+	GeneralAdminSetting.prototype.onBuild = function ()
 	{
 		var
 			self = this,
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		_.delay(function () {
@@ -127,19 +127,19 @@
 		}, 50);
 	};
 
-	AdminSettingsGeneral.prototype.selectLanguage = function ()
+	GeneralAdminSetting.prototype.selectLanguage = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:Languages'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Languages'));
 	};
 
 	/**
 	 * @return {string}
 	 */
-	AdminSettingsGeneral.prototype.phpInfoLink = function ()
+	GeneralAdminSetting.prototype.phpInfoLink = function ()
 	{
 		return LinkBuilder.phpInfo();
 	};
 
-	module.exports = AdminSettingsGeneral;
+	module.exports = GeneralAdminSetting;
 
 }());

dev/Settings/Admin/Licensing.js

@@ -7,14 +7,14 @@
 		ko = require('ko'),
 		moment = require('moment'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:Admin:Data')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/Admin/Data')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsLicensing()
+	function LicensingAdminSetting()
 	{
 		this.licensing = Data.licensing;
 		this.licensingProcess = Data.licensingProcess;
@@ -29,33 +29,33 @@
 		this.licenseTrigger.subscribe(function () {
 			if (this.subscriptionEnabled())
 			{
-				require('App:Admin').reloadLicensing(true);
+				require('App/Admin').reloadLicensing(true);
 			}
 		}, this);
 	}
 
-	AdminSettingsLicensing.prototype.onBuild = function ()
+	LicensingAdminSetting.prototype.onBuild = function ()
 	{
 		if (this.subscriptionEnabled())
 		{
-			require('App:Admin').reloadLicensing(false);
+			require('App/Admin').reloadLicensing(false);
 		}
 	};
 
-	AdminSettingsLicensing.prototype.onShow = function ()
+	LicensingAdminSetting.prototype.onShow = function ()
 	{
 		this.adminDomain(Settings.settingsGet('AdminDomain'));
 	};
 
-	AdminSettingsLicensing.prototype.showActivationForm = function ()
+	LicensingAdminSetting.prototype.showActivationForm = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:Activate'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Activate'));
 	};
 
 	/**
 	 * @returns {string}
 	 */
-	AdminSettingsLicensing.prototype.licenseExpiredMomentValue = function ()
+	LicensingAdminSetting.prototype.licenseExpiredMomentValue = function ()
 	{
 		var
 			iTime = this.licenseExpired(),
@@ -65,6 +65,6 @@
 		return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
 	};
 
-	module.exports = AdminSettingsLicensing;
+	module.exports = LicensingAdminSetting;
 
 }());

dev/Settings/Admin/Login.js

@@ -10,14 +10,14 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:Admin:Data')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/Admin/Data')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsLogin()
+	function LoginAdminSetting()
 	{
 		this.determineUserLanguage = Data.determineUserLanguage;
 		this.determineUserDomain = Data.determineUserDomain;
@@ -28,11 +28,11 @@
 		this.defaultDomainTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	}
 
-	AdminSettingsLogin.prototype.onBuild = function ()
+	LoginAdminSetting.prototype.onBuild = function ()
 	{
 		var
 			self = this,
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		_.delay(function () {
@@ -66,6 +66,6 @@
 		}, 50);
 	};
 
-	module.exports = AdminSettingsLogin;
+	module.exports = LoginAdminSetting;
 
 }());

dev/Settings/Admin/Packages.js

@@ -10,14 +10,14 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Data = require('Storage:Admin:Data'),
-		Remote = require('Storage:Admin:Remote')
+		Data = require('Storage/Admin/Data'),
+		Remote = require('Storage/Admin/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsPackages()
+	function PackagesAdminSetting()
 	{
 		this.packagesError = ko.observable('');
 
@@ -43,17 +43,17 @@
 		}, this);
 	}
 
-	AdminSettingsPackages.prototype.onShow = function ()
+	PackagesAdminSetting.prototype.onShow = function ()
 	{
 		this.packagesError('');
 	};
 
-	AdminSettingsPackages.prototype.onBuild = function ()
+	PackagesAdminSetting.prototype.onBuild = function ()
 	{
-		require('App:Admin').reloadPackagesList();
+		require('App/Admin').reloadPackagesList();
 	};
 
-	AdminSettingsPackages.prototype.requestHelper = function (oPackage, bInstall)
+	PackagesAdminSetting.prototype.requestHelper = function (oPackage, bInstall)
 	{
 		var self = this;
 		return function (sResult, oData) {
@@ -85,12 +85,12 @@
 			}
 			else
 			{
-				require('App:Admin').reloadPackagesList();
+				require('App/Admin').reloadPackagesList();
 			}
 		};
 	};
 
-	AdminSettingsPackages.prototype.deletePackage = function (oPackage)
+	PackagesAdminSetting.prototype.deletePackage = function (oPackage)
 	{
 		if (oPackage)
 		{
@@ -99,7 +99,7 @@
 		}
 	};
 
-	AdminSettingsPackages.prototype.installPackage = function (oPackage)
+	PackagesAdminSetting.prototype.installPackage = function (oPackage)
 	{
 		if (oPackage)
 		{
@@ -108,6 +108,6 @@
 		}
 	};
 
-	module.exports = AdminSettingsPackages;
+	module.exports = PackagesAdminSetting;
 
 }());

dev/Settings/Admin/Plugins.js

@@ -10,15 +10,15 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:Admin:Data'),
-		Remote = require('Storage:Admin:Remote')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/Admin/Data'),
+		Remote = require('Storage/Admin/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsPlugins()
+	function PluginsAdminSetting()
 	{
 		this.enabledPlugins = ko.observable(!!Settings.settingsGet('EnabledPlugins'));
 
@@ -35,18 +35,18 @@
 		this.onPluginDisableRequest = _.bind(this.onPluginDisableRequest, this);
 	}
 
-	AdminSettingsPlugins.prototype.disablePlugin = function (oPlugin)
+	PluginsAdminSetting.prototype.disablePlugin = function (oPlugin)
 	{
 		oPlugin.disabled(!oPlugin.disabled());
 		Remote.pluginDisable(this.onPluginDisableRequest, oPlugin.name, oPlugin.disabled());
 	};
 
-	AdminSettingsPlugins.prototype.configurePlugin = function (oPlugin)
+	PluginsAdminSetting.prototype.configurePlugin = function (oPlugin)
 	{
 		Remote.plugin(this.onPluginLoadRequest, oPlugin.name);
 	};
 
-	AdminSettingsPlugins.prototype.onBuild = function (oDom)
+	PluginsAdminSetting.prototype.onBuild = function (oDom)
 	{
 		var self = this;
 
@@ -74,21 +74,21 @@
 		});
 	};
 
-	AdminSettingsPlugins.prototype.onShow = function ()
+	PluginsAdminSetting.prototype.onShow = function ()
 	{
 		this.pluginsError('');
-		require('App:Admin').reloadPluginList();
+		require('App/Admin').reloadPluginList();
 	};
 
-	AdminSettingsPlugins.prototype.onPluginLoadRequest = function (sResult, oData)
+	PluginsAdminSetting.prototype.onPluginLoadRequest = function (sResult, oData)
 	{
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
-			require('App:Knoin').showScreenPopup(require('View:Popup:Plugin'), [oData.Result]);
+			require('Knoin/Knoin').showScreenPopup(require('View/Popup/Plugin'), [oData.Result]);
 		}
 	};
 
-	AdminSettingsPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
+	PluginsAdminSetting.prototype.onPluginDisableRequest = function (sResult, oData)
 	{
 		if (Enums.StorageResultType.Success === sResult && oData)
 		{
@@ -105,9 +105,9 @@
 			}
 		}
 
-		require('App:Admin').reloadPluginList();
+		require('App/Admin').reloadPluginList();
 	};
 
-	module.exports = AdminSettingsPlugins;
+	module.exports = PluginsAdminSetting;
 
 }());

dev/Settings/Admin/Security.js

@@ -11,15 +11,15 @@
 		Utils = require('Common/Utils'),
 		LinkBuilder = require('Common/LinkBuilder'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:Admin:Data'),
-		Remote = require('Storage:Admin:Remote')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/Admin/Data'),
+		Remote = require('Storage/Admin/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsSecurity()
+	function SecurityAdminSetting()
 	{
 		this.useLocalProxyForExternalImages = Data.useLocalProxyForExternalImages;
 
@@ -75,7 +75,7 @@
 		this.onNewAdminPasswordResponse = _.bind(this.onNewAdminPasswordResponse, this);
 	}
 
-	AdminSettingsSecurity.prototype.onNewAdminPasswordResponse = function (sResult, oData)
+	SecurityAdminSetting.prototype.onNewAdminPasswordResponse = function (sResult, oData)
 	{
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
@@ -91,10 +91,10 @@
 		}
 	};
 
-	AdminSettingsSecurity.prototype.onBuild = function ()
+	SecurityAdminSetting.prototype.onBuild = function ()
 	{
 		var
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		this.capaOpenPGP.subscribe(function (bValue) {
@@ -116,7 +116,7 @@
 		});
 	};
 
-	AdminSettingsSecurity.prototype.onHide = function ()
+	SecurityAdminSetting.prototype.onHide = function ()
 	{
 		this.adminPassword('');
 		this.adminPasswordNew('');
@@ -126,11 +126,11 @@
 	/**
 	 * @return {string}
 	 */
-	AdminSettingsSecurity.prototype.phpInfoLink = function ()
+	SecurityAdminSetting.prototype.phpInfoLink = function ()
 	{
 		return LinkBuilder.phpInfo();
 	};
 
-	module.exports = AdminSettingsSecurity;
+	module.exports = SecurityAdminSetting;
 
 }());

dev/Settings/Admin/Social.js

@@ -14,14 +14,15 @@
 	/**
 	 * @constructor
 	 */
-	function AdminSettingsSocial()
+	function SocialAdminSetting()
 	{
-		var Data = require('Storage:Admin:Data');
+		var Data = require('Storage/Admin/Data');
 
 		this.googleEnable = Data.googleEnable;
 		this.googleClientID = Data.googleClientID;
 		this.googleApiKey = Data.googleApiKey;
 		this.googleClientSecret = Data.googleClientSecret;
+		
 		this.googleTrigger1 = ko.observable(Enums.SaveSettingsStep.Idle);
 		this.googleTrigger2 = ko.observable(Enums.SaveSettingsStep.Idle);
 		this.googleTrigger3 = ko.observable(Enums.SaveSettingsStep.Idle);
@@ -44,11 +45,11 @@
 		this.dropboxTrigger1 = ko.observable(Enums.SaveSettingsStep.Idle);
 	}
 
-	AdminSettingsSocial.prototype.onBuild = function ()
+	SocialAdminSetting.prototype.onBuild = function ()
 	{
 		var
 			self = this,
-			Remote = require('Storage:Admin:Remote')
+			Remote = require('Storage/Admin/Remote')
 		;
 
 		_.delay(function () {
@@ -148,6 +149,6 @@
 		}, 50);
 	};
 
-	module.exports = AdminSettingsSocial;
+	module.exports = SocialAdminSetting;
 
 }());