X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/9ed73579aefba12ff191afc09766108bee783015..aee71926fef0a65076c0c40b4c3280506dec5aba:/edit/page/index.php

diff --git a/edit/page/index.php b/edit/page/index.php
index cd22216..13ebd24 100644
--- a/edit/page/index.php
+++ b/edit/page/index.php
@@ -1,7 +1,5 @@
 <?php
-ob_clean();
-
-if (empty($User['admin']))
+if (!$User->admin("edit {$Page->link}"))
 	abort("geen beheersrechten", '401 unauthorised');
 
 if ($_FILES) {
@@ -9,7 +7,7 @@ if ($_FILES) {
 	try {
 		require_once('upload.inc.php');
 		$datadir = implode('/', ['data', date('Y')]);
-		if ($Args) $datadir .= $Args;
+		if ($Page->path) $datadir .= $Page->path;
 		$target = userupload(@$_FILES['upload'], $datadir);
 		if ($target) {
 			$response['fileName'] = $_FILES['upload']['name'];
@@ -44,12 +42,13 @@ if ($_FILES) {
 
 if (!$_POST)
 	abort("niets te doen", '405 post error');
-if (!$Args)
-	abort("geen bestand aangeleverd", '409 input error');
 
-$filename = ltrim($Args, '/').'.html';
+$filename = trim($Page->path, '/') ?: 'index';
 if (preg_match('{^\.}', $filename))
 	abort("ongeldige bestandsnaam: $filename", '403 input error');
+if (is_dir($filename) && !file_exists("$filename.html"))
+	$filename .= '/index';
+$filename .= '.html';
 if (file_exists($filename) and !is_writable($filename))
 	abort("onwijzigbaar bestand: $filename", '403 input error');
 
@@ -74,8 +73,8 @@ if (!file_put_contents($filename, $upload))
 if (is_writable('../.git')) {
 	$gitmsg = preg_replace('/\.html$/', '', $filename).": edit from {$_SERVER['REMOTE_ADDR']}";
 	$gitcmd = 'git';
-	$gitcmd .= ' -c user.name='.escapeshellarg($User['name']);
-	$gitcmd .= ' -c user.email='.escapeshellarg("{$User['name']}@lijtweg.nl");
+	$gitcmd .= ' -c user.name='.escapeshellarg($User->name ?: $User->login);
+	$gitcmd .= ' -c user.email='.escapeshellarg($User->email ?: "{$User->login}@lijtweg.nl");
 	$gitcmd .= ' commit -q';
 	$gitcmd .= ' -m '.escapeshellarg($gitmsg);
 	$gitcmd .= ' -- '.escapeshellarg($filename);