Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-05 23:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2013-12-13 03:23:47 +04:00
parent ff8ef2012b
commit c9b5194baf
33 changed files with 296 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -769,7 +769,7 @@ class Actions
public function IsAdminLoggined($bThrowExceptionOnFalse = true)
{
$bResult = false;
if ($this->Config()->Get('labs', 'allow_admin_panel', true))
if ($this->Config()->Get('security', 'allow_admin_panel', true))
{
$aAdminHash = \RainLoop\Utils::DecodeKeyValues($this->getAdminAuthToken());
if ((!empty($aAdminHash[0]) && !empty($aAdminHash[1]) &&
@ -884,7 +884,7 @@ class Actions
'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', ''),
'Token' => $oConfig->Get('security', 'csrf_protection', false) ? \RainLoop\Utils::GetCsrfToken() : '',
'InIframe' => (bool) $oConfig->Get('labs', 'in_iframe', false),
'AllowAdminPanel' => (bool) $oConfig->Get('labs', 'allow_admin_panel', true),
'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),
'CustomLoginLink' => $oConfig->Get('labs', 'custom_login_link', ''),
'CustomLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
'AllowAdditionalAccounts' => (bool) $oConfig->Get('webmail', 'allow_additional_accounts', true),
@ -1896,7 +1896,7 @@ class Actions
$this->Logger()->AddSecret($sPassword);
if (0 === strlen($sLogin) || 0 === strlen($sPassword) ||
!$this->Config()->Get('labs', 'allow_admin_panel', true) ||
!$this->Config()->Get('security', 'allow_admin_panel', true) ||
$sLogin !== $this->Config()->Get('security', 'admin_login', '') ||
!$this->Config()->ValidatePassword($sPassword))
{

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

@ -222,7 +222,6 @@ Enables caching in the system'),
'custom_login_link' => array(''),
'custom_logout_link' => array(''),
'allow_external_login' => array(false),
'allow_admin_panel' => array(true),
'fast_cache_memcache_host' => array('127.0.0.1'),
'fast_cache_memcache_port' => array(11211),
'fast_cache_memcache_expire' => array(43200),

8
rainloop/v/0.0.0/app/templates/Views/ComposeAttachment.html
View file

@ -1,9 +1,9 @@
<div class="b-attacment">
<label>
<input type="checkbox" data-bind="checked: enabled" />
<label data-bind="click: function () { enabled(!enabled()); }">
<i class="checkboxAttachment" data-bind="css: enabled() ? 'checkboxMessage icon-checkbox-checked' : 'checkboxMessage icon-checkbox-unchecked'"></i>
<!--<input type="checkbox" data-bind="checked: enabled" />-->
&nbsp;&nbsp;
<span class="name" data-bind="text: fileName"></span>
(<span class="size" data-bind="text: friendlySize"></span>)
</label>
</div>
<br />
</div>

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

@ -10,5 +10,4 @@
<div class="error">
<span data-bind="text: error"></span>
</div>
</div>
<br />
</div>

10
rainloop/v/0.0.0/app/templates/Views/MailMessageList.html
View file

@ -7,6 +7,7 @@
<i class="icon-spinner-2" data-bind="css: {'animated': messageListCompleteLoadingThrottle}"></i>
</a>
</div>
<div class="btn-group">&nbsp;</div>
<div class="btn-group">
<a class="btn dropdown-toggle buttonMove" data-toggle="dropdown" data-placement="bottom" data-bind="command: moveCommand, tooltip: 'MESSAGE_LIST/BUTTON_MOVE_TO'">
<i class="icon-legacyfilemanager"></i>
@ -19,19 +20,20 @@
</li>
</ul>
</div>
<div class="btn-group">&nbsp;</div>
<div class="btn-group">
<a class="btn btn-danger buttonDelete" data-placement="bottom" data-bind="command: deleteCommand, tooltip: 'MESSAGE_LIST/BUTTON_DELETE'">
<i class="icon-trash icon-white"></i>
<span data-bind="text: 1 < messageListCheckedOrSelectedUidsWithSubMails().length ? ' (' + messageListCheckedOrSelectedUidsWithSubMails().length + ')' : ''"></span>
</a>
</div>
<div class="btn-group" data-placement="bottom" data-bind="visible: !isSpamFolder(), tooltip: 'MESSAGE_LIST/BUTTON_SPAM'">
<a class="btn buttonSpam" data-bind="command: spamCommand">
<span style="font-size:10px;">&nbsp;</span>
<a class="btn buttonSpam" data-placement="bottom" data-bind="visible: !isSpamFolder(), command: spamCommand, tooltip: 'MESSAGE_LIST/BUTTON_SPAM'">
<i class="icon-bug"></i>
</a>
</div>
<div class="btn-group">&nbsp;</div>
<div class="btn-group">
<a class="btn dropdown-toggle buttonMore" data-toggle="dropdown" data-placement="right" data-bind="tooltip: 'MESSAGE_LIST/BUTTON_MORE'">
<a class="btn dropdown-toggle buttonMore" data-toggle="dropdown" data-placement="bottom" data-bind="tooltip: 'MESSAGE_LIST/BUTTON_MORE'">
<i class="icon-reorder"></i>
</a>
<ul class="dropdown-menu g-ui-menu">

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

@ -7,6 +7,7 @@
<i class="icon-remove"></i>
</a>
</div>
<div class="btn-group">&nbsp;</div>
<div class="btn-group" data-placement="bottom" data-bind="visible: $root.isDraftFolder(), tooltip: 'MESSAGE/BUTTON_EDIT'">
<a class="btn btn-success buttonEdit" data-bind="command: $root.messageEditCommand">
<i class="icon-edit2 icon-white"></i>
@ -23,15 +24,19 @@
<i class="icon-forward"></i>
</a>
</div>
<!--
<!-- <div class="btn-group">&nbsp;</div>
<div class="btn-group">
<a class="btn btn-danger buttonDelete" data-placement="bottom" data-bind="command: $root.deleteCommand, tooltip: 'MESSAGE/BUTTON_DELETE'">
<i class="icon-trash icon-white"></i>
</a>
</div>
-->
<span style="font-size:10px;" data-bind="visible: !$root.isDraftFolder()">&nbsp;</span>
<a class="btn buttonSpam" data-placement="bottom" data-bind="visible: !$root.isDraftFolder(), command: $root.spamCommand, tooltip: 'MESSAGE/BUTTON_SPAM'">
<i class="icon-bug"></i>
</a>
</div>-->
<div class="btn-group">&nbsp;</div>
<div class="btn-group">
<a class="btn dropdown-toggle buttonMore" data-placement="right" data-toggle="dropdown" data-bind="command: $root.messageVisibilityCommand, tooltip: 'MESSAGE/BUTTON_MORE'">
<a class="btn dropdown-toggle buttonMore" data-placement="bottom" data-toggle="dropdown" data-bind="command: $root.messageVisibilityCommand, tooltip: 'MESSAGE/BUTTON_MORE'">
<i class="icon-reorder"></i>
</a>
<ul class="dropdown-menu g-ui-menu">
@ -74,6 +79,15 @@
</li>
</ul>
</div>
<div class="btn-group">&nbsp;</div>
<div class="btn-group" data-bind="visible: !$root.usePreviewPane()">
<a class="btn buttonUp" data-bind="command: $root.goUpCommand">
<i class="icon-arrow-left"></i>
</a>
<a class="btn buttonDown" data-bind="command: $root.goDownCommand">
<i class="icon-arrow-right-2"></i>
</a>
</div>
</div>
</div>
<div class="b-content thm-message-view-background-color">