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

BUG 8615 se adiciono la contraseña desencriptada SOLVED

Browse Source 
- para no generar confusion en los usuarios
- ahora se muestra en un campo password la contraseña
This commit is contained in:
Alvaro Campos
2012-03-26 19:13:29 -04:00
parent 3e3018965b
commit 80a298f5ca
10 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.spool.php
View File

@@ -333,7 +333,7 @@ class spoolRun {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $this->config['MESS_PASSWORD'] = $pass;
} }
$oPHPMailer->Password = $this->config['MESS_PASSWORD']; $oPHPMailer->Password = $this->config['MESS_PASSWORD'];
$oPHPMailer->From = $this->fileData['from_email']; $oPHPMailer->From = $this->fileData['from_email'];
@@ -387,7 +387,7 @@ class spoolRun {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $this->config['MESS_PASSWORD'] = $pass;
} }
$oPHPMailer->Password = $this->config['MESS_PASSWORD']; $oPHPMailer->Password = $this->config['MESS_PASSWORD'];
$oPHPMailer->From = $this->fileData['from_email']; $oPHPMailer->From = $this->fileData['from_email'];
@@ -473,7 +473,7 @@ class spoolRun {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $this->config['MESS_PASSWORD'] = $pass;
} }
$send->setPassword($this->config['MESS_PASSWORD']); $send->setPassword($this->config['MESS_PASSWORD']);
$send->setReturnPath($this->fileData['from_email']); $send->setReturnPath($this->fileData['from_email']);
@@ -507,7 +507,7 @@ class spoolRun {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $this->config['MESS_PASSWORD'] = $pass;
} }
if( $aConfiguration['MESS_ENABLED'] == '1' ) { if( $aConfiguration['MESS_ENABLED'] == '1' ) {
$this->setConfig(array ( $this->setConfig(array (

2
workflow/engine/classes/class.wsBase.php
View File

@@ -631,7 +631,7 @@ class wsBase
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $arrayFrom['MESS_PASSWORD'] = $pass;
} }
$oSpool = new spoolRun(); $oSpool = new spoolRun();
$oSpool->setConfig(array( $oSpool->setConfig(array(

2
workflow/engine/classes/class.xpdl.php
View File

@@ -728,7 +728,7 @@ class Xpdl extends processes
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $arrayFrom['MESS_PASSWORD'] = $pass;
} }
$from = $arrayFrom['MESS_ACCOUNT']; $from = $arrayFrom['MESS_ACCOUNT'];
if($to == 'ext'){ if($to == 'ext'){

2
workflow/engine/classes/model/AppNotes.php
View File

@@ -146,7 +146,7 @@ class AppNotes extends BaseAppNotes {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $aConfiguration['MESS_PASSWORD'] = $pass;
} }
} else { } else {
$aConfiguration = array(); $aConfiguration = array();

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

@@ -222,7 +222,7 @@ class adminProxy extends HttpProxyController
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $_POST['passwd'] = $pass;
} }
$port = $_POST['port']; $port = $_POST['port'];
@@ -548,8 +548,14 @@ 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); $this->success = (count($fields) > 0);
$this->data = $fields; $passwd = $fields['MESS_PASSWORD'];
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec);
$fields['MESS_PASSWORD'] = $pass;
}
$this->data = $fields;
} }
/** /**

2
workflow/engine/methods/cases/caseMessageHistory_Ajax.php
View File

@@ -154,7 +154,7 @@
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $aConfiguration['MESS_PASSWORD'] = $pass;
} }

6
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -772,6 +772,12 @@ switch(($_POST['action'])?$_POST['action']:$_REQUEST['action']) {
'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'], 'MESS_PASSWORD' => $aConfiguration['MESS_PASSWORD'],
'SMTPAuth' => $aConfiguration['MESS_RAUTH'] 'SMTPAuth' => $aConfiguration['MESS_RAUTH']
)); ));
$passwd = $oSpool['MESS_PASSWORD'];
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec);
$oSpool['MESS_PASSWORD'] = $pass;
}
$oSpool->create(array( $oSpool->create(array(
'msg_uid' => $data['MSG_UID'], 'msg_uid' => $data['MSG_UID'],

6
workflow/engine/methods/login/retrivePassword.php
View File

@@ -65,6 +65,12 @@ if($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL']
'SMTPAuth' => $aSetup['MESS_RAUTH'], 'SMTPAuth' => $aSetup['MESS_RAUTH'],
'SMTPSecure' => $aSetup['SMTPSecure'] 'SMTPSecure' => $aSetup['SMTPSecure']
)); ));
$passwd = $oSpool['MESS_PASSWORD'];
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec);
$oSpool['MESS_PASSWORD'] = $pass;
}
$oSpool->create(array( $oSpool->create(array(
'msg_uid' => '', 'msg_uid' => '',

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

@@ -76,7 +76,7 @@ switch ($request) {
$passwdDec = G::decrypt($passwd,'EMAILENCRYPT'); $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
if (strpos( $passwdDec, 'hash:' ) !== false) { if (strpos( $passwdDec, 'hash:' ) !== false) {
list($hash, $pass) = explode(":", $passwdDec); list($hash, $pass) = explode(":", $passwdDec);
$passwd = $pass; $_POST['passwd'] = $pass;
} }
$step = $_POST['step']; $step = $_POST['step'];
$auth_required = $_POST['auth_required']; $auth_required = $_POST['auth_required'];

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

@@ -276,8 +276,7 @@ Ext.onReady(function(){
Ext.getCmp('RequireAuthentication').setValue(res.data.MESS_RAUTH); Ext.getCmp('RequireAuthentication').setValue(res.data.MESS_RAUTH);
Ext.getCmp('AccountFrom').setValue(res.data.MESS_ACCOUNT); Ext.getCmp('AccountFrom').setValue(res.data.MESS_ACCOUNT);
Ext.getCmp('Password').setValue(res.data.MESS_PASSWORD); Ext.getCmp('Password').setValue(res.data.MESS_PASSWORD);
Ext.getCmp('PasswordHide').setValue(Ext.getCmp('Password').getValue()); Ext.getCmp('PasswordHide').setValue(Ext.getCmp('Password').getValue());
Ext.getCmp('Password').setValue('');
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) {
@@ -587,8 +586,7 @@ saveMethod=function() {
}, },
success: function(r){ success: function(r){
var i = Ext.decode(r.responseText); var i = Ext.decode(r.responseText);
PMExt.notify(_('ID_CHANGES_SAVED'),i.msg); PMExt.notify(_('ID_CHANGES_SAVED'),i.msg);
Ext.getCmp('Password').setValue('');
} }
}); });
} }