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

Adding trim to the fields referents to the mail configuration

Browse Source
This commit is contained in:
Hector Cortez
2011-01-20 16:51:55 +00:00
parent b539b220fb
commit a32b91eb60
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/js/setup/emails.js
View File

@@ -9,7 +9,7 @@ function verifyFields(oForm) {
switch (getField('MESS_ENGINE').value) { switch (getField('MESS_ENGINE').value) {
case 'PHPMAILER': case 'PHPMAILER':
verifyPassword = 0; verifyPassword = 0;
oAuxS = $('form[MESS_SERVER]').value; oAuxS = $('form[MESS_SERVER]').value.trim();
if (oAuxS == '') { if (oAuxS == '') {
new leimnud.module.app.alert().make({ new leimnud.module.app.alert().make({
label : G_STRINGS.ID_SERVER_REQUIRED label : G_STRINGS.ID_SERVER_REQUIRED
@@ -56,7 +56,7 @@ function verifyFields(oForm) {
break; break;
case 'MAIL': case 'MAIL':
if ($('form[MESS_TEST_MAIL]').checked) { if ($('form[MESS_TEST_MAIL]').checked) {
oAuxE = $('form[MESS_TEST_MAIL_TO]').value; oAuxE = $('form[MESS_TEST_MAIL_TO]').value.trim();
if (oAuxE == '') { if (oAuxE == '') {
new leimnud.module.app.alert().make({ new leimnud.module.app.alert().make({
label : G_STRINGS.ID_EMAIL_REQUIRED label : G_STRINGS.ID_EMAIL_REQUIRED
@@ -74,7 +74,7 @@ function verifyFields(oForm) {
function testConnection() { function testConnection() {
resultset = true; resultset = true;
params = 'srv=' + getField('MESS_SERVER').value; params = 'srv=' + getField('MESS_SERVER').value.trim();
params += '&port='+ ((getField('MESS_PORT').value.trim() != '') ? getField('MESS_PORT').value : 'default'); params += '&port='+ ((getField('MESS_PORT').value.trim() != '') ? getField('MESS_PORT').value : 'default');
params += '&account=' + getField('MESS_ACCOUNT').value; params += '&account=' + getField('MESS_ACCOUNT').value;
params += '&passwd=' + getField('MESS_PASSWORD').value; params += '&passwd=' + getField('MESS_PASSWORD').value;
@@ -117,7 +117,7 @@ function testConnectionMail() {
resultset = true; resultset = true;
if ($('form[MESS_TEST_MAIL]').checked) { if ($('form[MESS_TEST_MAIL]').checked) {
send_test_mail = 'yes'; send_test_mail = 'yes';
mail_to = $('form[MESS_TEST_MAIL_TO]').value; mail_to = $('form[MESS_TEST_MAIL_TO]').value.trim();
var uri = 'send_test_mail=' + send_test_mail + '&mail_to=' + mail_to; var uri = 'send_test_mail=' + send_test_mail + '&mail_to=' + mail_to;
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE, url : PROCESS_REQUEST_FILE,
@@ -158,7 +158,7 @@ function testSMTPHost(step) {
var requestfile = PROCESS_REQUEST_FILE; var requestfile = PROCESS_REQUEST_FILE;
var params = 'request=testConnection&step=' + step; var params = 'request=testConnection&step=' + step;
params += '&srv=' + getField('MESS_SERVER').value; params += '&srv=' + getField('MESS_SERVER').value.trim();
params += '&port='+ ((getField('MESS_PORT').value.trim() != '') ? getField('MESS_PORT').value : 'default'); params += '&port='+ ((getField('MESS_PORT').value.trim() != '') ? getField('MESS_PORT').value : 'default');
params += '&account=' + getField('MESS_ACCOUNT').value; params += '&account=' + getField('MESS_ACCOUNT').value;
params += '&passwd=' + getField('MESS_PASSWORD').value; params += '&passwd=' + getField('MESS_PASSWORD').value;
@@ -275,7 +275,7 @@ var verifyData = function(oForm) {
case 'PHPMAILER': case 'PHPMAILER':
case 'OPENMAIL': case 'OPENMAIL':
oAux = getField('MESS_SERVER'); oAux = getField('MESS_SERVER');
if (oAux.value == '') { if (oAux.value.trim() == '') {
alert(G_STRINGS.ID_MESS_SERVER_REQUIRED); alert(G_STRINGS.ID_MESS_SERVER_REQUIRED);
oAux.focus(); oAux.focus();
return; return;
@@ -305,7 +305,7 @@ var oPanel;
var testEmailConfiguration = function() { var testEmailConfiguration = function() {
if (getField('MESS_ENGINE').value != 'MAIL') { if (getField('MESS_ENGINE').value != 'MAIL') {
oAux = getField('MESS_SERVER'); oAux = getField('MESS_SERVER');
if (oAux.value == '') { if (oAux.value.trim() == '') {
alert(G_STRINGS.ID_MESS_SERVER_REQUIRED); alert(G_STRINGS.ID_MESS_SERVER_REQUIRED);
oAux.focus(); oAux.focus();
return; return;

2
workflow/engine/methods/setup/emails_Save.php
View File

@@ -27,7 +27,7 @@ require_once 'classes/model/Configuration.php';
$oConfiguration = new Configuration(); $oConfiguration = new Configuration();
$aFields['MESS_ENABLED'] = isset($_POST['form']['MESS_ENABLED']) ? $_POST['form']['MESS_ENABLED'] : ''; $aFields['MESS_ENABLED'] = isset($_POST['form']['MESS_ENABLED']) ? $_POST['form']['MESS_ENABLED'] : '';
$aFields['MESS_ENGINE'] = $_POST['form']['MESS_ENGINE']; $aFields['MESS_ENGINE'] = $_POST['form']['MESS_ENGINE'];
$aFields['MESS_SERVER'] = $_POST['form']['MESS_SERVER']; $aFields['MESS_SERVER'] = trim($_POST['form']['MESS_SERVER']);
$aFields['MESS_RAUTH'] = isset($_POST['form']['MESS_RAUTH']) ? $_POST['form']['MESS_RAUTH'] : ''; $aFields['MESS_RAUTH'] = isset($_POST['form']['MESS_RAUTH']) ? $_POST['form']['MESS_RAUTH'] : '';
$aFields['MESS_PORT'] = $_POST['form']['MESS_PORT']; $aFields['MESS_PORT'] = $_POST['form']['MESS_PORT'];
$aFields['MESS_ACCOUNT'] = $_POST['form']['MESS_ACCOUNT']; $aFields['MESS_ACCOUNT'] = $_POST['form']['MESS_ACCOUNT'];