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 -N -r1.77 -r1.78
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	17 May 2018 07:43:24 -0000	1.77
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	28 Dec 2018 11:24:10 -0000	1.78
@@ -785,87 +785,12 @@
         template::element create $form_name "__submit_button_value" -datatype text -widget hidden -value ""
     }
 
-    # Antonio Pisano: now ad_form supports :multiple, 
-    # :array and :sign flags in exported variables.
+    # Antonio Pisano: export property will eventually end up into
+    # template::form::render, where export_vars will take care of
+    # creating the required hidden form fields according to
+    # specification.
     if { [info exists export] } {
-        foreach value $export {
-            set has_value_p [expr {[llength $value] >= 2}]
-            lassign $value name value
-
-            # recognize supported flags
-            lassign [split $name ":"] name mode
-            set modes [split $mode ,]
-
-            # verify variable existence and nature
-            set var_exists_p [uplevel [list info  exists $name]]
-            set is_array_p   [uplevel [list array exists $name]]
-
-            # arrays are automatically recognized, even if not specified
-            set array_p    [expr {$is_array_p || "array" in $modes}]
-            set sign_p     [expr {"sign"     in $modes}]
-            set multiple_p [expr {"multiple" in $modes}]
-            
-            if {$array_p} {
-              # no explicit value:
-              if {!$has_value_p} {
-                # if array in caller stack exists, get its value from there
-                if {$is_array_p} {
-                  set value [uplevel [list array get $name]]
-                # else, if a variable exists but it's not an array, throw error (as in export_vars)
-                } elseif {$var_exists_p} {
-                    error "variable \"$name\" should be an array"
-                # else, just ignore this export
-                } else {continue}
-              }
-              # arrays generate one hidden formfield for each key
-              foreach {key val} $value {
-                set val [uplevel [list subst $val]]
-                # field is multiple: use '-values' instead of '-value'
-                if {$multiple_p} {
-                  template::element create $form_name ${name}.${key} \
-                      -datatype text -widget hidden \
-                      -values $val
-                } else {
-                  template::element create $form_name ${name}.${key} \
-                      -datatype text -widget hidden \
-                      -value $val
-                }
-              }
-            } else {
-              # no explicit value:
-              if {!$has_value_p} {
-                # if variable in caller stack exists, get its value from there
-                if {$var_exists_p} {
-                  set value [uplevel [list set $name]]
-                # else, just ignore this export
-                } else {continue}
-              } else {
-                #
-                # substitute only the explicitly specified value
-                #
-                set value [uplevel [list subst $value]]
-              }
-              # field is multiple: use '-values' instead of '-value'
-              if {$multiple_p} {
-                template::element create $form_name $name \
-                    -datatype text -widget hidden \
-                    -values $value
-              } else {
-                template::element create $form_name $name \
-                    -datatype text -widget hidden \
-                    -value $value
-              }
-            }
-            if {$sign_p} {
-                # value is signed and its signature sent as another hidden field.
-                # lsort is required for arrays, as 'array get' doesn't specify
-                # the order of extraction of elements and we could have different
-                # signature for the same array
-                template::element create $form_name $name:sig \
-                  -datatype text -widget hidden \
-                  -value [ad_sign [lsort $value]]
-            }
-        }
+        template::form::set_properties $form_name export $export
     }
 
     # We need to track these for submission time and for error checking
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -N -r1.58 -r1.59
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	3 Nov 2018 19:52:29 -0000	1.58
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	28 Dec 2018 11:24:10 -0000	1.59
@@ -633,6 +633,15 @@
         append output "<legend>$fieldset_legend</legend>"
     }
 
+    # Export variables specified by the export property as hidden
+    # formfields. (used e.g. by ad_form when specifying the -export
+    # flag)
+    if { [info exists form_properties(export)] } {
+        append output {<!-- Exported form vars START -->}
+        append output [uplevel #$level [subst {export_vars -form {$form_properties(export)}}]]
+        append output {<!-- Exported form vars END -->}
+    }
+
     # Export form ID and current form mode
     append output [export_vars -form { { form\:id $id } { form\:mode $properties(mode) } }]