Index: openacs-4/packages/richtext-tinymce/tcl/richtext-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/tcl/richtext-init.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/richtext-tinymce/tcl/richtext-init.tcl 19 Jul 2024 11:46:20 -0000 1.2.2.2
+++ openacs-4/packages/richtext-tinymce/tcl/richtext-init.tcl 29 Jul 2024 14:27:31 -0000 1.2.2.3
@@ -1,5 +1,17 @@
+ad_library {
+ Initialization for tinymce
+}
+
+::richtext::tinymce::register_urns
+
+#
+# GN: is this the right place?
+#
template::util::richtext::register_editor tinymce
+#
+# GN: this code is quite invasive. Why is this needed?
+#
if {[apm_package_installed_p xowiki]} {
#
# We become the preferred richtext editor for xowiki, if none was
@@ -16,6 +28,7 @@
}
}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4
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.13 -r1.4.2.14
--- openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 25 Jul 2024 14:24:26 -0000 1.4.2.13
+++ openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 29 Jul 2024 14:27:31 -0000 1.4.2.14
@@ -14,98 +14,63 @@
namespace eval ::richtext::tinymce {
- ad_proc -private version {} {
- return [::parameter::get_global_value \
- -package_key richtext-tinymce \
- -parameter Version]
- }
-
- ad_proc -private api_key {} {
- return [::parameter::get_global_value \
- -package_key richtext-tinymce \
- -parameter APIKey]
- }
-
- ad_proc -private cdn_host {} {
- return https://cdn.tiny.cloud
- }
-
- ad_proc -private base_cdn_url {} {
- set cdn_host [::richtext::tinymce::cdn_host]
- set api_key [::richtext::tinymce::api_key]
- return ${cdn_host}/1/${api_key}/tinymce
- }
-
- ad_proc -private base_download_url {} {
- return https://download.tiny.cloud/tinymce/community
- }
-
- ad_proc -private download_url {} {
- set version [::richtext::tinymce::version]
- set base_download_url [::richtext::tinymce::base_download_url]
- return ${base_download_url}/tinymce_${version}.zip
- }
-
- ad_proc -private lang_download_url {} {
- set version [::richtext::tinymce::version]
- set major [lindex [split $version .] 0]
- set base_download_url [::richtext::tinymce::base_download_url]
- return ${base_download_url}/languagepacks/${major}/langs.zip
- }
-
- ad_proc -private url {} {
- if {[file exists [::richtext::tinymce::path]]} {
- set version [::richtext::tinymce::version]
- set base_url /resources/richtext-tinymce/${version}/tinymce/js/tinymce
- return ${base_url}/tinymce.min.js
- } else {
- set version [::richtext::tinymce::version]
- set base_url [::richtext::tinymce::base_cdn_url]
- return ${base_url}/${version}/tinymce.min.js
- }
- }
-
- ad_proc -private base_path {} {
- set root_dir [acs_package_root_dir richtext-tinymce]
- set version [::richtext::tinymce::version]
- return ${root_dir}/www/resources/${version}/tinymce/js/tinymce
- }
-
- ad_proc -private langs_path {} {
- return [::richtext::tinymce::base_path]/langs
- }
-
- ad_proc -private path {} {
- return [::richtext::tinymce::base_path]/tinymce.min.js
- }
-
- ad_proc -private resource_info {} {
+ ad_proc resource_info {
+ {-version ""}
+ } {
@return a dict in "resource_info" format, compatible with
- other api and templates on the system.
+ other API and templates on the system.
@see util::resources::can_install_locally
@see util::resources::is_installed_locally
@see util::resources::download
- @see util::resources::version_dir
+ @see util::resources::version_segment
} {
- set version [::richtext::tinymce::version]
#
+ # If no version is specified, use configured one
+ #
+ if {$version eq ""} {
+ set version [::parameter::get_global_value \
+ -package_key richtext-tinymce \
+ -parameter Version]
+ }
+
+ #
# Setup variables for access via CDN vs. local resources.
#
- set resourceDir [acs_package_root_dir richtext-tinymce/www/resources]
- set resourceUrl /resources/richtext-tinymce
- set cdn [::richtext::tinymce::cdn_host]
+ # "resourceDir" is the absolute path in the filesystem
+ # "versionSegment" is the version-specific element both in the
+ # URL and in the filesystem.
+ #
- if {[file exists [::richtext::tinymce::path]]} {
- set prefix [::richtext::tinymce::base_path]
+ set resourceDir [acs_package_root_dir richtext-tinymce/www/resources]
+ set versionSegment $version
+ set cdnHost cdnjs.cloudflare.com
+ set cdn //$cdnHost/
+
+ if {[file exists $resourceDir/$versionSegment]} {
+ #
+ # Local version is installed
+ #
+ set prefix /resources/richtext-tinymce/$versionSegment
set cdnHost ""
+ set cspMap ""
} else {
- set base_url [::richtext::tinymce::base_cdn_url]
- set prefix ${base_url}/${version}
- set cdnHost [dict get [ns_parseurl $cdn] host]
+ #
+ # Use CDN
+ #
+ set prefix ${cdn}ajax/libs/tinymce/$versionSegment
+ set cspMap [subst {
+ urn:ad:js:tinymce {
+ connect-src $cdnHost
+ script-src $cdnHost
+ style-src $cdnHost
+ img-src $cdnHost
+ }}]
}
+ set major [lindex [split $version .] 0]
+
#
# Return the dict with at least the required fields
#
@@ -118,19 +83,22 @@
cssFiles {} \
jsFiles {} \
extraFiles {} \
- downloadURLs [list \
- [::richtext::tinymce::download_url] \
- [::richtext::tinymce::lang_download_url] \
- ] \
+ downloadURLs [subst {
+ https://download.tiny.cloud/tinymce/community/tinymce_$version.zip
+ https://download.tiny.cloud/tinymce/community/languagepacks/$major/langs.zip
+ }] \
urnMap {} \
+ cspMap $cspMap \
versionCheckAPI {cdn cdnjs library tinymce count 5} \
vulnerabilityCheck {service snyk library tinymce} \
- installedVersion $version
+ configuredVersion $version
return $result
}
- ad_proc -private download {} {
+ ad_proc -private download {
+ {-version ""}
+ } {
Download the editor package for the configured version and put
it into a directory structure similar to the CDN structure to
@@ -142,16 +110,13 @@
writable by the web server.
} {
- set version [::richtext::tinymce::version]
+ set resource_info [resource_info -version $version]
+ set version [dict get $resource_info configuredVersion]
+ set resourceDir [dict get $resource_info resourceDir]
+ set versionSegment [::util::resources::version_segment -resource_info $resource_info]
- set resource_info [::richtext::tinymce::resource_info]
+ ::util::resources::download -resource_info $resource_info
- ::util::resources::download \
- -resource_info $resource_info \
- -version_dir $version
-
- set resourceDir [dict get $resource_info resourceDir]
-
#
# Do we have unzip installed?
#
@@ -163,34 +128,35 @@
#
# Do we have a writable output directory under resourceDir?
#
- if {![file isdirectory $resourceDir/$version]} {
- file mkdir $resourceDir/$version
+ set path $resourceDir/$versionSegment
+ if {![file isdirectory $path]} {
+ file mkdir $path
}
- if {![file writable $resourceDir/$version]} {
- error "directory $resourceDir/$version is not writable"
+ if {![file writable $path]} {
+ error "directory $path is not writable"
}
#
# So far, everything is fine, unpack the editor package.
#
foreach url [dict get $resource_info downloadURLs] {
set fn [file tail $url]
- util::unzip -overwrite -source $resourceDir/$version/$fn -destination $resourceDir/$version
+ util::unzip -overwrite -source $path/$fn -destination $path
}
- #
- # Move the language pack where the editor expects it to be.
- #
- set langs_path [::richtext::tinymce::langs_path]
- #
- # The download zip contains a langs folder, which contains a
- # readme file, hence the -force.
- #
- file delete -force -- $langs_path
- file rename $resourceDir/$version/langs $langs_path
+ foreach f [glob \
+ $path/tinymce/js/tinymce/*.* \
+ $path/tinymce/js/tinymce/icons \
+ $path/tinymce/js/tinymce/models \
+ $path/tinymce/js/tinymce/plugins \
+ $path/tinymce/js/tinymce/skins \
+ $path/tinymce/js/tinymce/themes \
+ ] {
+ file rename $f $path/[file tail $f]
+ }
}
- ad_proc serialize_options {options} {
+ ad_proc -private serialize_options {options} {
Converts an options dict into a JSON value suitable to
configure TinyMCE.
} {
@@ -304,23 +270,14 @@
coming from system parameters and only use
that we provide locally.
} {
- ::template::head::add_javascript \
- -src [::richtext::tinymce::url] \
+ ::template::head::add_css \
+ -href urn:ad:css:tinymce \
-order ${order}.1
- ::template::head::add_css \
- -href /resources/richtext-tinymce/css/style.css \
+ ::template::head::add_javascript \
+ -src urn:ad:js:tinymce \
-order ${order}.1
- set local_installation_p [file exists [::richtext::tinymce::path]]
- if {!$local_installation_p} {
- set cdn_host [::richtext::tinymce::cdn_host]
- security::csp::require connect-src $cdn_host
- security::csp::require script-src $cdn_host
- security::csp::require style-src $cdn_host
- security::csp::require img-src $cdn_host
- }
-
if {!$init_p} {
#
# We just want the header stuff.
@@ -355,6 +312,30 @@
@see richtext::tinymce::add_editor
} {
}
+
+
+ ad_proc -private ::richtext::tinymce::register_urns {} {
+ Register URNs either with local or with CDN URLs.
+ } {
+ set resource_info [resource_info]
+ set prefix [dict get $resource_info prefix]
+
+ #
+ # Settings for CDN and local installs are the same
+ #
+ dict set URNs urn:ad:js:tinymce $prefix/tinymce.min.js
+ dict set URNs urn:ad:css:tinymce $prefix/skins/ui/oxide/skin.min.css
+
+ foreach {URN resource} $URNs {
+ template::register_urn \
+ -urn $URN \
+ -resource $resource \
+ -csp_list [expr {[dict exists $resource_info cspMap $URN]
+ ? [dict get $resource_info cspMap $URN]
+ : ""}]
+ }
+ }
+
}
# Local variables:
Index: openacs-4/packages/richtext-tinymce/www/sitewide-admin/download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/www/sitewide-admin/download.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-tinymce/www/sitewide-admin/download.tcl 29 Apr 2024 12:08:30 -0000 1.1.2.1
+++ openacs-4/packages/richtext-tinymce/www/sitewide-admin/download.tcl 29 Jul 2024 14:27:31 -0000 1.1.2.2
@@ -1,10 +1,12 @@
ad_page_contract {
+ @author Gustaf Neumann
- Download TinyMCE
-
+ @creation-date Jan 04, 2017
+} {
+ {version:token,notnull ""}
}
-::richtext::tinymce::download
+::richtext::tinymce::download -version $version
ad_returnredirect .
# Local variables:
Index: openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.adp 29 Apr 2024 12:08:30 -0000 1.1.2.1
+++ openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.adp 29 Jul 2024 14:27:31 -0000 1.1.2.2
@@ -4,3 +4,5 @@
@title;noquote@
+
+
Index: openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.tcl 29 Apr 2024 12:08:30 -0000 1.1.2.1
+++ openacs-4/packages/richtext-tinymce/www/sitewide-admin/index.tcl 29 Jul 2024 14:27:31 -0000 1.1.2.2
@@ -3,13 +3,11 @@
@creation-date Aug 6, 2018
} {
- {ck_package:token ""}
}
-set version [::richtext::tinymce::version]
-
set resource_info [::richtext::tinymce::resource_info]
-set download_url download
+set version [dict get $resource_info configuredVersion]
+set download_url [ad_conn url]/download?version=$version
set title "[dict get $resource_info resourceName] - Sitewide Admin"
set context [list $title]