Some small cleanups and fixes

This commit is contained in:
the-djmaze 2022-02-24 12:43:44 +01:00
parent e7c7b8ed53
commit 962ddde1f3
9 changed files with 34 additions and 39 deletions

View file

@ -16,9 +16,7 @@ class Settings extends \RainLoop\Providers\AbstractProvider
public function Load(\RainLoop\Model\Account $oAccount) : \RainLoop\Settings
{
$oSettings = new \RainLoop\Settings();
$oSettings->InitData($this->oDriver->Load($oAccount));
return $oSettings;
return new \RainLoop\Settings($this->oDriver->Load($oAccount));
}
public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool

View file

@ -7,14 +7,9 @@ class Settings
/**
* @var array
*/
protected $aData;
protected $aData = array();
public function __construct()
{
$this->aData = array();
}
public function InitData(array $aData) : void
public function __construct(array $aData)
{
$this->aData = $aData;
}

View file

@ -29,7 +29,7 @@
<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
<br>
<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: imapServer, hasfocus: imapServerFocus">
data-bind="textInput: imapHost, hasfocus: imapHostFocus">
</div>
<div class="span2">
<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
@ -71,7 +71,7 @@
<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
<br>
<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: smtpServer, hasfocus: smtpServerFocus">
data-bind="textInput: smtpHost, hasfocus: smtpHostFocus">
</div>
<div class="span2">
<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
@ -152,7 +152,7 @@
<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
<br>
<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: sieveServer, hasfocus: sieveServerFocus">
data-bind="textInput: sieveHost, hasfocus: sieveHostFocus">
</div>
<div class="span2">
<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>