[geeklog-cvs] Geeklog-2/system/Propel/Geeklog-2 Gl2Item.php,1.3,1.4

[vinny at iowaoutdoors.org]

Update of /var/cvs/Geeklog-2/system/Propel/Geeklog-2
In directory www:/tmp/cvs-serv22874

Modified Files:
	Gl2Item.php 
Log Message:
Minor problems corrected


Index: Gl2Item.php
===================================================================
RCS file: /var/cvs/Geeklog-2/system/Propel/Geeklog-2/Gl2Item.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Gl2Item.php	29 Dec 2004 05:18:23 -0000	1.3
--- Gl2Item.php	21 Jan 2005 04:28:21 -0000	1.4
***************
*** 23,26 ****
--- 23,29 ----
       */
      function hasAccess($user = '') {
+ 
+         // Make sure the Gl2User is loaded
+         require_once 'Geeklog-2/Gl2User.php';
          
          // Default rights
***************
*** 28,32 ****
          
          // Make sure we are checking access for a user
!         if ( !is_a($user, 'User') ) {
              // FIXME: get the current user object (from the session?)
          }
--- 31,35 ----
          
          // Make sure we are checking access for a user
!         if ( !($user instanceof User) ) {
              // FIXME: get the current user object (from the session?)
          }
***************
*** 44,48 ****
              // Check for $user's groups access level
              if ( $acl->getGroupId() != null && 
!                  in_array($acl->getGroupId(), $this->getGroups()) ) {
                  $rights |= $acl->getRights();
              }
--- 47,51 ----
              // Check for $user's groups access level
              if ( $acl->getGroupId() != null && 
!                  in_array($acl->getGroupId(), $user->getGroups()) ) {
                  $rights |= $acl->getRights();
              }