From a651fadd0bbdc284256052e36882aa73707a34f7 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 7 Aug 2002 02:35:19 +0000
Subject: [PATCH] Admins can now own pages, and an admin cannot remove
 him/herself from the admins group.

---
 lib/WebGUI/Operation/Page.pm | 3 ++-
 lib/WebGUI/Operation/User.pm | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index dd24e74ff..377e4f065 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -184,7 +184,8 @@ sub www_editPage {
         	$f->date("startDate",WebGUI::International::get(497),$page{startDate});
         	$f->date("endDate",WebGUI::International::get(498),$page{endDate});
 		%hash = WebGUI::SQL->buildHash("select users.userId,users.username from users,groupings 
-			where groupings.groupId=4 and groupings.userId=users.userId order by users.username");
+			where (groupings.groupId=4 or groupings.groupId=3) and groupings.userId=users.userId 
+			order by users.username");
 		$f->select("ownerId",\%hash,WebGUI::International::get(108),[$page{ownerId}],'','','',
 			' &nbsp; <a href="'.WebGUI::URL::page('op=listUsers').'">'.WebGUI::International::get(7).'</a>');
 		$f->yesNo("ownerView",WebGUI::International::get(109),$page{ownerView});
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 759b6855c..f5c03cebf 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -136,7 +136,9 @@ sub www_becomeUser {
 #-------------------------------------------------------------------
 sub www_deleteGrouping {
 	my ($u);
-        if (WebGUI::Privilege::isInGroup(3)) {
+	if ($session{user}{userId} == $session{form}{uid} && $session{form}{gid} == 3) {
+		return WebGUI::Privilege::vitalComponent();
+        } elsif (WebGUI::Privilege::isInGroup(3)) {
 		$u = WebGUI::User->new($session{form}{uid});
 		$u->deleteFromGroups([$session{form}{gid}]);
                 return www_editUserGroup();