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

Improvement in email configuration with sendmail engine, part 2

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-04-29 16:51:17 -04:00
committed by Erik Amaru Ortiz
parent 11d48e8073
commit c4a0ab336a
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,8 +528,8 @@ class adminProxy extends HttpProxyController
try { try {
$eregMail = "/^[0-9a-zA-Z]+(?:[._][0-9a-zA-Z]+)*@[0-9a-zA-Z]+(?:[._-][0-9a-zA-Z]+)*\.[0-9a-zA-Z]{2,3}$/"; $eregMail = "/^[0-9a-zA-Z]+(?:[._][0-9a-zA-Z]+)*@[0-9a-zA-Z]+(?:[._-][0-9a-zA-Z]+)*\.[0-9a-zA-Z]{2,3}$/";
$_POST['FROM_NAME'] = G::LoadTranslation('ID_MESS_TEST_BODY'); $_POST['FROM_EMAIL'] = ($fromMail != "" && preg_match($eregMail, $fromMail))? $fromMail : "";
$_POST["FROM_EMAIL"] = ($fromMail != "" && preg_match($eregMail, $fromMail))? $fromMail : $user; $_POST['FROM_NAME'] = $_POST["fromName"] != "" ? $_POST["fromName"] : G::LoadTranslation("ID_MESS_TEST_BODY");
$_POST['MESS_ENGINE'] = 'PHPMAILER'; $_POST['MESS_ENGINE'] = 'PHPMAILER';
$_POST['MESS_SERVER'] = $server; $_POST['MESS_SERVER'] = $server;
$_POST['MESS_PORT'] = $port; $_POST['MESS_PORT'] = $port;

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

@@ -80,7 +80,7 @@ Ext.onReady(function(){
else { else {
Ext.getCmp('eMailto').setVisible(false); Ext.getCmp('eMailto').setVisible(false);
Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('eMailto').setValue(' '); Ext.getCmp('eMailto').setValue('');
} }
} }
@@ -112,7 +112,7 @@ Ext.onReady(function(){
else { else {
Ext.getCmp('eMailto').setVisible(false); Ext.getCmp('eMailto').setVisible(false);
Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('eMailto').setValue(' '); Ext.getCmp('eMailto').setValue('');
} }
Ext.getCmp('UseSecureConnection').setVisible(false); Ext.getCmp('UseSecureConnection').setVisible(false);
@@ -166,8 +166,8 @@ Ext.onReady(function(){
Ext.getCmp('UseSecureConnection').setVisible(false); Ext.getCmp('UseSecureConnection').setVisible(false);
Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp("fromMail").setVisible(true); //Ext.getCmp("fromMail").setVisible(true);
Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true); //Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true);
} else { } else {
Ext.getCmp('Server').setVisible(true); Ext.getCmp('Server').setVisible(true);
Ext.getCmp('Server').getEl().up('.x-form-item').setDisplayed(true); // hide label Ext.getCmp('Server').getEl().up('.x-form-item').setDisplayed(true); // hide label
@@ -178,8 +178,8 @@ Ext.onReady(function(){
Ext.getCmp('AccountFrom').setVisible(true); Ext.getCmp('AccountFrom').setVisible(true);
Ext.getCmp('AccountFrom').getEl().up('.x-form-item').setDisplayed(true); Ext.getCmp('AccountFrom').getEl().up('.x-form-item').setDisplayed(true);
Ext.getCmp("fromMail").setVisible(true); //Ext.getCmp("fromMail").setVisible(true);
Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true); //Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true);
if (Ext.getCmp('RequireAuthentication').getValue() === true) if (Ext.getCmp('RequireAuthentication').getValue() === true)
{ {
@@ -463,14 +463,14 @@ Ext.onReady(function(){
Ext.getCmp('Password').setVisible(false); Ext.getCmp('Password').setVisible(false);
Ext.getCmp('Password').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('Password').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('eFromName').setVisible(false); //Ext.getCmp('eFromName').setVisible(false);
Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(false); //Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('UseSecureConnection').setVisible(false); Ext.getCmp('UseSecureConnection').setVisible(false);
Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp("fromMail").setVisible(true); //Ext.getCmp("fromMail").setVisible(false);
Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true); //Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(false);
if (typeof (res.data.MESS_FROM_MAIL) != "undefined"){ if (typeof (res.data.MESS_FROM_MAIL) != "undefined"){
Ext.getCmp("fromMail").setValue(res.data.MESS_FROM_MAIL); Ext.getCmp("fromMail").setValue(res.data.MESS_FROM_MAIL);
@@ -486,8 +486,8 @@ Ext.onReady(function(){
Ext.getCmp('RequireAuthentication').getEl().up('.x-form-item').setDisplayed(true); Ext.getCmp('RequireAuthentication').getEl().up('.x-form-item').setDisplayed(true);
Ext.getCmp('AccountFrom').setVisible(true); Ext.getCmp('AccountFrom').setVisible(true);
Ext.getCmp('AccountFrom').getEl().up('.x-form-item').setDisplayed(true); Ext.getCmp('AccountFrom').getEl().up('.x-form-item').setDisplayed(true);
Ext.getCmp("fromMail").setVisible(true); //Ext.getCmp("fromMail").setVisible(true);
Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true); //Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(true);
if (Ext.getCmp('RequireAuthentication').getValue() === true) if (Ext.getCmp('RequireAuthentication').getValue() === true)
{ {
@@ -500,8 +500,8 @@ Ext.onReady(function(){
// Ext.getCmp('AccountFrom').allowBlank = true; // Ext.getCmp('AccountFrom').allowBlank = true;
} }
Ext.getCmp('eFromName').setVisible(true); //Ext.getCmp('eFromName').setVisible(true);
Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(true); //Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(true);
if(!Ext.getCmp('UseSecureConnection').getValue()) { if(!Ext.getCmp('UseSecureConnection').getValue()) {
Ext.getCmp('UseSecureConnection').setValue('No'); Ext.getCmp('UseSecureConnection').setValue('No');
@@ -534,13 +534,13 @@ Ext.onReady(function(){
Ext.getCmp('SendaTestMail').setValue(res.data.MESS_TRY_SEND_INMEDIATLY); Ext.getCmp('SendaTestMail').setValue(res.data.MESS_TRY_SEND_INMEDIATLY);
if(!res.data.MAIL_TO) { if(!res.data.MAIL_TO) {
Ext.getCmp('eMailto').setValue(' '); Ext.getCmp('eMailto').setValue('');
} }
else { else {
Ext.getCmp('eMailto').setValue(res.data.MAIL_TO); Ext.getCmp('eMailto').setValue(res.data.MAIL_TO);
} }
if(!res.data.MESS_FROM_NAME) { if(!res.data.MESS_FROM_NAME) {
Ext.getCmp('eFromName').setValue(' '); Ext.getCmp('eFromName').setValue('');
} else { } else {
Ext.getCmp('eFromName').setValue(res.data.MESS_FROM_NAME); Ext.getCmp('eFromName').setValue(res.data.MESS_FROM_NAME);
} }
@@ -588,16 +588,16 @@ Ext.onReady(function(){
Ext.getCmp('SendaTestMail').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('SendaTestMail').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('eMailto').setVisible(false); Ext.getCmp('eMailto').setVisible(false);
Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('eMailto').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('eFromName').setVisible(false); //Ext.getCmp('eFromName').setVisible(false);
Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(false); //Ext.getCmp('eFromName').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('UseSecureConnection').setVisible(false); Ext.getCmp('UseSecureConnection').setVisible(false);
Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('UseSecureConnection').getEl().up('.x-form-item').setDisplayed(false);
Ext.getCmp('Test').setVisible(false); Ext.getCmp('Test').setVisible(false);
Ext.getCmp('SaveChanges').setVisible(false); Ext.getCmp('SaveChanges').setVisible(false);
Ext.getCmp('UnEdit').setVisible(false); Ext.getCmp('UnEdit').setVisible(false);
Ext.getCmp('labelUn').setVisible(false); Ext.getCmp('labelUn').setVisible(false);
Ext.getCmp("fromMail").setVisible(false); //Ext.getCmp("fromMail").setVisible(false);
Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(false); //Ext.getCmp("fromMail").getEl().up('.x-form-item').setDisplayed(false);
}); });
@@ -901,7 +901,8 @@ var testMethod = function()
SendaTestMail : Ext.getCmp('SendaTestMail').getValue() , SendaTestMail : Ext.getCmp('SendaTestMail').getValue() ,
eMailto : Ext.getCmp('eMailto').getValue(), eMailto : Ext.getCmp('eMailto').getValue(),
login : Ext.getCmp('AccountFrom').getValue(), login : Ext.getCmp('AccountFrom').getValue(),
fromMail : Ext.getCmp("fromMail").getValue() fromMail : Ext.getCmp("fromMail").getValue(),
fromName : Ext.getCmp("eFromName").getValue()
}; };
Ext.getCmp('step1').setText('<span id="rstep1"></span> '+_('RESOLVING_NAME')+' <b>'+params.server+'</b>', false); Ext.getCmp('step1').setText('<span id="rstep1"></span> '+_('RESOLVING_NAME')+' <b>'+params.server+'</b>', false);