[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.400,1.401

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv8886

Modified Files:
	lib-common.php 
Log Message:
Fixed use of an undefined variable $U in COM_showBlocks and warning messages for undefined array indexes in COM_getCurrentURL (reported by irawen).


Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.400
retrieving revision 1.401
diff -C2 -d -r1.400 -r1.401
*** lib-common.php	10 Dec 2004 09:22:22 -0000	1.400
--- lib-common.php	11 Dec 2004 14:57:37 -0000	1.401
***************
*** 3719,3723 ****
          if( SEC_hasAccess( $A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon']) > 0 )
          {
!             $retval .= COM_formatBlock( $A, $U['noboxes'] );
          }
      }
--- 3719,3723 ----
          if( SEC_hasAccess( $A['owner_id'], $A['group_id'], $A['perm_owner'], $A['perm_group'], $A['perm_members'], $A['perm_anon']) > 0 )
          {
!             $retval .= COM_formatBlock( $A, $_USER['noboxes'] );
          }
      }
***************
*** 5887,5894 ****
      global $_CONF, $HTTP_SERVER_VARS;
  
!     $thisUrl = $HTTP_SERVER_VARS['SCRIPT_URI'];
!     if( empty( $thisUrl ))
      {
!         $thisUrl = $HTTP_SERVER_VARS['DOCUMENT_URI'];
      }
      if( !empty( $thisUrl ) && !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))
--- 5887,5902 ----
      global $_CONF, $HTTP_SERVER_VARS;
  
!     $thisUrl = '';
! 
!     if( empty( $HTTP_SERVER_VARS['SCRIPT_URI'] ))
      {
!         if( !empty( $HTTP_SERVER_VARS['DOCUMENT_URI'] ))
!         {
!             $thisUrl = $HTTP_SERVER_VARS['DOCUMENT_URI'];
!         }
!     }
!     else
!     {
!         $thisUrl = $HTTP_SERVER_VARS['SCRIPT_URI'];
      }
      if( !empty( $thisUrl ) && !empty( $HTTP_SERVER_VARS['QUERY_STRING'] ))