cvs: pear /Perm_LiveUser/Auth Common.php /Perm_LiveUser/Perm/Container/XML Simple.php

arnaud Sun Nov 7 14:46:31 2004 EDT Modified files: /pear/Perm_LiveUser/Auth Common.php /pear/Perm_LiveUser/Perm/Container/XML Simple.php Log: * a couple of bugfixes from lukas@phpconf http://cvs.php.net/diff.php/pear/Perm_LiveUser/Auth/Common.php?r1=1.57&r2=1.58&ty=u Index: pear/Perm_LiveUser/Auth/Common.php diff -u pear/Perm_LiveUser/Auth/Common.php:1.57 pear/Perm_LiveUser/Auth/Common.php:1.58 --- pear/Perm_LiveUser/Auth/Common.php:1.57 Mon Oct 25 14:21:57 2004 +++ pear/Perm_LiveUser/Auth/Common.php Sun Nov 7 14:46:31 2004 @@ -28,7 +28,7 @@ * authorisation areas and rights * * @author Markus Wolff <wolff@21st.de> - * @version $Id: Common.php,v 1.57 2004/10/25 18:21:57 dufuz Exp $ + * @version $Id: Common.php,v 1.58 2004/11/07 19:46:31 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -236,7 +236,8 @@ 'ownerUserId' => $this->ownerUserId ); - $propertyValues['custom'] = $this->propertyValues['custom']; + $propertyValues['custom'] = isset($this->propertyValues['custom']) + ? $this->propertyValues['custom'] : null; return $propertyValues; } @@ -540,4 +541,4 @@ return $that; } } -?> \ No newline at end of file +?> http://cvs.php.net/diff.php/pear/Perm_LiveUser/Perm/Container/XML/Simple.php?r1=1.4&r2=1.5&ty=u Index: pear/Perm_LiveUser/Perm/Container/XML/Simple.php diff -u pear/Perm_LiveUser/Perm/Container/XML/Simple.php:1.4 pear/Perm_LiveUser/Perm/Container/XML/Simple.php:1.5 --- pear/Perm_LiveUser/Perm/Container/XML/Simple.php:1.4 Sat Oct 23 09:36:45 2004 +++ pear/Perm_LiveUser/Perm/Container/XML/Simple.php Sun Nov 7 14:46:31 2004 @@ -38,7 +38,7 @@ * - userrights * * @author Björn Kraus <krausbn@php.net> - * @version $Id: Simple.php,v 1.4 2004/10/23 13:36:45 arnaud Exp $ + * @version $Id: Simple.php,v 1.5 2004/11/07 19:46:31 arnaud Exp $ * @package LiveUser * @category authentication */ @@ -138,7 +138,6 @@ if (!$this->init_ok) { return false; } - $success = false; $nodeIndex = 0; $userIndex = 0; @@ -220,6 +219,7 @@ if (!$this->init_ok || !$this->userObj) { return false; } + $this->rights = array(); foreach ($this->userObj->children as $node) { if ($node->name == 'rights') { $tmp = explode(',', $node->content);