diff --git a/inc/account.class.php b/inc/account.class.php index 7c71404a..2ca37856 100644 --- a/inc/account.class.php +++ b/inc/account.class.php @@ -358,12 +358,12 @@ class SP_Account { // No escribir en el log ni enviar correos si la actualización es // por cambio de clave maestra... if ( ! $isMassive ){ - $accountInfo = array('customer_name'); + $accountInfo = array('customer_name','account_name'); $this->getAccountInfoById($accountInfo); $message['action'] = _('Modificar Clave'); $message['text'][] = _('Cliente').": ".$this->cacheParams['customer_name']; - $message['text'][] = _('Cuenta').": $this->accountName ($this->accountId)"; + $message['text'][] = _('Cuenta').": ".$this->cacheParams['account_name']." ($this->accountId)"; SP_Common::wrLogInfo($message); SP_Common::sendEmail($message); diff --git a/inc/crypt.class.php b/inc/crypt.class.php index 8ac00f99..985e563d 100644 --- a/inc/crypt.class.php +++ b/inc/crypt.class.php @@ -38,7 +38,11 @@ class SP_Crypt { */ private static function createIV() { $resEncDes = mcrypt_module_open('rijndael-256', '', 'cbc', ''); - $cryptIV = mcrypt_create_iv(mcrypt_enc_get_iv_size($resEncDes), MCRYPT_DEV_URANDOM); + if ( SP_Util::runningOnWindows() && (! defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50300) ){ + $cryptIV = mcrypt_create_iv(mcrypt_enc_get_iv_size($resEncDes), MCRYPT_RAND); + } else { + $cryptIV = mcrypt_create_iv(mcrypt_enc_get_iv_size($resEncDes), MCRYPT_DEV_URANDOM); + } mcrypt_module_close($resEncDes); return $cryptIV; diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo index 297112bc..4b9a57e5 100644 Binary files a/inc/locales/en_US/LC_MESSAGES/messages.mo and b/inc/locales/en_US/LC_MESSAGES/messages.mo differ