edit: implement filename storage in upload include

[minimedit.git] / edit / index.php

diff --git a/edit/index.php b/edit/index.php
index 19c02d9698a670ee3363792a93aec73ebae67460..cd222163a5a3615a7ad39193a0bcf218e471ae56 100644 (file)
--- a/edit/index.php
+++ b/edit/index.php
@@ -5,33 +5,39 @@ if (empty($User['admin']))
        abort("geen beheersrechten", '401 unauthorised');
 
 if ($_FILES) {
+       $response = ['uploaded' => 0];
        try {
-               $img = @$_FILES['upload'];
-               if (!$img or $img['error'] !== UPLOAD_ERR_OK)
-                       throw new Exception('bestand niet goed ontvangen: '.$img['error']);
-
+               require_once('upload.inc.php');
                $datadir = implode('/', ['data', date('Y')]);
-               if (!file_exists($datadir) and !@mkdir($datadir, 0777, TRUE)) {
-                       throw new Exception("bestand kon niet geplaatst worden in $datadir");
-               }
-
-               $target = $datadir.'/'.$img['name'];
-               if (!@move_uploaded_file($img['tmp_name'], $target)) {
-                       throw new Exception('bestand kon niet worden opgeslagen');
+               if ($Args) $datadir .= $Args;
+               $target = userupload(@$_FILES['upload'], $datadir);
+               if ($target) {
+                       $response['fileName'] = $_FILES['upload']['name'];
+                       $response['url'] = str_replace('%2F', '/', urlencode($target));
+                       $response['uploaded']++;
                }
        }
        catch (Exception $e) {
-               abort($e->getMessage(), '409 upload error');
+               $response['error'] = ['message' => $e->getMessage()];
        }
 
        switch (@$_GET['output']) {
+       case 'ckjson':
+               print json_encode($response);
+               exit;
        case 'ckescript':
+               if (empty($response['url'])) break;
                printf('<script>window.parent.CKEDITOR.tools.callFunction(%s)</script>',
-                       "{$_GET['CKEditorFuncNum']}, '$target'"
+                       "{$_GET['CKEditorFuncNum']}, '{$response['url']}'"
                );
                break;
        default:
-               abort($target);
+               if (empty($response['url'])) break;
+               print $target;
+       }
+
+       if (isset($response['error'])) {
+               abort($response['error']['message'], '409 upload error');
        }
        exit;
 }