Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -N -r1.32.2.1 -r1.32.2.2
--- openacs-4/packages/forums/forums.info	13 Dec 2005 22:24:49 -0000	1.32.2.1
+++ openacs-4/packages/forums/forums.info	10 May 2006 08:30:07 -0000	1.32.2.2
@@ -7,32 +7,33 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2.0d3" url="http://openacs.org/repository/download/apm/forums-1.2.0d3.apm">
+    <version name="1.2.0d4" url="http://openacs.org/repository/download/apm/forums-1.2.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Online discussion forums.</summary>
-        <release-date>2003-11-10</release-date>
+        <release-date>2006-05-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is a scalable datamodel. Forums supports threaded and flat view, moderation, a stand alone search function as well as integration with the OpenACS search package and integration with the notifications package for email alerts. It also supports reply via email.</description>
+        <maturity>0</maturity>
 
-        <provides url="forums" version="1.2.0d3"/>
+        <provides url="forums" version="1.2.0d4"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
-        <requires url="acs-subsite" version="5.1.4"/>
         <requires url="acs-mail-lite" version="0.1d"/>
-        <requires url="notifications" version="5.1.1"/>
+        <requires url="acs-subsite" version="5.1.4"/>
         <requires url="attachments" version="0.5"/>
+        <requires url="notifications" version="5.1.1"/>
 
-       <callbacks>
+        <callbacks>
             <callback type="after-install"  proc="forum::install::package_install"/>
             <callback type="before-uninstall"  proc="forum::install::package_uninstall"/>
             <callback type="before-upgrade"  proc="forum::install::package_upgrade"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayEmoticonsAsImagesP"  default="1" description="Automatically convert smileys like :-) and similar constructs to images when displaying messages in the browser."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForumsSearchBoxP"  default="1" description="Whether to display a forums specific searchbox within the page body (not desirable when there is a sitewide search in the header)."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseIntermediaForSearchP"  default="0" description="Should we use intermedia for searching forums? Intermedia is more scalable, but interprets searches differently from standard search."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_bgcolor"  default="#eeeeee" description="This is the color of the first message / table row"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="table_border_color"  default="#dddddd" description="The color of the table borders and between the cells, try #ffffff for a cool look"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_other_bgcolor"  default="#d9e4f9" description="The bgcolor for the other table rows"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseIntermediaForSearchP"  default="0" description="Should we use intermedia for searching forums? Intermedia is more scalable, but interprets searches differently from standard search."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v
diff -u -N -r1.30.2.1 -r1.30.2.2
--- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	26 Sep 2005 09:03:13 -0000	1.30.2.1
+++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	10 May 2006 08:30:07 -0000	1.30.2.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="forums" package_version="1.1.2d3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="forums" package_version="1.2.0d4" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Admin_for_all">Administrative options for all forums.</msg>
   <msg key="Administer">Administer</msg>
@@ -18,6 +18,7 @@
   <msg key="by_Date">by Date</msg>
   <msg key="by_Forum">by Forum</msg>
   <msg key="Charter">Charter</msg>
+  <msg key="charter_max_chars">Charter exceeds maximum length (4000 characters)</msg>
   <msg key="closed">closed</msg>
   <msg key="Confirm">Confirm?</msg>
   <msg key="Confirm_Delete">Confirm Delete:</msg>
@@ -60,9 +61,9 @@
   <msg key="Forums_Posting_hist_lt">Forums: Posting history for</msg>
   <msg key="forward">Forward</msg>
   <msg key="Fwd">Fwd:</msg>
-  <msg key="help_presentation">&lt;b&gt;Flat&lt;/b&gt; only allows replies at the end of a thread with no nesting or threading, &lt;b&gt;Threaded&lt;/b&gt; allows replies to be made to any post in the thread and the reply will be indented under the post they are associated with.</msg>
-  <msg key="help_posting_policy">&lt;b&gt;Open&lt;/b&gt; allows any users to post and have posts appear immediately, &lt;b&gt;moderated&lt;/b&gt; means posts must be approved by a moderator before others can see them, and &lt;b&gt;closed&lt;/b&gt; means only administrators may post.</msg>
   <msg key="help_new_threads">If &lt;b&gt;No&lt;/b&gt;, users may only reply to existing posts not create new threads.</msg>
+  <msg key="help_posting_policy">&lt;b&gt;Open&lt;/b&gt; allows any users to post and have posts appear immediately, &lt;b&gt;moderated&lt;/b&gt; means posts must be approved by a moderator before others can see them, and &lt;b&gt;closed&lt;/b&gt; means only administrators may post.</msg>
+  <msg key="help_presentation">&lt;b&gt;Flat&lt;/b&gt; only allows replies at the end of a thread with no nesting or threading, &lt;b&gt;Threaded&lt;/b&gt; allows replies to be made to any post in the thread and the reply will be indented under the post they are associated with.</msg>
   <msg key="html">HTML</msg>
   <msg key="If_checked_create_users">If checked, create users that don't exist:</msg>
   <msg key="Last_Post">Last Post</msg>
