Removed more non-community (aka Prem/Premium/License) code

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -1202,7 +1202,6 @@ class Actions
 			'themes' => $this->GetThemes($bMobile, false),
 			'languages' => $this->GetLanguages(false),
 			'languagesAdmin' => $this->GetLanguages(true),
-			'appVersionType' => 'community',
 			'attachmentsActions' => $aAttachmentsActions
 		), $bAdmin ? array(
 			'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
@@ -1247,8 +1246,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			'UserLogoTitle' => '',
 			'UserLogoMessage' => '',
 			'UserCss' => '',
-			'WelcomePageUrl' => '',
-			'WelcomePageDisplay' => 'none',
 			'IncludeCss' => '',
 			'IncludeBackground' => '',
 			'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
@@ -1259,15 +1256,11 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			'SieveAllowFileintoInbox' => (bool) $oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
 			'ContactsIsAllowed' => false,
 			'RequireTwoFactor' => false,
-			'Community' => true,
-			'PremType' => false,
 			'Admin' => array(),
 			'Capa' => array(),
 			'Plugins' => array(),
 			'System' => $this->AppDataSystem($bAdmin, $bMobile, $bMobileDevice)
 /*
-			'Community' => false,
-			'PremType' => true,
 			'LoginLogo' => $oConfig->Get('branding', 'login_logo', ''),
 			'LoginBackground' => $oConfig->Get('branding', 'login_background', ''),
 			'LoginCss' => $oConfig->Get('branding', 'login_css', ''),
@@ -1277,8 +1270,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			'UserLogoMessage' => $oConfig->Get('branding', 'user_logo_message', ''),
 			'UserIframeMessage' => $oConfig->Get('branding', 'user_iframe_message', ''),
 			'UserCss' => $oConfig->Get('branding', 'user_css', ''),
-			'WelcomePageUrl' => $oConfig->Get('branding', 'welcome_page_url', ''),
-			'WelcomePageDisplay' => \strtolower($oConfig->Get('branding', 'welcome_page_display', 'none')),
 */
 		);
 
@@ -1346,26 +1337,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 					}
 				}
 
