Remove more RainLoop standard/premium licensed code

This commit is contained in:
djmaze 2020-11-25 14:31:20 +01:00
parent 2a1ccc5d24
commit 4f8b07fe85
18 changed files with 3 additions and 326 deletions

View file

@ -10,15 +10,6 @@ class BrandingAdminSettings {
this.title = ko.observable(settingsGet('Title')).idleTrigger();
this.loadingDesc = ko.observable(settingsGet('LoadingDescription')).idleTrigger();
this.faviconUrl = ko.observable(settingsGet('FaviconUrl')).idleTrigger();
this.loginLogo = ko.observable(settingsGet('LoginLogo') || '').idleTrigger();
this.loginBackground = ko.observable(settingsGet('LoginBackground') || '').idleTrigger();
this.userLogo = ko.observable(settingsGet('UserLogo') || '').idleTrigger();
this.userLogoMessage = ko.observable(settingsGet('UserLogoMessage') || '').idleTrigger();
this.userIframeMessage = ko.observable(settingsGet('UserIframeMessage') || '').idleTrigger();
this.userLogoTitle = ko.observable(settingsGet('UserLogoTitle') || '').idleTrigger();
this.loginDescription = ko.observable(settingsGet('LoginDescription')).idleTrigger();
this.loginCss = ko.observable(settingsGet('LoginCss')).idleTrigger();
this.userCss = ko.observable(settingsGet('UserCss')).idleTrigger();
}
onBuild() {

View file

@ -14,9 +14,6 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
constructor() {
super();
this.logoImg = (Settings.get('UserLogo')||'').trim();
this.logoTitle = (Settings.get('UserLogoTitle')||'').trim();
this.mobile = !!Settings.app('mobile');
this.mobileDevice = !!Settings.app('mobileDevice');

View file

@ -63,9 +63,6 @@ class LoginUserView extends AbstractViewNext {
this.additionalCodeErrorAnimation = ko.observable(false).extend({ falseTimeout: 500 });
this.logoImg = (Settings.get('LoginLogo')||'').trim();
this.loginDescription = (Settings.get('LoginDescription')||'').trim();
this.mobile = !!Settings.app('mobile');
this.mobileDevice = !!Settings.app('mobileDevice');

View file

@ -88,9 +88,6 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
this.allowMessageActions = !!Settings.capa(Capa.MessageActions);
this.allowMessageListActions = !!Settings.capa(Capa.MessageListActions);
this.logoImg = (Settings.get('UserLogoMessage')||'').trim();
this.logoIframe = (Settings.get('UserIframeMessage')||'').trim();
this.mobile = !!Settings.app('mobile');
this.attachmentsActions = AppStore.attachmentsActions;

View file

@ -47,13 +47,6 @@ const
p.end();
},
writeCSS = css => {
const style = doc.createElement('style');
style.type = 'text/css';
style.textContent = css;
doc.head.append(style);
},
loadScript = src => {
if (!src) {
throw new Error('src should not be empty.');
@ -149,16 +142,6 @@ win.rl = {
eId('app-theme-link').href = appData.NewThemeLink;
}
appData.IncludeCss && writeCSS(appData.IncludeCss);
if (appData.IncludeBackground) {
const img = appData.IncludeBackground.replace('{{USER}}', rl.hash.get() || '0');
if (img) {
htmlCL.add('UserBackground');
doc.body.style.backgroundImage = "url("+img+")";
}
}
loadScript(appData.StaticLibJsLink)
.then(() => Promise.all([loadScript(appData.TemplatesLink), loadScript(appData.LangLink)]))
.then(() => loadScript(appData.StaticAppJsLink))

View file

@ -1040,7 +1040,7 @@ class Actions
/*
required by Index.html and rl.js:
NewThemeLink IncludeCss TemplatesLink LangLink IncludeBackground PluginsLink AuthAccountHash
NewThemeLink TemplatesLink LangLink PluginsLink AuthAccountHash
*/
$aResult = array(
@ -1055,16 +1055,6 @@ class Actions
'Title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
'FaviconUrl' => $oConfig->Get('webmail', 'favicon_url', ''),
'LoginDescription' => '',
'LoginLogo' => '',
'LoginBackground' => '',
'LoginCss' => '',
'UserLogo' => '',
'UserLogoTitle' => '',
'UserLogoMessage' => '',
'UserCss' => '',
'IncludeCss' => '',
'IncludeBackground' => '',
'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true),
'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false),
@ -1077,17 +1067,6 @@ class Actions
'Capa' => array(),
'Plugins' => array(),
'System' => $this->AppDataSystem($bAdmin, $bMobile, $bMobileDevice)
/*
'LoginLogo' => $oConfig->Get('branding', 'login_logo', ''),
'LoginBackground' => $oConfig->Get('branding', 'login_background', ''),
'LoginCss' => $oConfig->Get('branding', 'login_css', ''),
'LoginDescription' => $oConfig->Get('branding', 'login_desc', ''),
'UserLogo' => $oConfig->Get('branding', 'user_logo', ''),
'UserLogoTitle' => $oConfig->Get('branding', 'user_logo_title', ''),
'UserLogoMessage' => $oConfig->Get('branding', 'user_logo_message', ''),
'UserIframeMessage' => $oConfig->Get('branding', 'user_iframe_message', ''),
'UserCss' => $oConfig->Get('branding', 'user_css', ''),
*/
);
if (0 < \strlen($sAuthAccountHash)) {
@ -1099,8 +1078,6 @@ class Actions
if (!$bAdmin) {
$oAccount = $this->getAccountFromToken(false);
if ($oAccount) {
$aResult['IncludeCss'] = $aResult['UserCss'];
$oAddressBookProvider = $this->AddressBookProvider($oAccount);
$aResult['Auth'] = true;
@ -1146,14 +1123,7 @@ class Actions
if (!empty($aResult['StartupUrl'])) {
$aResult['StartupUrl'] = $this->compileLogParams($aResult['StartupUrl'], $oAccount, true);
}
if (!empty($aResult['UserIframeMessage'])) {
$aResult['UserIframeMessage'] = $this->compileLogParams($aResult['UserIframeMessage'], $oAccount, true);
}
} else {
$aResult['IncludeBackground'] = $aResult['LoginBackground'];
$aResult['IncludeCss'] = $aResult['LoginCss'];
$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
@ -1281,11 +1251,6 @@ class Actions
if ($this->GetCapa(false, $bMobile, Enumerations\Capa::USER_BACKGROUND, $oAccount)) {
$aResult['UserBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
$aResult['UserBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
// if (!empty($aResult['UserBackgroundName']) && !empty($aResult['UserBackgroundHash']))
// {
// $aResult['IncludeBackground'] = './?/Raw/&q[]=/{{USER}}/UserBackground/&q[]=/'.
// $aResult['UserBackgroundHash'].'/';
// }
}
$aResult['EnableTwoFactor'] = (bool)$oSettings->GetConf('EnableTwoFactor', $aResult['EnableTwoFactor']);

View file

@ -174,23 +174,6 @@ trait Admin
$this->setConfigFromParams($oConfig, 'TokenProtection', 'security', 'csrf_protection', 'bool');
$this->setConfigFromParams($oConfig, 'EnabledPlugins', 'plugins', 'enable', 'bool');
if ($this->HasOneOfActionParams(array(
'LoginLogo', 'LoginBackground', 'LoginDescription', 'LoginCss',
'UserLogo', 'UserLogoTitle', 'UserLogoMessage', 'UserIframeMessage', 'UserCss'
)))
{
$this->setConfigFromParams($oConfig, 'LoginLogo', 'branding', 'login_logo', 'string');
$this->setConfigFromParams($oConfig, 'LoginBackground', 'branding', 'login_background', 'string');
$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');
$this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string');
$this->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string');
$this->setConfigFromParams($oConfig, 'UserLogoTitle', 'branding', 'user_logo_title', 'string');
$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');
}
return $this->DefaultResponse(__FUNCTION__, $oConfig->Save());
}

View file

@ -137,19 +137,6 @@ class Application extends \RainLoop\Config\AbstractConfig
'new_move_to_folder_button' => array(true)
),
'branding' => array(
'login_logo' => array(''),
'login_background' => array(''),
'login_desc' => array(''),
'login_css' => array(''),
'user_css' => array(''),
'user_logo' => array(''),
'user_logo_title' => array(''),
'user_logo_message' => array(''),
'user_iframe_message' => array('')
),
'contacts' => array(
'enable' => array(false, 'Enable contacts'),
'allow_sync' => array(false),

View file

@ -52,16 +52,6 @@ en:
LABEL_PAGE_TITLE: "Page Title"
LABEL_LOADING_DESCRIPTION: "Loading Description"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Login"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Description"
LABEL_LOGIN_BACKGROUND: "Background"
LABEL_LOGIN_CUSTOM_CSS: "Custom CSS"
LEGEND_USER: "User"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Logo Title"
LABEL_USER_LOGO_MESSAGE: "Logo (Message View)"
LABEL_USER_CUSTOM_CSS: "Custom CSS"
TAB_CONTACTS:
LEGEND_CONTACTS: "Contacts"
LEGEND_STORAGE: "Storage (PDO)"

View file

@ -50,16 +50,6 @@ de_DE:
LABEL_PAGE_TITLE: "Seitentitel"
LABEL_LOADING_DESCRIPTION: "Ladevorgang-Beschreibung"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Anmeldung"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Beschreibung"
LABEL_LOGIN_BACKGROUND: "Hintergrund"
LABEL_LOGIN_CUSTOM_CSS: "Benutzerdefiniertes CSS"
LEGEND_USER: "Benutzer"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Logo Titel"
LABEL_USER_LOGO_MESSAGE: "Logo (Nachrichten-Ansicht)"
LABEL_USER_CUSTOM_CSS: "Benutzerdefiniertes CSS"
TAB_CONTACTS:
LEGEND_CONTACTS: "Kontakte"
LEGEND_STORAGE: "Speicher (PDO)"

View file

@ -50,16 +50,6 @@ en_US:
LABEL_PAGE_TITLE: "Page Title"
LABEL_LOADING_DESCRIPTION: "Loading Description"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Login"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Description"
LABEL_LOGIN_BACKGROUND: "Background"
LABEL_LOGIN_CUSTOM_CSS: "Custom CSS"
LEGEND_USER: "User"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Logo Title"
LABEL_USER_LOGO_MESSAGE: "Logo (Message View)"
LABEL_USER_CUSTOM_CSS: "Custom CSS"
TAB_CONTACTS:
LEGEND_CONTACTS: "Contacts"
LEGEND_STORAGE: "Storage (PDO)"

View file

@ -51,16 +51,6 @@ es_ES:
LABEL_PAGE_TITLE: "Título de la página"
LABEL_LOADING_DESCRIPTION: "Descripción"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Ingresar"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Descripción"
LABEL_LOGIN_BACKGROUND: "Fondo"
LABEL_LOGIN_CUSTOM_CSS: "CSS Personalizado"
LEGEND_USER: "Usuario"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Título del Logo"
LABEL_USER_LOGO_MESSAGE: "Logo (Vista desde mensaje)"
LABEL_USER_CUSTOM_CSS: "CSS Personalizado"
TAB_CONTACTS:
LEGEND_CONTACTS: "Contactos"
LEGEND_STORAGE: "Almacenamiento (PDO)"

View file

@ -51,16 +51,6 @@ fr_FR:
LABEL_PAGE_TITLE: "Titre de la page"
LABEL_LOADING_DESCRIPTION: "Description pendant le chargement"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Connexion"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Description"
LABEL_LOGIN_BACKGROUND: "Arrière-plan"
LABEL_LOGIN_CUSTOM_CSS: "CSS personnalisés"
LEGEND_USER: "Utilisateur"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Titre du logo"
LABEL_USER_LOGO_MESSAGE: "Logo (vue message)"
LABEL_USER_CUSTOM_CSS: "CSS personnalisés"
TAB_CONTACTS:
LEGEND_CONTACTS: "Contacts"
LEGEND_STORAGE: "Stockage (PDO)"

View file

@ -50,16 +50,6 @@ nl_NL:
LABEL_PAGE_TITLE: "Pagina titel"
LABEL_LOADING_DESCRIPTION: "Beschrijving tijdens laden"
LABEL_FAVICON_URL: "Favicon"
LEGEND_LOGIN: "Login scherm"
LABEL_LOGIN_LOGO: "Logo"
LABEL_LOGIN_DESCRIPTION: "Beschrijving"
LABEL_LOGIN_BACKGROUND: "Achtergrond"
LABEL_LOGIN_CUSTOM_CSS: "Aangepaste CSS"
LEGEND_USER: "Gebruiker"
LABEL_USER_LOGO: "Logo"
LABEL_USER_LOGO_TITLE: "Logo titel"
LABEL_USER_LOGO_MESSAGE: "Logo (berichtweergave)"
LABEL_USER_CUSTOM_CSS: "Aangepaste CSS"
TAB_CONTACTS:
LEGEND_CONTACTS: "Contactpersonen"
LEGEND_STORAGE: "Opslag (PDO)"

View file

@ -42,140 +42,4 @@
</div>
</div>
</div>
<!--
<br />
<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>
</li>
<li>
<a class="i18n" data-i18n="TAB_BRANDING/LEGEND_USER"
href="#branding-user-section-id" data-toggle="tab"></a>
</li>
</ul>
<br />
<div class="row">
<div class="tab-content span12">
<div class="tab-pane active" id="branding-login-section-id">
<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">
<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>

View file

@ -1,17 +1,6 @@
<div class="b-login-content">
<div class="loginFormWrapper" data-bind="css: {'afterLoginHide': formHidden}">
<center class="plugin-mark-Login-BeforeLogo">
{{INCLUDE/BeforeLogo/PLACE}}
<!-- ko if: logoImg -->
<div class="logoWrapper plugin-mark-Login-AfterLogo">
<img class="logoImg" data-bind="attr: {'src': logoImg }" />
</div>
<!-- /ko -->
<div class="descWrapper thm-login-desc plugin-mark-Login-AfterLogoDescription"
data-bind="visible: '' !== loginDescription">
<span class="desc" data-bind="text: loginDescription"></span>
</div>
{{INCLUDE/AfterLogo/PLACE}}
<div class="alert alertError" data-bind="hidden: !submitError()" hidden="">
<button type="button" class="close" data-bind="click: function () { submitError('') }">&times;</button>
<span data-bind="text: submitError"></span>

View file

@ -60,18 +60,8 @@
<div data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()" style="height: 100%">
<div class="b-message-view-desc" data-bind="visible: !logoIframe">
<span class="i18n" data-bind="visible: !logoImg" data-i18n="MESSAGE/MESSAGE_VIEW_DESC"></span>
<div class="logoPlace" data-bind="visible: logoImg, if: logoImg">
<img style="height: 99%" data-bind="attr: { 'src': logoImg }" />
</div>
</div>
<div class="b-message-view-iframe" data-bind="visible: logoIframe, if: logoIframe" style="position: relative; height: 100%">
<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': logoIframe}"></iframe>
<div class="b-message-view-iframe-backdrop"></div>
<div class="b-message-view-desc">
<span class="i18n" data-i18n="MESSAGE/MESSAGE_VIEW_DESC"></span>
</div>
</div>

View file

@ -87,12 +87,6 @@
</div>
<i class="stopIcon icon-pause"></i>
</div>
<div class="logoPlace pull-right" data-bind="if: logoImg">
<img style="height: 99%" data-tooltip-i18n="off"
data-bind="attr: { 'src': logoImg }, tooltip: logoTitle" />
</div>
</div>
</div>
</div>