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.18 -r1.19
--- openacs-4/packages/acs-templating/acs-templating.info	1 Oct 2003 14:32:48 -0000	1.18
+++ openacs-4/packages/acs-templating/acs-templating.info	4 Oct 2003 12:12:01 -0000	1.19
@@ -32,9 +32,8 @@
             <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="ShowCompiledTemplatesP"  default="0" description="Show thecompiled template (for debugging) at .cmp URL"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RefreshCache"  default="as needed" description="When to re-translate templates.  Speical values: "/>
-            <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. If the parameter is left blank, spellchecking will be disabled altogether."/>
+            <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="string"  min_n_values="1"  max_n_values="1"  name="SpellcheckLang"  description="The country/language code of the language to use when spellchecking. Only works with aspell! Leave empty and change dictionary manually if you use ispell. Examples: en_US or da-DK or sv or sv_SE ..."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SpellcheckerPath"  default="/usr/bin/aspell" description="The path to the ispell/aspell executable. (aspell is highly recommended if it supports your language)."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl	4 Oct 2003 12:12:01 -0000	1.1
@@ -0,0 +1,20 @@
+ad_library {
+
+    Set up the path to the spell-checker in an nsv cache.
+
+    @cvs-id $Id: spellcheck-init.tcl,v 1.1 2003/10/04 12:12:01 olah Exp $
+    @author Ola Hansson (ola@polyxena.net)
+    @creation-date 2003-10-04
+
+}
+
+# Find the aspell or, second best, the ispell binary.
+# In case neither one is found, spell-checking will be disabled.
+
+set bin [ad_decode [catch {exec which aspell}] \
+	     0 [exec which aspell] \
+	     [ad_decode [catch {exec which ispell}] \
+		  0 [exec which ispell] \
+		  ""]]
+
+nsv_set spellchecker path $bin
Index: openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl	2 Oct 2003 15:46:33 -0000	1.2
+++ openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl	4 Oct 2003 12:12:01 -0000	1.3
@@ -171,10 +171,7 @@
 
     set spelling_wrapper [file join [acs_root_dir] bin webspell]
 
-    set spellchecker_path [parameter::get_from_package_key \
-			       -package_key acs-templating \
-			       -parameter SpellcheckerPath \
-			       -default /usr/bin/aspell]
+    set spellchecker_path [nsv_get spellchecker path]
 
     set language [parameter::get_from_package_key \
 			       -package_key acs-templating \
@@ -324,15 +321,24 @@
 	# That's either because spell-checking is disabled for this element, or we're not dealing with a submit.
 	# Whichever it is, let's see if, and then how, we should render the spellcheck "sub widget".
 	
-	array set widget_info [string trim [parameter::get_from_package_key -package_key acs-templating \
-						-parameter SpellcheckFormWidgets \
-						-default ""]]
+	if { [empty_string_p [nsv_get spellchecker path]] } {
+
+	    # The aspell or ispell bibary was not found during server startup - turn spell-checking off.
+	    set spellcheck_p 0    
+
+	} else {
+
+	    array set widget_info [string trim [parameter::get_from_package_key -package_key acs-templating \
+						    -parameter SpellcheckFormWidgets \
+						    -default ""]]
+	    
+	    set spellcheck_p [expr [array size widget_info] \
+				  && ![info exists element(nospell)] \
+				  && ([string equal $element(widget) "richtext"] || [string equal $element(widget) "textarea"] || [string equal $element(widget) "text"]) \
+				  && [lsearch -exact [array names widget_info] $element(widget)] != -1]
+	    
+	}
 	
-	set spellcheck_p [expr [array size widget_info] \
-			      && ![info exists element(nospell)] \
-			      && ([string equal $element(widget) "richtext"] || [string equal $element(widget) "text"] || [string equal $element(widget) "textarea"]) \
-			      && [lsearch -exact [array names widget_info] $element(widget)] != -1]
-	
 	if { $spellcheck_p } {
 	    # This is not a submit; we are rendering the form element for the first time.
 	    # Since the spellcheck "sub widget" is to be displayed we'll also want to know