-				$oSettings = $this->SettingsProvider()->Load($oAccount);
-
-				if (!$oAccount->IsAdditionalAccount() && !empty($aResult['WelcomePageUrl']) &&
-					('once' === $aResult['WelcomePageDisplay'] || 'always' === $aResult['WelcomePageDisplay']))
-				{
-					if ('once' === $aResult['WelcomePageDisplay'])
-					{
-						if ($aResult['WelcomePageUrl'] === $oSettings->GetConf('LastWelcomePage', ''))
-						{
-							$aResult['WelcomePageUrl'] = '';
-							$aResult['WelcomePageDisplay'] = '';
-						}
-					}
-				}
-				else
-				{
-					$aResult['WelcomePageUrl'] = '';
-					$aResult['WelcomePageDisplay'] = '';
-				}
-
 				if (!empty($aResult['StartupUrl']))
 				{
 					$aResult['StartupUrl'] = $this->compileLogParams($aResult['StartupUrl'], $oAccount, true);
@@ -1384,9 +1355,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 				$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
 				$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
 
-				$aResult['WelcomePageUrl'] = '';
-				$aResult['WelcomePageDisplay'] = '';
-
 				$aResult['StartupUrl'] = '';
 
 				if (empty($aResult['AdditionalLoginError']))
@@ -1437,11 +1405,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 				$aResult['ContactsPdoUser'] = (string) $oConfig->Get('contacts', 'pdo_user', '');
 				$aResult['ContactsPdoPassword'] = (string) APP_DUMMY;
 
-				$aResult['SubscriptionEnabled'] = (bool) \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain'], true);
-//					|| \MailSo\Base\Utils::ValidateIP($aResult['AdminDomain']);
-
 				$aResult['WeakPassword'] = (bool) $oConfig->ValidatePassword('12345');
-				$aResult['CoreAccess'] = (bool) $this->rainLoopCoreAccess();
 
 				$aResult['PhpUploadSizes'] = array(
 					'upload_max_filesize' => \ini_get('upload_max_filesize'),
@@ -3130,8 +3094,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 
 		if ($this && $this->HasOneOfActionParams(array(
 			'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss',
-			'UserLogo', 'UserLogoTitle', 'UserLogoMessage', 'UserIframeMessage', 'UserCss',
-			'WelcomePageUrl', 'WelcomePageDisplay'
+			'UserLogo', 'UserLogoTitle', 'UserLogoMessage', 'UserIframeMessage', 'UserCss'
 		)))
 		{
 			$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
@@ -3144,9 +3107,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 			$this->setConfigFromParams($oConfig, 'UserLogoMessage', 'branding', 'user_logo_message', 'string');
 			$this->setConfigFromParams($oConfig, 'UserIframeMessage', 'branding', 'user_iframe_message', 'string');
 			$this->setConfigFromParams($oConfig, 'UserCss', 'branding', 'user_css', 'string');
-
-			$this->setConfigFromParams($oConfig, 'WelcomePageUrl', 'branding', 'welcome_page_url', 'string');
-			$this->setConfigFromParams($oConfig, 'WelcomePageDisplay', 'branding', 'welcome_page_display', 'string');
 		}
 
 		return $this->DefaultResponse(__FUNCTION__, $oConfig->Save());
@@ -3481,14 +3441,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		;
 	}
 
-	private function rainLoopCoreAccess() : bool
-	{
-		$sCoreAccess = \strtolower(\preg_replace('/[\s,;]+/', ' ',
-			$this->Config()->Get('security', 'core_install_access_domain', '')));
-
-		return '' === $sCoreAccess || '*' === $sCoreAccess || APP_SITE === $sCoreAccess;
-	}
-
 	private function getRepositoryDataByUrl(string $sRepo, bool &$bReal = false) : array
 	{
 		$bReal = false;
@@ -3587,56 +3539,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		return $sChannel;
 	}
 
-	private function getCoreData(bool &$bReal) : ?array
-	{
-		$bReal = false;
-
-		$sChannel = $this->getCoreChannel();
-
-		$sRepo = \str_replace('{{channel}}', $sChannel, APP_REPO_CORE_FILE);
-
-		$oHttp = \MailSo\Base\Http::SingletonInstance();
-
-		$sCacheKey = KeyPathHelper::RepositoryCacheCore($sRepo);
-		$sRep = $this->Cacher()->Get($sCacheKey);
-		if ('' !== $sRep)
-		{
-			$iRepTime = $this->Cacher()->GetTimer($sCacheKey);
-		}
-
-		if ('' === $sRep || 0 === $iRepTime || \time() - 3600 > $iRepTime)
-		{
-			$iCode = 0;
-			$sContentType = '';
-
-			$sRep = '' !== $sRepo ? $oHttp->GetUrlAsString($sRepo, 'RainLoop', $sContentType, $iCode, $this->Logger(), 10,
-				$this->Config()->Get('labs', 'curl_proxy', ''), $this->Config()->Get('labs', 'curl_proxy_auth', '')) : false;
-
-			if (false !== $sRep)
-			{
-				$aRep = \json_decode($sRep, true, 10);
-				$bReal = \is_array($aRep) && 0 < \count($aRep) && isset($aRep['id']) && 'rainloop' === $aRep['id'];
-
-				if ($bReal)
-				{
-					$this->Cacher()->Set($sCacheKey, $sRep);
-					$this->Cacher()->SetTimer($sCacheKey);
-				}
-			}
-			else
-			{
-				$this->Logger()->Write('Cannot read remote repository file: '.$sRepo, \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
-			}
-		}
-		else if ('' !== $sRep)
-		{
-			$aRep = \json_decode($sRep, true, 10);
-			$bReal = \is_array($aRep) && 0 < \count($aRep) && isset($aRep['id']) && 'rainloop' === $aRep['id'];
-		}
-
-		return $bReal ? $aRep : null;
-	}
-
 	private function getRepositoryData(bool &$bReal, bool &$bRainLoopUpdatable) : array
 	{
 		$bRainLoopUpdatable = $this->rainLoopUpdatable();
@@ -3713,59 +3615,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		));
 	}
 
