Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/doc/installation.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/doc/installation.html,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/doc/installation.html	11 Feb 2002 07:45:52 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/doc/installation.html	13 Mar 2002 22:50:53 -0000	1.4
@@ -31,14 +31,15 @@
 
 <dd>
 
+<p>
 <ul>
 
 <li><a
 href="http://www.research.att.com/sw/tools/graphviz/download.html">GraphViz
 download page</a>
 
 </ul>
-
+<p>
 We use GraphViz to create a graphic representation of the
 process. This is used in a number of places, including the Advanced
 Process Builder and the Process Monitor. Although the package will
@@ -47,33 +48,26 @@
 
 <p>
 
+On RedHat 7.2, say:
 
-You can <strong>install GraphViz anywhere you want</strong>. A good
-place is in <code>/usr/local</code>. Here's the commands that can be
-used to install this on a Linux system. You probably need to be root to do
-this.
+<pre>rpm -ivh http://www.research.att.com/sw/tools/graphviz/dist/graphviz-1.8.1-0.i386.rpm</pre>
 
-<pre>
-$ su -
-$ cd /usr/local
-$ wget http://www.research.att.com/sw/tools/graphviz/gviz1.5.linux.i386.tgz
-  (substitute the URL for your operating system, if not Linux)
-$ tar xvfz gviz1.5.linux.i386.tgz
-$ ln -s gv1.5 graphviz
-$ cd bin
-$ ln -s /usr/local/graphviz/bin/dot dot
-</pre>
+On Debian, say:
 
-<p>
-Note: on Debian, you can do: <code>apt-get install graphviz</code>
-</p>
+<pre>apt-get install graphviz</pre>
 
+On other systems, visit the <a
+href="http://www.research.att.com/sw/tools/graphviz/download.html">GraphViz
+download page</a> and see what you can find out.
+
 </dd>
 
 <dt>3. Install Fonts for GraphViz</dt>
 
 <dd>
 
+<p>
+
 <ul>
 
 <li><a
@@ -86,21 +80,41 @@
 
 </ul>
 
+<p>
+
 This will work a little differently depending on your platform.
 <p>
 On Linux, you can install the <strong>RPM fonts</strong>:
 
 <pre>
 $ su -
