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

Admin panel forms improvement

Browse source 
Domain system  improvement
This commit is contained in:
RainLoop Team 2014-04-26 03:41:47 +04:00
parent 79721f60df
commit de0648a392
17 changed files with 265 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rainloop/v/0.0.0/app/libraries/RainLoop/Domain.php
View file

@ -63,11 +63,6 @@ class Domain
*/
private $sWhiteList;
/**
* @var bool
*/
private $bDisabled;
/**
* @param string $sName
* @param string $sIncHost
@ -95,7 +90,6 @@ class Domain
$this->bOutShortLogin = $bOutShortLogin;
$this->bOutAuth = $bOutAuth;
$this->sWhiteList = \trim($sWhiteList);
$this->bDisabled = false;
}
/**
@ -125,6 +119,7 @@ class Domain
}
/**
* @param string $sName
* @param array $aDomain
*
* @return \RainLoop\Domain|null
@ -171,14 +166,6 @@ class Domain
return str_replace('"', '\\"', $sStr);
}
/**
* @param bool0 $bDisabled
*/
public function SetDisabled($bDisabled)
{
$this->bDisabled = (bool) $bDisabled;
}
public function Normalize()
{
$this->sIncHost = \trim($this->sIncHost);
@ -299,11 +286,13 @@ class Domain
}
/**
* @param string $sRealDomainName = ''
*
* @return string
*/
public function IncHost()
public function IncHost($sRealDomainName = '')
{
return $this->sIncHost;
return 0 < \strlen($sRealDomainName) ? \str_replace('{domain:name}', $sRealDomainName, $this->sIncHost) : $this->sIncHost;
}
/**
@ -331,11 +320,12 @@ class Domain
}
/**
* @param string $sRealDomainName = ''
* @return string
*/
public function OutHost()
public function OutHost($sRealDomainName = '')
{
return $this->sOutHost;
return 0 < \strlen($sRealDomainName) ? \str_replace('{domain:name}', $sRealDomainName, $this->sOutHost) : $this->sOutHost;
}
/**
@ -378,14 +368,6 @@ class Domain
return $this->sWhiteList;
}
/**
* @return bool
*/
public function Disabled()
{
return $this->bDisabled;
}
/**
* @param string $sEmail
* @param string $sLogin = ''