-	public function DoAdminCoreData() : array
-	{
-		$this->IsAdminLoggined();
-
-		$bReal = false;
-		$aData = array();
-
-		$bRainLoopUpdatable = $this->rainLoopUpdatable();
-		$bRainLoopAccess = $this->rainLoopCoreAccess();
-
-		if ($bRainLoopAccess)
-		{
-			$aData = $this->getCoreData($bReal);
-		}
-
-		$sVersion = empty($aData['version']) ? '' : $aData['version'];
-		$sType = empty($aData['channel']) ? 'stable' : $aData['channel'];
-
-		$sWarnings = empty($aData['warnings']) ? '' : $aData['warnings'];
-		$aWarnings = $sWarnings ? explode('|', $sWarnings) : array();
-
-		$sCurrentVersion = APP_VERSION;
-
-		$bShowWarning = false;
-		if ($sCurrentVersion !== APP_DEV_VERSION)
-		{
-			foreach ($aWarnings as $sWarningVersion)
-			{
-				$sWarningVersion = \trim($sWarningVersion);
-
-				if (\version_compare($sCurrentVersion, $sWarningVersion, '<') &&
-					\version_compare($sVersion, $sWarningVersion, '>='))
-				{
-					$bShowWarning = true;
-					break;
-				}
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, array(
-			 'Real' => $bReal,
-			 'Access' => $bRainLoopAccess,
-			 'Updatable' => $bRainLoopUpdatable,
-			 'Warning' => $bShowWarning,
-			 'Channel' => $this->getCoreChannel(),
-			 'Type' => $sType,
-			 'Version' => $sCurrentVersion,
-			 'RemoteVersion' => $sVersion,
-			 'RemoteRelease' => empty($aData['release']) ? '' : $aData['release'],
-			 'VersionCompare' => \version_compare($sCurrentVersion, $sVersion)
-		));
-	}
-
 	public function DoAdminPackageDelete() : array
 	{
 		$this->IsAdminLoggined();
@@ -4168,22 +4017,6 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 		return $this->DefaultResponse(__FUNCTION__, 'Pong');
 	}
 
-	public function DoWelcomeClose() : array
-	{
-		$oAccount = $this->getAccountFromToken();
-		if ($oAccount && !$oAccount->IsAdditionalAccount())
-		{
-			$oSettings = $this->SettingsProvider()->Load($oAccount);
-			$oSettings->SetConf('LastWelcomePage',
-				$this->Config()->Get('branding', 'welcome_page_url', ''));
-
-			return $this->DefaultResponse(__FUNCTION__,
-				$this->SettingsProvider()->Save($oAccount, $oSettings));
-		}
-
-		return $this->FalseResponse(__FUNCTION__);
-	}
-
 	public function DoVersion() : array
 	{
 		return $this->DefaultResponse(__FUNCTION__,
@@ -8122,8 +7955,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
 
 	public function StaticPath(string $sPath) : string
 	{
-		$sResult = Utils::WebStaticPath().$sPath;
-		return $sResult.(false === \strpos($sResult, '?') ? '?' : '&').'community';
+		return Utils::WebStaticPath().$sPath;
 	}
 
 	/**

rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php

@@ -147,10 +147,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'user_logo'			=> array(''),
 				'user_logo_title'	=> array(''),
 				'user_logo_message'	=> array(''),
-				'user_iframe_message'	=> array(''),
-
-				'welcome_page_url'		=> array(''),
-				'welcome_page_display'	=> array('none')
+				'user_iframe_message'	=> array('')
 			),
 
 			'contacts' => array(

rainloop/v/0.0.0/app/localization/admin/_source.en.yml

@@ -4,7 +4,6 @@ en:
     LABEL_PASSWORD: "Password"
     BUTTON_LOGIN: "Log into the admin panel"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Admin Panel"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "General"
@@ -64,14 +63,6 @@ en:
     LABEL_USER_LOGO_TITLE: "Logo Title"
     LABEL_USER_LOGO_MESSAGE: "Logo (Message View)"
     LABEL_USER_CUSTOM_CSS: "Custom CSS"
-    LEGEND_WELCOME_PAGE: "Welcome page"
-    LABEL_WELCOME_PAGE_TITLE: "Title"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Display"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "None"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Once"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Always"
-    HTML_ALERT_PREMIUM: "This functionality is available for <strong><a href=\"#/licensing\">Premium</a></strong> subscribers."
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Contacts"
     LEGEND_STORAGE: "Storage (PDO)"
@@ -167,14 +158,6 @@ en:
     LEGEND_ABOUT: "About"
     LABEL_TAG_HINT: "Simple, modern & fast web-based email client"
     LABEL_ALL_RIGHTS_RESERVED: "All Rights Reserved."
-    HINT_READ_CHANGE_LOG: "Please read the change log before updating."
-    HINT_IS_UP_TO_DATE: "RainLoop is up to date."
-    HTML_NEW_VERSION: "New <b>%VERSION%</b> version is available."
-    LABEL_UPDATING: "Updating"
-    LABEL_CHECKING: "Checking for updates"
-    BUTTON_UPDATE: "Update"
-    BUTTON_DOWNLOAD: "Download"
-    BUTTON_CHANGELOG: "Changelog"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "Activate Subscription Key?"
     TITLE_ACTIVATION: "Activation..."

rainloop/v/0.0.0/app/localization/admin/de_DE.yml

@@ -4,7 +4,6 @@ de_DE:
     LABEL_PASSWORD: "Passwort"
     BUTTON_LOGIN: "Im Adminpanel anmelden"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Adminpanel"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "Allgemein"
@@ -62,14 +61,6 @@ de_DE:
     LABEL_USER_LOGO_TITLE: "Logo Titel"
     LABEL_USER_LOGO_MESSAGE: "Logo (Nachrichten-Ansicht)"
     LABEL_USER_CUSTOM_CSS: "Benutzerdefiniertes CSS"
-    LEGEND_WELCOME_PAGE: "Willkommensseite"
-    LABEL_WELCOME_PAGE_TITLE: "Titel"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Anzeigen"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "Nie"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Einmal"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Immer"
-    HTML_ALERT_PREMIUM: "Diese Funktionalität ist für <strong><a href=\"#/licensing\">Premium</a></strong>-Abonnenten verfügbar."
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Kontakte"
     LEGEND_STORAGE: "Speicher (PDO)"
@@ -164,14 +155,6 @@ de_DE:
     LEGEND_ABOUT: "Über"
     LABEL_TAG_HINT: "Einfacher, moderner und schneller webbasierter E-Mail-Client"
     LABEL_ALL_RIGHTS_RESERVED: "Alle Rechte vorbehalten."
-    HINT_READ_CHANGE_LOG: "Bitte Lesen Sie das Änderungsprotokoll vor dem Update."
-    HINT_IS_UP_TO_DATE: "RainLoop ist auf dem neusten Stand."
-    HTML_NEW_VERSION: "Neue Version <b>%VERSION%</b> verfügbar."
-    LABEL_UPDATING: "Aktualisiere"
-    LABEL_CHECKING: "Prüfe auf Aktualisierungen"
-    BUTTON_UPDATE: "Aktualisieren"
-    BUTTON_DOWNLOAD: "Herunterladen"
-    BUTTON_CHANGELOG: "Änderungsprotokoll"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "Subscription-Schlüssel aktivieren?"
     TITLE_ACTIVATION: "Aktiviere..."

rainloop/v/0.0.0/app/localization/admin/en_US.yml

@@ -4,7 +4,6 @@ en_US:
     LABEL_PASSWORD: "Password"
     BUTTON_LOGIN: "Log into the admin panel"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Admin Panel"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "General"
@@ -62,14 +61,6 @@ en_US:
     LABEL_USER_LOGO_TITLE: "Logo Title"
     LABEL_USER_LOGO_MESSAGE: "Logo (Message View)"
     LABEL_USER_CUSTOM_CSS: "Custom CSS"
-    LEGEND_WELCOME_PAGE: "Welcome page"
-    LABEL_WELCOME_PAGE_TITLE: "Title"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Display"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "None"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Once"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Always"
-    HTML_ALERT_PREMIUM: "This functionality is available for <strong><a href=\"#/licensing\">Premium</a></strong> subscribers."
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Contacts"
     LEGEND_STORAGE: "Storage (PDO)"
@@ -164,14 +155,6 @@ en_US:
     LEGEND_ABOUT: "About"
     LABEL_TAG_HINT: "Simple, modern & fast web-based email client"
     LABEL_ALL_RIGHTS_RESERVED: "All Rights Reserved."
-    HINT_READ_CHANGE_LOG: "Please read the change log before updating."
-    HINT_IS_UP_TO_DATE: "RainLoop is up to date."
-    HTML_NEW_VERSION: "New <b>%VERSION%</b> version is available."
-    LABEL_UPDATING: "Updating"
-    LABEL_CHECKING: "Checking for updates"
-    BUTTON_UPDATE: "Update"
-    BUTTON_DOWNLOAD: "Download"
-    BUTTON_CHANGELOG: "Changelog"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "Activate Subscription Key?"
     TITLE_ACTIVATION: "Activation..."

rainloop/v/0.0.0/app/localization/admin/es_ES.yml

@@ -4,7 +4,6 @@ es_ES:
     LABEL_PASSWORD: "Contraseña"
     BUTTON_LOGIN: "Ingresar al panel de control"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Panel de Control"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "General"
@@ -63,14 +62,6 @@ es_ES:
     LABEL_USER_LOGO_TITLE: "Título del Logo"
     LABEL_USER_LOGO_MESSAGE: "Logo (Vista desde mensaje)"
     LABEL_USER_CUSTOM_CSS: "CSS Personalizado"
-    LEGEND_WELCOME_PAGE: "Pantalla de bienvenida"
-    LABEL_WELCOME_PAGE_TITLE: "Título"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Mostrar"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "Ninguno"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Una vez"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Siempre"
-    HTML_ALERT_PREMIUM: "Esta función se encuentra disponible para <strong><a href=\"#/licensing\">Usuarios Premium</a></strong>."
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Contactos"
     LEGEND_STORAGE: "Almacenamiento (PDO)"
@@ -165,14 +156,6 @@ es_ES:
     LEGEND_ABOUT: "Acerca"
     LABEL_TAG_HINT: "Moderno, simple y rápido cliente web de correo electrónico"
     LABEL_ALL_RIGHTS_RESERVED: "Todos los Derechos Reservados."
-    HINT_READ_CHANGE_LOG: "Revisa la lista de cambios antes de actualizar."
-    HINT_IS_UP_TO_DATE: "RainLoop está actualizado."
-    HTML_NEW_VERSION: "Nueva versión ( <b>%VERSION%</b> ) está disponible."
-    LABEL_UPDATING: "Actualizando"
-    LABEL_CHECKING: "Buscando actualizaciones"
-    BUTTON_UPDATE: "Actualizar"
-    BUTTON_DOWNLOAD: "Descargar"
-    BUTTON_CHANGELOG: "Lista de Cambios"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "¿Activar la clave de suscripción?"
     TITLE_ACTIVATION: "Activando..."

rainloop/v/0.0.0/app/localization/admin/fr_FR.yml

@@ -4,7 +4,6 @@ fr_FR:
     LABEL_PASSWORD: "Mot de passe"
     BUTTON_LOGIN: "Se connecter au panneau d'administration"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Panneau d'Administration"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "Général"
@@ -63,14 +62,6 @@ fr_FR:
     LABEL_USER_LOGO_TITLE: "Titre du logo"
     LABEL_USER_LOGO_MESSAGE: "Logo (vue message)"
     LABEL_USER_CUSTOM_CSS: "CSS personnalisés"
-    LEGEND_WELCOME_PAGE: "Page d'accueil"
-    LABEL_WELCOME_PAGE_TITLE: "Titre"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Affichage"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "Aucun"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Une seule fois"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Toujours"
-    HTML_ALERT_PREMIUM: "Cette fonctionnalité est réservé aux utilisateurs <strong><a href=\"#/licensing\">Premium</a></strong>."
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Contacts"
     LEGEND_STORAGE: "Stockage (PDO)"
@@ -165,14 +156,6 @@ fr_FR:
     LEGEND_ABOUT: "A propos"
     LABEL_TAG_HINT: "Un client webmail simple, moderne et rapide "
     LABEL_ALL_RIGHTS_RESERVED: "Tous droits réservés."
-    HINT_READ_CHANGE_LOG: "Veuillez lire le journal des modifications avant de faire la mise à jour."
-    HINT_IS_UP_TO_DATE: "Rainloop est à jour."
-    HTML_NEW_VERSION: "Une nouvelle version <b>%VERSION%</b> est disponible."
-    LABEL_UPDATING: "Mise à jour"
-    LABEL_CHECKING: "Vérification des mises à jour"
-    BUTTON_UPDATE: "Mettre à jour"
-    BUTTON_DOWNLOAD: "Télécharger"
-    BUTTON_CHANGELOG: "Journal des modifications"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "Activer une clé de souscription ?"
     TITLE_ACTIVATION: "Activation..."

rainloop/v/0.0.0/app/localization/admin/nl_NL.yml

@@ -4,7 +4,6 @@ nl_NL:
     LABEL_PASSWORD: "Wachtwoord"
     BUTTON_LOGIN: "Aanmelden in het beheer paneel"
   TOP_PANEL:
-    LABEL_PREMIUM: "Premium"
     LABEL_ADMIN_PANEL: "Beheer paneel"
   TABS_LABELS:
     LABEL_GENERAL_NAME: "Algemeen"
@@ -62,14 +61,6 @@ nl_NL:
     LABEL_USER_LOGO_TITLE: "Logo titel"
     LABEL_USER_LOGO_MESSAGE: "Logo (berichtweergave)"
     LABEL_USER_CUSTOM_CSS: "Aangepaste CSS"
-    LEGEND_WELCOME_PAGE: "Welkom pagina"
-    LABEL_WELCOME_PAGE_TITLE: "Titel"
-    LABEL_WELCOME_PAGE_URL: "URL"
-    LABEL_WELCOME_PAGE_DISPLAY: "Weergave"
-    OPTION_WELCOME_PAGE_DISPLAY_NONE: "Nooit"
-    OPTION_WELCOME_PAGE_DISPLAY_ONCE: "Eenmalig"
-    OPTION_WELCOME_PAGE_DISPLAY_ALWAYS: "Altijd"
-    HTML_ALERT_PREMIUM: "Deze functionaliteit is alleen beschikbaar voor <strong><a href=\"#/licensing\">Premium</a></strong> abonnees.\n"
   TAB_CONTACTS:
     LEGEND_CONTACTS: "Contactpersonen"
     LEGEND_STORAGE: "Opslag (PDO)"
@@ -163,14 +154,6 @@ nl_NL:
     LEGEND_ABOUT: "Over"
     LABEL_TAG_HINT: "Simpel, modern en snelle web-based e-mail client"
     LABEL_ALL_RIGHTS_RESERVED: "Alle rechten gereserveerd."
-    HINT_READ_CHANGE_LOG: "Lees a.u.b. het veranderingen logboek alvorens te updaten."
-    HINT_IS_UP_TO_DATE: "De laatste versie van RainLoop is geïnstalleerd."
-    HTML_NEW_VERSION: "Een nieuwe versie <b>%VERSION%</b> is beschikbaar."
-    LABEL_UPDATING: "Bezig met updaten"
-    LABEL_CHECKING: "Controleren op updates"
-    BUTTON_UPDATE: "Bijwerken"
-    BUTTON_DOWNLOAD: "Download"
-    BUTTON_CHANGELOG: "Veranderingen logboek"
   POPUPS_ACTIVATE:
     TITLE_ACTIVATE: "Activatie code activeren?"
     TITLE_ACTIVATION: "Activeren..."

rainloop/v/0.0.0/app/localization/webmail/_source.en.yml

@@ -240,8 +240,6 @@ en:
     BUTTON_MARK_AS_IMPORTANT: "Mark as important"
     BUTTON_OPEN_PGP: "OpenPGP (Plain Text Only)"
     BUTTON_REQUEST_DSN: "Request a delivery receipt"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Close"
   POPUPS_ASK:
     BUTTON_YES: "Yes"
     BUTTON_NO: "No"

rainloop/v/0.0.0/app/localization/webmail/de_DE.yml

@@ -238,8 +238,6 @@ de_DE:
     BUTTON_MARK_AS_IMPORTANT: "Als Wichtig markieren"
     BUTTON_OPEN_PGP: "OpenPGP (nur bei unformatiertem Text)"
     BUTTON_REQUEST_DSN: "Übermittlungsstatus anfordern"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Schließen"
   POPUPS_ASK:
     BUTTON_YES: "Ja"
     BUTTON_NO: "Nein"

rainloop/v/0.0.0/app/localization/webmail/en_GB.yml

@@ -239,8 +239,6 @@ en_GB:
     BUTTON_MARK_AS_IMPORTANT: "Mark as important"
     BUTTON_OPEN_PGP: "OpenPGP (Plain Text Only)"
     BUTTON_REQUEST_DSN: "Request a delivery receipt"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Close"
   POPUPS_ASK:
     BUTTON_YES: "Yes"
     BUTTON_NO: "No"

rainloop/v/0.0.0/app/localization/webmail/en_US.yml

@@ -239,8 +239,6 @@ en_US:
     BUTTON_MARK_AS_IMPORTANT: "Mark as important"
     BUTTON_OPEN_PGP: "OpenPGP (Plain Text Only)"
     BUTTON_REQUEST_DSN: "Request a delivery receipt"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Close"
   POPUPS_ASK:
     BUTTON_YES: "Yes"
     BUTTON_NO: "No"

rainloop/v/0.0.0/app/localization/webmail/es_ES.yml

@@ -238,8 +238,6 @@ es_ES:
     BUTTON_MARK_AS_IMPORTANT: "Marcar como importante"
     BUTTON_OPEN_PGP: "OpenPGP (solo texto plano)"
     BUTTON_REQUEST_DSN: "Solicitar una confirmación de entrega"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Cerrar"
   POPUPS_ASK:
     BUTTON_YES: "Sí"
     BUTTON_NO: "No"

rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml

@@ -239,8 +239,6 @@ fr_FR:
     BUTTON_MARK_AS_IMPORTANT: "Marquer comme important"
     BUTTON_OPEN_PGP: "OpenPGP (Texte non formaté uniquement)"
     BUTTON_REQUEST_DSN: "Demander un accusé de réception"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Fermer"
   POPUPS_ASK:
     BUTTON_YES: "Oui"
     BUTTON_NO: "Non"

rainloop/v/0.0.0/app/localization/webmail/nl_NL.yml

@@ -238,8 +238,6 @@ nl_NL:
     BUTTON_MARK_AS_IMPORTANT: "Markeer als belangrijk"
     BUTTON_OPEN_PGP: "OpenPGP (allen bij Platte Tekst)"
     BUTTON_REQUEST_DSN: "Ontvangstbevestiging vragen"
-  POPUPS_WELCOME_PAGE:
-    BUTTON_CLOSE: "Close"
   POPUPS_ASK:
     BUTTON_YES: "Ja"
     BUTTON_NO: "Nee"

rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html

@@ -5,11 +5,8 @@
 				<i class="icon-spinner animated" style="margin-top: 2px" data-bind="style: {'visibility': adminManLoadingVisibility }"></i>
 				&nbsp;&nbsp;
 				RainLoop
-				<span data-bind="visible: capa && !community">(<span data-i18n="TOP_PANEL/LABEL_PREMIUM"></span>)</span>
 				&mdash;
 				<span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span>
-				&nbsp;&nbsp;
-				<span data-bind="visible: !community">(<span data-bind="text: adminDomain"></span>)</span>
 			</h4>
 			<div class="btn-group pull-right">
 				<a class="btn single btn-narrow" data-bind="click: logoutClick">

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html

@@ -19,60 +19,6 @@
 					</span>
 				</h4>
 				<h4 style="color: #aaa; font-weight: normal;" data-i18n="TAB_ABOUT/LABEL_TAG_HINT"></h4>
-				<h5 style="font-weight: normal; margin-top: 40px;" data-bind="visible: !community">
-					<div data-bind="visible: 'error' === statusType()">
-						<i class="icon-warning" style="color: red"></i>
-						&nbsp;&nbsp;
-						<span data-bind="text: errorDesc"></span>
-					</div>
-					<div data-bind="visible: 'available' === statusType()">
-						<i class="icon-bolt" style="color: red"></i>
-						&nbsp;&nbsp;
-						<span data-bind="html: coreRemoteVersionHtmlDesc"></span>
-						<span data-bind="visible: '' !== coreRemoteRelease()">
-							(<span data-bind="text: coreRemoteRelease"></span>)
-						</span>
-						<br />
-						<span data-bind="if: coreWarning">
-							<br />
-							<i class="icon-warning" style="color: red"></i>
-							&nbsp;&nbsp;
-							<b data-i18n="HINTS/WARNING"></b>
-							&nbsp;&nbsp;
-							<span data-i18n="TAB_ABOUT/HINT_READ_CHANGE_LOG"></span>
-							<br />
-						</span>
-						<br />
-						<span data-bind="visible: coreAccess()">
-							<a class="btn" href="http://www.rainloop.net/downloads/" target="_blank">
-								<i class="icon-download"></i>
-								&nbsp;&nbsp;
-								<span data-i18n="TAB_ABOUT/BUTTON_DOWNLOAD"></span>
-							</a>
-							&nbsp;&nbsp;&nbsp;
-							<a class="btn" href="http://www.rainloop.net/changelog/" target="_blank">
-								<i class="icon-file-text"></i>
-								&nbsp;&nbsp;
-								<span data-i18n="TAB_ABOUT/BUTTON_CHANGELOG"></span>
-							</a>
-						</span>
-					</div>
-					<div data-bind="visible: 'up-to-date' === statusType()">
-						<i class="icon-ok" style="color: green"></i>
-						&nbsp;&nbsp;
-						<span data-i18n="TAB_ABOUT/HINT_IS_UP_TO_DATE"></span>
-					</div>
-					<div data-bind="visible: 'updating' === statusType()">
-						<i class="icon-spinner animated"></i>
-						&nbsp;&nbsp;
-						<span data-i18n="TAB_ABOUT/LABEL_UPDATING"></span>…
-					</div>
-					<div data-bind="visible: 'checking' === statusType()">
-						<i class="icon-spinner animated"></i>
-						&nbsp;&nbsp;
-						<span data-i18n="TAB_ABOUT/LABEL_CHECKING"></span>…
-					</div>
-				</h5>
 			</div>
 		</div>
 	</div>

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html

@@ -42,8 +42,9 @@
 			</div>
 		</div>
 	</div>
+<!--
 	<br />
-	<ul class="nav nav-tabs" data-bind="visible: !community">
+	<ul class="nav nav-tabs">
 		<li class="active">
 			<a class="i18n" data-i18n="TAB_BRANDING/LEGEND_LOGIN"
 			   href="#branding-login-section-id" data-toggle="tab"></a>
@@ -52,187 +53,129 @@
 			<a class="i18n" data-i18n="TAB_BRANDING/LEGEND_USER"
 			   href="#branding-user-section-id" data-toggle="tab"></a>
 		</li>
-		<li>
-			<a class="i18n" data-i18n="TAB_BRANDING/LEGEND_WELCOME_PAGE"
-			   href="#branding-welcome-page-section-id" data-toggle="tab"></a>
-		</li>
 	</ul>
 	<br  />
-	<div class="row" data-bind="visible: !community">
+	<div class="row">
 		<div class="tab-content span12">
 			<div class="tab-pane active" id="branding-login-section-id">
-
-<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_LOGO"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: loginLogo,
-					trigger: loginLogo.trigger,
-					placeholder: 'https://',
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_DESCRIPTION"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: loginDescription,
-					trigger: loginDescription.trigger,
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_BACKGROUND"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: loginBackground,
-					trigger: loginBackground.trigger,
-					placeholder: 'https://',
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_CUSTOM_CSS"></label>
-		<div class="controls">
-			<div class="custom-css-wrapper" data-bind="component: {
-				name: 'TextArea',
-				params: {
-					value: loginCss,
-					trigger: loginCss.trigger,
-					width: 495,
-					enable: capa,
-					rows: 7
-				}
-			}"></div>
-		</div>
-	</div>
-</div>
-
+				<div class="form-horizontal">
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_LOGO"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: loginLogo,
+									trigger: loginLogo.trigger,
+									placeholder: 'https://',
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_DESCRIPTION"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: loginDescription,
+									trigger: loginDescription.trigger,
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_BACKGROUND"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: loginBackground,
+									trigger: loginBackground.trigger,
+									placeholder: 'https://',
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_LOGIN_CUSTOM_CSS"></label>
+						<div class="controls">
+							<div class="custom-css-wrapper" data-bind="component: {
+								name: 'TextArea',
+								params: {
+									value: loginCss,
+									trigger: loginCss.trigger,
+									width: 495,
+									rows: 7
+								}
+							}"></div>
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="tab-pane" id="branding-user-section-id">
-
-<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: userLogo,
-					trigger: userLogo.trigger,
-					placeholder: 'https://',
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO_TITLE"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: userLogoTitle,
-					trigger: userLogoTitle.trigger,
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO_MESSAGE"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: userLogoMessage,
-					trigger: userLogoMessage.trigger,
-					placeholder: 'https://',
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_CUSTOM_CSS"></label>
-		<div class="controls">
-			<div class="custom-css-wrapper" data-bind="component: {
-				name: 'TextArea',
-				params: {
-					value: userCss,
-					trigger: userCss.trigger,
-					width: 495,
-					enable: capa,
-					rows: 7
-				}
-			}"></div>
-		</div>
-	</div>
-</div>
-
-			</div>
-			<div class="tab-pane" id="branding-welcome-page-section-id">
-
-<div class="form-horizontal" data-bind="css: {'disabled-form': !capa()}">
-	<div class="control-group">
-		<label class="control-label" data-i18n="TAB_BRANDING/LABEL_WELCOME_PAGE_URL"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: welcomePageUrl,
-					trigger: welcomePageUrl.trigger,
-					placeholder: 'https://',
-					size: 5,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-	<div class="control-group">
-	<label class="control-label" data-i18n="TAB_BRANDING/LABEL_WELCOME_PAGE_DISPLAY"></label>
-		<div class="controls">
-			<div data-bind="component: {
-				name: 'Select',
-				params: {
-					options: welcomePageDisplay.options,
-					value: welcomePageDisplay,
-					trigger: welcomePageDisplay.trigger,
-					optionsText: 'optText',
-					optionsValue: 'optValue',
-					size: 2,
-					enable: capa
-				}
-			}"></div>
-		</div>
-	</div>
-</div>
-
+				<div class="form-horizontal">
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: userLogo,
+									trigger: userLogo.trigger,
+									placeholder: 'https://',
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO_TITLE"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: userLogoTitle,
+									trigger: userLogoTitle.trigger,
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_LOGO_MESSAGE"></label>
+						<div class="controls">
+							<div data-bind="component: {
+								name: 'Input',
+								params: {
+									value: userLogoMessage,
+									trigger: userLogoMessage.trigger,
+									placeholder: 'https://',
+									size: 5
+								}
+							}"></div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" data-i18n="TAB_BRANDING/LABEL_USER_CUSTOM_CSS"></label>
+						<div class="controls">
+							<div class="custom-css-wrapper" data-bind="component: {
+								name: 'TextArea',
+								params: {
+									value: userCss,
+									trigger: userCss.trigger,
+									width: 495,
+									rows: 7
+								}
+							}"></div>
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
-
-	<div class="row" data-bind="visible: !capa() && !community">
-		<div class="alert span8" style="margin-top: 10px;" data-i18n="[html]TAB_BRANDING/HTML_ALERT_PREMIUM"></div>
-	</div>
-
-</div>
+-->
+</div>

rainloop/v/0.0.0/app/templates/Views/Common/PopupsWelcomePage.html

@@ -1,22 +0,0 @@
-<div class="popups">
-	<div class="modal hide b-welcom-page-content g-ui-user-select-none"
-			data-bind="modal: modalVisibility" style="width: 600px">
-
-		<div class="modal-body" style="height: 450px; padding: 0">
-			<div data-bind="if: welcomePageURL" style="height: 100%; width: 100%; margin: 0; padding: 0; position: relative">
-				<iframe src="javascript:1;" tabindex="-1" frameborder="0"
-					style="border: none; width: 100%; height: 100%; position: absolute; top: 0px; left: 0px; right: 0px; bottom: 0px;"
-					data-bind="attr: {'src': welcomePageURL}"></iframe>
-			</div>
-		</div>
-
-		<div class="modal-footer">
-			<button class="btn" autofocus="" data-bind="command: cancelCommand">
-				<i class="icon-remove"></i>
-				&nbsp;&nbsp;
-				<span class="i18n" data-i18n="POPUPS_WELCOME_PAGE/BUTTON_CLOSE"></span>
-			</button>
-		</div>
-
-	</div>
-</div>