-$ wget ftp://rpmfind.net/linux/contrib/noarch/noarch/webfonts-1-3.noarch.rpm
-$ rpm -ivh webfonts-1-3.noarch.rpm
-$ cp /usr/X11R6/lib/X11/fonts/webfonts/*.ttf /usr/local/lib/fonts/
+$ rpm -ivh ftp://rpmfind.net/linux/contrib/noarch/noarch/webfonts-1-3.noarch.rpm
 </pre>
 
+Unfortunately, Graphviz doesn't look in the place where the webfonts
+RPM puts them. Webfonts puts the fonts in
+<code>/usr/X11R6/lib/X11/fonts/webfonts</code>. Graphviz looks in
+<code>/usr/X11R6/lib/X11/fonts/webfonts/truetype</code> (among other
+places, and it may vary from version to version.)
+
+<p>
+
+Here's what you can do to copy the font files from where webfonts puts
+them to where GraphiViz looks:
+
+<pre>
+$ cd /usr/X11R6/lib/X11/fonts
+$ mkdir truetype
+$ cd truetype
+$ cp ../webfonts/* .
+</pre>
+
+<p>
+
 You don't have to copy over all the fonts. For the standard
 installation, you only need <code>arial.ttf</code>,
-<code>arialb.ttf</code>, and <code>times.ttf</code>. You may also symlink
-them if you prefer. But the above will work.
+<code>arialb.ttf</code>, and <code>times.ttf</code>. You may also
+symlink them if you prefer. But the above will work.
 <p>
 
 If you have a recent version of Solaris, you can probably find the
@@ -130,8 +144,9 @@
 <code>c:\winnt\fonts</code>.
 
 <li>Copy <code>arial.ttf</code> and <code>arialb.ttf</code> onto your
-server Unix machine, into <code>/usr/local/lib/fonts</code>. If you
-want, you can download, install and copy over additional font files.
+server Unix machine, into
+<code>/usr/X11R6/lib/X11/fonts/truetype</code>. If you want, you can
+download, install and copy over additional font files.
 
 </ol>
 
@@ -143,8 +158,8 @@
 
 <ol>
 
-<li>Visit the Site Map at <code>/admin/site-map</code> on your
-webserver.
+<li>Visit the Site Map at <code><a
+href="/admin/site-map">/admin/site-map</a></code> on your webserver.
 
 <li>Click "set parameters" next to the acs-workflow package.
 
@@ -162,8 +177,9 @@
 
 <dd>
 Your workflow package is installed. You probably want to visit the
-package at <code>/workflow/</code>, click on admin, and study the
-sample processes included.
+package at <code><a href="/acs-workflow/">/acs-workflow/</a></code> (this
+is where Workflow is mounted by default&#151;may vary on your server),
+click on admin, and study the sample processes included.
 
 
 </dd>
@@ -177,7 +193,3 @@
 
 </body>
 </html>
-
-
-
-
Index: openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-create.sql	9 Mar 2002 02:00:02 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/sql/oracle/bboard-create.sql	13 Mar 2002 22:50:53 -0000	1.4
@@ -427,49 +427,4 @@
   return finalString;
 end;
 /
-
--- NOTE: this is only temporary until we figure out how
---       packages will register child types to an acs-message
-declare
-    v_exists	integer;
-begin
-
-    select decode(count(*),0,0,1) into v_exists 
-      from cr_type_children
-      where parent_type = 'acs_message_revision'
-      and child_type = 'content_revision';
-
-    if v_exists = 0 then
-      content_type.register_child_type (
-          parent_type => 'acs_message_revision',
-          child_type  => 'content_revision'
-      );
-    end if;
-
-    select decode(count(*),0,0,1) into v_exists 
-      from cr_type_children
-      where parent_type = 'acs_message_revision'
-      and child_type = 'content_revision';
-
-    if v_exists = 0 then
-      content_type.register_child_type (
-          parent_type => 'acs_message_revision',
-          child_type  => 'image'
-      );
-    end if;
-
-    select decode(count(*),0,0,1) into v_exists 
-      from cr_type_children
-      where parent_type = 'acs_message_revision'
-      and child_type = 'content_revision';
-
-    if v_exists = 0 then
-      content_type.register_child_type (
-          parent_type => 'acs_message_revision',
-          child_type  => 'content_extlink'
-      );
-    end if;
-
-end;
-/
 show errors
Index: openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql	9 Mar 2002 02:00:02 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-create.sql	13 Mar 2002 22:50:53 -0000	1.5
@@ -312,49 +312,3 @@
 insert into cr_mime_types (mime_type) 
  values ('text/plain; format=flowed');
 
-
--- -- NOTE: this is only temporary until we figure out how
--- --       packages will register child types to an acs-message
--- declare
---     v_exists	integer;
--- begin
-
---     select decode(count(*),0,0,1) into v_exists 
---       from cr_type_children
---       where parent_type = 'acs_message_revision'
---       and child_type = 'content_revision';
-
---     if v_exists = 0 then
---       content_type.register_child_type (
---           parent_type => 'acs_message_revision',
---           child_type  => 'content_revision'
---       );
---     end if;
-
---     select decode(count(*),0,0,1) into v_exists 
---       from cr_type_children
---       where parent_type = 'acs_message_revision'
---       and child_type = 'content_revision';
-
---     if v_exists = 0 then
---       content_type.register_child_type (
---           parent_type => 'acs_message_revision',
---           child_type  => 'image'
---       );
---     end if;
-
---     select decode(count(*),0,0,1) into v_exists 
---       from cr_type_children
---       where parent_type = 'acs_message_revision'
---       and child_type = 'content_revision';
-
---     if v_exists = 0 then
---       content_type.register_child_type (
---           parent_type => 'acs_message_revision',
---           child_type  => 'content_extlink'
---       );
---     end if;
-
--- end;
--- /
--- show errors
Index: openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql	9 Mar 2002 02:00:02 -0000	1.7
+++ openacs-4/contrib/obsolete-packages/bboard/sql/postgresql/bboard-packages.sql	13 Mar 2002 22:50:53 -0000	1.8
@@ -274,21 +274,19 @@
 end;
 ' language 'plpgsql';
 
-
 create function bboard_category__name (integer)
 returns varchar as '
 declare
-    category_id      alias for $1;
-    v_category_name   varchar;
+   p_category_id     alias for $1;
+   v_category_name   varchar;
 begin
-    select short_name into v_category_name
-        from bboard_categories
-	    where category_id = name.category_id;
-    return v_category_name;
+   select short_name into v_category_name
+       from bboard_categories
+       where category_id = p_category_id;
+   return v_category_name;
 end;
 ' language 'plpgsql';
 
-
 --------------- bboard_message package ----------------
 
 create function bboard_message__new (integer, integer, timestamp, integer,
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	29 Jun 2001 20:37:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -14,7 +14,7 @@
 </td>
 
 <td align="right">
- <if @subscribed_p@ eq 0>
+ <if @subscribed_p@ false>
   <if @category_id@ not nil>
    [<a href="category-subscribe?category_id=@category_id@">Subscribe to Category</a>]
   </if>
@@ -41,7 +41,7 @@
  </if>
 </tr></table>
 
-<if @moderator_p@ ne 0>
+<if @moderator_p@ true>
  <if @unapproved:rowcount@ gt 0>
   <h4>Not Yet Approved</h4>
   <ul>
@@ -59,7 +59,7 @@
 
 <include src="message-list" &=messages forum_id="@forum_id@" last_updated_p="t" top_p="t"/>
 
-<if @moderator_p@ ne 0>
+<if @moderator_p@ true>
  <if @rejected:rowcount@ gt 0>
   <h4>Rejected</h4>
   <ul>
@@ -72,15 +72,15 @@
  </if>
 </if>
 
-<if @categories:rowcount@ ne 0 or @category_create_p@ ne 0>
+<if @categories:rowcount@ ne 0 or @category_create_p@ true>
  <h3>By Category</h3>
 </if>
 <if @categories:rowcount@ ne 0>
  <ul>
   <multiple name=categories>
    <li><a href="forum-by-category?forum_id=@forum_id@&category_id=@categories.category_id@">@categories.short_name@</a>
     (@categories.message_count@)
-    <if @admin_p@ eq "t">
+    <if @admin_p@ true>
      [<a href="category-edit?category_id=@categories.category_id@">edit</a>]
      [<a href="category-delete?category_id=@categories.category_id@">delete</a>]
     </if>
@@ -90,7 +90,7 @@
  </ul>
 </if>
 
-<if @category_create_p@ ne 0>
+<if @category_create_p@ true>
  [<a href="category-new?forum_id=@forum_id@">Create a category</a>]
 </if> <p>
 
@@ -103,7 +103,7 @@
 
 <p>
 
-<if @admin_p@ eq "t">
+<if @admin_p@ true>
  <h3>Admin</h3>
  [<a href="forum-move?forum_id=@forum_id@">Move messages to other forum</a>]
  [<a href="/permissions/one?object_id=@forum_id@">Set Permissions</a>]
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql	9 Mar 2002 02:00:02 -0000	1.9
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/sql/oracle/ticket-tracker-packages.sql	13 Mar 2002 22:50:53 -0000	1.10
@@ -795,11 +795,10 @@
         body	 	in varchar2
     )
     is
-        v_request_id integer;
         v_url           varchar2(1000);
         v_request_id    integer;
-        v_body          varchar2;
-        v_subject       varchar2;
+        v_body          varchar2(4000);
+        v_subject       varchar2(200);
         v_party_from    parties.party_id%TYPE;
         cursor ticket_cur is
             select tt.ticket_id,
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp	8 Feb 2002 06:35:44 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp	13 Mar 2002 22:50:53 -0000	1.4
@@ -25,6 +25,7 @@
 		<th>Search for a user
 		<th>Add a new user
 		</tr>
+                <tr>
 		<td>
 		<form action=/acs-admin/users/search method=post>
 		<input type=hidden name=target value="@package_url@admin/install/set-sender">
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	15 Feb 2002 18:53:52 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
@@ -63,7 +63,7 @@
     Some of the packages you are trying to install have unsatisfied dependencies.  The packages
     with unsatisfied dependencies have been deselected.  If you wish to install packages that do
     not pass dependencies, please click the \"force\" option below.
-    <form action=packages-install-2>
+    <form action=packages-install-2 method=post>
     
     <ul>
     <li>To <b>install</b> a package is to load its data model.
Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	4 Mar 2002 14:53:30 -0000	1.9
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	13 Mar 2002 22:50:53 -0000	1.10
@@ -90,7 +90,7 @@
         db_bootstrap_checks database_problem error_p
     }
 
-	ns_log notice "Loading acs-tcl"
+    ns_log notice "Loading acs-tcl"
     apm_bootstrap_load_libraries -procs acs-tcl
 
     if { [info exists database_problem] } {
Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl	29 Aug 2001 21:22:48 -0000	1.2
+++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-oracle.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -14,8 +14,7 @@
             # This should never happened - we were able to grab a handle previously, why not now?
             append my_errors "(db_bootstrap_checks) Internal error accessing pool \"$pool\".<br>"
             set my_error_p 1
-        } else {
-            # DRB: The aD code didn't deallocate the database handle if either of the following
+        } else { # DRB: The aD code didn't deallocate the database handle if either of the following
             # errors occured.  Boo hiss...
             if { [catch { ns_ora 1row $db "select sysdate from dual" }] ||
                  [catch { ns_ora exec_plsql_bind $db { begin :1 := 37*73; end; } 1 "" }] } {
@@ -44,6 +43,11 @@
 
     if { [db_string sysdate "select sysdate from dual"] != [ns_fmttime [ns_time] "%Y-%m-%d"] } {
         # See if NLS_DATE_FORMAT is set correctly
+    	append my_errors "<hr><P><B>"
+	append my_errors [db_string sysdate "select sysdate from dual"] 
+    	append my_errors "<P>"
+	append my_errors [ns_fmttime [ns_time] "%Y-%m-%d"] 
+	append my_errors "</B><P><hr>"
         append my_errors "<li><p><b>Your Oracle driver is correctly installed, however
             Oracle's date format should be set to <i>YYYY-MM-DD</i>.</b></p>\n"
         set my_error_p 1
@@ -64,33 +68,105 @@
     # check, so let them check!
     if {![info exists env(ORACLE_HOME)]} {
         append my_errors "<li><p>
-        <strong>There is no <code>ORACLE_HOME</code> variable in your environment.  This variable must be set in order for the installer to locate your Oracle instance.</strong><p>
+        <strong>There is no <code>ORACLE_HOME</code> variable in your environment. 
+This variable must be set in order for the Oracle software to work properly (even on an Oracle client).</strong><p>
         "
         set my_error_p 1
-    } elseif { ![file exists "$env(ORACLE_HOME)/ctx/bin/ctxhx"] && ![ad_windows_p]} {
-        append my_errors "<li><p><strong> The file <code>$env(ORACLE_HOME)/ctx/bin/ctxhx</code> which is needed 
-by the OpenACS Content Repository is not present in your filesystem.  You must be running Oracle 8.1.6 
-with Intermedia installed to use OpenACS.  If you are using Linux, this file is missing because Oracle 
-does not distribute it with the Linux version of Oracle.  However, you can replace this file with a 
-shell script that acts as a workaround.<p>
-The program <code>ctxhx</code> is primarily used to convert files to HTML or TEXT and can
-support translating between different character sets.  The content repository does not need
-this extensive functionality, so you can replace the program with
+    } 
+
+    # First we look for the overall presence of interMedia
+    db_1row check_role "SELECT (SELECT COUNT(*) FROM USER_ROLE_PRIVS WHERE GRANTED_ROLE = 'CTXAPP') ctxrole,
+       (SELECT COUNT(*) FROM ALL_USERS WHERE USERNAME = 'CTXSYS') ctxuser,
+       USER thisuser FROM DUAL"
+    if {$ctxuser < 1} {
+        append my_errors "<li><p><strong>The CTXSYS user does not exist in your database. This means 
+that interMedia is probably not installed. interMedia is needed for full-text searching. 
+To install it, you may either use the Oracle Database Assistant (<code>dbassist</code> under UNIX) to re-create 
+your database or add the missing capabilities (JServer and interMedia), or, if you're feeling adventurous, look at running 
+the SQL*Plus script <code>\$ORACLE_HOME/ctx/admin/dr0inst.sql</code> <em>on the Oracle server</em>.</strong></p>"
+        set my_error_p 1
+    }
+
+    if {$ctxrole < 1} {
+      append my_errors "<li><p><strong>The <code>CTXAPP</code> role has not been granted to this database 
+user (<code>$thisuser</code>). Without the role, it will be impossible to synchronize interMedia indexes 
+and several other tasks. As a dba user (e.g., <code>SYSTEM</code>), grant the role:
 <blockquote><pre>
+GRANT CTXAPP TO $thisuser;
+</pre></blockquote>
+If you still receive this error after restarting AOLserver, you may need to include the role 
+as a \"default\" role for the user. To do so, run the following as a dba user such as <code>SYSTEM</code>:
+<blockquote><pre>
+ALTER USER $thisuser DEFAULT ROLE ALL;
+</pre></blockquote>
+</strong></p>"
+
+      set my_error_p 1
+    }
+
+
+    # drop in a function to convert an Oracle supplied procedure into
+    # function output
+    set sql "CREATE OR REPLACE FUNCTION oacs_get_oracle_version(p_which IN VARCHAR2 DEFAULT 'version') 
+      RETURN VARCHAR2 AS
+      v_version VARCHAR2(50);
+      v_compat VARCHAR2(50);
+      BEGIN
+        DBMS_UTILITY.DB_VERSION( v_version, v_compat );
+        IF LOWER(p_which) = 'version' THEN
+	   RETURN v_version;
+        ELSIF LOWER(p_which) = 'compatibility' THEN
+           RETURN v_compat;
+        ELSE
+   	   RETURN '';
+   	END IF;
+      END oacs_get_oracle_version;"
+    db_dml create_oacs_get_oracle_version $sql
+
+    db_1row get_platform_dbversion  "SELECT DBMS_UTILITY.PORT_STRING platform, oacs_get_oracle_version('version') dbversion FROM DUAL"
+    # the following isn't used currently, but maybe someday we'll give the user
+    # a snapshot of what we think their environment is
+    switch -regexp -- $platform {
+       {^IBMPC/WIN_NT.*} {set platformname "Windows"}
+       {^SVR4-be-.*}      {set platformname "Solaris"}
+       {^IBM AIX/RS.*}    {set platformname "RS/6000 AIX"}
+       {^HP9000.*}        {set platformname "HP-UX on HP 9000"}
+       {^Linuxi386.*}     {set platformname "Linux on Intel" }
+       {^DEC Alpha OSF/1} {set platformname "Tru64 UNIX on Alpha" }
+    }
+
+    set dbversion_list [split $dbversion .]
+    set dbversion_major [lindex $dbversion_list 0]
+    set dbversion_minor [lindex $dbversion_list 1]
+    set dbversion_patch [lindex $dbversion_list 2]
+    set dbversion_total [expr {($dbversion_major * 1000000) + ($dbversion_minor * 1000) + ($dbversion_patch)}]
+
+    # Check for Oracle 8.1.6 and before running on Linux. If so, we've got to tell the user
+    # what to do about lack of INSO filter support in interMedia there.
+    if {($dbversion_total <= 8001006) && [string match $platform "Linuxi386*"]} {
+        append my_errors "<li><p><strong>You are running Oracle $dbversion under Linux (Intel). Versions of
+Oracle prior to 8.1.7 lack the INSO filters used by interMedia. (These filters convert content
+stored in a variety of proprietary formats (e.g., Microsoft Word) into plain text or HTML for indexing
+and searching.) The best solution is to upgrade the server to Oracle 8.1.7. A workaround is to create the 
+file <code>\$ORACLE_HOME/ctx/bin/ctxhx</code> 
+<em>on the Oracle server</em> containing the following lines:
+<blockquote><pre>
 #!/bin/sh
 cat \$1 > \$2
 </pre></blockquote>
-
-Save the above text in <code>$env(ORACLE_HOME)/ctx/bin/ctxhx</code>, and give
-it the proper ownership and permissions.
+This is a simple shell script that just copies the input onto the output. This will work fine
+for the HTML and text documents generally stored in this toolset. After saving this file,
+be sure to give it the proper ownership and permissions:
 <blockquote><pre>
-chown oracle:oinstall $env(ORACLE_HOME)/ctx/bin/ctxhx
-chmod 755 $env(ORACLE_HOME)/ctx/bin/ctxhx
+chown oracle:oinstall \$ORACLE_HOME/ctx/bin/ctxhx
+chmod 755 \$ORACLE_HOME/ctx/bin/ctxhx
 </pre></blockquote>
 </strong><p>"
-
         set my_error_p 1
     }
+
+    # do some cleanup
+    db_dml drop "DROP FUNCTION oacs_get_oracle_version"
  
     # ksh must be installed for Oracle's loadjava to work.
 
@@ -104,7 +180,8 @@
 	    append my_errors "<li><p><strong>The file <code>/bin/ksh</code> is not present.  This file is the Korn shell and
 	    is required by Oracle's <code>loadjava</code> utility for adding Java class files to the database.
 	    It must be installed in order for OpenACS to install properly.  Please obtain it from 
-	    <a href=\"http://www.kornshell.com/\">David Korn's Kornshell page</a>.  Install it and provide
+	    <a href=\"http://www.kornshell.com/\">David Korn's Kornshell page</a>.  (Alternatively, <code>pdksh</code> 
+            (a ksh clone) has been reported to work.) Install it and provide
 	    a symbolic link from <code>/bin/ksh</code> to the executable.  Alternatively, <code>loadjava</code>
 	    is known to work if <code>/bin/sh</code> is linked to <code>/bin/ksh</code>.  You can do this by typing
 	    as root:
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	29 Aug 2001 21:22:48 -0000	1.4
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	13 Mar 2002 22:50:53 -0000	1.5
@@ -173,14 +173,16 @@
 }
 
 ad_proc -public ad_windows_p {} {
+    # DLB - this used to check the existence of the WINDIR environment
+    # variable, rather than just asking AOLserver.
     Returns 1 if the ACS is running under Windows.
     Note,  this procedure is a best guess, not sure of a better way of determining:
 } {
-    global env
-    if {[info exists env(WINDIR)]} {
-	return 1
+    set thisplatform [ns_info platform]
+    if {[string equal $thisplatform  "win32" ]} {
+       return 1
     } else {
-	return 0
+       return 0
     }
 }
 
Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	11 Feb 2002 07:09:23 -0000	1.4
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	13 Mar 2002 22:50:53 -0000	1.5
@@ -416,27 +416,26 @@
     # properly
 
     append result "
-    <tr align=center>    
-     [ad_decode $view "list" "<td bgcolor=ffd700>" "<td>"]    
-    <a href=\"$base_url" "view=list&date=$date\">
-    <font size=-1 color=blue>List</font></a>
+    <tr align=center>"
+    
+    foreach viewname {list day week month year} {
+        set text [string toupper $viewname 0]
+        if { $viewname == $view } {
+            # current view
+            append result "<td bgcolor=ffd700>
+    <font size=-1>$text</font>
     </td>
-     [ad_decode $view "day" "<td bgcolor=ffd700>" "<td>"]    
-    <a href=\"$base_url" "view=day&date=$date\">
-    <font size=-1 color=blue>Day</font></a>
+    "
+        } else {
+            append result "<td>
+    <a href=\"$base_url" "view=$viewname&date=$date\">
+    <font size=-1 color=blue>$text</font></a>
     </td>
-     [ad_decode $view "week" "<td bgcolor=ffd700>" "<td>"]
-    <a href=\"$base_url" "view=week&date=$date\">
-    <font size=-1 color=blue>Week</font></a>
-    </td>
-     [ad_decode $view "month" "<td bgcolor=ffd700>" "<td>"]    
-    <a href=\"$base_url" "view=month&date=$date\">
-    <font size=-1 color=blue>Month</font></a>
-    </td>
-     [ad_decode $view "year" "<td bgcolor=ffd700>" "<td>"]
-    <a href=\"$base_url" "view=year&date=$date\">
-    <font size=-1 color=blue>Year</a>
-    </td>
+    "
+        }
+    }
+
+    append result "
     </tr>
     "
 
@@ -735,8 +734,17 @@
     <tr><td align=center bgcolor=lavender colspan=5>
     <table cellspacing=0 cellpadding=1 border=0 bgcolor=lavender>
     <td><td>
-    <font size=-1><a href=\"$today_url\"><font color=blue>
-    <b>Today</b></font></a> is [dt_ansi_to_pretty]</font><br>
+    <font size=-1>"
+
+    if { $view == "day" && [dt_sysdate] == $date } {
+        append output "<b>Today</b>"
+    } else {
+        append output "<a href=\"$today_url\"><font color=blue>
+    <b>Today</b></font></a> "
+    }
+    
+    append output "
+    is [dt_ansi_to_pretty]</font><br>
     <form method=get action=$base_url>
     Go to: <INPUT TYPE=text name=date size=10> <INPUT type=submit value=go>
     <INPUT TYPE=hidden name=view value=day>
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	17 Nov 2001 11:40:42 -0000	1.2
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -306,10 +306,10 @@
 ad_proc -private ds_get_real_user_id {} { 
     Get the "real" user id.
 } {
-    if { [llength [info proc orig_ad_get_user_id]] == 1 } {
-        return [orig_ad_get_user_id]
+    if { [llength [info proc orig_ad_conn]] == 1 } {
+        return [orig_ad_conn user_id]
     } else {
-        return [ad_get_user_id]
+        return [ad_conn user_id]
     }
 }
 
@@ -325,6 +325,18 @@
     }
 }
 
+ad_proc ds_conn { args } {
+    Developer support version of ad_conn. Overloads "ad_conn user_id",
+    delegates to ad_conn in all other cases.
+} {
+    if { [lindex $args 0] == "user_id" || 
+         ([lindex $args 0] == "-get" && [lindex $args 1] == "user_id") } {
+        return [ds_get_user_id]
+    } else {
+        return [eval "orig_ad_conn [join $args]"]
+    }
+}
+
 ad_proc ds_set_user_switching_enabled { enabled_p } {
     Enables/disables user-switching in a safe manner.
 
@@ -345,9 +357,13 @@
 	    catch {
 		ad_set_client_property developer-support user_id [ad_get_user_id]
 	    }
+            rename ad_conn orig_ad_conn
 	    rename ad_get_user_id orig_ad_get_user_id
 	    rename ad_verify_and_get_user_id orig_ad_verify_and_get_user_id
 	    
+            proc ad_conn { args } {
+                eval "ds_conn [join $args]"
+            }
 	    proc ad_get_user_id {} {
                 ds_get_user_id
 	    }
@@ -357,6 +373,9 @@
 	}
     } else {
 	if { [llength [info proc orig_ad_get_user_id]] == 1 } {
+            rename ad_conn {}
+            rename orig_ad_conn ad_conn
+
 	    rename ad_get_user_id {}
 	    rename orig_ad_get_user_id ad_get_user_id
 
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	4 Sep 2001 04:50:05 -0000	1.3
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql	13 Mar 2002 22:50:53 -0000	1.4
@@ -496,6 +496,7 @@
   object_id	in acs_objects.object_id%TYPE
  )
  is
+   v_exists_p char;
  begin
   
   -- Delete dynamic/generic attributes
@@ -509,11 +510,19 @@
                                 where o.object_id = acs_object.delete.object_id)
       connect by object_type = prior supertype)
   loop
-    -- Delete from the table.
-    execute immediate 'delete from ' || object_type.table_name ||
+    -- Delete from the table if it exists.
+    select decode(count(*),0,'f','t') into v_exists_p
+    from user_tables
+    where table_name = upper(object_type.table_name);
+
+    if v_exists_p = 't' then
+      execute immediate 'delete from ' || object_type.table_name ||
         ' where ' || object_type.id_column || ' = :object_id'
-    using in object_id;
+      using in object_id;
+    end if;
+
   end loop;
+
  end delete;
 
  function name (
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql	27 Jan 2002 00:19:36 -0000	1.29
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql	13 Mar 2002 22:50:53 -0000	1.30
@@ -713,9 +713,14 @@
     -- because the table names appear to be stored in upper case.  Quoting
     -- causes them to not match the actual lower or potentially mixed-case
     -- table names.  We will just forbid squirrely names that include quotes.
+-- daveB
+-- ETP is creating a new object, but not a table, although it does specify a
+-- table name, so we need to check if the table exists. Wp-slim does this too
 
-    execute ''delete from '' || obj_type.table_name ||
-        '' where '' || obj_type.id_column || '' =  '' || delete__object_id;
+    if table_exists(obj_type.table_name) then
+      execute ''delete from '' || obj_type.table_name ||
+          '' where '' || obj_type.id_column || '' =  '' || delete__object_id;
+    end if;
   end loop;
 
   return 0; 
Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	23 Feb 2002 02:37:36 -0000	1.8
+++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql	13 Mar 2002 22:50:53 -0000	1.9
@@ -665,6 +665,8 @@
 -- create or replace package body acs_user
 -- function new
 select define_function_args('user__new','user_id,object_type;user,creation_date;now(),creation_user,creation_ip,email,url,first_names,last_name,password,salt,password_question,password_answer,screen_name,email_verified_p;t,context_id');
+
+
 create function acs_user__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,varchar,char,char,varchar,varchar,varchar,boolean,integer)
 returns integer as '
 declare
@@ -685,12 +687,23 @@
   new__email_verified_p         alias for $15; -- default ''t''
   new__context_id               alias for $16; -- default null
   v_user_id                     users.user_id%TYPE;
+  person_exists			varchar;			
 begin
+  v_user_id := new__user_id;
+
+  select case when count(*) = 0 then ''f'' else ''t'' end into person_exists
+   from persons where person_id = v_user_id;
+
+  if person_exists = ''f'' then
+
   v_user_id :=
-   person__new(new__user_id, new__object_type,
+   person__new(v_user_id, new__object_type,
                new__creation_date, new__creation_user, new__creation_ip,
                new__email, new__url, new__first_names, new__last_name, 
                new__context_id);
+  else
+   update acs_objects set object_type = ''user'' where object_id = v_user_id;
+  end if;
 
   insert into users
    (user_id, password, salt, password_question, password_answer, screen_name,
@@ -708,6 +721,7 @@
   
 end;' language 'plpgsql';
 
+
 create function acs_user__new(varchar,varchar,varchar,char,char) 
 returns integer as '
 declare
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -22,7 +22,7 @@
 }
 
 set context_bar [list \
-	[list "" "Group types"] \
+        [list "[ad_conn package_url]admin/group-types/" "Group types"] \
 	[list "one?[ad_export_vars group_type]" "One type"] \
 	"Edit default join policy"]
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -28,7 +28,10 @@
     }
 }
 
-set context_bar [list [list one?[export_url_vars group_type] "One group type"] "Delete group type"]
+set context_bar [list \
+         [list "[ad_conn package_url]admin/group-types/" "Group types"] \
+         [list one?[export_url_vars group_type] "One group type"] \
+         "Delete group type"]
 
 if { ![db_0or1row select_pretty_name {
     select t.pretty_name as group_type_pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -18,7 +18,7 @@
 }
 
 set user_id [ad_conn user_id]
-set context_bar [list [list "" "Group types"] [list one?[ad_export_vars group_type] "One type"] "Groups"]
+set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars group_type] "One type"] "Groups"]
 set group_type_enc [ad_urlencode $group_type]
 
 if { ![db_0or1row select_type_info {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -16,7 +16,7 @@
     context_bar:onevalue
 }
 
-set context_bar [list [list "" "Group types"] "Add type"]
+set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "Add type"]
 
 template::form create group_type
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql	13 Mar 2002 22:50:53 -0000	1.2
@@ -19,7 +19,7 @@
 <fullquery name="groups_select">      
       <querytext>
       
-    select my_view.group_name, my_view.group_id, rownum as num 
+    select my_view.group_name, my_view.group_id
     from (select /*+ ORDERED */ DISTINCT  g.group_name, g.group_id
            from acs_objects o, groups g,
                 application_group_element_map app_group, 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	4 Dec 2001 00:20:47 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	13 Mar 2002 22:50:53 -0000	1.3
