Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/forums/forums.info	27 Mar 2009 07:42:09 -0000	1.41
+++ openacs-4/packages/forums/forums.info	10 Oct 2009 22:00:48 -0000	1.42
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="1.3d9" url="http://openacs.org/repository/download/apm/forums-1.3d9.apm">
+    <version name="1.3d10" url="http://openacs.org/repository/download/apm/forums-1.3d10.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Online discussion forums.</summary>
         <release-date>2009-03-27</release-date>
@@ -18,7 +18,7 @@
         <maturity>0</maturity>
         <package_instance_name>#forums.Forums#</package_instance_name>
 
-        <provides url="forums" version="1.3d9"/>
+        <provides url="forums" version="1.3d10"/>
         <requires url="acs-kernel" version="5.3.1a1"/>
         <requires url="acs-mail-lite" version="5.3.1a1"/>
         <requires url="acs-subsite" version="5.3.1a1"/>
@@ -34,6 +34,7 @@
         <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="SecureOutboundP"  default="0" description="Should we withhold message content from notifications when the forum message is posted in a secure connection? This helps to keep controlled content available only to subsite members when the forum connection is secure, such as controlled by referencing subsite in acs-subsite's RestrictToSSL parameter."/>
             <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="number"  min_n_values="1"  max_n_values="1"  name="UseReadingInfo"  default="0" description="Should ReadingInfo be stored and displayed for this forum"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseScreenNameP"  default="0" description="Weather the real user name or only the (anonymous) screenName will be shown in forums. Do not revert to 0 if once set to 1, since this will discard the beforehand granted anonymity."/>
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.44 -r1.45
--- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	29 May 2009 12:32:37 -0000	1.44
+++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	10 Oct 2009 22:00:48 -0000	1.45
@@ -102,6 +102,7 @@
   <msg key="ManageModerate">Manage/Moderate</msg>
   <msg key="mark_all_as_read">mark all as read</msg>
   <msg key="Message_awaiting_your_approval">The message is awaiting your approval</msg>
+  <msg key="Message_content_witheld">Message content witheld from this notification for security reasons.</msg>
   <msg key="Message_ID">Message ID</msg>
   <msg key="Message_sent_to_moderator">Your message has been sent to the moderator for its approval</msg>
   <msg key="Message_Subject">Subject</msg>
@@ -192,6 +193,7 @@
   <msg key="Thread_title">Forum %forum.name%: %message.subject%</msg>
   <msg key="Threaded">Threaded</msg>
   <msg key="Threads">Threads</msg>
+  <msg key="To_view_message_follow_link">To view message content, browse to the referenced link.</msg>
   <msg key="User">User</msg>
   <msg key="Users_that_wrote_in_the_forum">Users that wrote in the forum</msg>
   <msg key="View">View</msg>
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -N -r1.42 -r1.43
--- openacs-4/packages/forums/tcl/messages-procs.tcl	2 Apr 2009 14:14:54 -0000	1.42
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	10 Oct 2009 22:00:48 -0000	1.43
@@ -99,6 +99,12 @@
     set message_text [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)]
     set message_html [ad_html_text_convert -from $message(format) -to text/html -- $message(content)]
 
+    set SecureOutboundP [parameter::get -parameter "SecureOutboundP" -default 0]
+    if { $SecureOutboundP && [ns_conn isconnected] && [security::secure_conn_p] } {
+        set message_html "<p>#Forums.Message_content_witheld# #Forums.To_view_message_follow_link#</p>"
+        set message_text [ad_html_text_convert -from text/html -to text/plain -- $message_html]
+    }
+
     set html_version ""
     append html_version "#forums.Forum#:  <a href=\"${url}forum-view?forum_id=$message(forum_id)\">$message(forum_name)</a><br>\n"
     append html_version "#forums.Thread#: <a href=\"${url}message-view?message_id=$message(root_message_id)\">$message(root_subject)</a><br>\n"