edit/page: git directory relative to site root

[minimedit.git] / edit / page / index.php

diff --git a/edit/page/index.php b/edit/page/index.php
index 13ebd242ec9a91b939832313ce4974a947b02129..d506e8f3a20e252c9f914f36ad5c0f11f813397b 100644 (file)
--- a/edit/page/index.php
+++ b/edit/page/index.php
@@ -6,10 +6,11 @@ if ($_FILES) {
        $response = ['uploaded' => 0];
        try {
                require_once('upload.inc.php');
-               $datadir = implode('/', ['data', date('Y')]);
+               $datadir = implode('/', ['data', date('Y'), $User->login]);
                if ($Page->path) $datadir .= $Page->path;
                $target = userupload(@$_FILES['upload'], $datadir);
                if ($target) {
+                       $target = "/thumb/640x/$target";
                        $response['fileName'] = $_FILES['upload']['name'];
                        $response['url'] = str_replace('%2F', '/', urlencode($target));
                        $response['uploaded']++;
@@ -70,7 +71,7 @@ if (!file_exists(dirname($filename)) and !mkdir(dirname($filename), 0777, TRUE))
 if (!file_put_contents($filename, $upload))
        abort("fout bij schrijven van $filename", '500 save error');
 
-if (is_writable('../.git')) {
+if (is_writable('.git')) {
        $gitmsg = preg_replace('/\.html$/', '', $filename).": edit from {$_SERVER['REMOTE_ADDR']}";
        $gitcmd = 'git';
        $gitcmd .= ' -c user.name='.escapeshellarg($User->name ?: $User->login);