fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improvement in email configuration with sendmail engine

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-29 16:09:54 -04:00
parent 410d52ef6f
commit f62d81395a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/controllers/adminProxy.php
View File

@@ -374,8 +374,8 @@ class adminProxy extends HttpProxyController
define("FAILED", 'FAILED'); define("FAILED", 'FAILED');
$mail_to = $_POST['mail_to']; $mail_to = $_POST['mail_to'];
$send_test_mail = $_POST['send_test_mail']; $send_test_mail = $_POST['send_test_mail'];
$_POST['FROM_NAME'] = G::LoadTranslation("ID_MESS_TEST_BODY");
$_POST['FROM_EMAIL'] = ($_POST["from_mail"] != "" && preg_match($eregMail, $_POST["from_mail"]))? $_POST["from_mail"] : ""; $_POST['FROM_EMAIL'] = ($_POST["from_mail"] != "" && preg_match($eregMail, $_POST["from_mail"]))? $_POST["from_mail"] : "";
$_POST['FROM_NAME'] = $_POST["from_name"] != "" ? $_POST["from_name"] : G::LoadTranslation("ID_MESS_TEST_BODY");
$_POST['MESS_ENGINE'] = 'MAIL'; $_POST['MESS_ENGINE'] = 'MAIL';
$_POST['MESS_SERVER'] = 'localhost'; $_POST['MESS_SERVER'] = 'localhost';
$_POST['MESS_PORT'] = 25; $_POST['MESS_PORT'] = 25;

8
workflow/engine/templates/admin/emails.js
View File

@@ -376,9 +376,10 @@ Ext.onReady(function(){
xtype: "textfield", xtype: "textfield",
id: "fromMail", id: "fromMail",
name: "fromMail", name: "fromMail",
fieldLabel: "From Mail", //"From Mail", fieldLabel: _('ID_FROM_EMAIL'), //"From Mail",
width: 250, width: 250,
disabled: true disabled: true,
vtype:'email'
}, },
{ {
xtype: 'textfield', xtype: 'textfield',
@@ -849,7 +850,8 @@ var testMethod = function()
request : 'mailTestMail_Show', request : 'mailTestMail_Show',
mail_to : 'admin@processmaker.com', mail_to : 'admin@processmaker.com',
send_test_mail : 'yes', send_test_mail : 'yes',
from_mail : Ext.getCmp("fromMail").getValue() from_mail : Ext.getCmp("fromMail").getValue(),
from_name : Ext.getCmp("eFromName").getValue()
}; };
Ext.getCmp('step11').setText('<span id="rstep11"></span> '+_('LOGIN_VERIFY_MSG')+' <b> Mail Transport Agent </b>', false); Ext.getCmp('step11').setText('<span id="rstep11"></span> '+_('LOGIN_VERIFY_MSG')+' <b> Mail Transport Agent </b>', false);