[geeklog-cvs] geeklog-1.3/public_html/admin group.php,1.39,1.40

[dhaun at iowaoutdoors.org]

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

Modified Files:
	group.php 
Log Message:
Group Admins should not even see the groups of which they are not a member (bug #280).


Index: group.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** group.php	18 Sep 2004 14:55:45 -0000	1.39
--- group.php	18 Sep 2004 15:43:04 -0000	1.40
***************
*** 507,525 ****
      $group_templates->set_var('lang_list_users', $LANG_ACCESS['listusers']);
  
      $result = DB_query("SELECT * FROM {$_TABLES['groups']}");
      $nrows = DB_numRows($result);
      for ($i = 0; $i < $nrows; $i++) {
!         $A = DB_fetchArray($result);
!         if ($A['grp_gl_core'] == 1) {
!             $core = $LANG_ACCESS['yes'];
!         } else {
!             $core = $LANG_ACCESS['no'];
          }
-         $group_templates->set_var('group_id', $A['grp_id']);
-         $group_templates->set_var('group_name', $A['grp_name']);
-         $group_templates->set_var('group_description', $A['grp_descr']);
-         $group_templates->set_var('group_core', $core);
-         $group_templates->set_var('lang_list', $LANG_ACCESS['listthem']);
-         $group_templates->parse('group_row', 'row', true);
      }
      $group_templates->parse('output', 'list');
--- 507,529 ----
      $group_templates->set_var('lang_list_users', $LANG_ACCESS['listusers']);
  
+     $thisUsersGroups = SEC_getUserGroups ();
+ 
      $result = DB_query("SELECT * FROM {$_TABLES['groups']}");
      $nrows = DB_numRows($result);
      for ($i = 0; $i < $nrows; $i++) {
!         $A = DB_fetchArray ($result);
!         if (in_array ($A['grp_id'], $thisUsersGroups)) {
!             if ($A['grp_gl_core'] == 1) {
!                 $core = $LANG_ACCESS['yes'];
!             } else {
!                 $core = $LANG_ACCESS['no'];
!             }
!             $group_templates->set_var ('group_id', $A['grp_id']);
!             $group_templates->set_var ('group_name', $A['grp_name']);
!             $group_templates->set_var ('group_description', $A['grp_descr']);
!             $group_templates->set_var ('group_core', $core);
!             $group_templates->set_var ('lang_list', $LANG_ACCESS['listthem']);
!             $group_templates->parse ('group_row', 'row', true);
          }
      }
      $group_templates->parse('output', 'list');