Index: openacs-4/packages/acs-admin/www/users/modify-admin-privileges-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/modify-admin-privileges-oracle.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/users/modify-admin-privileges-oracle.xql	24 Sep 2002 00:12:32 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="grant_admin">
+<querytext>
+select acs_permission.grant_permission(
+	acs.magic_object_id('security_context_root'), 
+	:user_id, 
+	'admin')
+</querytext>
+</fullquery>
+
+<fullquery name="grant_admin">
+<querytext>
+select acs_permission.revoke_permission(
+        acs.magic_object_id('security_context_root'),
+        :user_id,
+        'admin')
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-admin/www/users/modify-admin-privileges-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/modify-admin-privileges-postgresql.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/users/modify-admin-privileges-postgresql.xql	24 Sep 2002 00:12:32 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+<rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="grant_admin">
+<querytext>
+select acs_permission__grant_permission(
+	acs__magic_object_id('security_context_root'), 
+	:user_id, 
+	'admin')
+</querytext>
+</fullquery>
+
+<fullquery name="grant_admin">
+<querytext>
+select acs_permission__revoke_permission(
+        acs__magic_object_id('security_context_root'),
+        :user_id,
+        'admin')
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/acs-admin/www/users/modify-admin-privileges.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/modify-admin-privileges.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/users/modify-admin-privileges.adp	24 Sep 2002 00:12:32 -0000	1.1
@@ -0,0 +1,16 @@
+<master>
+<property name=title>Confirm privilege modification for user #@user_id@</property>
+<property name=context>@context@</property>
+
+Are you sure you wish to @action@ admin privileges for user #@user_id@?
+
+<p></p>
+
+<if @action@ eq "grant">
+  <a href="@confirmed_url@">Grant privileges</a> |
+</if>
+<else>
+  <a href="@confirmed_url@">Revoke privileges</a> |
+</else>
+
+<a href="@return_url@">Cancel</a>
Index: openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/users/modify-admin-privileges.tcl	24 Sep 2002 00:12:32 -0000	1.1
@@ -0,0 +1,41 @@
+ad_page_contract {
+
+    Grants or revokes site-wide admin privileges.
+    @author Andrew Spencer (andrew@fallingblue.com)
+    @cvs-id $Id: modify-admin-privileges.tcl,v 1.1 2002/09/24 00:12:32 donb Exp $
+
+} {
+    user_id:notnull
+    action:notnull
+    confirmed_p:optional
+}
+
+set confirmed_url "/acs-admin/users/modify-admin-privileges?user_id=$user_id&action=$action&confirmed_p=1"
+
+set return_url "/acs-admin/users/one?user_id=$user_id"
+
+set context [list [list "./" "Users"] "Modify privileges"]
+
+if ![info exists confirmed_p] {
+    set confirmed_p 0
+}
+
+if $confirmed_p {
+    if [string equal grant $action] {
+        db_exec_plsql grant_admin {
+            select acs_permission__grant_permission(
+                acs__magic_object_id('security_context_root'),
+                :user_id,
+                'admin')
+        }
+    } else {
+        db_exec_plsql revoke_admin {
+            select acs_permission__revoke_permission(
+                acs__magic_object_id('security_context_root'),
+                :user_id,
+                'admin')
+        }
+    }
+
+    ad_returnredirect $return_url
+}
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/one.adp	6 Sep 2002 21:49:53 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/one.adp	24 Sep 2002 00:12:32 -0000	1.5
@@ -57,6 +57,13 @@
 <h2>Administrative Actions</h2>
 
 <ul>
+<if @admin_p@>
+  <li><a href="modify-admin-privileges?user_id=@user_id@&action=revoke">Revoke site-wide administration privileges</a></li>
+</if>
+<else>
+  <li><a href="modify-admin-privileges?user_id=@user_id@&action=grant">Grant site-wide administration privileges</a></li>
+</else>
+
 <li><a href="/user/password-update?@export_edit_vars@">Update this user's password</a></li>
 
 <li><a href="/user/portrait/index.tcl?@export_edit_vars@">Manage this user's portrait</a></li>
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/one.tcl	6 Sep 2002 21:49:53 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/one.tcl	24 Sep 2002 00:12:32 -0000	1.5
@@ -30,6 +30,12 @@
     return
 }
 
+if [db_0or1row user_is_admin "select privilege from acs_permissions where object_id = 0 and grantee_id = :user_id and privilege = 'admin'"] {
+    set admin_p 1
+} else {
+    set admin_p 0
+}
+
 set return_url "/acs-admin/users/one?user_id=$user_id"
 
 set context [list [list "./" "Users"] "One User"]
Index: openacs-4/packages/acs-admin/www/users/one.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/one.xql	2 Sep 2002 08:07:02 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/one.xql	24 Sep 2002 00:12:32 -0000	1.9
@@ -11,6 +11,15 @@
       </querytext>
 </fullquery>
 
+<fullquery name="user_is_admin">
+      <querytext>
+      select privilege
+      from acs_permissions
+      where object_id = 0
+            and grantee_id = :user_id
+            and privilege = 'admin'
+      </querytext>
+</fullquery>
  
 <fullquery name="get_item_id">      
       <querytext>