diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 7647dbdc5..5a3fd2796 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -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() { diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 23583820a..960c4a967 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -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'); diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index b77785d5e..b80928d62 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -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'); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index a3c9bbefe..67d92385c 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -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; diff --git a/dev/boot.js b/dev/boot.js index 7f3252e40..85d8252c2 100644 --- a/dev/boot.js +++ b/dev/boot.js @@ -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)) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 56c08cc79..4dc32b2ca 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -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']); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php index 9d2dcbf02..c56f96efc 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php @@ -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()); } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 0fccfd103..723df2ce4 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -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), diff --git a/snappymail/v/0.0.0/app/localization/admin/_source.en.yml b/snappymail/v/0.0.0/app/localization/admin/_source.en.yml index f0ec834aa..57f5956e5 100644 --- a/snappymail/v/0.0.0/app/localization/admin/_source.en.yml +++ b/snappymail/v/0.0.0/app/localization/admin/_source.en.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/localization/admin/de_DE.yml b/snappymail/v/0.0.0/app/localization/admin/de_DE.yml index 47db31ce6..6a9314fb1 100644 --- a/snappymail/v/0.0.0/app/localization/admin/de_DE.yml +++ b/snappymail/v/0.0.0/app/localization/admin/de_DE.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/localization/admin/en_US.yml b/snappymail/v/0.0.0/app/localization/admin/en_US.yml index f88d53904..fa2764a47 100644 --- a/snappymail/v/0.0.0/app/localization/admin/en_US.yml +++ b/snappymail/v/0.0.0/app/localization/admin/en_US.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/localization/admin/es_ES.yml b/snappymail/v/0.0.0/app/localization/admin/es_ES.yml index dd5ca76d6..6f2347a3b 100644 --- a/snappymail/v/0.0.0/app/localization/admin/es_ES.yml +++ b/snappymail/v/0.0.0/app/localization/admin/es_ES.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml b/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml index d027995bf..014666b34 100644 --- a/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml +++ b/snappymail/v/0.0.0/app/localization/admin/fr_FR.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml index 33a46fc5e..84073690d 100644 --- a/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml +++ b/snappymail/v/0.0.0/app/localization/admin/nl_NL.yml @@ -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)" diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html index 87312d785..ee5e71bca 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html @@ -42,140 +42,4 @@ - diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html index 8d9a3d612..c1a19e44d 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html @@ -1,17 +1,6 @@