cvs: pear /Perm_LiveUser LiveUser.php

arnaud Sat Sep 27 13:09:03 2003 EDT Modified files: /pear/Perm_LiveUser LiveUser.php Log: * fix rememberMe feature * uses Crypt_RC4 correctly Index: pear/Perm_LiveUser/LiveUser.php diff -u pear/Perm_LiveUser/LiveUser.php:1.42 pear/Perm_LiveUser/LiveUser.php:1.43 --- pear/Perm_LiveUser/LiveUser.php:1.42 Fri Sep 26 10:32:14 2003 +++ pear/Perm_LiveUser/LiveUser.php Sat Sep 27 13:09:01 2003 @@ -91,7 +91,7 @@ * @author Lukas Smith <smith@backendmedia.com> * @author Pierre-Alain Joye <pajoye@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: LiveUser.php,v 1.42 2003/09/26 14:32:14 lsmith Exp $ + * @version $Id: LiveUser.php,v 1.43 2003/09/27 17:09:01 arnaud Exp $ * @package LiveUser */ class LiveUser @@ -407,7 +407,7 @@ * @param string data to crypt * @return string crypted data */ - function _cookieCryptMode($crypt, $data) + function &_cookieCryptMode($crypt, $data) { if (function_exists('mcrypt_module_open')) { $td = mcrypt_module_open('tripledes', '', 'ecb', ''); @@ -420,16 +420,14 @@ } mcrypt_generic_deinit($td); mcrypt_module_close($td); - unset($td, $iv); } else { - include_once('Crypt/Rc4.php'); - $crypt =& new Crypt_RC4($this->_options['cookie']['secret']); + include_once 'Crypt/Rc4.php'; + $rc4 =& new Crypt_RC4($this->_options['cookie']['secret']); if ($crypt) { - $data = $crypt->crypt($data); + $rc4->crypt($data); } else { - $data = $crypt->decrypt($data); + $rc4->decrypt($data); } - unset($crypt); } return $data; @@ -604,7 +602,7 @@ if (isset($this->_options['cookie']) && isset($_COOKIE[$this->_options['cookie']['name']])) { - $cookieData = unserialize($_COOKIE[$this->_options['cookie']['name']]); + $cookieData = unserialize(stripslashes($_COOKIE[$this->_options['cookie']['name']])); if (count($cookieData) != 3) { $this->_error = true; return PEAR::raiseError(null, LIVEUSER_COOKIE_ERROR, null,E_USER_WARNING,