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

Return false on more server issues regarding domains control #1513

Browse source
This commit is contained in:
the-djmaze 2024-03-24 17:22:57 +01:00
parent 6df5802f97
commit 2a116612be
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
View file

@ -123,20 +123,27 @@ class DefaultDomain implements DomainInterface
public function Save(\RainLoop\Model\Domain $oDomain) : bool public function Save(\RainLoop\Model\Domain $oDomain) : bool
{ {
$this->Delete($oDomain->Name());
$sRealFileName = static::encodeFileName($oDomain->Name()); $sRealFileName = static::encodeFileName($oDomain->Name());
\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.json', \json_encode($oDomain, \JSON_PRETTY_PRINT)); if (!$sRealFileName) {
return false;
}
$this->Delete($oDomain->Name());
\RainLoop\Utils::saveFile("{$this->sDomainPath}/{$sRealFileName}.json", \json_encode($oDomain, \JSON_PRETTY_PRINT));
$this->oCacher && $this->oCacher->Delete(static::CACHE_KEY); $this->oCacher && $this->oCacher->Delete(static::CACHE_KEY);
return true; return true;
} }
public function SaveAlias(string $sName, string $sTarget) : bool public function SaveAlias(string $sName, string $sTarget) : bool
{ {
// $this->Delete($sName);
// $sTarget = \SnappyMail\IDN::toAscii($sTarget); // $sTarget = \SnappyMail\IDN::toAscii($sTarget);
// $sTarget = static::encodeFileName($sTarget);
$sTarget = \strtolower(\idn_to_ascii($sTarget)); $sTarget = \strtolower(\idn_to_ascii($sTarget));
$sRealFileName = static::encodeFileName($sName); $sRealFileName = static::encodeFileName($sName);
\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.alias', $sTarget); if (!$sRealFileName || !$sTarget/* || !\is_readable("{$this->sDomainPath}/{$sTarget}.json")*/) {
return false;
}
// $this->Delete($sName);
\RainLoop\Utils::saveFile("{$this->sDomainPath}/{$sRealFileName}.alias", $sTarget);
$this->oCacher && $this->oCacher->Delete(static::CACHE_KEY); $this->oCacher && $this->oCacher->Delete(static::CACHE_KEY);
return true; return true;
} }
@ -170,7 +177,8 @@ class DefaultDomain implements DomainInterface
} else { } else {
$aResult = \array_filter($aResult, fn($v) => $v !== $sName); $aResult = \array_filter($aResult, fn($v) => $v !== $sName);
} }
\RainLoop\Utils::saveFile($this->sDomainPath.'/disabled', \implode("\n", \array_unique($aResult))); $aResult = \array_unique($aResult);
\RainLoop\Utils::saveFile($this->sDomainPath.'/disabled', \implode("\n", $aResult));
return $this->getDisabled() === $aResult; return $this->getDisabled() === $aResult;
} }
return false; return false;