Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.57 -r1.58
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	1 Nov 2006 19:12:54 -0000	1.57
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	10 Jan 2007 21:22:12 -0000	1.58
@@ -511,7 +511,7 @@
 
     # Are we extending the form?
 
-    if { [string equal [lindex $args 0] "-extend"] } {
+    if {[lindex $args 0] eq "-extend"} {
         set extend_p 1
         set args [lrange $args 1 end]
     } else {
@@ -608,7 +608,7 @@
 
             # This can easily be generalized if we add more embeddable form commands ...
 
-            if { [string equal $element_name_part "-section"] } {
+            if {$element_name_part eq "-section"} {
                 lappend af_element_names($form_name) "[list "-section" [uplevel [list subst [lindex $element 1]]]]"
             } else {
                 set element_name_part [uplevel [list subst $element_name_part]]
@@ -626,11 +626,11 @@
                     set af_element_parameters($element_name:$flag) [list]
                     set left_paren [string first "(" $flag]
                     if { $left_paren != -1 } {
-                        if { ![string equal [string index $flag end] ")"] } {
+                        if { [string index $flag end] ne ")" } {
                             return -code error "Missing or misplaced end parenthesis for flag '$flag' on argument '$element_name'"
                         }
-                        set flag_stem [string range $flag 0 [expr $left_paren - 1]]
-                        lappend af_element_parameters($element_name:$flag_stem) [string range $flag [expr $left_paren + 1] [expr [string length $flag]-2]]
+                        set flag_stem [string range $flag 0 [expr {$left_paren - 1}]]
+                        lappend af_element_parameters($element_name:$flag_stem) [string range $flag [expr {$left_paren + 1}] [expr {[string length $flag]-2}]]
                         lappend af_flag_list(${form_name}__$element_name) $flag_stem
                     } else {
                         lappend af_flag_list(${form_name}__$element_name) $flag
@@ -777,7 +777,7 @@
                             return -code error "element $element_name: a form can only declare one key"
                         }
                         set af_key_name($form_name) $element_name
-                        if { ![empty_string_p $af_element_parameters($element_name:key)] } {
+                        if { $af_element_parameters($element_name:key) ne "" } {
                             if { [info exists af_sequence_name($form_name)] } {
                                 return -code error "element $element_name: duplicate sequence"
                             }
@@ -789,14 +789,14 @@
                     }
 
                     multiple {
-                        if { ![empty_string_p $af_element_parameters($element_name:$flag)] } {
+                        if { $af_element_parameters($element_name:$flag) ne "" } {
                             return -code error "element $element_name: $flag attribute can not have a parameter"
                         }
                     }
 
                     nospell -
 		    optional {
-                        if { ![empty_string_p $af_element_parameters($element_name:$flag)] } {
+                        if { $af_element_parameters($element_name:$flag) ne "" } {
                             return -code error "element $element_name: $flag attribute can not have a parameter"
                         }
                         lappend form_command "-$flag"
@@ -805,7 +805,7 @@
                     from_sql -
                     to_sql -
                     to_html {
-                        if { [empty_string_p $af_element_parameters($element_name:$flag)] } {
+                        if { $af_element_parameters($element_name:$flag) eq "" } {
                             return -code error "element $element_name: \"$flag\" attribute must have a parameter"
                         }
                         set name af_$flag
@@ -824,7 +824,7 @@
                         lappend form_command "-datatype"
                         lappend form_command $flag
                         set af_type(${form_name}__$element_name) $flag
-                        if { [empty_string_p $af_element_parameters($element_name:$flag)] } {
+                        if { $af_element_parameters($element_name:$flag) eq "" } {
                             if { ![empty_string_p [info command "::template::widget::$flag"]] } {
                                 lappend form_command "-widget" $flag
                             }
@@ -1252,6 +1252,6 @@
 
     set form [ns_getform]
 
-    return [expr {[empty_string_p $form] || [ns_set find $form $key] == -1 || [ns_set get $form __new_p] == 1 }]
+    return [expr {$form eq "" || [ns_set find $form $key] == -1 || [ns_set get $form __new_p] == 1 }]
 
 }