From 6e2aaaaa31afc31b0ed216ded52b3b0ab9eb61ad Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 25 Jun 2014 15:32:40 +0200
Subject: [PATCH] Fix test mail behaviour
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
---
settings/admin/controller.php | 2 +-
settings/js/admin.js | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index d0dcc49f29..7ced57791e 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -86,7 +86,7 @@ class Controller {
$defaults = new \OC_Defaults();
try {
- \OC_Mail::send($email, $_POST['user'],
+ \OC_Mail::send($email, \OC_User::getDisplayName(),
$l->t('test email settings'),
$l->t('If you received this email, the settings seem to be correct.'),
\OCP\Util::getDefaultEmailAddress('no-reply'), $defaults->getName());
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 7036f6dbf2..a202feb4f6 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -123,10 +123,10 @@ $(document).ready(function(){
});
});
- $('#sendtestemail').click(function(){
+ $('#sendtestemail').click(function(event){
+ event.preventDefault();
OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...'));
- var post = $( "#sendtestemail" ).serialize();
- $.post(OC.generateUrl('/settings/admin/mailtest'), post, function(data){
+ $.post(OC.generateUrl('/settings/admin/mailtest'), '', function(data){
OC.msg.finishedAction('#sendtestmail_msg', data);
});
});
--
GitLab