mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-05 15:37:03 +03:00
Admin panel forms improvement
Domain system improvement
This commit is contained in:
parent
79721f60df
commit
de0648a392
17 changed files with 265 additions and 179 deletions
|
|
@ -35,13 +35,13 @@ class Domain extends \RainLoop\Providers\AbstractProvider
|
|||
|
||||
/**
|
||||
* @param string $sName
|
||||
* @param bool $bDefaultOnNull = false
|
||||
* @param bool $bFindWithWildCard = false
|
||||
*
|
||||
* @return \RainLoop\Domain|null
|
||||
*/
|
||||
public function Load($sName, $bDefaultOnNull = false)
|
||||
public function Load($sName, $bFindWithWildCard = false)
|
||||
{
|
||||
return $this->oDriver->Load($sName, $bDefaultOnNull);
|
||||
return $this->oDriver->Load($sName, $bFindWithWildCard);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -122,6 +122,11 @@ class Domain extends \RainLoop\Providers\AbstractProvider
|
|||
$bOutAuth = '1' === (string) $oActions->GetActionParam('OutAuth', '1');
|
||||
$sWhiteList = (string) $oActions->GetActionParam('WhiteList', '');
|
||||
|
||||
if (0 < \strlen($sName) && 0 < strlen($sNameForTest) && false === \strpos($sName, '*'))
|
||||
{
|
||||
$sNameForTest = '';
|
||||
}
|
||||
|
||||
if (0 < strlen($sName) || 0 < strlen($sNameForTest))
|
||||
{
|
||||
$oDomain = 0 < strlen($sNameForTest) ? null : $this->Load($sName);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue