Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add "labs.domain_list_limit" (#1055)

Browse source
This commit is contained in:
RainLoop Team 2016-06-04 21:06:14 +03:00
parent 4f2a8b5b9b
commit 613ab074d9
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Settings/Admin/Domains.js
View file

@ -25,6 +25,9 @@
}, this); }, this);
this.domainForDeletion = ko.observable(null).deleteAccessHelper(); this.domainForDeletion = ko.observable(null).deleteAccessHelper();
this.onDomainListChangeRequest = _.bind(this.onDomainListChangeRequest, this);
this.onDomainLoadRequest = _.bind(this.onDomainLoadRequest, this);
} }
DomainsAdminSettings.prototype.createDomain = function () DomainsAdminSettings.prototype.createDomain = function ()
@ -35,13 +38,13 @@
DomainsAdminSettings.prototype.deleteDomain = function (oDomain) DomainsAdminSettings.prototype.deleteDomain = function (oDomain)
{ {
this.domains.remove(oDomain); this.domains.remove(oDomain);
Remote.domainDelete(_.bind(this.onDomainListChangeRequest, this), oDomain.name); Remote.domainDelete(this.onDomainListChangeRequest, oDomain.name);
}; };
DomainsAdminSettings.prototype.disableDomain = function (oDomain) DomainsAdminSettings.prototype.disableDomain = function (oDomain)
{ {
oDomain.disabled(!oDomain.disabled()); oDomain.disabled(!oDomain.disabled());
Remote.domainDisable(_.bind(this.onDomainListChangeRequest, this), oDomain.name, oDomain.disabled()); Remote.domainDisable(this.onDomainListChangeRequest, oDomain.name, oDomain.disabled());
}; };
DomainsAdminSettings.prototype.onBuild = function (oDom) DomainsAdminSettings.prototype.onBuild = function (oDom)
@ -52,7 +55,7 @@
var oDomainItem = ko.dataFor(this); var oDomainItem = ko.dataFor(this);
if (oDomainItem) if (oDomainItem)
{ {
Remote.domain(_.bind(self.onDomainLoadRequest, self), oDomainItem.name); Remote.domain(self.onDomainLoadRequest, oDomainItem.name);
} }
}) })
; ;

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.10.1", "version": "1.10.1",
"release": "121", "release": "123",
"private": true, "private": true,
"ownCloudPackageVersion": "4.17", "ownCloudPackageVersion": "4.17",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",

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

@ -4082,8 +4082,20 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
$sSearch = (string) $this->GetActionParam('Search', ''); $sSearch = (string) $this->GetActionParam('Search', '');
$iOffset = 0; $iOffset = 0;
$iLimit = 99;
$sSearch = ''; $sSearch = '';
$iLimit = $this->Config()->Get('labs', 'domain_list_limit', 99);
$sSearch = \trim($sSearch);
if ($iOffset < 0)
{
$iOffset = 0;
}
if ($iLimit < 20)
{
$iLimit = 20;
}
return $this->DefaultResponse(__FUNCTION__, return $this->DefaultResponse(__FUNCTION__,
$this->DomainProvider()->GetList($iOffset, $iLimit, $sSearch)); $this->DomainProvider()->GetList($iOffset, $iLimit, $sSearch));

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

@ -418,6 +418,7 @@ Enables caching in the system'),
'imap_timeout' => array(300), 'imap_timeout' => array(300),
'smtp_timeout' => array(60), 'smtp_timeout' => array(60),
'sieve_timeout' => array(10), 'sieve_timeout' => array(10),
'domain_list_limit' => array(99),
'mail_func_clear_headers' => array(true), 'mail_func_clear_headers' => array(true),
'mail_func_additional_parameters' => array(false), 'mail_func_additional_parameters' => array(false),
'favicon_status' => array(true), 'favicon_status' => array(true),