edit/page: save original request for commit message

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

diff --git a/edit/page/index.php b/edit/page/index.php
index 48f8942e144e3487dee87ca1f7efabb6a50ca068..194a25d88a476b85d367cd5b46cecd5b5bb54727 100644 (file)
--- a/edit/page/index.php
+++ b/edit/page/index.php
@@ -1,15 +1,16 @@
 <?php
-if (!$User or !$User->admin("edit $Page$Args"))
+if (!$User->admin("edit {$Page->link}"))
        abort("geen beheersrechten", '401 unauthorised');
 
 if ($_FILES) {
        $response = ['uploaded' => 0];
        try {
                require_once('upload.inc.php');
-               $datadir = implode('/', ['data', date('Y')]);
-               if ($Args) $datadir .= $Args;
+               $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']++;
@@ -42,12 +43,11 @@ if ($_FILES) {
 
 if (!$_POST)
        abort("niets te doen", '405 post error');
-if (!$Args)
-       abort("geen bestand aangeleverd", '409 input error');
 
-$filename = trim($Args, '/');
-if (preg_match('{^\.}', $filename))
-       abort("ongeldige bestandsnaam: $filename", '403 input error');
+$request = trim($Page->path, '/') ?: 'index';
+if (preg_match('{^\.}', $request))
+       abort("ongeldige bestandsnaam: $request", '403 input error');
+$filename = $request;
 if (is_dir($filename) && !file_exists("$filename.html"))
        $filename .= '/index';
 $filename .= '.html';
@@ -72,8 +72,8 @@ 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')) {
-       $gitmsg = preg_replace('/\.html$/', '', $filename).": edit from {$_SERVER['REMOTE_ADDR']}";
+if (is_writable('.git')) {
+       $gitmsg = "$request: edit from {$_SERVER['REMOTE_ADDR']}";
        $gitcmd = 'git';
        $gitcmd .= ' -c user.name='.escapeshellarg($User->name ?: $User->login);
        $gitcmd .= ' -c user.email='.escapeshellarg($User->email ?: "{$User->login}@lijtweg.nl");