[geeklog-cvs] geeklog-1.3/system lib-security.php,1.20,1.21

[vinny at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv14725

Modified Files:
	lib-security.php 
Log Message:
Fixed some minor bugs and did a bit of clean-up in lib-security.


Index: lib-security.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-security.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** lib-security.php	9 Aug 2004 07:56:22 -0000	1.20
--- lib-security.php	28 Sep 2004 17:34:34 -0000	1.21
***************
*** 165,169 ****
      global $_TABLES, $_USER, $_SEC_VERBOSE, $_GROUPS;
  
!     if (empty($uid)) {
          if (empty($_USER['uid'])) {
              $uid = 1;
--- 165,170 ----
      global $_TABLES, $_USER, $_SEC_VERBOSE, $_GROUPS;
  
!     if ( empty($uid) || ($uid == $_USER['uid']) 
!          || ($uid == 1 && empty($_USER['uid'])) ) {
          if (empty($_USER['uid'])) {
              $uid = 1;
***************
*** 173,177 ****
  
          if (empty($_GROUPS)) {
!             $_GROUPS = SEC_getUserGroups($_USER['uid']);
          }
          $groups = $_GROUPS;
--- 174,178 ----
  
          if (empty($_GROUPS)) {
!             $_GROUPS = SEC_getUserGroups($uid);
          }
          $groups = $_GROUPS;
***************
*** 443,447 ****
  function SEC_getUserPermissions($grp_id='',$uid='')
  {
!     global $_TABLES, $_USER, $_SEC_VERBOSE;
  
      $retval = '';
--- 444,448 ----
  function SEC_getUserPermissions($grp_id='',$uid='')
  {
!     global $_TABLES, $_USER, $_SEC_VERBOSE, $_GROUPS;
  
      $retval = '';