Index: openacs-4/packages/categories/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v
diff -u -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/categories/tcl/widget-procs.tcl	9 Mar 2022 17:09:32 -0000	1.30.2.2
+++ openacs-4/packages/categories/tcl/widget-procs.tcl	9 Mar 2022 17:09:53 -0000	1.30.2.3
@@ -2,7 +2,6 @@
 
 # Author: Timo Hentschel (timo@timohentschel.de)
 #
-# $Id: 
 
 # This is free software distributed under the terms of the GNU Public
 # License.  Full text of the license is available from the GNU Project:
@@ -14,13 +13,13 @@
 namespace eval template::data::transform {}
 namespace eval template::data::validate {}
 
-ad_proc -public template::widget::category { 
-    element_reference 
-    tag_attributes 
+ad_proc -public template::widget::category {
+    element_reference
+    tag_attributes
 } {
     Display the category widget. This has a multitude of options:
     <ul>
-    <li>value: Values should be a list of two items: the object_id being viewed and the object_id which the trees are mapped to. 
+    <li>value: Values should be a list of two items: the object_id being viewed and the object_id which the trees are mapped to.
     This will get the mapped trees (if no value provided defaults to package_id) and the mapped categories for the object_id. If you
     do not provide a value, the following options are used:
     <li>category_application_id></li>
@@ -35,8 +34,8 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-      	array set attributes $element(html)
-      	array set ms_attributes $element(html)
+        array set attributes $element(html)
+        array set ms_attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -52,7 +51,7 @@
 
     # Determine the size automatically for a multiselect
     if { ![info exists ms_attributes(size)] } {
-	set ms_attributes(size) 5
+        set ms_attributes(size) 5
     }
 
     # Get parameters for the category widget
@@ -64,11 +63,11 @@
     set require_category_p f
     set widget {}
 
-    if { [info exists element(value)] && $element(value) ne "" 
-	 && [llength $element(value)] == 2 
+    if { [info exists element(value)] && $element(value) ne ""
+         && [llength $element(value)] == 2
      } {
         # Legacy method for passing parameters
-	lassign $element(value) object_id package_id
+        lassign $element(value) object_id package_id
     } else {
         if { [info exists element(category_application_id)] && $element(category_application_id) ne "" } {
             set package_id $element(category_application_id)
@@ -93,19 +92,19 @@
         }
     }
     if { $package_id eq "" } {
-	set package_id [ad_conn package_id]
+        set package_id [ad_conn package_id]
     }
 
     if { $object_id ne "" && ![info exists element(submit)] } {
         set mapped_categories [category::get_mapped_categories $object_id]
     } elseif { $element(values) ne "" && ![info exists element(submit)] } {
-	set mapped_categories $element(values)
+        set mapped_categories $element(values)
     } else {
-	set mapped_categories [ns_querygetall $element(id)]
-	# QUIRK: ns_querygetall returns a single-element list {{}} for no values
-	if { [string equal $mapped_categories {{}}] } {
-	    set mapped_categories [list]
-	}
+        set mapped_categories [ns_querygetall $element(id)]
+        # QUIRK: ns_querygetall returns a single-element list {{}} for no values
+        if { [string equal $mapped_categories {{}}] } {
+            set mapped_categories [list]
+        }
     }
     set output {}
 
@@ -133,63 +132,63 @@
     }
 
     foreach mapped_tree $mapped_trees {
-	lassign $mapped_tree tree_id tree_name subtree_id assign_single_p require_category_p widget
-	set tree_name [ns_quotehtml [lang::util::localize $tree_name]]
-	set one_tree [list]
+        lassign $mapped_tree tree_id tree_name subtree_id assign_single_p require_category_p widget
+        set tree_name [ns_quotehtml [lang::util::localize $tree_name]]
+        set one_tree [list]
 
-        if { $require_category_p == "t" } { 
+        if { $require_category_p == "t" } {
             set required_mark "<span class=\"form-required-mark\">*</span>"
         } else {
             set required_mark {}
         }
 
-	foreach category [category_tree::get_tree -subtree_id $subtree_id $tree_id] {
-	    lassign $category category_id category_name deprecated_p level
-	    set category_name [ns_quotehtml [lang::util::localize $category_name]]
-	    if { $level>1 } {
-		set category_name "[string repeat . [expr {2*$level -4}]]..$category_name"
-	    }
-	    lappend one_tree [list $category_name $category_id]
-	}
+        foreach category [category_tree::get_tree -subtree_id $subtree_id $tree_id] {
+            lassign $category category_id category_name deprecated_p level
+            set category_name [ns_quotehtml [lang::util::localize $category_name]]
+            if { $level>1 } {
+                set category_name "[string repeat . [expr {2*$level -4}]]..$category_name"
+            }
+            lappend one_tree [list $category_name $category_id]
+        }
 
         if { [llength $mapped_trees] > 1 } {
             append output "<div class=\"categorySelect\"><div class=\"categoryTreeName\">$tree_name$required_mark</div>"
-	}
+        }
 
-	if {$assign_single_p == "t" || $all_single_p} {
-	    # single-select widget
+        if {$assign_single_p == "t" || $all_single_p} {
+            # single-select widget
             if { $require_category_p == "f" } {
                 set one_tree [linsert $one_tree 0 [list "" ""]]
             }
             #
-	    # We default to the select widget unless the valid option
-	    # of radio was provided.
+            # We default to the select widget unless the valid option
+            # of radio was provided.
             #
-	    #ns_log notice "template::widget::menu $element(name) $one_tree $mapped_categories" \
+            #ns_log notice "template::widget::menu $element(name) $one_tree $mapped_categories" \
                 "[array get attributes] $element(mode) $widget $display_widget" \
                 [info exists element(display_widget)]
 
-	    if { $widget eq "radio" && ![info exists element(display_widget)] } {
-		# checkbox was specified at mapping and the display widget was not explicitly defined code
-		append output [template::widget::menu $element(name) $one_tree \
+            if { $widget eq "radio" && ![info exists element(display_widget)] } {
+                # checkbox was specified at mapping and the display widget was not explicitly defined code
+                append output [template::widget::menu $element(name) $one_tree \
                                    $mapped_categories attributes $element(mode) radio]
-	    } else {
-		append output [template::widget::menu $element(name) $one_tree \
+            } else {
+                append output [template::widget::menu $element(name) $one_tree \
                                    $mapped_categories attributes $element(mode) $display_widget]
-	    }
-	} else {
-	    ns_log notice "template::widget::menu $element(name) $one_tree $mapped_categories [array get ms_attributes] $element(mode) $widget $display_widget [info exists element(display_widget)]"
-	    # we default to the multiselect widget (if user didn't override with single option) or select checkbox
-	    if { $widget eq "checkbox" && ![info exists element(display_widget)] } {
-		# checkbox was specified at mapping and the display widget was not explicitly defined in code
-		append output [template::widget::menu $element(name) $one_tree \
+            }
+        } else {
+            ns_log notice "template::widget::menu $element(name) $one_tree $mapped_categories [array get ms_attributes] $element(mode) $widget $display_widget [info exists element(display_widget)]"
+            # we default to the multiselect widget (if user didn't override with single option) or select checkbox
+            if { $widget eq "checkbox" && ![info exists element(display_widget)] } {
+                # checkbox was specified at mapping and the display widget was not explicitly defined in code
+                append output [template::widget::menu $element(name) $one_tree \
                                    $mapped_categories ms_attributes $element(mode) checkbox]
-	    } else {
-		append output [template::widget::menu $element(name) $one_tree \
+            } else {
+                append output [template::widget::menu $element(name) $one_tree \
                                    $mapped_categories ms_attributes $element(mode) $display_widget]
-	    }
-	}
-	if { [llength $mapped_trees] > 1 } {
+            }
+        }
+        if { [llength $mapped_trees] > 1 } {
             append output "</div>"
         }
     }
@@ -208,22 +207,22 @@
     set invalid_values [list]
 
     foreach value $values {
-	if {![regexp {^[+-]?\d+$} $value]} {
-	    lappend invalid_values $value
-	}
+        if {![regexp {^[+-]?\d+$} $value]} {
+            lappend invalid_values $value
+        }
     }
 
     set result 1
     if {[llength $invalid_values] > 0} {
-	set result 0
-	if {[llength $invalid_values] == 1} {
-	    set message "Invalid category [lindex $invalid_values 0]"
-	} else {
-	    set message "Invalid categories [join $invalid_values ", "]"
-	}
+        set result 0
+        if {[llength $invalid_values] == 1} {
+            set message "Invalid category [lindex $invalid_values 0]"
+        } else {
+            set message "Invalid categories [join $invalid_values ", "]"
+        }
     }
-    
-    return $result 
+
+    return $result
 }
 
 ad_proc -public template::data::transform::category {
@@ -236,7 +235,7 @@
 
     # QUIRK: ns_querygetall returns a single-element list {{}} for no values
     if { [string equal $values {{}}] } {
-	set values [list]
+        set values [list]
     }
 
     # to mark submission of form for rendering element in case of invalid data
@@ -249,8 +248,8 @@
     set subtree_id {}
     set require_category_p f
 
-    if { [info exists element(value)] && $element(value) ne "" 
-	 && [llength $element(value)] == 2 
+    if { [info exists element(value)] && $element(value) ne ""
+         && [llength $element(value)] == 2
     } {
         # Legacy method for passing parameters
         set package_id [lindex $element(value) 1]
@@ -269,48 +268,48 @@
         }
     }
     if { $package_id eq "" } {
-	set package_id [ad_conn package_id]
+        set package_id [ad_conn package_id]
     }
 
     if { $tree_id eq "" } {
-	set trees [list]
+        set trees [list]
         foreach tree [category_tree::get_mapped_trees $package_id] {
-	    lassign $tree tree_id tree_name subtree_id assign_single_p require_category_p
-	    if {$require_category_p == "t" || ![info exists element(optional)]} {
-		lappend trees [list $tree_id $subtree_id]
-	    }
-	}
+            lassign $tree tree_id tree_name subtree_id assign_single_p require_category_p
+            if {$require_category_p == "t" || ![info exists element(optional)]} {
+                lappend trees [list $tree_id $subtree_id]
+            }
+        }
     } else {
-	if {$require_category_p == "t"} {
-	    set trees [list [list $tree_id $subtree_id]]
-	} else {
-	    set trees [list]
-	}
+        if {$require_category_p == "t"} {
+            set trees [list [list $tree_id $subtree_id]]
+        } else {
+            set trees [list]
+        }
     }
 
     set trees_without_category [list]
     foreach tree $trees {
-	lassign $tree tree_id subtree_id
-	# get categories of every tree requiring a categorization
-	foreach category [category_tree::get_tree -all -subtree_id $subtree_id $tree_id] {
-	    set tree_categories([lindex $category 0]) 1
-	}
-	set found_p 0
-	# check if at least one selected category is among tree categories
-	foreach value $values {
-	    if {[info exists tree_categories($value)]} {
-		set found_p 1
-	    }
-	}
-	if {!$found_p} {
-	    # no categories of this tree selected, so add for error message
-	    lappend trees_without_category [category_tree::get_name $tree_id]
-	}
-	array unset tree_categories
+        lassign $tree tree_id subtree_id
+        # get categories of every tree requiring a categorization
+        foreach category [category_tree::get_tree -all -subtree_id $subtree_id $tree_id] {
+            set tree_categories([lindex $category 0]) 1
+        }
+        set found_p 0
+        # check if at least one selected category is among tree categories
+        foreach value $values {
+            if {[info exists tree_categories($value)]} {
+                set found_p 1
+            }
+        }
+        if {!$found_p} {
+            # no categories of this tree selected, so add for error message
+            lappend trees_without_category [category_tree::get_name $tree_id]
+        }
+        array unset tree_categories
     }
     if {[llength $trees_without_category] > 0} {
-	# some trees require category, but none selected
-	template::element::set_error $element(form_id) $element(id) "Please select a category for [join $trees_without_category ", "]."
+        # some trees require category, but none selected
+        template::element::set_error $element(form_id) $element(id) "Please select a category for [join $trees_without_category ", "]."
         return [list]
     }