X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/97bc8f54b09859842e53d4886234a3b09122ea71..c1eb891eceb8be1f3621fda7f0e5a58875df4d3e:/edit.php

diff --git a/edit.php b/edit.php
old mode 100755
new mode 100644
index 01d83df..f0d001e
--- a/edit.php
+++ b/edit.php
@@ -1,11 +1,13 @@
 <?php
+ob_clean();
+
 function abort($status, $body) {
 	header("HTTP/1.1 $status");
 	print "$body\n";
 	exit;
 }
 
-if (!$User['admin'])
+if (!@$User['admin'])
 	abort('401 unauthorised', "geen beheersrechten");
 
 if (!$_POST)
@@ -14,9 +16,9 @@ if (!isset($_SERVER['PATH_INFO']) or strlen($_SERVER['PATH_INFO']) <= 1)
 	abort('409 input error', "geen bestand aangeleverd");
 
 $filename = ltrim($Args, '/').'.html';
-if (file_exists($filename) and !is_writable($filename))
+if (!preg_match('{^(?:[/a-z0-9-])+\.html$}', $filename))
 	abort('403 input error', "ongeldige bestandsnaam: $filename");
-if (is_executable($filename))
+if (file_exists($filename) and !is_writable($filename))
 	abort('403 input error', "onwijzigbaar bestand: $filename");
 
 if (!isset($_POST['body']))
@@ -32,6 +34,9 @@ if (!strlen($upload)) {
 	exit;
 }
 
+if (!file_exists(dirname($filename)) and !mkdir(dirname($filename)))
+	abort('500 save error', "fout bij aanmaken van map voor $filename");
+
 if (!file_put_contents($filename, $upload))
 	abort('500 save error', "fout bij schrijven van $filename");