From 77eb7385ca21135feb1f56ea34f0b6760e23f183 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Fri, 25 Oct 2013 01:44:37 +0200 Subject: [PATCH] Select right random number generator on windows Update translations --- inc/account.class.php | 4 ++-- inc/crypt.class.php | 6 +++++- inc/locales/en_US/LC_MESSAGES/messages.mo | Bin 37147 -> 37137 bytes 3 files changed, 7 insertions(+), 3 deletions(-) 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 297112bcabc7ea8334c6b258c557aa8303c0304b..4b9a57e537bdbb30372de30ed9469ec1e0350101 100644 GIT binary patch delta 7018 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 MZee|S#kRKp2g;P6=>Px# delta 7039 zcmXxn3sjax9>?(q6y+ip6+uk#lb$GSg%`uBoYI+oo1xxw`K6$IN<;=QA_UJTw3K&&=~4)^79O zw9Wh7&{l4|<2b8^I!;gAi_!QscEh_EhB3n&$Ac+&A7*1`T!0<18oT3O)capyBL0p& zuv@BmJ`TH3Uxa;eW2)miaTJcxpg^wM4jqS^i3Xr1%EAsg` zX#|Y}F$%L$?>}#S#kwoaH67|`@X+A`c17N z`Zer>(GNNfNpQwvZ(N71@DN60y-Oj1!oN@{>oC%B+F=@M)(NNx3s5hvMg_LRK0jb>Kp)yK zU@(4%n)ntfP``A?8I576=Q*eh%tOX=orM&Xs!CL(e?evB2=>FD@Cl55n0>@D9E4|3 zD-RiE_O>f(Yx<)OIR{iU&JUE8T-i{SnkzxPV%b*CXb6 zdkmqTh}xP5P`Bc7)R`$k^VR@5i7_b4wn?;ned`@4bON@HleLohHPFuPemz@LY;|$n1YkAFRsPjc-W=j zq3|=RWBV-gDNaUikTV72a3?C|4X8uagt{G(|kP|)Fe3Gc^UsKa*-d*U6`fC&>#eH8YhJ|B~CJL-^qi2?XEs{a)XL7z!xuftFi z_Csx9rqOlsDX8NLY>U;Hh;LvroocWn>Ske=Tal zPf&rMLd|y>$Ljw7L_sSU`lLC0*{JI=3!5WHy;zM3a3^ZO1E|CLH`ErMMg@8U{m|zr z6HqYfOBj!8AB|x+0o^_nW>L@zHe)y3hJ&#l)zLfK3><+9pciUoskS}Kwogax{X*0V zH=+XFg1zu;cr4WuP*d?NZQTnu7{pxqVQBO4)AIN*l2Y{)`GZ zAJ1RrTsLT#Wt$YmX`BYSZb5QMWIR%~C8q|v4#Q}I22jXp1Jvqm$ zv;ej8=TNC!iuxd}z!vxxY9a4n^Wj8o$!Y5)^x}8;7bJ78b91WMWAAC^aQLDE3C8Xi zje{@)HStPRUsDS384&_p7H7elU1?0aq zg^y@ZN)Dq^b`m{!)#^Xfd@vGGD;R~X@Cnq}nSweKv(X>tp~hW;+KQF7{wnJIt*F5E zxwfGWeQEd{wUS2b52%6fpd$8~Ww!`5K#a97YNAvOzzL{vo<)sYjDA>#3SbrLeRn+t zZNYX7z>jSGC~D$wP#rI!R{Asg<2_sVpKS&XN2NFl)o&mwLnBd{$Up@$9=qYw$X2?} zathkZ4X8cah5FJppa*}zAs8^n)E`D&w|vxu<*11^VgSB|TH$WgmVStB@R+TCh3a>? zS@!=11*P^b24Ya5IlZ0Hhk6=nqKEN5oQz4h2y<~4YJxUJCNmMJ{;{acrdYF3TQn23 z02jOI{?}0Gj|b6%zoNcu9p>6E6>6XiQ~*;^r{2XLxE+^_}r+TBUZ$+i@ zO;lj}QCrb~$#@nONbqv==lD=m|3Xy1C8&8;qvm9BkW5Z2K})M%Lj_+>QF;eUBatUTL1YeJDiGFbbnE7t?ShDuth5 z3|_L&eOH-V&;#|`kcHV;hFa+v)cyYsJ=la@G5il^4<@`|dvVo^ual(7fVnBSE8;{4R*#os1MFD`}{Pvpnegxg;(tJ>*!1U4(gElyhz~8?+l}$ zl%=EgbRz2B&#*2;P5h#*Z?L|Jt!V!MwemV_ji*psaTc}GA8q|MDgggKn%|1{=<3DM z6mqk_ett!pJ0axKZe?}NvOc`F%TD^CRl|!D{D~wcc2dA zF4R`kxfHb0dJM!yRD@Shr~Vf9!o(`G$4{bOEJOvg0QGzYw!wX4kGjq$?eoj1 zaehIaIlnc{x=tj8AR78%9FDLSU_A9TsE9v6?d=g%0LM|OJ%QeM3AGj9p#u0F^~EjQ}_<=TSW3n8AOLQh`d)Z#^ROY^3A=H`@? aEGR0T=9!UKm{*)rT2NG2n_sf4%l`nfl&Eb0