@@ -6,7 +6,7 @@
 <fullquery name="groups_select">      
       <querytext>
 
-    select my_view.group_name, my_view.group_id, 1 as num 
+    select my_view.group_name, my_view.group_id
     from (select DISTINCT g.group_name, g.group_id
            from acs_objects o, groups g,
                 application_group_element_map app_group, 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -10,7 +10,7 @@
   </if>
   <else>
     <multiple name="groups">
-      <if @groups.num@ gt 25>
+      <if @groups.rownum@ gt 25>
         <li> <a href="groups-display?group_type=@group_type_enc@">View all groups of this type</a> </li>
       </if>
       <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -31,7 +31,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [list [list "" "Group types"] "One type"]
+set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "One type"]
 
 if { ![db_0or1row select_pretty_name {
     select t.pretty_name as group_type_pretty_name, t.dynamic_p,
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -19,7 +19,7 @@
 }
 
 set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
-set context_bar [list [list "" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Add relation type"]
+set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Add relation type"]
 
 
 # Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -31,6 +31,6 @@
 }
 
 set export_vars [ad_export_vars -form {group_rel_type_id return_url}]
-set context_bar [list [list "" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
+set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -33,8 +33,8 @@
 
 
 set context_bar [list \
-	[list "" "Groups"] \
-	[list "one?group_id=@group_id@" "One Group" ] \
+        [list "[ad_conn package_url]admin/groups/" "Groups"] \
+	[list "one?group_id=$group_id" "One Group" ] \
         "Edit Join Policy"]
 
 db_1row group_info {
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -20,7 +20,7 @@
     group_name:onevalue
 }
 
-set context_bar [list [list "" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "Add constraint"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "Add constraint"]
 set export_vars [ad_export_vars -form {group_id rel_type return_url}]
 
 db_1row select_props {
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -16,7 +16,7 @@
         <li> <a href=elements-display?group_id=@group_id@&rel_type=@rels.rel_type@>Display all @rels.num_rels@ @rels.role_pretty_plural@</a> </li>
         </ul>
       </if><else>
-        <br><dd>
+        <br>
 	<include src="elements-display-list" group_id="@group_id@" rel_type="@rels.rel_type@" return_url_enc=@return_url_enc@ member_state="approved">
       </else>
     </else>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -49,6 +49,6 @@
      where rel_types.rel_type = :rel_type
 }
 
-set context_bar [list [list "" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -31,7 +31,7 @@
     }
 }
 
-set context_bar [list [list "" "Groups"] "Add a group"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] "Add a group"]
 
 if {[empty_string_p $add_to_group_id]} {
     set add_to_group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	13 Mar 2002 22:50:53 -0000	1.2
@@ -30,7 +30,7 @@
 </ul>
 
  
-<h3>Permissable relationship types</h3>
+<h3>Permissible relationship types</h3>
 <include src="elements-by-rel-type" group_id=@group_id@>
 
 <if @admin_p@ eq 1>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	23 Feb 2002 21:26:39 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -51,7 +51,7 @@
        and g.group_id = :group_id
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/]" "Groups"] "One Group"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] "One Group"]
 
 attribute::multirow \
 	-start_with group \
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -18,7 +18,7 @@
     primary_rels:multirow
 }
 
-set context_bar [list [list "" "Groups"] [list "one?[ad_export_vars group_id]" "One Group"] "Add relation type"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[ad_export_vars group_id]" "One Group"] "Add relation type"]
 set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
 
 # Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -33,6 +33,6 @@
 ad_require_permission $group_id admin
 
 set export_vars [ad_export_vars -form {group_rel_id return_url}]
-set context_bar [list [list "" "Groups"] [list one?[ad_export_vars {group_id}] "One group"] "Remove relation type"]
+set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars {group_id}] "One group"] "Remove relation type"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	10 Oct 2001 18:15:13 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -37,7 +37,7 @@
 doc_body_append "
 [ad_header "Host-Node Map"]
 <h2>Host-Node Map</h2>
-[ad_context_bar]
+[ad_context_bar "Host-Node Map"]
 <hr>
 <h3>Registered hostname/URL pairs</h3>
 <table border>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -29,6 +29,9 @@
 }
 
 set export_vars [export_form_vars segment_id]
-set context_bar [list [list "" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Remove segment"]
+set context_bar [list \
+     [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
+     [list one?[ad_export_vars segment_id] "One segment"] \
+     "Remove segment"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -32,7 +32,7 @@
        and s.rel_type = r.rel_type
 }
 
-set context_bar [list [list "" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"]
+set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"]
 
 # Expects segment_id, segment_name, group_id, role to be passed in 
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -37,7 +37,7 @@
 
 ad_require_permission $group_id "read"
 
-set context_bar [list [list "" "Relational segments"] "Add segment"]
+set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] "Add segment"]
 
 set export_vars [ad_export_vars -form {group_id rel_type return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -66,7 +66,7 @@
 }
 
 
-set context_bar [list [list "" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Create constraints"]
+set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Create constraints"]
 set export_vars [ad_export_vars -form {segment_id return_url}]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	9 Sep 2001 15:36:44 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
@@ -27,7 +27,7 @@
     supertype_pretty_name:onevalue
 }
 
-set context_bar [list [list "" "Relationship types"] "Add relation type"]
+set context_bar [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relation type"]
 
 template::form create rel_type
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -23,7 +23,7 @@
      start with t.object_type in ('membership_rel','composition_rel')
 }
 
-set context_bar [list [list "" "Relationship types"] "Add relationship type"]
+set context_bar [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relationship type"]
 
 set export_vars [ad_export_vars -form {return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -18,7 +18,7 @@
     
 }
 
-set context_bar [list [list "../" "Relationship types"] [list "" "Roles"] "Create role"]
+set context_bar [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "Create role"]
 
 template::form create role_form
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -20,7 +20,7 @@
 }
 
 set role_enc [ad_urlencode $role]
-set context_bar [list [list "../" "Relationship types"] [list "" "Roles"] "One role"]
+set context_bar [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "One role"]
 
 if { ![db_0or1row select_role_props {
     select r.pretty_name, r.pretty_plural
Index: openacs-4/packages/acs-subsite/www/admin/relations/add-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/Attic/add-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/relations/add-postgresql.xql	8 Dec 2001 01:17:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/add-postgresql.xql	13 Mar 2002 22:50:53 -0000	1.5
@@ -43,8 +43,8 @@
                    p.party_id
             from (select o.object_id as party_id
                   from acs_objects o,
-                       (select ot.object_type from acs_object_types ot, acs_object_types ot2
-                        where ot.tree_sortkey between ot2.tree_sortkey and tree_right(ot2.tree_sortkey)
+                       (select ot2.object_type from acs_object_types ot, acs_object_types ot2
+                        where ot2.tree_sortkey between ot.tree_sortkey and tree_right(ot.tree_sortkey)
                           and $start_with) t
                   where o.object_type = t.object_type) p left join
                  (select element_id
Index: openacs-4/packages/acs-subsite/www/register/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/register/user-new-2.tcl	16 Feb 2002 23:14:08 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/register/user-new-2.tcl	13 Mar 2002 22:50:53 -0000	1.5
@@ -66,7 +66,7 @@
 
 # Get whether they requre some sort of approval
 if {[ad_parameter RegistrationRequiresApprovalP "security" 0]} {
-    set member_state ""
+    set member_state "needs approval"
 } else {
     set member_state "approved"
 }
@@ -107,7 +107,7 @@
     set title "Please read your email"
 
     ad_return_template
-} elseif { $member_state == "" } {
+} elseif { $member_state == "needs approval" } {
 
     # this user won't be able to use the system until an admin has
     # approved him, so don't give an auth cookie, but instead tell him 
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	13 Mar 2002 22:50:53 -0000	1.2
@@ -44,7 +44,7 @@
 
 <p>
 
-Full Name:    <input type=text name=first_names size=20> <input type=text name=last_name size=25>
+Full Name:    <input type=text name=first_names size=20 value="@first_names@"> <input type=text name=last_name size=25 value="@last_name@">
 <p>
 
 <if @require_question_p@ eq 1>
Index: openacs-4/packages/acs-subsite/www/register/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/user-new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/user-new.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -32,13 +32,20 @@
 }
 
 # we're going to ask this guy to register
+if { ! [db_0or1row find_person {select party_id as user_id, first_names, last_name from parties join persons on party_id = person_id where lower(email) = lower(:email)} ] } {
+    set user_id [db_nextval acs_object_id_seq]
+    set first_names ""
+    set last_name ""
+} 
 
-set user_id [db_nextval acs_object_id_seq]
 db_release_unused_handles
 
 set system_name [ad_system_name]
 set export_vars [export_form_vars email return_url user_id]
 set no_require_password_p [ad_parameter RegistrationProvidesRandomPasswordP security 0]
 set require_question_p [ad_parameter UseCustomQuestionForPasswordReset security 1]
 
-ad_return_template
\ No newline at end of file
+ad_return_template
+
+
+
Index: openacs-4/packages/acs-subsite/www/shared/1pixel.footer
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/1pixel.footer,v
diff -u -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/acs-subsite/www/shared/1pixel.header
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/1pixel.header,v
diff -u -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/acs-subsite/www/shared/1pixel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/1pixel.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/1pixel.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/shared/1pixel.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -9,7 +9,7 @@
 
 set_the_usual_form_variables
 
-set file [open "[ns_info pageroot]/graphics/1pixel.header"]
+set file [open "[acs_package_root_dir "acs-subsite"]/www/shared/1pixel.header"]
 ns_writefp $file
 close $file
 
@@ -35,6 +35,6 @@
     ns_unlink $file_name
 }
 
-set file [open "[ns_info pageroot]/graphics/1pixel.footer"]
+set file [open "[acs_package_root_dir "acs-subsite"]/www/shared/1pixel.footer"]
 ns_writefp $file
 close $file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/1pixel.tcl.orig'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/1pixel.tcl.rej'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	20 Feb 2002 21:35:28 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	13 Mar 2002 22:50:53 -0000	1.5
@@ -12,6 +12,7 @@
     Returns 1 if this AOLserver has the SSL module installed.
 } {
     if { [ns_config ns/server/[ns_info server]/modules nsssl] != "" ||
+         [ns_config ns/server/[ns_info server]/modules nsssle] != "" ||
          [ns_config ns/server/[ns_info server]/modules nsopenssl] != "" } {
 	return 1
     } else {
@@ -26,6 +27,7 @@
     @creation-date 2 November 2000
 } {
     if { [ad_conn driver] == "nsssl" ||
+         [ad_conn driver] == "nsssle" ||
 	 [ad_conn driver] == "nsopenssl"} {
  	return "filter_ok"
     } 
@@ -35,11 +37,31 @@
     set ssl_port [ns_config -int "ns/server/[ns_info server]/module/nsssl" Port 443]
     } elseif { [ns_config ns/server/[ns_info server]/modules nsopenssl] != "" } {
 	set ssl_port [ns_config -int "ns/server/[ns_info server]/module/nsopenssl" ServerPort 443]
+    } elseif { [ns_config ns/server/[ns_info server]/modules nsssle] != "" } {
+    set ssl_port [ns_config -int "ns/server/[ns_info server]/module/nsssle" Port 443]
     }
     
     set host [ns_set iget [ad_conn headers] "host"]
     if { [regexp {^(.*?):(.*)$} $host match host port] == 0 || [string compare $port $http_port] == 0 } {
 	set url [ad_conn url]
+
+        # ArsDigita probably meant to pass along any form variables (I hope)...
+        set form [ns_getform]
+
+        if {$form != ""} {
+            set size [ns_set size $form]
+            set url_args [list]
+ 
+            for {set i 0} {$i < $size} {incr i} {
+                set key [ns_set key $form $i]
+                set val [ns_set value $form $i]
+                lappend url_args [ns_urlencode $key]=[ns_urlencode $val]
+            }
+ 
+           append url "?[join $url_args &]"
+        }
+        
+
 	if { $ssl_port == 443 } {
 	    set redir "https://$host$url"
 	} else {
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	21 Sep 2001 21:46:42 -0000	1.9
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	13 Mar 2002 22:50:53 -0000	1.10
@@ -119,7 +119,7 @@
     file mkdir $dir
     # cd, gunzip, and untar all in the same subprocess (to avoid having to
     # chdir first).
-    exec sh -c "cd $dir ; [apm_gunzip_cmd] -c $apm_file | [apm_tar_cmd] xf -"
+    exec sh -c "cd $dir ; [apm_gunzip_cmd] -q -c $apm_file | [apm_tar_cmd] xf -" 2>/dev/null
     file delete $apm_file
 }
 
@@ -149,7 +149,7 @@
     # file; we need this to ensure that the tarballs are relative to the
     # package root directory ([acs_root_dir]/packages).
 
-    set cmd [list exec [apm_tar_cmd] cf -]
+    set cmd [list exec [apm_tar_cmd] cf -  2>/dev/null]
     foreach file $files {
 	lappend cmd -C "[acs_root_dir]/packages"
 	lappend cmd "$package_key/$file"
@@ -505,7 +505,7 @@
     }
     if { [catch {
 	set files [split [string trim \
-		[exec [apm_gunzip_cmd]  -c $file_path | [apm_tar_cmd] tf -] "\n"]]
+		[exec [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] tf -] "\n" 2>/dev/null]]
 	apm_callback_and_log $callback  "<li>Done. Archive is [format "%.1f" [expr { [file size $file_path] / 1024.0 }]]KB, with [llength $files] files.<li>"
     } errmsg] } {
 	apm_callback_and_log $callback "The follow error occured during the uncompression process:
@@ -549,7 +549,7 @@
     apm_callback_and_log $callback  "Extracting the .info file (<tt>$info_file</tt>)..."
     set tmpdir [ns_tmpnam]
     file mkdir $tmpdir
-    exec sh -c "cd $tmpdir ; [apm_gunzip_cmd] -c $file_path | [apm_tar_cmd] xf - $info_file"
+    exec sh -c "cd $tmpdir ; [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] xf - $info_file" 2>/dev/null
     
     if { [catch {
 	array set package [apm_read_package_info_file [file join $tmpdir $info_file]]
@@ -586,7 +586,7 @@
 	if {[file exists $package_key]} {
 	    file delete -force $package_key
 	}
-	exec sh -c "cd $install_path ; [apm_gunzip_cmd] -c $file_path | [apm_tar_cmd] xf -"
+	exec sh -c "cd $install_path ; [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] xf -" 2>/dev/null
     }
 }
 
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	1 Mar 2002 23:16:13 -0000	1.8
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	13 Mar 2002 22:50:53 -0000	1.9
@@ -236,7 +236,7 @@
         # the empty string
         set prev_user_id [ad_conn user_id]
 
-        if { $prev_user_id != 0 } {
+        if { $prev_user_id != 0 && $prev_user_id != $new_user_id } {
             # this is a change in identity so we should create
             # a new session so session-level data is not shared
             set session_id [sec_allocate_session]
@@ -298,6 +298,16 @@
     } {
 	return ""
     }
+
+    set new_last_hit [clock seconds]
+
+    db_dml update_last_hit_dml {
+        update sec_session_properties
+           set last_hit = :new_last_hit
+         where session_id = :id and
+               property_name = :name
+    }
+
     return [list $property_value $secure_p]
 }
 
@@ -1035,6 +1045,16 @@
 	return 1
     }
 
+    # check to see if IE is lame (and buggy!) and is expanding \n to \r\n
+    # See: http://www.arsdigita.com/bboard/q-and-a-fetch-msg?msg_id=000bfF
+    set value [string map [list \r ""] $value]
+    set computed_hash [ns_sha1 "$value$token_id$expire_time$secret_token"]
+
+    if { [string compare $computed_hash $hash] == 0 && ($expire_time > [ns_time] || $expire_time == 0) } {
+	return 1
+    }
+
+
     ns_log Debug "Security: The string compare is [string compare $computed_hash $hash]."
     # signature could not be authenticated
     return 0
@@ -1195,14 +1215,19 @@
 	return $tcl_secret_tokens($token_id)
     } else {
 	set token [ns_cache eval secret_tokens $token_id {
-	    return [db_string get_token {select token from secret_tokens
+	    set token [db_string get_token {select token from secret_tokens
                        	                 where token_id = :token_id} -default 0]
-	}]
 
-        if { $token == 0 } {
-	    error "Invalid token ID"
-	}
+	    # Very important to throw the error here if $token == 0
+	    # see: http://www.arsdigita.com/sdm/one-ticket?ticket_id=10760
 
+            if { $token == 0 } {
+	        error "Invalid token ID"
+	    }
+
+	    return $token
+	}]
+
 	set tcl_secret_tokens($token_id) $token
 	return $token
 	
Index: openacs-4/packages/acs-tcl/tcl/security-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/security-procs.xql	1 Mar 2002 23:16:13 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/security-procs.xql	13 Mar 2002 22:50:53 -0000	1.6
@@ -58,4 +58,14 @@
       </querytext>
 </fullquery>
 
+<fullquery name="sec_lookup_property.update_last_hit_dml">
+      <querytext>
+	update sec_session_properties
+	   set last_hit = :new_last_hit
+	 where session_id = :id and
+               property_name = :name
+      </querytext>
+</fullquery>
+
+
 </queryset>
Index: openacs-4/packages/acs-templating/tcl/date-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/date-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-templating/tcl/date-procs.tcl	5 Feb 2002 02:10:55 -0000	1.8
+++ openacs-4/packages/acs-templating/tcl/date-procs.tcl	13 Mar 2002 22:50:53 -0000	1.9
@@ -228,6 +228,9 @@
         set piece [lindex $date $index]
         if { ![string equal $piece {}] } {
           append value $space
+          if { [string length $piece] == 1 } {
+            append value "0"
+          }
           append value $piece 
           append format $space
           append format $sql_form
@@ -243,7 +246,9 @@
       set ret [list]
       foreach fragment $clipped_date {
         if { [string equal $fragment {}] } {
-          lappend ret 0
+          lappend ret "00"
+        } elseif {[string length $fragment] == 1} {
+          lappend ret "0$fragment"
 	} else {
           lappend ret $fragment
 	}
Index: openacs-4/packages/acs-templating/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/element-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/tcl/element-procs.tcl	9 May 2001 05:15:58 -0000	1.2
+++ openacs-4/packages/acs-templating/tcl/element-procs.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -332,8 +332,8 @@
       if { ! [eval $v_code] } {
       
 	# value is invalid according to custom validation code
-	lappend v_errors [subst $v_message]
-	set formerror($element_id:$v_name) [subst $v_message]
+	lappend v_errors [string map [list \$value $value \${value} $value \$label $label \${label} $label] $v_message]
+	set formerror($element_id:$v_name) [lindex $v_errors end]
       }
     }
   }
Index: openacs-4/packages/acs-templating/tcl/tag-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/tcl/tag-procs.tcl	17 Feb 2002 13:53:31 -0000	1.5
+++ openacs-4/packages/acs-templating/tcl/tag-procs.tcl	13 Mar 2002 22:50:53 -0000	1.6
@@ -188,8 +188,9 @@
     }
 
     default { 
-      # abort evaluation
-      error "Invalid operator <tt>$op</tt> in IF tag" 
+      # treat <if @foo_p@> as a shortcut for <if @foo_p@ true>
+      append condition "\[template::util::is_true $arg1\]"
+      set next [expr $i - 1]
     }
   }
 
Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	19 Jan 2002 03:55:16 -0000	1.5
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	13 Mar 2002 22:50:53 -0000	1.6
@@ -56,7 +56,7 @@
 
   if { [info exists element(value)] } {
     # As per scottwseago's request
-    append output [ns_quotehtml $element(value)]
+    append output [ad_quotehtml $element(value)]
   } 
 
   append output "</textarea>"
Index: openacs-4/packages/acs-templating/www/doc/demo/if.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/if.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/if.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/if.adp	13 Mar 2002 22:50:53 -0000	1.2
@@ -4,7 +4,11 @@
 
     <p>The value of x is <b>@x@</b><br>
     The value of y is <b>@y@</b><br>
-    The value of n is <b>@n@</b></p>
+    The value of n is <b>@n@</b><br>
+    The value of bool_t_p is <b>@bool_t_p@</b><br>
+    The value of bool_1_p is <b>@bool_1_p@</b><br>
+    The value of bool_f_p is <b>@bool_f_p@</b><br>
+    The value of bool_0_p is <b>@bool_0_p@</b><p>
 
 <table cellpadding=2 cellspacing=0 border=1>
 <tr bgcolor=#eeeeee>
@@ -14,61 +18,107 @@
 </tr>
 
 <tr><td><tt><b>eq</b></tt></td>
-    <td><tt>if x eq 5</tt></td>
+    <td><tt>if \@x\@ eq 5</tt></td>
     <td><b><if @x@ eq 5>X is 5</if><else>X is not 5</else></b></td>
 </tr>
 
 <tr><td><tt><b>eq</b></tt></td>
-    <td><tt>if x eq 6</tt></td>
+    <td><tt>if \@x\@ eq 6</tt></td>
     <td><b><if @x@ eq 6>X is 6</if><else>X is not 6</else></b></td>
 </tr>
 
 <tr><td><tt><b>eq</b></tt></td>
-    <td><tt>if n eq "Fred's Flute"</tt></td>
+    <td><tt>if \@n\@ eq "Fred's Flute"</tt></td>
     <td><b><if @n@ eq "Fred's Flute">N is "Fred's Flute"</if>
            <else>N is not "Fred's Flute"</else></b></td>
 </tr>
 
 <tr><td><tt><b>eq</b></tt></td>
-    <td><tt>if n eq "Fred"</tt></td>
+    <td><tt>if \@n\@ eq "Fred"</tt></td>
     <td><b><if @n@ eq "Fred">N is "Fred"</if>
            <else>N is not "Fred"</else></b></td>
 </tr>
 
 <tr><td><tt><b>defined</b></tt></td>
-    <td><tt>if x defined</tt></td>
+    <td><tt>if \@x\@ defined</tt></td>
     <td><b><if @x@ defined>x is defined</if>
            <else>x is undefined</else></b></td>
 </tr>
 
 <tr><td><tt><b>nil</b></tt></td>
-    <td><tt>if x nil</tt></td>
+    <td><tt>if \@x\@ nil</tt></td>
     <td><b><if @x@ nil>x is nil</if>
            <else>x is nonnil</else></b></td>
 </tr>
 
 <tr><td><tt><b>defined</b></tt></td>
-    <td><tt>if z defined</tt></td>
+    <td><tt>if \@z\@ defined</tt></td>
     <td><b><if @z@ defined>z is defined</if>
            <else>z is undefined</else></b></td>
 </tr>
 
 <tr><td><tt><b>nil</b></tt></td>
-    <td><tt>if z nil</tt></td>
+    <td><tt>if \@z\@ nil</tt></td>
     <td><b><if @z@ nil>z is nil</if>
            <else>z is nonnil</else></b></td>
 </tr>
 
 <tr><td><tt><b>defined</b></tt></td>
-    <td><tt>if w defined</tt></td>
+    <td><tt>if \@w\@ defined</tt></td>
     <td><b><if @w@ defined>w is defined</if>
            <else>w is undefined</else></b></td>
 </tr>
 
 <tr><td><tt><b>nil</b></tt></td>
-    <td><tt>if w nil</tt></td>
+    <td><tt>if \@w\@ nil</tt></td>
     <td><b><if @w@ nil>w is nil</if>
            <else>w is nonnil</else></b></td>
 </tr>
 
+<tr><td><tt><b>nil</b></tt></td>
+    <td><tt>if \@w\@ nil</tt></td>
+    <td><b><if @w@ nil>w is nil</if>
+           <else>w is nonnil</else></b></td>
+</tr>
+
+<tr><td><tt><b>true</b></tt></td>
+    <td><tt>if \@bool_t_p\@ true</tt></td>
+    <td><b><if @bool_t_p@ true>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
+<tr><td><tt><b>true</b></tt></td>
+    <td><tt>if \@bool_1_p\@ true</tt></td>
+    <td><b><if @bool_1_p@ true>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
+<tr><td><tt><b>true short</b></tt></td>
+    <td><tt>if \@bool_t_p\@</tt></td>
+    <td><b><if @bool_t_p@>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
+<tr><td><tt><b>true short</b></tt></td>
+    <td><tt>if \@bool_1_p\@</tt></td>
+    <td><b><if @bool_1_p@>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
+
+<tr><td><tt><b>false</b></tt></td>
+    <td><tt>if \@bool_f_p\@ false</tt></td>
+    <td><b><if @bool_f_p@ false>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
+<tr><td><tt><b>false</b></tt></td>
+    <td><tt>if \@bool_0_p\@ false</tt></td>
+    <td><b><if @bool_0_p@ false>ok</if>
+           <else>not ok</else></b></td>
+</tr>
+
 </table>
+
+</body>
+</html>
Index: openacs-4/packages/acs-templating/www/doc/demo/if.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/if.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/if.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/if.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -11,3 +11,10 @@
 set n "Fred's Flute"
 
 set z ""
+
+
+set bool_t_p t
+set bool_1_p 1
+
+set bool_f_p f
+set bool_0_p 0
Index: openacs-4/packages/calendar/www/cal-item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-create.tcl	11 Mar 2002 16:42:07 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-create.tcl	13 Mar 2002 22:50:53 -0000	1.9
@@ -98,7 +98,7 @@
     # is not given
 	
     if { [empty_string_p $calendar_id] } {
-	ad_return_compliant 1 "You need to supply a caledar"
+	ad_return_complaint 1 "You need to supply a calendar"
     }
 
     # now we make sure that the user has the permission 
Index: openacs-4/packages/calendar/www/cal-item.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/calendar/www/cal-item.tcl	11 Mar 2002 16:42:07 -0000	1.7
+++ openacs-4/packages/calendar/www/cal-item.tcl	13 Mar 2002 22:50:53 -0000	1.8
@@ -82,7 +82,7 @@
     # check so that cal_item_id does exist
     if { [empty_string_p cal_item_id] } {
 	# barf error
-	ad_return_compliant 1 "you need to supply a cal_item_id"
+	ad_return_complaint 1 "you need to supply a cal_item_id"
     }
 
 
Index: openacs-4/packages/calendar/www/admin/cal-item-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/cal-item-permissions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	9 Jan 2002 23:56:31 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -26,12 +26,15 @@
 
         <else>
           <p>
+            <ul>
             <multiple name=audiences>
 	      <li> 
               <a href="cal-item-permissions?cal_item_id=@cal_item_id@&party_id=@audiences.party_id@&action=view">
                 @audiences.name@            
 	      </a>
+              </li>
             </multiple>
+            </ul>
           </p>
         </else>
 
@@ -58,11 +61,13 @@
 
 <else>
   <p>
+    <ul>
     <multiple name=privileges>	 
       <li>@privileges.privilege@  
 	[<a href="cal-item-permissions?cal_item_id=@cal_item_id@&action=revoke&party_id=@party_id@&permission=@privileges.privilege@">            revoke
-	 </a>]
+	 </a>]</li>
     </multiple>
+    </ul>
   </p>
 </else>
 </if>
Index: openacs-4/packages/calendar/www/admin/calendar-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/admin/calendar-edit.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/admin/calendar-edit.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -25,7 +25,7 @@
     calendar_update $calendar_id $party_id $calendar_name $calendar_permission
 }
 
-ad_returnredirect "/calendar/admin"
+ad_returnredirect "."
 
 
 
Index: openacs-4/packages/calendar/www/admin/calendar-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-permissions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/admin/calendar-permissions.adp	9 Jan 2002 23:56:31 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/calendar-permissions.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -16,19 +16,21 @@
 <b> Current Permissions </b>
 
 <if @privileges:rowcount@ eq 0>
-  <p>		
+  <ul>		
     <li>no privilege has been granted
-  </p>
+  </ul>
 </if>
 
 <else>
   <p>
+    <ul>
     <multiple name=privileges>	 
       <li>@privileges.privilege@  
 	[<a href="calendar-permissions?calendar_id=@calendar_id@&action=revoke&party_id=@party_id@&permission=@privileges.privilege@">            
 	  revoke
-	 </a>]
+	 </a>]</li>
     </multiple>
+    </ul>
   </p>
 </else>
 </if>
Index: openacs-4/packages/calendar/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/admin/index.adp	9 Jan 2002 23:56:31 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/index.adp	13 Mar 2002 22:50:53 -0000	1.3
@@ -42,13 +42,13 @@
 
 <p>
 <a href="one?party_id=@user_id@&action=add">
-create a new calendar
+Create a new calendar
 </a>
 </p>
 
 
 <p>
-<a href="one?party_id=@user_id@&action=add">
+<a href="calendar-preferences">
 Edit your Calendar Preferences
 </a>
 </p>
Index: openacs-4/packages/file-manager/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-manager/www/file-edit-2.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/file-manager/www/file-edit-2.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -49,10 +49,10 @@
 	set user_id [ad_verify_and_get_user_id]
 
 	db_1row user_info {
-	    select first_names || ' ' || last_name as name,
-	           email
-	    from   users
-	    where  user_id = :user_id
+            select first_names || ' ' || last_name as name, 
+                   email 
+            from persons pe, parties pa 
+            where pe.person_id=:user_id and pa.party_id=pe.person_id
 	}
 	db_release_unused_handles
 
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql	8 Jan 2002 05:15:37 -0000	1.6
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-drop.sql	13 Mar 2002 22:50:53 -0000	1.7
@@ -27,6 +27,10 @@
 /
 show errors
 
+drop view fs_folders_and_files;
+drop view fs_files;
+drop view fs_folders;
+
 drop trigger fs_package_items_delete_trig;
 drop trigger fs_root_folder_delete_trig;
 
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql	7 Mar 2002 06:27:16 -0000	1.12
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql	13 Mar 2002 22:50:53 -0000	1.13
@@ -81,7 +81,7 @@
             where package_id = get_root_folder__package_id;
         else
             -- must be a new instance.  Gotta create a new root folder
-            v_folder_id := file_storage__new_root_folder(get_root_folder__package_id);
+            v_folder_id := file_storage__new_root_folder(get_root_folder__package_id, null, null);
         end if;
 
         return v_folder_id;
@@ -109,6 +109,8 @@
 
     if NOT FOUND then
         return null;
+    else
+        return v_package_id;
     end if;
 end;' language 'plpgsql' with (iscachable);
 
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-drop.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-drop.sql	18 Dec 2001 21:05:44 -0000	1.6
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-drop.sql	13 Mar 2002 22:50:53 -0000	1.7
@@ -37,6 +37,10 @@
 select inline_0();
 drop function inline_0();
 
+drop view fs_folders_and_files;
+drop view fs_files;
+drop view fs_folders;
+
 drop function fs_package_items_delete_trig();
 drop trigger fs_package_items_delete_trig on fs_root_folders;
 
Index: openacs-4/packages/news/www/preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/preview.tcl	12 Jan 2002 13:16:02 -0000	1.2
+++ openacs-4/packages/news/www/preview.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -14,8 +14,8 @@
     {publish_body:allhtml,trim ""}
     {revision_log: ""}
     html_p:notnull,trim
-    {text_file:trim ""}
-    {text_file.tmpfile:tmpfile ""}
+    text_file:optional
+    text_file.tmpfile:optional,tmpfile
     {publish_date:array ""}
     {archive_date:array ""}
     {permanent_p: "f"}
@@ -44,7 +44,7 @@
 	}
     }
 
-    check_upload_one -requires {publish_body text_file} {
+    check_upload_one -requires {publish_body text_file.tmpfile text_file} {
 	set file_size [file size ${text_file.tmpfile}]
 	# !XOR condition (don't want to have both)
 	if { [empty_string_p $publish_body] && $file_size==0 } {
@@ -56,12 +56,12 @@
 	} 
     }
 
-    max_size -requires {text_file} {
+    max_size -requires {text_file.tmpfile text_file} {
 	set b [file size ${text_file.tmpfile}]
 	
 	set b_max [expr 1000*[ad_parameter MaxFileSizeKb "news" 1024]]
 	if { $b > $b_max } {
-	    ad_complain "Your Word document is larger than the maximum size allowed ([util_commify_number $b_max] bytes)"
+	    ad_complain "Your document is larger than the maximum size allowed ([util_commify_number $b_max] bytes)"
 	    return
 	}
     }
Index: openacs-4/packages/page/page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/page/page.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/page/page.info	9 May 2001 22:32:25 -0000	1.4
+++ openacs-4/packages/page/page.info	13 Mar 2002 22:50:53 -0000	1.5
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
 
 <package key="page" url="http://www.arsdigita.com/acs-repository/apm/packages/page/" type="apm_application">
     <package-name>Page</package-name>
     <pretty-plural>Pages</pretty-plural>
-    <singleton-p>f</singleton-p>
     <initial-install-p>t</initial-install-p>
+    <singleton-p>f</singleton-p>
 
     <version name="4.0" url="http://www.arsdigita.com/acs-repository/download/apm/page-4.0.apm">
     <database-support>
@@ -21,7 +21,9 @@
         <files>
             <file type="package_spec" path="page.info"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/page-create.sql"/>
+            <file type="data_model_drop" db_type="oracle" path="sql/oracle/page-drop.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/page-create.sql"/>
+            <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/page-drop.sql"/>
             <file type="content_page" path="www/admin/content-update.tcl"/>
             <file type="content_page" path="www/admin/index.tcl"/>
             <file type="content_page" path="www/index.tcl"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/page/sql/oracle/page-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/page/sql/postgresql/page-drop.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/search/tcl/search-procs.tcl	21 Nov 2001 04:51:52 -0000	1.6
+++ openacs-4/packages/search/tcl/search-procs.tcl	13 Mar 2002 22:50:53 -0000	1.7
@@ -75,7 +75,9 @@
 	    set data [db_blob_get data "select '$content' as content, 'file' as storage_type"]
 	}
 	lob {
-	    set data [db_blob_get data "select $content as content, 'lob' as storage_type"]
+            db_transaction {
+	        set data [db_blob_get data "select $content as content, 'lob' as storage_type"]
+            }
 	}
     }
 
Index: openacs-4/packages/version-control/tcl/version-control-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/version-control/tcl/version-control-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/version-control/tcl/version-control-procs.tcl	20 Apr 2001 20:51:23 -0000	1.1
+++ openacs-4/packages/version-control/tcl/version-control-procs.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -110,7 +110,7 @@
 } {
 
     # Try the system default
-    set root [ad_parameter CVSROOT vc]
+    set root [ad_parameter  -package_id [apm_package_id_from_key version-control] CVSROOT]
 
     # If not defined we go to the fallback methods
     if [empty_string_p $root] {
@@ -323,7 +323,7 @@
     starts execution from [acs_root_dir].
 
 } {
-    set cvs [ad_parameter CvsPath vc "/usr/local/bin/cvs"]
+    set cvs [ad_parameter  -package_id [apm_package_id_from_key version-control] CvsPath version-control "/usr/local/bin/cvs"]
     return  [exec /bin/env CVS_RSH=/usr/local/bin/ssh /bin/sh -c "cd [acs_root_dir] ; $cvs -d [vc_fetch_root] $cmd"]
 }
 
Index: openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/sql/oracle/wp-slim-drop.sql	13 Mar 2002 22:50:53 -0000	1.3
@@ -3,7 +3,6 @@
 
 
 -- certainly needs to be modified !!
-delete from cr_item_publish_audit;
 
 -- ??
 delete from cr_folder_type_map
@@ -22,7 +21,6 @@
 begin
 
   for c in v_attach_cursor loop
-    update acs_objects set context_id = null where context_id = c.item_id;
     content_item.delete(c.item_id);
   end loop;
 
@@ -90,22 +88,18 @@
 begin
 
   for c in v_slide_clob_cursor loop
-    update acs_objects set context_id = null where context_id = c.item_id;
     content_item.delete(c.item_id);
   end loop;
 
   for c in v_slide_cursor loop
-    update acs_objects set context_id = null where context_id = c.item_id;
     content_item.delete(c.item_id);
   end loop;
 
   for c in v_pres_clob_cursor loop
-    update acs_objects set context_id = null where context_id = c.item_id;
     content_item.delete(c.item_id);
   end loop;
 
   for c in v_pres_cursor loop
-    update acs_objects set context_id = null where context_id = c.item_id;
     content_item.delete(c.item_id);
   end loop;
 
Index: openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql	13 Mar 2002 22:50:53 -0000	1.3
@@ -4,7 +4,8 @@
 
 
 -- certainly needs to be modified !!
-delete from cr_item_publish_audit;
+-- DaveB content_item__delete should take care of this
+-- delete from cr_item_publish_audit;
 
 
 delete from cr_folder_type_map
@@ -20,7 +21,8 @@
   for del_rec in select item_id from cr_items 
 	where content_type in (''cr_wp_file_attachment'', ''cr_wp_image_attachment'')
   loop 
-    update acs_objects set context_id = null where context_id = del_rec.item_id;
+-- DaveB this causes an RI error, and it works without it
+--    update acs_objects set context_id = null where context_id = del_rec.item_id;
     PERFORM content_item__delete(del_rec.item_id);
   end loop;
 return 0;
@@ -104,17 +106,19 @@
 	''cr_wp_slide_bullet_items''
 )
   loop
-    update acs_objects set context_id = null 
-	where context_id = del_rec_a.item_id; 
+-- DaveB this causes an RI error, and it works without it
+--    update acs_objects set context_id = null 
+--	where context_id = del_rec_a.item_id; 
     PERFORM content_item__delete(del_rec_a.item_id);
   end loop;
 
   for del_rec_b
   in select item_id from cr_items
   where content_type = ''cr_wp_slide''
   loop
-    update acs_objects set context_id = null 
-	where context_id = del_rec_b.item_id; 
+-- DaveB this causes an RI error, and it works without it
+--    update acs_objects set context_id = null 
+--	where context_id = del_rec_b.item_id; 
     PERFORM content_item__delete(del_rec_b.item_id);
   end loop;
 
@@ -124,17 +128,19 @@
 	''cr_wp_presentation_aud'', 
 	''cr_wp_presentation_back'')
   loop
-    update acs_objects set context_id = null 
-	where context_id = del_rec_c.item_id;
+-- DaveB this causes an RI error, and it works without it
+--   update acs_objects set context_id = null 
+--	where context_id = del_rec_c.item_id;
     PERFORM content_item__delete(del_rec_c.item_id);
   end loop;
 
   for del_rec_d 
   in select item_id from cr_items
   where content_type = ''cr_wp_presentation''
   loop 
-    update acs_objects set context_id = null 
-	where context_id = del_rec_d.item_id;
+-- DaveB this causes an RI error, and it works without it
+--    update acs_objects set context_id = null 
+--	where context_id = del_rec_d.item_id;
     PERFORM content_item__delete(del_rec_d.item_id);
   end loop;
 
@@ -412,7 +418,8 @@
 	boolean,
 	boolean,
         varchar,
-        varchar
+        varchar,
+	integer
 );
 
 DROP FUNCTION wp_presentation__delete_audience(
Index: openacs-4/packages/wp-slim/www/create-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/create-presentation-2.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/create-presentation-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
@@ -8,7 +8,7 @@
     { background:html "" }
     { page_signature:html "" }
     { copyright_notice:html "" }
-    pres_title:html,notnull
+    pres_title:notnull
     { style:integer -1 }
     show_modified_p:notnull
     public_p:notnull
Index: openacs-4/packages/wp-slim/www/create-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/create-slide-2.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/create-slide-2.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -8,10 +8,10 @@
     pres_item_id:naturalnum,notnull
     slide_title:notnull
     sort_key:naturalnum
-    preamble
+    preamble:html
     array_max:integer
-    bullet:array
-    postamble    
+    bullet:array,html
+    postamble:html   
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/wp-slim/www/edit-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/edit-presentation-2.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-presentation-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
@@ -7,13 +7,13 @@
 } {
     pres_item_id:integer,notnull
     pres_title
-    page_signature
-    copyright_notice
+    page_signature:html
+    copyright_notice:html
     show_modified_p
     public_p:notnull
     style
-    audience
-    background
+    audience:html
+    background:html
 }
 
 
Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/edit-slide-2.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl	13 Mar 2002 22:50:53 -0000	1.3
@@ -9,13 +9,13 @@
     slide_item_id:naturalnum,notnull
     pres_item_id:naturalnum,notnull
     slide_title
-    preamble
-    postamble
+    preamble:html
+    postamble:html
     sort_key
     original_slide_id
     array_max
     button
-    bullet:array
+    bullet:array,html
     bullet_num:integer
 } -properties {
     slide_item_id
Index: openacs-4/packages/wp-slim/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/index-oracle.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/index-oracle.xql	13 Mar 2002 22:50:53 -0000	1.2
@@ -16,6 +16,7 @@
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = p.person_id
 	and   pres.public_p = 't'
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
@@ -31,6 +32,7 @@
 	where i.live_revision = p.presentation_id
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = :user_id
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
@@ -51,6 +53,7 @@
 	and   ao.creation_user <> :user_id
 	and   ao.creation_user = p.person_id
 	and   acs_permission.permission_p(i.item_id, :user_id, 'wp_view_presentation') = 't'
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
Index: openacs-4/packages/wp-slim/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/index-postgresql.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/index-postgresql.xql	13 Mar 2002 22:50:53 -0000	1.2
@@ -16,6 +16,7 @@
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = p.person_id
 	and   pres.public_p = 't'
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
@@ -31,6 +32,7 @@
 	where i.live_revision = p.presentation_id
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = :user_id
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
@@ -51,6 +53,7 @@
 	and   ao.creation_user <> :user_id
 	and   ao.creation_user = p.person_id
 	and   acs_permission__permission_p(i.item_id, :user_id, 'wp_view_presentation') = 't'
+	and   ao.context_id = :package_id
     
       </querytext>
 </fullquery>
Index: openacs-4/packages/wp-slim/www/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/users.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/users.tcl	13 Mar 2002 22:50:53 -0000	1.2
@@ -13,6 +13,7 @@
     users:multirow
 }
 
+set package_id [ad_conn package_id]
 
 # Right now this file is weak. It should link the username to a one-user page which shows 
 # What presentations that users has created (but only if the current user has permission to see/view
@@ -27,6 +28,7 @@
     and   o.object_id = i.item_id
     and   p.person_id = o.creation_user
     and   parties.party_id = p.person_id
+    and   o.context_id = :package_id
     group by p.person_id, p.first_names, p.last_name, parties.email
 }
 
Index: openacs-4/packages/wp-slim/www/users.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/users.xql	4 Oct 2001 04:29:01 -0000	1.1
+++ openacs-4/packages/wp-slim/www/users.xql	13 Mar 2002 22:50:53 -0000	1.2
@@ -10,6 +10,7 @@
     and   o.object_id = i.item_id
     and   p.person_id = o.creation_user
     and   parties.party_id = p.person_id
+    and   o.context_id = :package_id
     group by p.person_id, p.first_names, p.last_name, parties.email
 
       </querytext>