Index: openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/postgresql/wf-ticket-tracker-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/postgresql/wf-ticket-tracker-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/postgresql/wf-ticket-tracker-create.sql	4 Mar 2002 16:38:40 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/wf-ticket-tracker/sql/postgresql/wf-ticket-tracker-create.sql	17 May 2003 12:45:36 -0000	1.4
@@ -32,7 +32,7 @@
         varchar,	-- description  in wf_tickets.description%TYPE,
 	integer,	-- severity	in wf_tickets.severity%TYPE default 3,
 	integer,	-- priority 	in wf_tickets.priority%TYPE default 3,
-	timestamp,	-- creation_date   in acs_objects.creation_date%TYPE default sysdate,
+	timestamptz,	-- creation_date   in acs_objects.creation_date%TYPE default sysdate,
 	integer,	-- creation_user in acs_objects.creation_user%TYPE default null,
 	varchar		-- creation_ip	in acs_objects.creation_ip%TYPE default null
     ) returns integer as '
@@ -45,7 +45,7 @@
 	new__creation_date	alias for $6;
 	new__creation_user	alias for $7;
 	new__creation_ip	alias for $8;
-	v_creation_date		timestamp;
+	v_creation_date		timestamptz;
         v_ticket_id number;
 	v_case_id number;
     begin
@@ -107,4 +107,4 @@
 	from   wf_tickets
 	where  ticket_id = name__ticket_id;
 	return v_subject;
-    end;' language 'plpgsql';
\ No newline at end of file
+    end;' language 'plpgsql';
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/workflow/sql/oracle/upgrade/upgrade-1.0d2-1.0d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/workflow/sql/oracle/upgrade/upgrade-1.0d3-1.0d4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/workflow/sql/postgresql/upgrade/upgrade-1.0d2-1.0d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/workflow/www/doc/api-docify.sh'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/wp-slim.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/wp-slim.info,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/wp-slim/wp-slim.info	16 Jan 2003 14:06:56 -0000	1.10
+++ openacs-4/packages/wp-slim/wp-slim.info	17 May 2003 12:49:05 -0000	1.11
@@ -21,8 +21,8 @@
         <vendor url="http://arsdigita.com/">ArsDigita Corporation</vendor>
         <description format="text/plain">Ported (Jack). Fixed several bugs. Added new features (e.g. versioning and authorization).</description>
 
-        <requires url="acs-content-repository" version="4.0"/>
-        <requires url="acs-kernel" version="4.0"/>
+        <requires url="acs-content-repository" version="4.6.3"/>
+        <requires url="acs-kernel" version="4.6.2"/>
 
         <files>
             <file type="java_code" path="java/src/com/arsdigita/acs/wpSlim/test/WPSlimTest.java"/>
Index: openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql	23 Feb 2002 21:21:07 -0000	1.3
+++ openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql	17 May 2003 12:49:23 -0000	1.4
@@ -34,8 +34,8 @@
 -- Styles for presentations. We'll think more about this later if there's time -
 -- maybe allow ADPs for more flexibility.
 
-insert into cr_mime_types (mime_type) 
-select 'application/octet-stream'
+insert into cr_mime_types (label, mime_type) 
+select 'Binary data', 'application/octet-stream'
 from dual
 where not exists (select 1 from cr_mime_types where mime_type = 'application/octet-stream');
 
Index: openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql	21 Sep 2002 17:09:09 -0000	1.6
+++ openacs-4/packages/wp-slim/sql/postgresql/wp-slim-create.sql	17 May 2003 12:49:58 -0000	1.7
@@ -33,8 +33,8 @@
 -- Style for presentation. We'll think more about this later if there's time 
 -- maybe allow ADPs for more flexibility.
 
-insert into cr_mime_types (mime_type) 
-select 'application/octet-stream'
+insert into cr_mime_types (label, mime_type) 
+select 'Binary data', 'application/octet-stream'
 from dual
 where not exists (select 1 from cr_mime_types where mime_type ='application/octet-stream');
 
