X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/87ae71d836e57d6952f4c11ee6ffc02a79d8bdf7..refs/tags/v2.4:/edit.php?ds=sidebyside

diff --git a/edit.php b/edit.php
index ca9639c..8f3abc5 100644
--- a/edit.php
+++ b/edit.php
@@ -7,7 +7,7 @@ function abort($body, $status = NULL) {
 	exit;
 }
 
-if (!@$User['admin'])
+if (empty($User['admin']))
 	abort("geen beheersrechten", '401 unauthorised');
 
 if ($_FILES) {
@@ -54,11 +54,25 @@ if (!strlen($upload)) {
 	abort("Bestand verwijderd");
 }
 
-if (!file_exists(dirname($filename)) and !mkdir(dirname($filename)))
+if (!file_exists(dirname($filename)) and !mkdir(dirname($filename), 0777, TRUE))
 	abort("fout bij aanmaken van map voor $filename", '500 save error');
 
 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']}";
+	$gitcmd = 'git';
+	$gitcmd .= ' -c user.name='.escapeshellarg($User['name']);
+	$gitcmd .= ' -c user.email='.escapeshellarg("{$User['name']}@lijtweg.nl");
+	$gitcmd .= ' commit -q';
+	$gitcmd .= ' -m '.escapeshellarg($gitmsg);
+	$gitcmd .= ' -- '.escapeshellarg($filename);
+	exec("$gitcmd 2>&1", $gitlog, $gitstatus);
+	if ($gitstatus) {
+		trigger_error("git commit failure $gitstatus: ".implode("\n", $gitlog), E_USER_WARNING);
+	}
+}
+
 abort("Bestand opgeslagen");