Index: openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info 9 Oct 2017 10:26:37 -0000 1.5
+++ openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info 10 Dec 2017 15:18:34 -0000 1.6
@@ -9,14 +9,14 @@
f
f
-
+
Gustaf Neumann
Richtext editor plugin for integrating CKeditor 4 with acs-templating
2017-08-06
2
-
+
Index: openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-init.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-init.tcl 7 Oct 2017 18:40:02 -0000 1.3
+++ openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-init.tcl 10 Dec 2017 15:18:34 -0000 1.4
@@ -212,13 +212,21 @@
#
# View handler
#
+if {$::tcl_version eq "8.5"} {
+ #
+ # In Tcl 8.5, "::try" was not yet a builtin of Tcl
+ #
+ package require try
+}
ns_register_proc GET $::richtext::ckeditor4::ckfinder_url/view {
#
# View function (for "filebrowser" and "uploadimage" plugins)
#
+ ns_log notice richtext::ckeditor4::ckfinder_url/view
+
set ::template::parse_level [info level]
- ad_try {
+ ::try {
#
# Use the standard page_contract
#
@@ -230,7 +238,7 @@
-revision_id $image_id \
-user_id [ad_conn user_id]
- } ad_script_abort val {
+ } trap {AD EXCEPTION ad_script_abort} {result} {
#
# The page contract has probably failed, no need to raise an
# exception.
Index: openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-procs.tcl 19 Aug 2017 13:22:34 -0000 1.2
+++ openacs-4/packages/richtext-ckeditor4/tcl/ckfinder-procs.tcl 10 Dec 2017 15:18:34 -0000 1.3
@@ -10,8 +10,14 @@
@author Gustaf Neumann
@creation-date 15 Aug 2017
@cvs-id $Id$
-}
+ NOTE: the delivery of files performs two permission checks, once
+ in the requestprocessor (the site nodes) and once for the concrete image.
+ If one whishes to make uploaded images readable by "The Public", make
+ sure that the /
+
+}
+
namespace eval ::richtext::ckeditor4::ckfinder {
ad_proc -public file_attach {
Index: openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 9 Oct 2017 10:26:37 -0000 1.6
+++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 10 Dec 2017 15:18:34 -0000 1.7
@@ -17,7 +17,7 @@
set package_id [apm_package_id_from_key "richtext-ckeditor4"]
# ns_section ns/server/${server}/acs/richtext-ckeditor
- # ns_param CKEditorVersion 4.7.1
+ # ns_param CKEditorVersion 4.7.3
# ns_param CKEditorPackage standard
# ns_param CKFinderURL /acs-content-repository/ckfinder
# ns_param StandardPlugins uploadimage