[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.274,1.275

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv23811

Modified Files:
	lib-common.php 
Log Message:
When the user submission queue is activated, add a link to admin/moderation.php to the Admin's menu for User Admins (workaround, see bug #134).


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** lib-common.php	13 Jan 2004 20:00:40 -0000	1.274
--- lib-common.php	18 Jan 2004 14:43:31 -0000	1.275
***************
*** 2205,2209 ****
          }
  
!         if( SEC_isModerator() )
          {
              $num = 0;
--- 2205,2209 ----
          }
  
!         if( SEC_isModerator()  || (( $_CONF['usersubmission'] == 1 ) && SEC_hasRights( 'user.edit,user.delete' )))
          {
              $num = 0;
***************
*** 2245,2249 ****
              }
  
!             if( $_CONF['usersubmission'] == 1)
              {
                  if( SEC_hasrights( 'user.edit' ) && SEC_hasrights( 'user.delete' ))
--- 2245,2249 ----
              }
  
!             if( $_CONF['usersubmission'] == 1 )
              {
                  if( SEC_hasrights( 'user.edit' ) && SEC_hasrights( 'user.delete' ))
***************
*** 5087,5091 ****
          $sql .= "(({$table}owner_id = '{$uid}') AND ({$table}perm_owner >= $access)) OR ";
  
!         $sql .= "(({$table}group_id IN (" . implode (',', $_GROUPS)
               . ")) AND ({$table}perm_group >= $access)) OR ";
          $sql .= "({$table}perm_members >= $access)";
--- 5087,5091 ----
          $sql .= "(({$table}owner_id = '{$uid}') AND ({$table}perm_owner >= $access)) OR ";
  
!         $sql .= "(({$table}group_id IN (" . implode( ',', $_GROUPS )
               . ")) AND ({$table}perm_group >= $access)) OR ";
          $sql .= "({$table}perm_members >= $access)";