Index: openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	2 Aug 2003 06:18:49 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	24 Feb 2005 11:10:31 -0000	1.6
@@ -37,7 +37,6 @@
          privilege
   from acs_permissions
   where object_id = :object_id
-	$extra_where_clause
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql	2 Aug 2003 06:18:49 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/permissions/one-postgresql.xql	24 Feb 2005 11:10:31 -0000	1.7
@@ -37,8 +37,6 @@
          privilege
   from acs_permissions
   where object_id = :object_id
-	$extra_where_clause
-
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-subsite/www/permissions/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/permissions/one.adp	17 Oct 2003 09:19:31 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/permissions/one.adp	24 Feb 2005 11:10:31 -0000	1.8
@@ -1,67 +1,69 @@
   <master>
-    <property name="title">#acs-subsite.Permissions_for_name#</property>
-    <property name="context">@context;noquote@</property>
+  <property name="title">#acs-subsite.Permissions_for_name#</property>
+  <property name="context">@context;noquote@</property>
 
-    <h3>#acs-subsite.lt_Inherited_Permissions#</h3>
-    <if @inherited:rowcount@ gt 0>
+  <h3>#acs-subsite.lt_Inherited_Permissions#</h3>
+  <if @inherited:rowcount@ gt 0>
+    <ul>
+      <multiple name="inherited">
+        <li>@inherited.grantee_name@, @inherited.privilege@</li>
+      </multiple>
+    </ul>
+  </if>
+  <else>
+    <p><em>#acs-subsite.none#</em></p>
+  </else>
+  <h3>#acs-subsite.Direct_Permissions#</h3>
+  <if @acl:rowcount@ gt 0>
+    <form method="get" action="revoke">
+      @export_form_vars;noquote@
+      <multiple name="acl">
+        <if @mainsite_p@ true and @acl.grantee_id@ eq "-1">@acl.grantee_name@, @acl.privilege@ <b>#acs-subsite.perm_cannot_be_removed#</b><br /></if>
+        <else>
+          <input type="checkbox" name="revoke_list" value="@acl.grantee_id@ @acl.privilege@" 
+            id="check_@acl.grantee_id@_@acl.privilege@">
+            <label for="check_@acl.grantee_id@_@acl.privilege@">@acl.grantee_name@, @acl.privilege@</label><br />
+        </else>
+      </multiple>
+    </blockquote>
+  </if>
+  <else>
+    <p><em>#acs-subsite.none#</em></p>
+  </else>
+  <if @acl:rowcount@ gt 0>
+    <input type=submit value="#acs-subsite.Revoke_Checked#">
+    </form>
+  </if>
+  @controls;noquote@
+
+  <h3>#acs-subsite.Children#</h3>
+  <if @children_p@>
+    <if @children:rowcount@ gt 0>
       <ul>
-        <multiple name="inherited">
-          <li>@inherited.grantee_name@, @inherited.privilege@</li>
+        <multiple name="children">
+          <li><a href="one?object_id=@children.c_object_id@">@children.c_name@</a> @children.c_type@</li>
         </multiple>
       </ul>
+
+      [<a href="@hide_children_url@">#acs-subsite.Hide#</a>]
     </if>
     <else>
       <p><em>#acs-subsite.none#</em></p>
     </else>
-    <h3>#acs-subsite.Direct_Permissions#</h3>
-    <if @acl:rowcount@ gt 0>
-      <form method="get" action="revoke">
-        @export_form_vars;noquote@
-          <blockquote style="margin-left: 16px;">
-            <multiple name="acl">
-              <input type="checkbox" name="revoke_list" value="@acl.grantee_id@ @acl.privilege@" 
-                id="check_@acl.grantee_id@_@acl.privilege@">
-              <label for="check_@acl.grantee_id@_@acl.privilege@">@acl.grantee_name@, @acl.privilege@</label><br />
-            </multiple>
-          </blockquote>
-    </if>
+  </if>
+
+  <if @children_p@ eq "f">
+    <if @num_children@ gt 0> #acs-subsite.lt_num_children_Children# [<a href="one?object_id=@object_id@&amp;children_p=t">#acs-subsite.Show#</a>]</if>
     <else>
-      <p><em>#acs-subsite.none#</em></p>
+      <em>#acs-subsite.none#</em>
     </else>
-    <if @acl:rowcount@ gt 0>
-    <input type=submit value="#acs-subsite.Revoke_Checked#">
-    </form>
-    </if>
-    @controls;noquote@
+  </if>
+  <if @application_url@ not nil>
+    <p>
+      [<a href="@application_url@">#acs-subsite.return_to_application#</a>]
+    </p>
+  </if>
+  <else>
+    <if @context_id@ not nil><p>[<a href="one?object_id=@context_id@">#acs-subsite.up_to_context_name#</a>]</p></if>
+  </else>      
 
-    <h3>#acs-subsite.Children#</h3>
-    <if @children_p@>
-      <if @children:rowcount@ gt 0>
-        <ul>
-          <multiple name="children">
-            <li><a href="one?object_id=@children.c_object_id@">@children.c_name@</a> @children.c_type@</li>
-          </multiple>
-        </ul>
-
-        [<a href="@hide_children_url@">#acs-subsite.Hide#</a>]
-      </if>
-      <else>
-        <p><em>#acs-subsite.none#</em></p>
-      </else>
-    </if>
-
-    <if @children_p@ eq "f">
-      <if @num_children@ gt 0> #acs-subsite.lt_num_children_Children# [<a href="one?object_id=@object_id@&amp;children_p=t">#acs-subsite.Show#</a>]</if>
-      <else>
-        <em>#acs-subsite.none#</em>
-      </else>
-    </if>
-    <if @application_url@ not nil>
-      <p>
-        [<a href="@application_url@">#acs-subsite.return_to_application#</a>]
-      </p>
-    </if>
-    <else>
-      <if @context_id@ not nil><p>[<a href="one?object_id=@context_id@">#acs-subsite.up_to_context_name#</a>]</p></if>
-    </else>      
-
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl	20 Apr 2004 21:13:01 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl	24 Feb 2005 11:10:31 -0000	1.11
@@ -19,12 +19,13 @@
 # RBM: Check if this is the Main Site and prevent the user from being
 #      able to remove Read permission on "The Public" and locking
 #      him/herself out.
-#
-set extra_where_clause ""
 if { [string equal $object_id [subsite::main_site_id]] } {
-	set extra_where_clause "AND grantee_id <> -1"
+    set mainsite_p 1
+} else {
+    set mainsite_p 0
 }
 
+
 set name [db_string name {}]
 
 set context [list [list "./" [_ acs-subsite.Permissions]] [ad_quotehtml [_ acs-subsite.Permissions_for_name]]]