edit: enable image uploads in ckeditor

diff --git a/edit.js b/edit.js
index 439fb97908675a02e92629569889f6b1a8b7473c..049bbd0d13aff7e939e34fbf6b110ca63effeb47 100644 (file)
--- a/edit.js
+++ b/edit.js
@@ -69,7 +69,7 @@ CKEDITOR.on('instanceCreated', function (event) {
                config.format_tags = 'h2;h3;h4;p';
                config.allowedContent = true;
                config.entities = false; // keep unicode
-               config.filebrowserImageUploadUrl = '/edit?type=img';
+               config.filebrowserImageUploadUrl = '/edit?output=ckescript';
                config.pasteFilter = pastefilter;
                config.contentsCss = document.styleSheets[0].href;
                config.toolbar = [

diff --git a/edit.php b/edit.php
index 75b80b3b86432a4dd02e076bacb708c84a56cea5..ca9639c3da44f2049cf14bb2318ec1be0b919b34 100644 (file)
--- a/edit.php
+++ b/edit.php
@@ -18,7 +18,17 @@ if ($_FILES) {
        $datadir = 'data/' . date('Y');
        $target = $datadir.'/'.$img['name'];
        move_uploaded_file($img['tmp_name'], $target);
-       abort($target);
+
+       switch (@$_GET['output']) {
+       case 'ckescript':
+               printf('<script>window.parent.CKEDITOR.tools.callFunction(%s)</script>',
+                       "{$_GET['CKEditorFuncNum']}, '$target'"
+               );
+               break;
+       default:
+               abort($target);
+       }
+       exit;
 }
 
 if (!$_POST)