[phpwiki-checkins] CVS: phpwiki/lib WikiGroup.php,1.17,1.18 WikiUserNew.php,1.28,1.29

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20813

Modified Files:
	WikiGroup.php WikiUserNew.php 
Log Message:
fixed File Auth for user and group
missing only getMembersOf(Authenticated Users),getMembersOf(Every),getMembersOf(Signed Users)


Index: WikiGroup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiGroup.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- WikiGroup.php	10 Mar 2004 15:38:48 -0000	1.17
+++ WikiGroup.php	11 Mar 2004 13:30:47 -0000	1.18
@@ -655,6 +655,6 @@ class GroupFile extends WikiGroup {
             return false;
         }
-        require 'lib/pear/File_Passwd.php';
-        $this->_file = File_Passwd($file);
+        require_once('lib/pear/File_Passwd.php');
+        $this->_file = new File_Passwd(AUTH_GROUP_FILE,true);
     }
 
@@ -679,5 +679,6 @@ class GroupFile extends WikiGroup {
         }
 
-        foreach ($this->_file->users[] as $g => $u) {
+        if (is_array($this->_file->users)) {
+          foreach ($this->_file->users as $g => $u) {
             $users = explode(' ',$u);
             if (in_array($username,$users)) {
@@ -686,4 +687,5 @@ class GroupFile extends WikiGroup {
             }
         }
+        }
         $this->membership[$group] = false;
         return false;
@@ -708,5 +710,6 @@ class GroupFile extends WikiGroup {
             }
         }
-        foreach ($this->_file->users[] as $group => $u) {
+        if (is_array($this->_file->users)) {
+          foreach ($this->_file->users as $group => $u) {
             $users = explode(' ',$u);
             if (in_array($username,$users)) {
@@ -715,4 +718,5 @@ class GroupFile extends WikiGroup {
             }
         }
+        }
         $this->membership = $membership;
         return $membership;
@@ -861,4 +865,8 @@ class GroupLdap extends WikiGroup {
 
 // $Log$
+// Revision 1.18  2004/03/11 13:30:47  rurban
+// fixed File Auth for user and group
+// missing only getMembersOf(Authenticated Users),getMembersOf(Every),getMembersOf(Signed Users)
+//
 // Revision 1.17  2004/03/10 15:38:48  rurban
 // store current user->page and ->action in session for WhoIsOnline

Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -2 -b -p -d -r1.28 -r1.29
--- WikiUserNew.php	8 Mar 2004 18:17:09 -0000	1.28
+++ WikiUserNew.php	11 Mar 2004 13:30:47 -0000	1.29
@@ -1810,11 +1810,11 @@ extends _PassUser
 
         // read the .htaccess style file. We use our own copy of the standard pear class.
-        require 'lib/pear/File_Passwd.php';
+        include_once 'lib/pear/File_Passwd.php';
         // if passwords may be changed we have to lock them:
         $this->_may_change = defined('AUTH_USER_FILE_STORABLE') && AUTH_USER_FILE_STORABLE;
         if (empty($file) and defined('AUTH_USER_FILE'))
-            $this->_file = File_Passwd(AUTH_USER_FILE, !empty($this->_may_change));
+            $this->_file = new File_Passwd(AUTH_USER_FILE, !empty($this->_may_change));
         elseif (!empty($file))
-            $this->_file = File_Passwd($file, !empty($this->_may_change));
+            $this->_file = new File_Passwd($file, !empty($this->_may_change));
         else
             return false;
@@ -2273,4 +2273,8 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.29  2004/03/11 13:30:47  rurban
+// fixed File Auth for user and group
+// missing only getMembersOf(Authenticated Users),getMembersOf(Every),getMembersOf(Signed Users)
+//
 // Revision 1.28  2004/03/08 18:17:09  rurban
 // added more WikiGroup::getMembersOf methods, esp. for special groups