Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-templating/acs-templating.info	25 Apr 2004 15:09:51 -0000	1.30
+++ openacs-4/packages/acs-templating/acs-templating.info	6 May 2004 21:38:20 -0000	1.31
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.1.0b1" url="http://openacs.org/repository/download/apm/acs-templating-5.1.0b1.apm">
+    <version name="5.1.1" url="http://openacs.org/repository/download/apm/acs-templating-5.1.1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
         <release-date>2004-04-18</release-date>
@@ -26,7 +26,7 @@
 layout of a site can be more easily administered.
 </description>
 
-        <provides url="acs-templating" version="5.1.0b1"/>
+        <provides url="acs-templating" version="5.1.1"/>
         <requires url="acs-kernel" version="5.0.0"/>
 
         <callbacks>
@@ -41,7 +41,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowDataDictionariesP"  default="0" description="Offer data dictionaries on .dat/.fmt URL."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SpellcheckDialectsP"  default="0" description="Do you care about dialects or not? If this is set to '1' all available dictionary dialects for all available languages will appear as choices in the pull-down menu. If the param is set to '0', only the base-language(s) will be shown. However, it only works with aspell - on ispell you'll simply get a 'yes' and 'no' option, no matter how this param is set, where 'yes' will use ispell's default dictionary. NOTE! You'll need to restart the server for this param to take effect."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SpellcheckFormWidgets"  default="textarea 0 richtext 0" description="The widgets that you specify here will be spellcheck enabled in all forms (that use ad_form / form builder). Adding a 'nospell' flag to a form element overrides this parameter and disables spellchecking of that element. The format of this parameter is such: 'widget 1 widget 0 ...', where 'widget' stands for one of the form widgets that are possible to spellcheck enable: text, textarea, richtext. '1' after 'widget' indicates that the default should be to spellcheck; '0' means the user has to manually state that spellchecking should be performed on the form element. In order to enable spellchecking via this parameter either the aspell or ispell binary (or both, in which case aspell takes precedence) must be installed on the server. The path to the binary is auto-detected on server startup. If the parameter is left blank, spellchecking will be disabled altogether."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseHtmlAreaForRichtextP"  default="0" description="Should the richtext widget use the htmlArea widget for richtext editing. 1 = yes, 0 = no."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseHtmlAreaForRichtextP"  default="1" description="Should the richtext widget use the htmlArea widget for richtext editing. 1 = yes, 0 = no. We will also check the browser's User-Agent header to find out if htmlArea works with the given browser."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	4 Mar 2004 18:41:54 -0000	1.16
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	6 May 2004 21:38:20 -0000	1.17
@@ -207,7 +207,27 @@
                               -default 0]
       }
 
+      # Check browser's User-Agent header for compatibility with htmlArea
       if { $htmlarea_p } {
+          set user_agent [string tolower [ns_set get [ns_conn headers] User-Agent]]
+          if { [string first "opera" $user_agent] != -1 } { 
+              # Opera - doesn't work, even though Opera claims to be IE
+              set htmlarea_p 0
+          } elseif { [regexp {msie ([0-9]*)\.([0-9]+)} $user_agent matches major minor] } {
+              # IE, works for browsers > 5.5
+              if { $major < 5 || ($major == 5  && $minor < 5) } {
+                  set htmlarea_p 0
+              }
+          } elseif { [regexp {gecko/0*([1-9][0-9]*)} $user_agent match build] } {
+              if { $build < 20030210 } {
+                  set htmlarea_p 0
+              }
+          } else {
+              set htmlarea_p 0
+          }
+      }
+
+      if { $htmlarea_p } {
           # Tell the blank-master to include the special stuff for htmlArea in the page header
           global acs_blank_master__htmlareas
           lappend acs_blank_master__htmlareas $attributes(id)