@@ -117,9 +118,9 @@
   <msg key="Parameters">Parameters</msg>
   <msg key="parent_ID">parent ID</msg>
   <msg key="Pending">Pending</msg>
-  <msg key="Permissions_for_all">Permissions for all forums.</msg>
-  <msg key="Permission_forum_name">Permissions for &quot;%name%&quot;</msg>
   <msg key="Pending_Threads">Pending Threads</msg>
+  <msg key="Permission_forum_name">Permissions for &quot;%name%&quot;</msg>
+  <msg key="Permissions_for_all">Permissions for all forums.</msg>
   <msg key="Post">Post</msg>
   <msg key="Post_a_Message">Post a Message</msg>
   <msg key="Post_a_New_Message">Post a New Message</msg>
Index: openacs-4/packages/forums/sql/oracle/forums-forums-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-forums-create.sql,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/forums/sql/oracle/forums-forums-create.sql	26 Sep 2005 09:03:13 -0000	1.5.2.1
+++ openacs-4/packages/forums/sql/oracle/forums-forums-create.sql	10 May 2006 08:30:07 -0000	1.5.2.2
@@ -40,7 +40,7 @@
     name                            varchar(200)
                                     constraint forums_name_nn
                                     not null,
-    charter                         varchar(2000),
+    charter                         varchar(4000),
     presentation_type               varchar(100) 
                                     constraint forums_presentation_type_nn
                                     not null
Index: openacs-4/packages/forums/sql/oracle/upgrade/upgrade-1.2.0d3-1.2.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/upgrade/upgrade-1.2.0d3-1.2.0d4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/sql/oracle/upgrade/upgrade-1.2.0d3-1.2.0d4.sql	10 May 2006 08:30:07 -0000	1.1.2.1
@@ -0,0 +1,12 @@
+-- 
+-- packages/forums/sql/oracle/upgrade/upgrade-1.2.0d3-1.2.0d4.sql
+-- 
+-- @author Deds Castillo (deds@i-manila.com.ph)
+-- @creation-date 2006-05-10
+-- @arch-tag: 0584c03b-94d4-4356-93bd-593b737805a2
+-- @cvs-id $Id: upgrade-1.2.0d3-1.2.0d4.sql,v 1.1.2.1 2006/05/10 08:30:07 dedsc Exp $
+--
+
+-- increase charter to 4000 chars
+
+alter table forums_forums modify charter varchar(4000);
Index: openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql,v
diff -u -N -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql	13 Dec 2005 22:24:50 -0000	1.7.2.2
+++ openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql	10 May 2006 08:30:07 -0000	1.7.2.3
@@ -40,7 +40,7 @@
     name                            varchar(200)
                                     constraint forums_name_nn
                                     not null,
-    charter                         varchar(2000),
+    charter                         varchar(4000),
     presentation_type               varchar(100) 
                                     constraint forums_presentation_type_nn
                                     not null
Index: openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.2.0d3-1.2.0d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.2.0d3-1.2.0d4.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.2.0d3-1.2.0d4.sql	10 May 2006 08:30:08 -0000	1.1.2.1
@@ -0,0 +1,22 @@
+-- 
+-- packages/forums/sql/postgresql/upgrade/upgrade-1.2.0d3-1.2.0d4.sql
+-- 
+-- @author Deds Castillo (deds@i-manila.com.ph)
+-- @creation-date 2006-05-10
+-- @arch-tag: 3b12c94c-beed-4b92-a2bb-f07a2856154e
+-- @cvs-id $Id: upgrade-1.2.0d3-1.2.0d4.sql,v 1.1.2.1 2006/05/10 08:30:08 dedsc Exp $
+--
+
+-- increase charter to 4000 chars
+
+alter table forums_forums add charter_temp varchar(4000);
+update forums_forums set charter_temp = charter;
+drop view forums_forums_enabled;
+alter table forums_forums drop charter;
+alter table forums_forums rename charter_temp to charter;
+
+create view forums_forums_enabled
+as
+    select *
+    from forums_forums
+    where enabled_p = 't';
Index: openacs-4/packages/forums/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/form-procs.tcl,v
diff -u -N -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/forums/tcl/form-procs.tcl	10 May 2006 07:21:59 -0000	1.6.2.1
+++ openacs-4/packages/forums/tcl/form-procs.tcl	10 May 2006 08:30:08 -0000	1.6.2.2
@@ -156,6 +156,7 @@
       -datatype richtext \
       -widget richtext \
       -html {cols 60 rows 10 wrap soft} \
+      -validate { {expr [string length $value] <= 4000 } {#forums.charter_max_chars#} } \
       -optional
 
     template::element create $form_name ${prefix}presentation_type \