Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.117.2.36 -r1.117.2.37
--- openacs-4/packages/acs-subsite/acs-subsite.info 7 Oct 2017 11:11:38 -0000 1.117.2.36
+++ openacs-4/packages/acs-subsite/acs-subsite.info 14 Sep 2018 11:56:34 -0000 1.117.2.37
@@ -9,7 +9,7 @@
<implements-subsite-p>t</implements-subsite-p>
<inherit-templates-p>t</inherit-templates-p>
- <version name="5.9.2d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.2d1.apm">
+ <version name="5.9.2d2" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.2d2.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Subsite</summary>
<release-date>2017-08-06</release-date>
@@ -18,11 +18,11 @@
<license>GPL</license>
<maturity>3</maturity>
- <provides url="acs-subsite" version="5.9.2d1"/>
+ <provides url="acs-subsite" version="5.9.2d2"/>
<requires url="acs-authentication" version="5.9.1"/>
<requires url="acs-content-repository" version="5.9.1"/>
<requires url="acs-kernel" version="5.9.1"/>
- <requires url="acs-tcl" version="5.9.1"/>
+ <requires url="acs-tcl" version="5.9.2d3"/>
<requires url="acs-lang" version="5.9.1"/>
<requires url="acs-mail-lite" version="5.9.1"/>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.19.6.3 -r1.19.6.4
--- openacs-4/packages/acs-subsite/www/admin/index.tcl 2 Sep 2016 17:33:19 -0000 1.19.6.3
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl 14 Sep 2018 11:56:34 -0000 1.19.6.4
@@ -22,9 +22,22 @@
set acs_admin_url [apm_package_url_from_key "acs-admin"]
array set acs_admin_node [site_node::get -url $acs_admin_url]
set acs_admin_name $acs_admin_node(instance_name)
-set sw_admin_p [permission::permission_p -party_id [ad_conn user_id] -object_id $acs_admin_node(object_id) -privilege admin]
-set full_acs_admin_url [util::configured_location]$acs_admin_url
+set sw_admin_p [permission::permission_p \
+ -party_id [ad_conn user_id] \
+ -object_id $acs_admin_node(object_id) \
+ -privilege admin]
+#
+# Get the main site location, which is the configured location.
+# When SuppressHttpPort is set, get it without the port.
+#
+set suppress_port [parameter::get -parameter SuppressHttpPort \
+ -package_id [apm_package_id_from_key acs-tcl] \
+ -default 0]
+set main_site_location [util::configured_location -suppress_port=$suppress_port]
+set full_acs_admin_url $main_site_location$acs_admin_url
+
+
set convert_subsite_p [expr { [llength [apm::get_package_descendent_options [ad_conn package_key]]] > 0 }]
# Local variables:
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.70.2.29 -r1.70.2.30
--- openacs-4/packages/acs-tcl/acs-tcl.info 19 Jan 2018 19:38:54 -0000 1.70.2.29
+++ openacs-4/packages/acs-tcl/acs-tcl.info 14 Sep 2018 11:56:34 -0000 1.70.2.30
@@ -9,7 +9,7 @@
<implements-subsite-p>f</implements-subsite-p>
<inherit-templates-p>t</inherit-templates-p>
- <version name="5.9.2d1" url="http://openacs.org/repository/download/apm/acs-tcl-5.9.2d1.apm">
+ <version name="5.9.2d3" url="http://openacs.org/repository/download/apm/acs-tcl-5.9.2d3.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>The Kernel Tcl API library.</summary>
<release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
<license>GPL version 2</license>
<maturity>3</maturity>
- <provides url="acs-tcl" version="5.9.2d1"/>
+ <provides url="acs-tcl" version="5.9.2d3"/>
<requires url="acs-bootstrap-installer" version="5.9.1"/>
<requires url="acs-kernel" version="5.9.1"/>
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.140.2.83 -r1.140.2.84
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Jul 2017 09:52:36 -0000 1.140.2.83
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 14 Sep 2018 11:56:34 -0000 1.140.2.84
@@ -2676,7 +2676,7 @@
return $result
}
-ad_proc -public util::configured_location {} {
+ad_proc -public util::configured_location {{-suppress_port:boolean}} {
Return the configured location as configured for the current
network driver. While [util_current_location] honors the virtual
@@ -2695,7 +2695,7 @@
return [util::join_location \
-proto [dict get $driver_info proto] \
-hostname [dict get $driver_info hostname] \
- -port [dict get $driver_info port]]
+ -port [expr {$suppress_port_p ? "" : [dict get $driver_info port]}]]
}
ad_proc -public util_current_location {} {