Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/forums/forums.info	30 Nov 2002 17:34:39 -0000	1.14
+++ openacs-4/packages/forums/forums.info	7 Jan 2003 18:59:07 -0000	1.15
@@ -7,14 +7,16 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="0.2d" url="http://openacs.org/repository/download/apm/forums-0.2d.apm">
+    <version name="0.4" url="http://openacs.org/repository/download/apm/forums-0.4.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:ben@openforce.net">Ben Adida</owner>
+        <summary>Online discussion boards with many configuration options.</summary>
+        <description format="text/plain">This online discussion board software is the successor of the original bboard package. The biggest improvement is the new scalable datamodel. This package 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 automatic posting of incoming email.</description>
 
-        <provides url="forums" version="0.1d"/>
+        <provides url="forums" version="0.4"/>
         <requires url="acs-mail-lite" version="0.1d"/>
         <requires url="notifications" version="0.1"/>
 
@@ -52,6 +54,7 @@
             <file type="data_model" db_type="postgresql" path="sql/postgresql/forums-tree-drop.sql"/>
             <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade-0.1d-0.2d.sql"/>
             <file type="tcl_procs" path="tcl/forum-message-reply-procs.tcl"/>
+            <file type="tcl_procs" path="tcl/messages-format-procs.tcl"/>
             <file type="query_file" db_type="oracle" path="tcl/forum-reply-procs-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="tcl/forum-reply-procs-postgresql.xql"/>
             <file type="tcl_procs" path="tcl/forum-reply-procs.tcl"/>
@@ -76,6 +79,25 @@
             <file type="query_file" db_type="postgresql" path="www/forum-view-postgresql.xql"/>
             <file type="content_page" path="www/forum-view.adp"/>
             <file type="content_page" path="www/forum-view.tcl"/>
+            <file type="content_page" path="www/graphics/angel.gif"/>
+            <file type="content_page" path="www/graphics/bigsmile.gif"/>
+            <file type="content_page" path="www/graphics/burp.gif"/>
+            <file type="content_page" path="www/graphics/crazy4.gif"/>
+            <file type="content_page" path="www/graphics/crossedlips.gif"/>
+            <file type="content_page" path="www/graphics/cry.gif"/>
+            <file type="content_page" path="www/graphics/embarrassed.gif"/>
+            <file type="content_page" path="www/graphics/farted.gif"/>
+            <file type="content_page" path="www/graphics/kiss.gif"/>
+            <file type="content_page" path="www/graphics/moneymouth.gif"/>
+            <file type="content_page" path="www/graphics/oneeye.gif"/>
+            <file type="content_page" path="www/graphics/sad.gif"/>
+            <file type="content_page" path="www/graphics/scream.gif"/>
+            <file type="content_page" path="www/graphics/smile.gif"/>
+            <file type="content_page" path="www/graphics/smile8.gif"/>
+            <file type="content_page" path="www/graphics/think.gif"/>
+            <file type="content_page" path="www/graphics/tongue.gif"/>
+            <file type="content_page" path="www/graphics/wink.gif"/>
+            <file type="content_page" path="www/graphics/yell.gif"/>
             <file type="query_file" db_type="oracle" path="www/index-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
             <file type="content_page" path="www/index.adp"/>
@@ -123,6 +145,7 @@
             <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="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="DisplayEmoticonsAsImagesP"  default="0" description="Automatically convert smileys like :-) and similar constructs to images when displaying messages in the browser."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/forums/tcl/messages-format-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-format-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/tcl/messages-format-procs.tcl	7 Jan 2003 18:58:35 -0000	1.1
@@ -0,0 +1,35 @@
+ad_library {
+    message formatting procs
+}
+
+namespace eval forum::format {
+
+    ad_proc emoticons {
+        {-content:required}
+    } {
+        Convert smileys (emoticons) to img references. It constructs a relative 
+        image reference to graphics/imagename.gif, so it will only work when
+        used from pages that are directly under the forums/www/ directory.
+
+        <p>
+
+        If you change the images make sure to also adapt the image sizes in 
+        the img tag that gets constructed here.
+    } {
+        set emoticons_map [list]
+        foreach { emoticon image } {
+            ":-)" "smile" 
+            ";-)" "wink"
+            ":-D" "bigsmile"
+            "8-)" "smile8"
+            ":-(" "sad"
+            ";-(" "cry"
+            ":-O" "scream"
+            ":-/" "think"
+        } {
+            lappend emoticons_map $emoticon
+            lappend emoticons_map "<img style=\"vertical-align:text-bottom\" src=\"graphics/${image}.gif\" alt=\"$emoticon\" width=\"19\" height=\"19\">"
+        }
+        return [string map $emoticons_map $content]
+    }
+}
Index: openacs-4/packages/forums/www/message-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/forums/www/message-chunk.adp	30 Nov 2002 17:35:39 -0000	1.14
+++ openacs-4/packages/forums/www/message-chunk.adp	7 Jan 2003 18:58:09 -0000	1.15
@@ -55,7 +55,7 @@
 
     <if @message.html_p@ false>
     <div align="left">
-      <%= [ad_text_to_html --  "$message(content)"] %>
+      @message.content@
     </div>
     </if>
     <else>
@@ -67,6 +67,3 @@
 <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
   <include src="message-attachment-chunk" &message="message" bgcolor=@table_bgcolor@>
 </if>
-
-
-
Index: openacs-4/packages/forums/www/message-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/www/message-chunk.tcl	30 Nov 2002 17:35:39 -0000	1.6
+++ openacs-4/packages/forums/www/message-chunk.tcl	7 Jan 2003 18:58:09 -0000	1.7
@@ -24,6 +24,15 @@
 if {![exists_and_not_null moderate_p]} { set moderate_p 0 }
 if {![exists_and_not_null forum_moderated_p]} {set forum_moderated_p 0}
 
+if { [string is false $message(html_p)] } {
+    set message(content) [ad_text_to_html $message(content)]
+}
+
+# convert emoticons to images if the parameter is set
+if { [string is true [parameter::get -parameter DisplayEmoticonsAsImagesP -default 0]] } {
+    set message(content) [forum::format::emoticons -content $message(content)]
+}
+
 # JCD: display subject only if changed from the root subject
 if {![info exists root_subject]} {
     set display_subject_p 1
Index: openacs-4/packages/forums/www/graphics/angel.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/angel.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/bigsmile.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/bigsmile.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/burp.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/burp.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/crazy4.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/crazy4.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/crossedlips.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/crossedlips.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/cry.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/cry.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/embarrassed.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/embarrassed.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/farted.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/farted.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/kiss.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/kiss.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/moneymouth.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/moneymouth.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/oneeye.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/oneeye.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/sad.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/sad.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/scream.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/scream.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/smile.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/smile.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/smile8.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/smile8.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/think.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/think.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/tongue.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/tongue.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/wink.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/wink.gif,v
diff -u
Binary files differ
Index: openacs-4/packages/forums/www/graphics/yell.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/graphics/Attic/yell.gif,v
diff -u
Binary files differ