@@ -716,7 +716,7 @@
 
 --jackp: To p_create each presentation
 create function wp_presentation__new (
-	timestamp,
+	timestamptz,
 	integer,
 	varchar(400),
 	varchar(400),	
@@ -1029,7 +1029,7 @@
    
 
 create function wp_presentation__new_revision (
-    timestamp,
+    timestamptz,
     integer,	 
     varchar,	 
     integer,	 
@@ -1160,7 +1160,7 @@
 
 create function wp_slide__new (
     integer,
-    timestamp,
+    timestamptz,
     integer,
     varchar,
     varchar,
@@ -1602,7 +1602,7 @@
 end;' language 'plpgsql';
 
 create function wp_slide__new_revision(
-    timestamp,
+    timestamptz,
     integer,
     varchar,
     integer,
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.3 -r1.4
--- openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/wp-slim/sql/postgresql/wp-slim-drop.sql	17 May 2003 12:49:58 -0000	1.4
@@ -368,7 +368,7 @@
 --drop package wp_slide;
 DROP FUNCTION wp_slide__new(
 	integer,
-	timestamp,
+	timestamptz,
 	integer,
 	varchar,
 	varchar,
@@ -408,7 +408,7 @@
 
 --drop package wp_presentation;
 DROP FUNCTION wp_presentation__new(
-	timestamp,
+	timestamptz,
 	integer,
 	varchar,
 	varchar,
@@ -450,7 +450,7 @@
 );
 
 drop function wp_slide__new_revision(
-    timestamp,
+    timestamptz,
     integer,
     varchar,
     integer,
@@ -465,7 +465,7 @@
     boolean);
 
 drop function wp_presentation__new_revision (
-    timestamp,
+    timestamptz,
     integer,	 
     varchar,	 
     integer,	 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/tcl/printer-view-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/tcl/printer-view-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/attach-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/attach-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/attach.tcl	18 Sep 2002 12:07:02 -0000	1.6
+++ openacs-4/packages/wp-slim/www/attach.tcl	17 May 2003 12:50:50 -0000	1.7
@@ -19,7 +19,7 @@
 set creation_ip [ad_conn peeraddr]
 
 set tmp_filename [ns_queryget attachment.tmpfile]
-set mime_type [ns_guesstype $attachment]
+set mime_type [cr_filename_to_mime_type -create $attachment]
 set tmp_size [file size $tmp_filename]
 
 # strip off the C:\directories... crud and just get the file name
Index: openacs-4/packages/wp-slim/www/edit-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/edit-presentation.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/edit-presentation.tcl	17 May 2003 12:50:50 -0000	1.5
@@ -47,4 +47,10 @@
 
 set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "Edit Presentation"]
 
+# quote html tags
+set page_signature [ad_quotehtml $page_signature]
+set copyright_notice [ad_quotehtml $copyright_notice]
+set audience [ad_quotehtml $audience]
+set background [ad_quotehtml $background]
+
 ad_return_template
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.4 -r1.5
--- openacs-4/packages/wp-slim/www/edit-slide-2.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl	17 May 2003 12:50:50 -0000	1.5
@@ -13,7 +13,6 @@
     postamble:html
     sort_key
     original_slide_id
-    array_max
     button
     bullet:array,html
     bullet_num:integer
@@ -30,7 +29,7 @@
 
 # construct the list of bullet_items
 set bullet_items [list]
-for {set index 1} {$index < [expr $bullet_num + 2]} {incr index} {
+for {set index 1} {$index < [expr $bullet_num + 1]} {incr index} {
     if {![empty_string_p $bullet($index)]} {
         lappend bullet_items $bullet($index)
     }
Index: openacs-4/packages/wp-slim/www/edit-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/edit-slide.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-slide.adp	17 May 2003 12:50:50 -0000	1.4
@@ -6,7 +6,7 @@
 
 <input type=hidden name=slide_item_id value="@slide_item_id@">
 <input type=hidden name=pres_item_id value="@pres_item_id@">
-<input type=hidden name=bullet_num value="@bullet_num@">
+<input type=hidden name=bullet_num value="@bullets:rowcount@">
 <input type=hidden name=sort_key value="@sort_key@">
 <input type=hidden name=original_slide_id value="@original_slide_id@">
 
@@ -37,16 +37,20 @@
     <th align=right nowrap>Bullet Items:</th>
     <td>
       <ul>
-        <input type=hidden name=array_max value=<%=[expr $bullet_num + 2]%>>
-<list name="bullet_items">
-  <if @bullet_items:rownum@ eq 1>
-    <li><input type=text size=60 name=bullet.1 value="@bullet_items:item@">&nbsp;<img src="pics/1white.gif" width=18 height=15"><a href="javascript:swapWithNext(1)"><img src="pics/down.gif" width=18 height=15 border=0></a>
-  </if>
-<else>
-  <li><input type=text size=60 name=bullet.@bullet_items:rownum@ value="@bullet_items:item@">&nbsp;<a href="javascript:swapWithNext(<%=[expr @bullet_items:rownum@ - 1]%>)"><img src="pics/up.gif" width=18 height=15 border=0></a><a href="javascript:swapWithNext(@bullet_items:rownum@)"><img src="pics/down.gif" width=18 height=15 border=0></a>
+
+<multiple name="bullets">
+<li> <if @bullets.widget@ eq "text">
+    <input type="text" name="bullet.@bullets.rownum@" value="@bullets.item@" size="70">
+</if><else>
+    <textarea wrap="soft" rows="@bullets.rows@" cols="60" name="bullet.@bullets.rownum@">@bullets.item@</textarea>
 </else>
-</list>
-<li><input type=text size=60 name=bullet.<%=[expr $bullet_num + 1]%> value="">&nbsp;<a href="javascript:swapWithNext(@bullet_num@)"><img src="pics/up.gif" width=18 height=15 border=0></a><img src="pics/1white.gif" width=18 height=15">
+<if @bullets.prev@ gt 0><a href="javascript:swapWithNext(@bullets.prev@)"><img src="pics/up.gif" width=18 height=15 border=0></a>
+</if><else>
+    <img src="pics/1white.gif" width=18 height=15">
+</else>
+<a href="javascript:swapWithNext(@bullets.rownum@)"><img src="pics/down.gif" width=18 height=15 border=0></a>
+</multiple>
+<li><input type="text" size="70" name="bullet.@bullet_num@" value="">&nbsp;<a href="javascript:swapWithNext(@bullets:rowcount@)"><img src="pics/up.gif" width=18 height=15 border=0></a><img src="pics/1white.gif" width=18 height=15">
 
         <br><i>You can add additional bullets later.</i>
       </ul>
@@ -60,7 +64,6 @@
     </td>
   </tr>
 </table>
-
 <p><center>
 <input type=submit name=button value="Save Slide">
 <spacer type=horizontal size=50>
Index: openacs-4/packages/wp-slim/www/edit-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/edit-slide.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/edit-slide.tcl	17 May 2003 12:50:50 -0000	1.5
@@ -61,6 +61,23 @@
 #
 #
 
-set bullet_num [llength $bullet_items]
+set bullet_num 0
+multirow create bullets item widget rows prev
+foreach item $bullet_items { 
+    if {[string length $item] < 60} { 
+        set rows 1 
+        set widget text
+    } else { 
+        set rows [max 3 [min 8 [expr {[string length $item]/45}]]]
+        set widget textarea
+    }
+    multirow append bullets $item $widget $rows $bullet_num
+    incr bullet_num
+}
+incr bullet_num
+set bullet_max [expr $bullet_num + 1]
 
+# quote html tags contained in bullet items
+set bullet_items [ad_quotehtml $bullet_items]
+
 ad_return_template
Index: openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql	17 May 2003 12:50:50 -0000	1.2
@@ -31,8 +31,7 @@
            acs_permission__permission_p(:pres_item_id, person_id, 'wp_edit_presentation') as edit_p,
            acs_permission__permission_p(:pres_item_id, person_id, 'wp_admin_presentation') as admin_p
     from persons
-    where acs_permission__permission_p(:pres_item_id, person_id,
-'wp_view_presentation') = 'f'
+    where acs_permission__permission_p(:pres_item_id, person_id, 'wp_view_presentation') = 't'
     or    acs_permission__permission_p(:pres_item_id, person_id, 'wp_edit_presentation') = 't'
     or    acs_permission__permission_p(:pres_item_id, person_id, 'wp_admin_presentation') = 't'
 
Index: openacs-4/packages/wp-slim/www/serve-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	21 Sep 2002 17:09:10 -0000	1.5
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	17 May 2003 12:50:50 -0000	1.6
@@ -1,4 +1,4 @@
-<master>
+<master src="wp-presentation-master">
 <property name="title">@pres_title@</property>
 <property name="context">"one presentation"</property>
 
Index: openacs-4/packages/wp-slim/www/serve-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/serve-slide.adp	6 Sep 2002 21:51:10 -0000	1.6
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	17 May 2003 12:50:50 -0000	1.7
@@ -1,4 +1,4 @@
-<master>
+<master src="wp-presentation-master">
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
 
@@ -8,9 +8,11 @@
 </tr>
 </table>
 
+<h2>@slide_title@</h2>
 <if @show_modified_p@ eq t>
 <i>Last modified @modified_date@</i>
 </if>
+<hr>
 
 <multiple name="attach_list">
         <if @attach_list.display@ eq "top">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/wp-presentation-master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/wp-presentation-master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/www/default-master.adp	21 Apr 2003 09:50:29 -0000	1.7
+++ openacs-4/www/default-master.adp	17 May 2003 12:51:57 -0000	1.8
@@ -1,28 +1,23 @@
 @doc_type@
 <html>
-  <head>
-    <title>@title@</title>
-    @header_stuff@
-  </head>
+<head>
+<title>@title@</title>
+@header_stuff@
+</head>
+<body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
+<include src="login-status" />
 
-  <body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
+<if @body_start_include@ not nil>
+<include src="@body_start_include@" />
+</if>
 
-    <if @body_start_include@ not nil>
-      <include src="@body_start_include@" />
-    </if>
+<h1>@title@</h1>
+@context_bar@
+<hr />
+<slave>
 
-    <h1>@title@</h1>
-
-      <div>
-        @context_bar@
-        <hr />
-      </div>
-
-    <slave>
-
-    <hr />
-    <address><a href="mailto:@signatory@">@signatory@</a></address>
-    @ds_link@
-
-  </body>
+<hr />
+<address><a href="mailto:@signatory@">@signatory@</a></address>
+@ds_link@
+</body>
 </html>
Index: openacs-4/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/www/index.adp	21 Apr 2003 07:35:41 -0000	1.11
+++ openacs-4/www/index.adp	17 May 2003 12:51:57 -0000	1.12
@@ -14,7 +14,7 @@
 
       <p>
       Thank you for using our software. Please write to us at the <a
-      href="http://openacs.org/forums">OpenACS forums</a> to let
+      href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS discussion forums</a> to let
       us know of your experience with installing and using OpenACS. 
       </p>
       
@@ -87,11 +87,12 @@
       </p>      
 
       <p>
-      Should you develop an OpenACS package that you want to share with the rest
-      of the community, upload it to <a
-      href="http://openacs.org/storage/"
-      title="OpenACS.org File Storage">OpenACS Repository</a> and we will
-      evaluate it and publish it.
+      If you are using OpenACS to develop a website, please read our 
+      <a href="http://openacs.org/contribute">conbribution instructions</a> to learn
+      how you can become involved in the OpenACS project.
+      If you develop your own OpenACS packages there is a good chance they will be 
+      useful to other people in the community and after review they can be included in the OpenACS
+      distribution.
       </p>      
 
       <p>
@@ -217,6 +218,17 @@
                   <a href="http://openacs.org/">Developer Community</a>
                 </td>
               </tr>
+              <tr bgcolor="#eeeeee">
+                <td>
+                  <a
+                     href="http://openacs.org/forums/forum-view?forum_id=14013">OpenACS Q&amp;A forum</a>
+                </td>
+              </tr>
+              <tr bgcolor="#eeeeee">
+                <td>
+                  <a href="http://openacs.org/forums/">Other OpenACS forums</a>
+                </td>
+              </tr>
              <tr bgcolor="#eeeeee">
                 <td>
                   <a href="http://openacs.org/bugtracker/openacs/">Report a bug</a>
Index: openacs-4/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/www/index.tcl	7 Apr 2003 12:16:41 -0000	1.4
+++ openacs-4/www/index.tcl	17 May 2003 12:51:57 -0000	1.5
@@ -26,6 +26,15 @@
     focus:onevalue
 }
 
+# DRB: vertical applications like dotLRN can set the IndexRedirectUrl parameter to force the user
+# to an index page of its choice.
+
+set redirect_url [parameter::get_from_package_key -package_key acs-kernel -parameter IndexRedirectUrl]
+if { ![string equal $redirect_url ""] } {
+    ad_returnredirect $redirect_url
+    ad_script_abort
+}
+
 set user_id [ad_get_user_id]
 if { $user_id == 0 } {
     set user_id ""
@@ -51,7 +60,7 @@
 set form_vars [export_form_vars return_url time token_id hash]
 
 set allow_persistent_login_p [ad_parameter -package_id [ad_acs_kernel_id] AllowPersistentLoginP security 1]
-if {[ad_parameter -package_id [ad_acs_kernel_id] PersistentLoginDefaultP security 1]} {
+if {[ad_parameter -package_id [ad_acs_kernel_id] DefaultPersistentLoginP security 0]} {
     set remember_password "checked=\"checked\""
 } else {
     set remember_password ""
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/www/login-status.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/www/login-status.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?