[Xoops-cvs2] xoops2/modules/system/admin/groups main.php,1.9,1.10

[<on...@us...>]

Update of /cvsroot/xoops/xoops2/modules/system/admin/groups
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21645/modules/system/admin/groups

Modified Files:
	main.php 
Log Message:
Added check to prevent admin group/user from being removed

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/modules/system/admin/groups/main.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main.php	16 Sep 2003 02:59:44 -0000	1.9
--- main.php	6 Feb 2004 19:27:06 -0000	1.10
***************
*** 200,204 ****
          break;
  	case "delConf":
! 		if (intval($g_id) > 0) {
  			$member_handler =& xoops_gethandler('member');
  			$group =& $member_handler->getGroup($g_id);
--- 200,204 ----
          break;
  	case "delConf":
! 		if (intval($g_id) > 0 && !in_array($g_id, array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
  			$member_handler =& xoops_gethandler('member');
  			$group =& $member_handler->getGroup($g_id);
***************
*** 218,225 ****
  		break;
  	case "delUser":
! 		$member_handler =& xoops_gethandler('member');
! 		$member_handler->removeUsersFromGroup($groupid, $uids);
! 		$memstart = isset($memstart) ? intval($memstart) : 0;
! 		redirect_header('admin.php?fct=groups&op=modify&g_id='.$groupid.'&memstart='.$memstart,0,_AM_DBUPDATED);
  		break;
  	case "display":
--- 218,233 ----
  		break;
  	case "delUser":
! 		if (intval($groupid) > 0) {
! 			$member_handler =& xoops_gethandler('member');
! 			$memstart = isset($memstart) ? intval($memstart) : 0;
! 			if ($groupid == XOOPS_GROUP_ADMIN) {
!             	if ($member_handler->getUserCountByGroup($groupid) <= count($uids)){
! 					redirect_header('admin.php?fct=groups&op=modify&g_id='.$groupid.'&memstart='.$memstart,0,_AM_ADMINNO);
!             	}
!         	} else {
! 				$member_handler->removeUsersFromGroup($groupid, $uids);
! 				redirect_header('admin.php?fct=groups&amp;op=modify&amp;g_id='.$groupid.'&amp;memstart='.$memstart,0,_AM_DBUPDATED);
! 			}
! 		}
  		break;
  	case "display":