Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes and changes

Browse source
This commit is contained in:
RainLoop Team 2015-01-19 01:57:29 +04:00
parent 91b3f1a3e9
commit 54edeaa645
15 changed files with 77 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1060,6 +1060,7 @@ class Actions
'LoginDescription' => '',
'LoginCss' => '',
'LoginPowered' => true,
'UserLogo' => '',
'Token' => $oConfig->Get('security', 'csrf_protection', false) ? \RainLoop\Utils::GetCsrfToken() : '',
'InIframe' => (bool) $oConfig->Get('labs', 'in_iframe', false),
'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),
@ -1120,6 +1121,7 @@ class Actions
$aResult['LoginDescription'] = $oConfig->Get('branding', 'login_desc', '');
$aResult['LoginCss'] = $oConfig->Get('branding', 'login_css', '');
$aResult['LoginPowered'] = !!$oConfig->Get('branding', 'login_powered', true);
$aResult['UserLogo'] = $oConfig->Get('branding', 'user_logo', '');
}
$aResult['LoadingDescriptionEsc'] = \htmlspecialchars($aResult['LoadingDescription'], ENT_QUOTES|ENT_IGNORE, 'UTF-8');
@ -1340,7 +1342,7 @@ class Actions
$aResult['SignatureToAll'] = false;
$aResult['EnableTwoFactor'] = false;
$aResult['ParentEmail'] = '';
$aResult['InterfaceAnimation'] = \RainLoop\Enumerations\InterfaceAnimation::NORMAL;
$aResult['InterfaceAnimation'] = true;
$aResult['UserBackgroundName'] = '';
$aResult['UserBackgroundHash'] = '';
@ -1371,7 +1373,6 @@ class Actions
$aResult['ReplySameFolder'] = (bool) $oSettings->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
$aResult['Layout'] = (int) $oSettings->GetConf('Layout', $aResult['Layout']);
$aResult['UseCheckboxesInList'] = (bool) $oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
$aResult['InterfaceAnimation'] = (string) $oSettings->GetConf('InterfaceAnimation', $aResult['InterfaceAnimation']);
if ($oConfig->Get('webmail', 'allow_user_background', false))
{
@ -1389,9 +1390,6 @@ class Actions
$aResult['ParentEmail'] = $oAccount->ParentEmail();
}
$aResult['InterfaceAnimation'] = \RainLoop\Enumerations\InterfaceAnimation::NONE === $aResult['InterfaceAnimation']
? $aResult['InterfaceAnimation'] : \RainLoop\Enumerations\InterfaceAnimation::NORMAL;
if (0 < \strlen($aResult['ParentEmail']))
{
$aResult['AllowGoogleSocial'] = false;
@ -2661,7 +2659,7 @@ class Actions
$this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
$this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');
if ($this->HasOneOfActionParams(array('Title', 'LoadingDescription', 'LoginLogo', 'LoginDescription', 'LoginCss', 'LoginPowered')) && $this->PremType())
if ($this->HasOneOfActionParams(array('Title', 'LoadingDescription', 'LoginLogo', 'LoginDescription', 'LoginCss', 'LoginPowered', 'UserLogo')) && $this->PremType())
{
$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
@ -2670,6 +2668,8 @@ class Actions
$this->setConfigFromParams($oConfig, 'LoginDescription', 'branding', 'login_desc', 'string');
$this->setConfigFromParams($oConfig, 'LoginCss', 'branding', 'login_css', 'string');
$this->setConfigFromParams($oConfig, 'LoginPowered', 'branding', 'login_powered', 'bool');
$this->setConfigFromParams($oConfig, 'UserLogo', 'branding', 'user_logo', 'string');
}
$this->setConfigFromParams($oConfig, 'TokenProtection', 'security', 'csrf_protection', 'bool');
@ -4048,13 +4048,6 @@ class Actions
$this->setSettingsFromParams($oSettings, 'EditorDefaultType', 'string');
$this->setSettingsFromParams($oSettings, 'ShowImages', 'bool');
$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
$this->setSettingsFromParams($oSettings, 'InterfaceAnimation', 'string', function ($sValue) {
return (\in_array($sValue,
array(\RainLoop\Enumerations\InterfaceAnimation::NONE,
\RainLoop\Enumerations\InterfaceAnimation::NORMAL,
\RainLoop\Enumerations\InterfaceAnimation::FULL)) ? $sValue :
\RainLoop\Enumerations\InterfaceAnimation::FULL);
});
$this->setSettingsFromParams($oSettings, 'DesktopNotifications', 'bool');
$this->setSettingsFromParams($oSettings, 'UseThreads', 'bool');
$this->setSettingsFromParams($oSettings, 'ReplySameFolder', 'bool');

3
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -88,7 +88,8 @@ class Application extends \RainLoop\Config\AbstractConfig
'login_logo' => array(''),
'login_desc' => array(''),
'login_css' => array(''),
'login_powered' => array(true)
'login_powered' => array(true),
'user_logo' => array('')
),
'contacts' => array(

10
rainloop/v/0.0.0/app/libraries/RainLoop/Enumerations/InterfaceAnimation.php
View file

@ -1,10 +0,0 @@
<?php
namespace RainLoop\Enumerations;
class InterfaceAnimation
{
const NONE = 'None';
const NORMAL = 'Normal';
const FULL = 'Full';
}

2
rainloop/v/0.0.0/app/templates/Views/Admin/AdminPane.html
View file

@ -21,7 +21,7 @@
<div class="b-content" data-bind="nano: true">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div id="rl-settings-subscreen" class="b-settings-content"></div>
<div id="rl-settings-subscreen" class="b-settings-content" style="position: relative; z-index: 2"></div>
</div>
</div>
</div>

49
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
View file

@ -42,7 +42,7 @@
</div>
<br />
<div class="legend">
Login Screen
Login Page
</div>
<div class="control-group">
<label class="control-label">
@ -77,18 +77,6 @@
}"></div>
</div>
</div>
<div class="control-group">
<div class="controls">
<div data-bind="component: {
name: 'Checkbox',
params: {
enable: capa,
label: 'Show &quot;Powered by RainLoop&quot; link',
value: loginPowered
}
}"></div>
</div>
</div>
<div class="control-group">
<label class="control-label">
Custom CSS
@ -106,5 +94,40 @@
}"></div>
</div>
</div>
<div class="control-group">
<div class="controls">
<div data-bind="component: {
name: 'Checkbox',
params: {
enable: capa,
label: 'Show &quot;Powered by RainLoop&quot; link',
value: loginPowered
}
}"></div>
</div>
</div>
<!--
<br />
<div class="legend">
User Page
</div>
<div class="control-group">
<label class="control-label">
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>
</div>

3
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -58,7 +58,6 @@
</div>
<div class="message-fixed-button-toolbar clearfix" data-bind="visible: message">
<!--<div class="message-fixed-button-toolbar clearfix" data-bind="visible: message, initFixedTrigger: ['.b-message-view-wrapper', 20]">-->
<nobr>
<div class="btn-group colored-toggle pull-right">
<a class="btn btn-dark-disabled-border buttonReply" data-tooltip-placement="bottom"
@ -187,7 +186,7 @@
</div>
<div data-bind="visible: message">
<div class="messageItemHeader">
<div class="messageItemHeader" data-bind="css: {'emptySubject': '' === viewSubject()}">
<div>
<img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }">
<div style="overflow: hidden;">

2
rainloop/v/0.0.0/app/templates/Views/User/SettingsPane.html
View file

@ -11,7 +11,7 @@
<div class="b-content" data-bind="nano: true">
<div class="content g-scrollbox">
<div class="content-wrapper">
<div id="rl-settings-subscreen" class="b-settings-content"></div>
<div id="rl-settings-subscreen" class="b-settings-content" style="position: relative; z-index: 2"></div>
</div>
</div>
</div>