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

BUG 8730 arreglo de email configuration cuando este no existe

Browse Source
This commit is contained in:
Alvaro Campos
2012-04-13 18:16:57 -04:00
parent 60cffbd255
commit d1d2a820f9
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -653,13 +653,15 @@ class adminProxy extends HttpProxyController
$oConfiguration = new Configurations(); $oConfiguration = new Configurations();
$oConfiguration->loadConfig($x, 'Emails','','','',''); $oConfiguration->loadConfig($x, 'Emails','','','','');
$fields = $oConfiguration->aConfig; $fields = $oConfiguration->aConfig;
$this->success = (count($fields) > 0); if (count($fields) > 0) {
$passwd = $fields['MESS_PASSWORD']; $this->success = (count($fields) > 0);
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwd = $fields['MESS_PASSWORD'];
if (strpos( $passwdDec, 'hash:' ) !== false) { $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
list($hash, $pass) = explode(":", $passwdDec); if (strpos( $passwdDec, 'hash:' ) !== false) {
$fields['MESS_PASSWORD'] = $pass; list($hash, $pass) = explode(":", $passwdDec);
} $fields['MESS_PASSWORD'] = $pass;
}
}
$this->data = $fields; $this->data = $fields;
} }

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

@@ -101,7 +101,7 @@ Ext.onReady(function(){
disabled : true, disabled : true,
listeners: { listeners: {
select: function(combo, value) { select: function(combo, value) {
if (Ext.getCmp('EmailEngine').getValue()== 'MAIL') { alert if (Ext.getCmp('EmailEngine').getValue()== 'MAIL') {
Ext.getCmp('Server').setVisible(false); Ext.getCmp('Server').setVisible(false);
Ext.getCmp('Server').getEl().up('.x-form-item').setDisplayed(false); // hide label Ext.getCmp('Server').getEl().up('.x-form-item').setDisplayed(false); // hide label
Ext.getCmp('Port').setVisible(false); Ext.getCmp('Port').setVisible(false);
@@ -317,7 +317,8 @@ Ext.onReady(function(){
params: { CFG_UID: 'Emails' }, params: { CFG_UID: 'Emails' },
success: function(r,o) { success: function(r,o) {
var res = Ext.decode(r.responseText); var res = Ext.decode(r.responseText);
if (! res.data) return; if (! res.data)
return;
if (res.success) { if (res.success) {
Ext.getCmp('EnableEmailNotifications').setValue(res.data.MESS_ENABLED); Ext.getCmp('EnableEmailNotifications').setValue(res.data.MESS_ENABLED);
Ext.getCmp('EmailEngine').setValue(res.data.MESS_ENGINE); Ext.getCmp('EmailEngine').setValue(res.data.MESS_ENGINE);