[geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.9,1.10

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory geeklog_prod:/tmp/cvs-serv16533/classes

Modified Files:
	search.class.php 
Log Message:
Anonymous users couldn't use the advanced search even if $_CONF['searchloginrequired'] was not set ...


Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** search.class.php	23 Jul 2003 17:13:51 -0000	1.9
--- search.class.php	24 Jul 2003 21:09:45 -0000	1.10
***************
*** 809,820 ****
          global $_USER, $_CONF;
  
!         if (empty($_USER['username']) AND (($_CONF['loginrequired'] == 1) OR ($_CONF['searchloginrequired'] == 2))) {
!             return false;
!         }
!         
!         if ($this->_hasAdvancedCriteria() AND empty($_USER['username'])) {
!             return false;
          }
!         
          return true;
      }
--- 809,830 ----
          global $_USER, $_CONF;
  
!         if (empty($_USER['username'])) {
! 
!             if ($this->_hasAdvancedCriteria ()) {
! 
!                 if (($_CONF['loginrequired'] == 1) OR ($_CONF['searchloginrequired'] >= 1)) {
!                     return false;
!             }
! 
!             } else {
! 
!                 if (($_CONF['loginrequired'] == 1) OR ($_CONF['searchloginrequired'] == 2)) {
!                     return false;
!                 }
! 
!             }
! 
          }
! 
          return true;
      }