Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.48 -r1.49
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	6 Oct 2018 09:26:52 -0000	1.48
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	3 Sep 2024 15:37:34 -0000	1.49
@@ -14,20 +14,20 @@
     -separator
     context
 } {
-    Generate the an html fragment for a context bar.
+    Generate the an HTML fragment for a context bar.
     This is the function that takes a list in the format
     <pre>
     [list [list url1 text1] [list url2 text2] ... "terminal text"]
     <pre>
-    and generates the html fragment.  In general the higher level
+    and generates the HTML fragment.  In general, the higher level
     proc ad_context_bar should be
     used, and then only in the sitewide master rather than on
     individual pages.
 
     @param separator The text placed between each link
     @param context list as with ad_context_bar
 
-    @return html fragment
+    @return HTML fragment
 
     @see ad_context_bar
 } {
@@ -102,7 +102,7 @@
     @param node_id If provided work up from this node, otherwise the current node
     @param from_node If provided do not generate links to the given node and above.
 
-    @return an html fragment generated by ad_context_bar_html
+    @return an HTML fragment generated by ad_context_bar_html
 
     @see ad_context_bar_html
 } {
@@ -129,14 +129,20 @@
 
     foreach elm [ad_context_node_list -from_node $from_node $node_id] {
         lassign $elm elm_0 elm_1
-        if { $node_id_url_end > 0 && [string match -nocase $node_id_url [string range $elm_0 0 ${node_id_url_end}-1] ] } {
+        if { $node_id_url_end > 0
+             && [string match -nocase $node_id_url [string range $elm_0 0 $node_id_url_end-1] ]
+         } {
             set elm_0 [string range $elm_0 $node_id_url_end end]
         }
         template::multirow append $multirow $elm_0 $elm_1
     }
 
     if { [string match "admin/*" [ad_conn extra_url]] } {
-        template::multirow append $multirow "[ad_conn package_url]admin/" "[_ acs-tcl.Administration]"
+        template::multirow append $multirow \
+            "[ad_conn package_url]admin/" \
+            [expr {[ad_conn package_key] ne "acs-subsite"
+                   ? [_ acs-tcl.Administration]
+                   : [_ acs-subsite.Administration]}]
     }
 
     if { [llength $context] == 0 } {
@@ -156,14 +162,15 @@
     -separator
     args
 } {
-    Returns a Yahoo-style hierarchical navbar. Includes "Administration"
-    if applicable, and the subsite if not global. 'args' can be either
-    one or more lists, or a simple string.
+    Returns a Yahoo-style hierarchical navbar. Includes
+    "Administration" or "Subsite Administration" if applicable, and
+    the subsite if not global. 'args' can be either one or more lists,
+    or a simple string.
 
     @param node_id If provided work up from this node, otherwise the current node
     @param from_node If provided do not generate links to the given node and above.
     @param separator The text placed between each link (passed to ad_context_bar_html if provided)
-    @return an html fragment generated by ad_context_bar_html
+    @return an HTML fragment generated by ad_context_bar_html
 
     @see ad_context_bar_html
 } {
@@ -175,16 +182,26 @@
         set node_id [ad_conn node_id]
     }
 
+    #
+    # Get context info for this node. In case of "early" errors
+    # (e.g. invalid characters in the URL), the result might be empty.
+    #
     set context [ad_context_node_list -from_node $from_node $node_id]
 
     if { [string match "admin/*" [ad_conn extra_url]] } {
         lappend context [list "[ad_conn package_url]admin/" \
-                             [_ acs-tcl.Administration]]
+                             [expr {[ad_conn package_key] ne "acs-subsite"
+                                    ? [_ acs-tcl.Administration]
+                                    : [_ acs-subsite.Administration]}]]
     }
 
     if {[llength $args] == 0} {
-        # fix last element to just be literal string
-        lset context end [lindex $context end 1]
+        #
+        # Fix last element to just be literal string
+        #
+        if {$context ne ""} {
+            lset context end [lindex $context end 1]
+        }
     } else {
         if {![string match "\{*" $args]} {
             # args is not a list, transform it into one.
@@ -210,17 +227,17 @@
 
     @param args list of url desc ([list [list url desc] [list url desc]])
 
-    @return html fragment
+    @return HTML fragment
 
     @see ad_context_bar_html
 } {
     set counter 0
     foreach arg $args {
-        lappend link_list [subst {<a href="[ns_quotehtml [lindex $element 0]]">[ns_quotehtml [lindex $element 1]]</a>}]
+        lappend link_list [subst {<a href="[ns_quotehtml [lindex $arg 0]]">[ns_quotehtml [lindex $arg 1]]</a>}]
         incr counter
     }
     if { $counter } {
-        return "\[[join $link_list " | "]\]"
+        return "\[[join $link_list { | }]\]"
     } else {
         return ""
     }
@@ -290,7 +307,7 @@
     set netscape_p 0
 
     # get the version
-    set user_agent [ns_set get [ad_conn headers] User-Agent]
+    set user_agent [ns_set iget [ad_conn headers] User-Agent]
     regexp -nocase "mozilla/(\[^\.\ \]*)" $user_agent match version
 
     # IE browsers have MSIE and Mozilla in their user-agent header
@@ -319,7 +336,7 @@
     set netscape_p 0
 
     # get the version
-    set user_agent [ns_set get [ad_conn headers] User-Agent]
+    set user_agent [ns_set iget [ad_conn headers] User-Agent]
     regexp -nocase "mozilla/(\[^\.\ \]*)" $user_agent match version
 
     # IE browsers have MSIE and Mozilla in their user-agent header
@@ -395,9 +412,9 @@
 
 
 #     foreach naked_pattern [ad_naked_html_patterns] {
-# 	if { [string match $naked_pattern $url_stub] } {
-# 	    # want the global admins with no menu, but not the domain admin
-# 	    return ""
+#       if { [string match $naked_pattern $url_stub] } {
+#           # want the global admins with no menu, but not the domain admin
+#           return ""
 #         }
 #     }
 
@@ -413,89 +430,89 @@
 #     set return_string ""
 
 #     if { $java_script_p } {
-#     	append return_string "
-# 	<script type='text/javascript' nonce='$::__csp_nonce'>
-# 	//<!--
+#       append return_string "
+#       <script type='text/javascript' nonce='$::__csp_nonce'>
+#       //<!--
 
-# 	go = new Image();
-# 	go.src = \"/graphics/go.gif\";
-# 	go_h = new Image();
-# 	go_h.src = \"/graphics/go_h.gif\";
+#       go = new Image();
+#       go.src = \"/graphics/go.gif\";
+#       go_h = new Image();
+#       go_h.src = \"/graphics/go_h.gif\";
 
-# 	up_one_level = new Image();
-# 	up_one_level.src = \"/graphics/36_up_one_level.gif\";
-# 	up_one_level_h = new Image();
-# 	up_one_level_h.src = \"/graphics/36_up_one_level_h.gif\";
+#       up_one_level = new Image();
+#       up_one_level.src = \"/graphics/36_up_one_level.gif\";
+#       up_one_level_h = new Image();
+#       up_one_level_h.src = \"/graphics/36_up_one_level_h.gif\";
 
-# 	back_to_top = new Image();
-# 	back_to_top.src = \"/graphics/24_back_to_top.gif\";
-# 	back_to_top_h = new Image();
-# 	back_to_top_h.src = \"/graphics/24_back_to_top_h.gif\";
+#       back_to_top = new Image();
+#       back_to_top.src = \"/graphics/24_back_to_top.gif\";
+#       back_to_top_h = new Image();
+#       back_to_top_h.src = \"/graphics/24_back_to_top_h.gif\";
 
-# 	help = new Image();
-# 	help.src = \"/graphics/help.gif\";
-# 	help_h = new Image();
-# 	help_h.src = \"/graphics/help_h.gif\";
+#       help = new Image();
+#       help.src = \"/graphics/help.gif\";
+#       help_h = new Image();
+#       help_h.src = \"/graphics/help_h.gif\";
 
-# 	rules = new Image();
-# 	rules.src = \"/graphics/rules.gif\";
-# 	rules_h = new Image();
-# 	rules_h.src = \"/graphics/rules_h.gif\";"
+#       rules = new Image();
+#       rules.src = \"/graphics/rules.gif\";
+#       rules_h = new Image();
+#       rules_h.src = \"/graphics/rules_h.gif\";"
 
-# 	foreach item $menu_items {
-# 	    if {  $item == [menu_highlight $section] } {
-# 		#this means the item was selected, so there are different gifs
-# 		append return_string "
-# 		  $item = new Image();
-# 		  $item.src =  \"/graphics/[set item]_a.gif\";
-# 		  [set item]_h = new Image();
-# 		  [set item]_h.src =  \"/graphics/[set item]_ah.gif\";"
-# 	    } else {
-# 		append return_string "
-# 		$item = new Image();
-# 		$item.src =  \"/graphics/[set item].gif\";
-# 		[set item]_h = new Image();
-# 		[set item]_h.src =  \"/graphics/[set item]_h.gif\";"
-# 	    }
+#       foreach item $menu_items {
+#           if {  $item == [menu_highlight $section] } {
+#               #this means the item was selected, so there are different gifs
+#               append return_string "
+#                 $item = new Image();
+#                 $item.src =  \"/graphics/[set item]_a.gif\";
+#                 [set item]_h = new Image();
+#                 [set item]_h.src =  \"/graphics/[set item]_ah.gif\";"
+#           } else {
+#               append return_string "
+#               $item = new Image();
+#               $item.src =  \"/graphics/[set item].gif\";
+#               [set item]_h = new Image();
+#               [set item]_h.src =  \"/graphics/[set item]_h.gif\";"
+#           }
 
-# 	}
+#       }
 
-# 	# JavaScript enabled
-# 	append return_string "
+#       # JavaScript enabled
+#       append return_string "
 
-# 	function hiLite(imgObjName) \{
-# 	    document \[imgObjName\].src = eval(imgObjName + \"_h\" + \".src\")
-# 	\}
+#       function hiLite(imgObjName) \{
+#           document \[imgObjName\].src = eval(imgObjName + \"_h\" + \".src\")
+#       \}
 
-# 	function unhiLite(imgObjName) \{
-# 	    document \[imgObjName\].src = eval(imgObjName + \".src\")
-# 	\}
+#       function unhiLite(imgObjName) \{
+#           document \[imgObjName\].src = eval(imgObjName + \".src\")
+#       \}
 
-# 	function go_to_url(url) \{
-# 		if (url \!= \"\") \{
-# 			self.location=url;
-# 		\}
-# 		return;
-# 	\}
-# 	// -->
-# 	</SCRIPT>"
+#       function go_to_url(url) \{
+#               if (url \!= \"\") \{
+#                       self.location=url;
+#               \}
+#               return;
+#       \}
+#       // -->
+#       </SCRIPT>"
 #     } else {
 
-# 	append return_string "
+#       append return_string "
 
-# 	<script type='text/javascript' nonce='$::__csp_nonce'>
-# 	//<!--
+#       <script type='text/javascript' nonce='$::__csp_nonce'>
+#       //<!--
 
-# 	function hiLite(imgObjName) \{
-# 	\}
+#       function hiLite(imgObjName) \{
+#       \}
 
-# 	function unhiLite(imgObjName) \{
-# 	\}
+#       function unhiLite(imgObjName) \{
+#       \}
 
-# 	function go_to_url(url) \{
-# 	\}
-# 	// -->
-# 	</SCRIPT>"
+#       function go_to_url(url) \{
+#       \}
+#       // -->
+#       </SCRIPT>"
 #     }
 
 #     # We divide up the screen into 4 areas top to bottom:
@@ -510,10 +527,10 @@
 
 
 #     if {$netscape3_p} {
-# 	append return_string "<IMG src=\"/graphics/top_left_brand.gif\" width=124 height=87 border=0 align=left alt=\"Cognet\">
+#       append return_string "<IMG src=\"/graphics/top_left_brand.gif\" width=124 height=87 border=0 align=left alt=\"Cognet\">
 # <TABLE border=0 cellpadding=3 cellspacing=0>"
 #     }  else {
-# 	append return_string "
+#       append return_string "
 # <TABLE border=0 cellpadding=0 cellspacing=0 height=87 width=\"100%\" cols=100>
 #     <TR><TD width=124 align=center><IMG src=\"/graphics/top_left_brand.gif\" width=124 height=87 border=0 alt=\"Cognet\"></TD>
 #         <TD colspan=99><TABLE border=0 cellpadding=3 cellspacing=0 width=\"100%\">"
@@ -529,12 +546,12 @@
 #                 <INPUT type=text value=\"\" name=query_string>&nbsp;&nbsp;"
 
 #     if {$netscape3_p} {
-# 	append return_string "<INPUT TYPE=submit VALUE=go>&nbsp;&nbsp;
+#       append return_string "<INPUT TYPE=submit VALUE=go>&nbsp;&nbsp;
 #              </FORM></TD></TR>
 #          </TABLE>"
 #     } else {
-# 	append return_string "<A href=\"JavaScript: document.SearchDirect.submit();\" onMouseOver=\"hiLite('go')\" onMouseOut=\"unhiLite('go')\" alt=\"search\"><img name=\"go\" src=\"/graphics/go.gif\" border=0 width=32 height=24 align=top alt=\"go\"></A>
-# 	</FORM></TD></TR>
+#       append return_string "<A href=\"JavaScript: document.SearchDirect.submit();\" onMouseOver=\"hiLite('go')\" onMouseOut=\"unhiLite('go')\" alt=\"search\"><img name=\"go\" src=\"/graphics/go.gif\" border=0 width=32 height=24 align=top alt=\"go\"></A>
+#       </FORM></TD></TR>
 #          </TABLE></TD>
 #    </TR>
 # </TABLE>"
@@ -547,37 +564,37 @@
 #     set uplevel_string  "<TD align=right><A href=\"[menu_uplevel $section $uplink]\" onMouseOver=\"hiLite(\'up_one_level\')\" onMouseOut=\"unhiLite(\'up_one_level\')\"><img name=\"up_one_level\" src=\"/graphics/36_up_one_level.gif\" border=0 width=120 height=36 \" alt=\"Up\"></A></TD></TR>"
 
 #     foreach url_pattern [ad_no_uplevel_patterns] {
-# 	if { [regexp $url_pattern $url_stub match] } {
-# 	    set uplevel_string ""
-# 	}
+#       if { [regexp $url_pattern $url_stub match] } {
+#           set uplevel_string ""
+#       }
 #     }
 
 #     append return_string $uplevel_string
 #     append return_string "</TABLE>"
 
 #     if  {$netscape3_p} {
-# 	append return_string "<TABLE border=0 cellpadding=0 cellspacing=0 width=200 align=left>"
+#       append return_string "<TABLE border=0 cellpadding=0 cellspacing=0 width=200 align=left>"
 #     } else {
-# 	append return_string "<TABLE border=0 cellpadding=0 cellspacing=0 width=\"100%\" cols=100>
+#       append return_string "<TABLE border=0 cellpadding=0 cellspacing=0 width=\"100%\" cols=100>
 #    <TR valign=top><TD width=200 bgcolor=\"[table_background_1]\">
 #        <TABLE border=0 cellpadding=0 cellspacing=0 width=200>"
 #     }
 
 # #  Navigation Table
 
 #     foreach item $menu_items {
-# 	if {  $item == [menu_highlight $section] } {
-# 	    append return_string "<TR><TD valign=bottom height=25 width=200 bgcolor=\"#FFFFFF\"><A href=\"[menu_url $item]\" onMouseOver=\"hiLite('[set item]')\" onMouseOut=\"unhiLite('[set item]')\"><img name=\"[set item]\" src=\"/graphics/[set item]_a.gif\" border=0 width=200 height=25 alt=\"$item\"></A></TD></TR>"
-# 	} else {
-# 	    append return_string "<TR><TD valign=bottom height=25 width=200 bgcolor=\"#FFFFFF\"><A href=\"[menu_url $item]\" onMouseOver=\"hiLite('[set item]')\" onMouseOut=\"unhiLite('[set item]')\"><img name=\"[set item]\" src=\"/graphics/[set item].gif\" border=0 width=200 height=25 alt=\"$item\"></A></TD></TR>"
-# 	}
+#       if {  $item == [menu_highlight $section] } {
+#           append return_string "<TR><TD valign=bottom height=25 width=200 bgcolor=\"#FFFFFF\"><A href=\"[menu_url $item]\" onMouseOver=\"hiLite('[set item]')\" onMouseOut=\"unhiLite('[set item]')\"><img name=\"[set item]\" src=\"/graphics/[set item]_a.gif\" border=0 width=200 height=25 alt=\"$item\"></A></TD></TR>"
+#       } else {
+#           append return_string "<TR><TD valign=bottom height=25 width=200 bgcolor=\"#FFFFFF\"><A href=\"[menu_url $item]\" onMouseOver=\"hiLite('[set item]')\" onMouseOut=\"unhiLite('[set item]')\"><img name=\"[set item]\" src=\"/graphics/[set item].gif\" border=0 width=200 height=25 alt=\"$item\"></A></TD></TR>"
+#       }
 #     }
 
 #     append return_string "
 #        <TR bgcolor=\"[table_background_1]\" valign=top align=left><TD width=200>
 #            <TABLE border=0 cellpadding=4 cellspacing=0 width=200>
 #     <!-- NAVIGATION BAR CONTENT GOES AFTER THIS START COMMENT USING TABLE Row and Data open and close tags -->
-# 	        [menu_subsection $section]
+#               [menu_subsection $section]
 #                 <!-- NAVIGATION BAR CONTENT GOES BEFORE THIS END COMMENT -->
 #            </TABLE></TD></TR>
 #    </TABLE>"
@@ -603,22 +620,22 @@
 #     set full_filename "$::acs::pageroot$url_stub"
 
 #     foreach naked_pattern [ad_naked_html_patterns] {
-# 	if { [string match $naked_pattern $url_stub] } {
-# 	    return ""
-# 	}
+#       if { [string match $naked_pattern $url_stub] } {
+#           return ""
+#       }
 #     }
 
 #     set netscape3_p 0
 
 #     if {[netscape3_browser]} {
-# 	set netscape3_p 1
+#       set netscape3_p 1
 #     }
 
 #     append return_string "</TD></TR></TABLE>"
 
 #     # close up the table
 #     if {$netscape3_p != 1} {
-# 	append return_string "</TD></TR>
+#       append return_string "</TD></TR>
 #        </TABLE>"
 #     }