Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/acs-subsite.info	25 Aug 2001 09:31:07 -0000	1.14
+++ openacs-4/packages/acs-subsite/acs-subsite.info	25 Aug 2001 13:42:53 -0000	1.15
@@ -294,6 +294,8 @@
             <file type="content_page" path="www/admin/rel-segments/delete.adp"/>
             <file type="content_page" path="www/admin/rel-segments/delete.tcl"/>
             <file type="query_file" path="www/admin/rel-segments/delete.xql"/>
+            <file type="query_file" db_type="oracle" path="www/admin/rel-segments/elements-display-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/admin/rel-segments/elements-display-postgresql.xql"/>
             <file type="content_page" path="www/admin/rel-segments/elements-display.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/rel-segments/elements-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/rel-segments/elements-postgresql.xql"/>
@@ -478,6 +480,7 @@
             <file type="query_file" db_type="oracle" path="www/permissions/revoke-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/permissions/revoke-postgresql.xql"/>
             <file type="content_page" path="www/permissions/revoke.tcl"/>
+            <file type="query_file" db_type="oracle" path="www/permissions/toggle-inherit-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/permissions/toggle-inherit-postgresql.xql"/>
             <file type="content_page" path="www/permissions/toggle-inherit.tcl"/>
             <file type="query_file" path="www/permissions/toggle-inherit.xql"/>
@@ -605,30 +608,30 @@
             <file type="content_page" path="www/user/portrait/upload.tcl"/>
         </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultMaster"  default="/www/default-master" description="Path to the default master page (skin) for acs-templating.  Extensions                                             .adp/.tcl are implied."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailForgottenPasswordP"  default="1" description="Email users forgotten passwords" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AllowPersistentLoginP"  default="1" description="do we allow persistent logins?" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailChangedPasswordP"  default="0" description="if the admin changes the password, should it be mailed to the user" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UseCustomQuestionForPasswordReset"  default="1" description="Does the user get to choose their custom password question and answer" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRandomPasswordWhenForgottenP"  default="0" description="If so, do you choose a random a password (if you use encrypted password, a random password will always be generated)" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationProvidesRandomPasswordP"  default="0" description="have the system generate a random password instead of the user" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresEmailVerificationP"  default="0" description="set this to 1 if the user has to receive and email and come back to the site" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresApprovalP"  default="0" description="set this to 1 if user does not go live immediately" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRegistrationConfirmationToUserP"  default="0" description="send confirmation email to user after registration" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NewRegistrationEmailAddress"  default="admin@yourdomain.com" description="where to send those notes (defaults to SystemOwner)" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NotifyAdminOfNewRegistrationsP"  default="0" description="Notify someone of new registrations?" section_name="user-login"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePortraitMIMETypes"  default="image/gif image/jpeg" description="Enter a set of acceptable MIME types for portrait submissions." section_name="user-info"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MaxPortraitBytes"  default="200000" description="Maximum portrait size in bytes. Leave empty for no limitation." section_name="user-info"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SolicitPortraitP"  default="1" description="Set this to 1 if you want users to be asked to submit a portrait." section_name="user-info"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="GlobalURLStub"  default="/global" description="Where is the global directory for such things as file-not-found error messages"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TmpDir"  default="/tmp" description="What tmp directories are used on this system? Note the leading / character."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LastVisitUpdateInterval"  default="600" description="how many seconds old a last visit cookie must be before we update it"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SomeAmericanReadersP"  default="1" description="is it even worth bothering asking for state and zip code?"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="background"  default="/graphics/bg.gif" description="Sets a default image background for the default master template (unused 09/18/2000)."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="textcolor"  default="black" description="This setting sets the textcolor for the default master template that all HTML content is returned through."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="bgcolor"  default="white" description="this setting sets the background color for the default-master template that all HTML content is returned in."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictEntireServerToRegisteredUsersP"  default="0" description="do we want to restrict the entire server to registered users (unused 09/18/2000)"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictToSSL"  default="admin/*" description="URLs we want restricted to SSL. Note that this only takes effect if you have an SSL listener configured on your AOLserver."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictEntireServerToRegisteredUsersP"  default="0" description="do we want to restrict the entire server to registered users (unused 09/18/2000)"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="bgcolor"  default="white" description="this setting sets the background color for the default-master template that all HTML content is returned in."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="textcolor"  default="black" description="This setting sets the textcolor for the default master template that all HTML content is returned through."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="background"  default="/graphics/bg.gif" description="Sets a default image background for the default master template (unused 09/18/2000)."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SomeAmericanReadersP"  default="1" description="is it even worth bothering asking for state and zip code?"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="LastVisitUpdateInterval"  default="600" description="how many seconds old a last visit cookie must be before we update it"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="TmpDir"  default="/tmp" description="What tmp directories are used on this system? Note the leading / character."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="GlobalURLStub"  default="/global" description="Where is the global directory for such things as file-not-found error messages"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SolicitPortraitP"  default="1" description="Set this to 1 if you want users to be asked to submit a portrait." section_name="user-info"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MaxPortraitBytes"  default="200000" description="Maximum portrait size in bytes. Leave empty for no limitation." section_name="user-info"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptablePortraitMIMETypes"  default="image/gif image/jpeg" description="Enter a set of acceptable MIME types for portrait submissions." section_name="user-info"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NotifyAdminOfNewRegistrationsP"  default="0" description="Notify someone of new registrations?" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NewRegistrationEmailAddress"  default="admin@yourdomain.com" description="where to send those notes (defaults to SystemOwner)" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRegistrationConfirmationToUserP"  default="0" description="send confirmation email to user after registration" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresApprovalP"  default="0" description="set this to 1 if user does not go live immediately" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationRequiresEmailVerificationP"  default="0" description="set this to 1 if the user has to receive and email and come back to the site" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RegistrationProvidesRandomPasswordP"  default="0" description="have the system generate a random password instead of the user" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRandomPasswordWhenForgottenP"  default="0" description="If so, do you choose a random a password (if you use encrypted password, a random password will always be generated)" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UseCustomQuestionForPasswordReset"  default="1" description="Does the user get to choose their custom password question and answer" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailChangedPasswordP"  default="0" description="if the admin changes the password, should it be mailed to the user" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AllowPersistentLoginP"  default="1" description="do we allow persistent logins?" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailForgottenPasswordP"  default="1" description="Email users forgotten passwords" section_name="user-login"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultMaster"  default="/www/default-master" description="Path to the default master page (skin) for acs-templating.  Extensions                                             .adp/.tcl are implied."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-subsite/www/permissions/toggle-inherit-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/Attic/toggle-inherit-oracle.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/permissions/toggle-inherit-oracle.xql	25 Aug 2001 13:42:53 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="toggle_inherit">      
+      <querytext>
+
+  update acs_objects
+  set security_inherit_p = decode(security_inherit_p, 't', 'f', 'f', 't')
+  where object_id = :object_id
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>