Merge pull request #2187 from RainLoop/road-to-the-os

Road to the MIT

Author: RainLoop

.docker/nginx/ssl.sh

@@ -12,7 +12,6 @@ module.exports = {
 		es6: true
 	},
 	globals: {
-		'RL_COMMUNITY': true,
 		'RL_ES6': true
 	},
 	// http://eslint.org/docs/rules/

.eslintrc.js

@@ -26,7 +26,6 @@ jobs:
 
     - run: yarn install --frozen-lockfile --check-files
     - run: yarn build
-    - run: yarn build-pro
 
     - name: Move all assets to release folder
       run: |

.github/workflows/builder.yml

@@ -29,7 +29,3 @@
 
 1. Edit data/\_data_/\_default_/configs/application.ini
 2. Set 'cache_system_data' to Off
-
----
-
-If you have any questions, open an issue or email [email protected].

CONTRIBUTING.md

@@ -61,8 +61,6 @@ rl-watch-js:
 
 rl-build:
 	@docker compose run --no-deps --rm node gulp all
-rl-build-pro:
-	@docker compose run --no-deps --rm node gulp all --pro
 
 yarn-install:
 	@docker compose run --no-deps --rm node yarn install

LICENSE

@@ -22,8 +22,8 @@ Information about installing the product, check the [documentation page](http://
 
 ## License
 
-**RainLoop Webmail (Community edition)** is released under
-**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
-http://www.gnu.org/licenses/agpl-3.0.html
+**RainLoop Webmail (Legacy edition)** is released under
+**MIT License**.
+https://choosealicense.com/licenses/mit/
 
-Copyright (c) 2019 Rainloop Team
+Copyright (c) 2022 Rainloop Team

Makefile

@@ -4,17 +4,15 @@ import ko from 'ko';
 import progressJs from 'progressJs';
 
 import { root } from 'Common/Links';
-import { getNotification } from 'Common/Translator';
-import { StorageResultType, Notification } from 'Common/Enums';
-import { pInt, isNormal, isArray, inArray, isUnd } from 'Common/Utils';
+import { StorageResultType } from 'Common/Enums';
+import { pInt, isArray, isUnd } from 'Common/Utils';
 
 import * as Settings from 'Storage/Settings';
 
 import AppStore from 'Stores/Admin/App';
 import CapaStore from 'Stores/Admin/Capa';
 import DomainStore from 'Stores/Admin/Domain';
 import PluginStore from 'Stores/Admin/Plugin';
-import LicenseStore from 'Stores/Admin/License';
 import PackageStore from 'Stores/Admin/Package';
 import CoreStore from 'Stores/Admin/Core';
 import Remote from 'Remote/Admin/Ajax';
@@ -150,40 +148,6 @@ class AdminApp extends AbstractApp {
 		});
 	}
 
-	/**
-	 * @param {boolean=} force = false
-	 */
-	reloadLicensing(force = false) {
-		LicenseStore.licensingProcess(true);
-		LicenseStore.licenseError('');
-		Remote.licensing((result, data) => {
-			LicenseStore.licensingProcess(false);
-			if (StorageResultType.Success === result && data && data.Result && isNormal(data.Result.Expired)) {
-				LicenseStore.licenseValid(true);
-				LicenseStore.licenseExpired(pInt(data.Result.Expired));
-				LicenseStore.licenseError('');
-				LicenseStore.licensing(true);
-				AppStore.prem(true);
-			} else {
-				if (
-					data &&
-					data.ErrorCode &&
-					-1 < inArray(pInt(data.ErrorCode), [Notification.LicensingServerIsUnavailable, Notification.LicensingExpired])
-				) {
-					LicenseStore.licenseError(getNotification(pInt(data.ErrorCode)));
-					LicenseStore.licensing(true);
-				} else {
-					if (StorageResultType.Abort === result) {
-						LicenseStore.licenseError(getNotification(Notification.LicensingServerIsUnavailable));
-						LicenseStore.licensing(true);
-					} else {
-						LicenseStore.licensing(false);
-					}
-				}
-			}
-		}, force);
-	}
-
 	bootend(bootendCallback = null) {
 		if (progressJs) {
 			progressJs.end();

README.md

@@ -26,11 +26,6 @@ $hcont
 
 export const startMicrotime = new window.Date().getTime();
 
-/**
- * @type {boolean}
- */
-export const community = RL_COMMUNITY;
-
 /**
  * @type {?}
  */

dev/App/Admin.js

@@ -12,6 +12,7 @@ import { SocialAdminSettings } from 'Settings/Admin/Social';
 import { PluginsAdminSettings } from 'Settings/Admin/Plugins';
 import { PackagesAdminSettings } from 'Settings/Admin/Packages';
 import { AboutAdminSettings } from 'Settings/Admin/About';
+import { BrandingAdminSettings } from 'Settings/Admin/Branding';
 
 import { getApp } from 'Helper/Apps/Admin';
 
@@ -27,16 +28,6 @@ class SettingsAdminScreen extends AbstractSettingsScreen {
 	 * @param {Function=} fCallback = null
 	 */
 	setupSettings(fCallback = null) {
-		let branding = null,
-			licensing = null;
-
-		if (RL_COMMUNITY) {
-			branding = require('Settings/Admin/Branding').default;
-		} else {
-			branding = require('Settings/Admin/Prem/Branding').default;
-			licensing = require('Settings/Admin/Prem/Licensing').default;
-		}
-
 		addSettingsViewModel(
 			GeneralAdminSettings,
 			'AdminSettingsGeneral',
@@ -49,9 +40,7 @@ class SettingsAdminScreen extends AbstractSettingsScreen {
 
 		addSettingsViewModel(LoginAdminSettings, 'AdminSettingsLogin', 'TABS_LABELS/LABEL_LOGIN_NAME', 'login');
 
-		if (branding) {
-			addSettingsViewModel(branding, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
-		}
+		addSettingsViewModel(BrandingAdminSettings, 'AdminSettingsBranding', 'TABS_LABELS/LABEL_BRANDING_NAME', 'branding');
 
 		addSettingsViewModel(ContactsAdminSettings, 'AdminSettingsContacts', 'TABS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
 
@@ -68,10 +57,6 @@ class SettingsAdminScreen extends AbstractSettingsScreen {
 
 		addSettingsViewModel(PackagesAdminSettings, 'AdminSettingsPackages', 'TABS_LABELS/LABEL_PACKAGES_NAME', 'packages');
 
-		if (licensing) {
-			addSettingsViewModel(licensing, 'AdminSettingsLicensing', 'TABS_LABELS/LABEL_LICENSING_NAME', 'licensing');
-		}
-
 		addSettingsViewModel(AboutAdminSettings, 'AdminSettingsAbout', 'TABS_LABELS/LABEL_ABOUT_NAME', 'about');
 
 		runSettingsViewModelHooks(true);