Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-07 00:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Fixed wrong behavior when setting mail parameters

Browse Source 
* [MOD] Improved email message templates

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-11-19 18:44:18 +01:00
parent afdfa80d8f
commit 13e12baaf0
13 changed files with 98 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/modules/web/Controllers/ConfigMailController.php
View File

@@ -68,7 +68,9 @@ final class ConfigMailController extends SimpleControllerBase
$mailRecipients = ConfigUtil::mailAddressesAdapter($this->request->analyzeString('mail_recipients'));
// Valores para la configuración del Correo
if ($mailEnabled && (!$mailServer || !$mailFrom || count($mailRecipients) === 0)) {
if ($mailEnabled
&& (empty($mailServer) || empty($mailFrom) || empty($mailRecipients))
) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Missing Mail parameters'));
}
@@ -106,9 +108,16 @@ final class ConfigMailController extends SimpleControllerBase
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('No changes'));
}
return $this->saveConfig($configData, $this->config, function () use ($eventMessage) {
$this->eventDispatcher->notifyEvent('save.config.mail', new Event($this, $eventMessage));
});
return $this->saveConfig(
$configData,
$this->config,
function () use ($eventMessage) {
$this->eventDispatcher->notifyEvent(
'save.config.mail',
new Event($this, $eventMessage)
);
}
);
}
/**
@@ -125,11 +134,11 @@ final class ConfigMailController extends SimpleControllerBase
$mailParams->port = $this->request->analyzeInt('mail_port', 25);
$mailParams->security = $this->request->analyzeString('mail_security');
$mailParams->from = $this->request->analyzeEmail('mail_from');
$mailParams->mailAuthenabled = $this->request->analyzeBool('mail_authenabled', false);
$mailParams->mailAuthenabled = $this->request->analyzeBool('mail_auth_enabled', false);
$mailRecipients = ConfigUtil::mailAddressesAdapter($this->request->analyzeString('mail_recipients'));
// Valores para la configuración del Correo
if (!$mailParams->server || empty($mailParams->from) || empty($mailRecipients)) {
if (empty($mailParams->server) || empty($mailParams->from) || empty($mailRecipients)) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Missing Mail parameters'));
}
@@ -164,7 +173,8 @@ final class ConfigMailController extends SimpleControllerBase
/**
* @return bool
*/
protected function initialize()
protected
function initialize()
{
try {
$this->checks();