Index: openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl 1 Apr 2022 13:04:44 -0000 1.1.2.1
+++ openacs-4/packages/bootstrap-icons/www/sitewide-admin/index.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.2
@@ -7,7 +7,7 @@
set version $::bootstrap_icons::version
set resource_info [::bootstrap_icons::resource_info]
-set download_url download
+set download_url [ad_conn url]/download
set title "[dict get $resource_info resourceName] - Sitewide Admin"
set context [list $title]
Index: openacs-4/packages/fa-icons/www/sitewide-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/www/sitewide-admin/index.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/fa-icons/www/sitewide-admin/index.adp 23 Oct 2022 17:59:07 -0000 1.1.2.2
+++ openacs-4/packages/fa-icons/www/sitewide-admin/index.adp 24 Jul 2024 16:31:45 -0000 1.1.2.3
@@ -5,4 +5,4 @@
<h1>@title;noquote@</h1>
<include src="/packages/acs-tcl/lib/check-installed" &=resource_info &=version &=download_url>
<include src="/packages/acs-templating/lib/registered-urns" match="*:fa-icons*">
-<p>For more background information, see the <a href="sample">Sample Icons</a> page.
+<p>For more background information, see the <a href="./sample">Sample Icons</a> page.
Index: openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl 17 Apr 2022 10:41:37 -0000 1.1.2.1
+++ openacs-4/packages/fa-icons/www/sitewide-admin/index.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.2
@@ -7,7 +7,7 @@
set version $::fa_icons::version
set resource_info [::fa_icons::resource_info]
-set download_url download
+set download_url [ad_conn url]/download
set title "[dict get $resource_info resourceName] - Sitewide Admin"
set context [list $title]
Index: openacs-4/packages/highcharts/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/tcl/resource-procs.tcl,v
diff -u -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/highcharts/tcl/resource-procs.tcl 23 Jul 2024 16:10:50 -0000 1.1.2.11
+++ openacs-4/packages/highcharts/tcl/resource-procs.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.12
@@ -63,14 +63,6 @@
#
# Use CDN
#
- # cloudflare has the following resources:
- #
- # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/highcharts.js
- # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/highcharts.min.js
- #
- # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/modules/exporting.js
- # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/modules/exporting.min.js
- #
set prefix ${cdn}ajax/libs/highcharts/$version
set cspMap [subst {
urn:ad:js:highcharts {
@@ -103,6 +95,7 @@
urnMap {} \
versionCheckURL https://cdnjs.com/libraries/highcharts \
versionCheckAPI {cdn cdnjs library highcharts count 5} \
+ vulnerabilityCheckURL https://snyk.io/advisor/npm-package/highcharts \
installedVersion $version
return $result
Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v
diff -u -r1.5.2.7 -r1.5.2.8
--- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 23 Jul 2024 16:10:50 -0000 1.5.2.7
+++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 24 Jul 2024 16:31:45 -0000 1.5.2.8
@@ -45,6 +45,7 @@
urn:ad:css:bootstrap3 css/bootstrap.min.css
urn:ad:js:bootstrap3 js/bootstrap.min.js
} \
+ vulnerabilityCheckURL https://snyk.io/advisor/npm-package/bootstrap \
installedVersion $version
if {$cdnHost ne ""} {
Index: openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl,v
diff -u -r1.1.2.12 -r1.1.2.13
--- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 23 Jul 2024 16:10:50 -0000 1.1.2.12
+++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.13
@@ -21,20 +21,21 @@
#
set resourceDir [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap]
set resourceUrl /resources/openacs-bootstrap5-theme/bootstrap
- set cdnHost cdn.jsdelivr.net
- set cdn //$cdnHost/npm
set version $openacs_bootstrap5_theme::bootstrap_version
- set versionDir bootstrap@$version/dist
+ set versionDir $version
+ set cdn //cdnjs.cloudflare.com/ajax/libs/bootstrap
if {[file exists $resourceDir/$versionDir]} {
- set prefix $resourceUrl/$versionDir
+ set prefix $resourceUrl/$version
set cdnHost ""
} else {
- # https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css
- # https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js
- set prefix $cdn/$versionDir
+ #
+ # Use CDN
+ #
+ set prefix $cdn/$version
+ set cdnHost cdnjs.cloudflare.com
}
-
+
lappend result \
resourceName "Bootstrap 5" \
resourceDir $resourceDir \
@@ -51,6 +52,7 @@
} \
versionCheckURL https://cdnjs.com/libraries/bootstrap \
versionCheckAPI {cdn cdnjs library bootstrap count 1} \
+ vulnerabilityCheckURL https://snyk.io/advisor/npm-package/bootstrap \
installedVersion $version
#urn:ad:js:popper2 dist/umd/popper.min.js
Index: openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl,v
diff -u -r1.3.2.3 -r1.3.2.4
--- openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl 16 Dec 2020 18:53:38 -0000 1.3.2.3
+++ openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl 24 Jul 2024 16:31:45 -0000 1.3.2.4
@@ -12,7 +12,7 @@
set ck_package $::richtext::ckeditor4::ck_package
}
set resource_info [::richtext::ckeditor4::resource_info -ck_package $ck_package]
-set download_url download?ck_package=$ck_package
+set download_url [ad_conn url]/download?ck_package=$ck_package
set title "[dict get $resource_info resourceName] - Sitewide Admin"
set context [list $title]
Index: openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl,v
diff -u -r1.4.2.11 -r1.4.2.12
--- openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 23 Jul 2024 16:10:50 -0000 1.4.2.11
+++ openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 24 Jul 2024 16:31:45 -0000 1.4.2.12
@@ -125,6 +125,7 @@
urnMap {} \
versionCheckURL https://cdnjs.com/libraries/tinymce \
versionCheckAPI {cdn cdnjs library tinymce count 5} \
+ vulnerabilityCheckURL https://snyk.io/advisor/npm-package/tinymce \
installedVersion $version
return $result
Index: openacs-4/packages/xowiki/tcl/resource-info-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/resource-info-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 23 Jul 2024 16:10:50 -0000 1.1.2.5
+++ openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.6
@@ -40,7 +40,7 @@
cdn $cdn \
cdnHost $cdnHost \
prefix $prefix \
- versionCheckURL "https://cdnjs.com/libraries?q=bootstrap-treeview" \
+ versionCheckURL https://cdnjs.com/libraries/bootstrap-treeview \
cssFiles {bootstrap-treeview.min.css} \
jsFiles {bootstrap-treeview.min.js} \
extraFiles {} \
Index: openacs-4/packages/xowiki/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xowiki/www/sitewide-admin/index.tcl 2 Feb 2024 12:31:36 -0000 1.1.2.3
+++ openacs-4/packages/xowiki/www/sitewide-admin/index.tcl 24 Jul 2024 16:31:45 -0000 1.1.2.4
@@ -10,7 +10,7 @@
set resource_info [::xowiki::bootstrap_treeview::resource_info -version $version]
set resoure_name [dict get $resource_info resourceName]
set resource_title "Static resources"
-set download_url download?version=$version
+set download_url [ad_conn url]/download?version=$version
set context [list $title]