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

Resolve #1828

Browse source
This commit is contained in:
the-djmaze 2024-11-11 23:57:41 +01:00
parent bc6a2b67c0
commit 91ff43e6ab
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,8 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
testUsername() { testUsername() {
Remote.request('AdminDomainMatch', Remote.request('AdminDomainMatch',
(iError, oData) => { (iError, oData) => {
if (oData?.Result?.domain) { if (oData?.Result?.name) {
alert(`${oData.Result.email} matched domain: ${oData.Result.domain.name}`); alert(`${oData.Result.email} matched domain: ${oData.Result.name}`);
} else { } else {
alert('No domain match'); alert('No domain match');
} }

3
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
View file

@ -71,7 +71,8 @@ trait AdminDomains
return $this->DefaultResponse(array( return $this->DefaultResponse(array(
'email' => $sEmail, 'email' => $sEmail,
'login' => $sCredentials['imapUser'], 'login' => $sCredentials['imapUser'],
'domain' => $sCredentials['domain'], 'name' => $sCredentials['domain'] ? $sCredentials['domain']->Name() : null,
// 'domain' => $sCredentials['domain'],
'whitelist' => $sCredentials['domain'] ? $sCredentials['domain']->ValidateWhiteList($sEmail) : null 'whitelist' => $sCredentials['domain'] ? $sCredentials['domain']->ValidateWhiteList($sEmail) : null
)); ));
} }