X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/f8527c143033f51fecd929789ef7ad6589c8c2b4..HEAD:/upload.inc.php

diff --git a/upload.inc.php b/upload.inc.php
index 86af604..22db140 100644
--- a/upload.inc.php
+++ b/upload.inc.php
@@ -1,4 +1,10 @@
 <?php
+global $journalcol;
+$journalcol = [
+	'assign' => 'Toegewezen aan',
+	'subject' => 'Onderwerp',
+];
+
 function userupload($input, $target = NULL, $filename = NULL)
 {
 	switch ($input['error']) {
@@ -48,7 +54,7 @@ function messagehtml($input)
 	if (empty($input)) {
 		return;
 	}
-	if ($User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
+	if ($User and $User->admin and preg_match('/\A<[a-z][^>]*>/', $input)) {
 		return $input;  # allow html input as is if privileged
 	}
 	$markup = [
@@ -57,10 +63,133 @@ function messagehtml($input)
 		'{<([^>\s|]+)[\s|]([^>]+)>}'   => '<a href="$1">$2</a>', # hyperlink
 		"/\r\n?/" => "\n",        # unix newlines
 		"/  +\n/" => "<br />",    # trailing spaces for hard line break
-		"/\n/"    => "</p>\n<p>", # newlines start paragraphs
-		'/\b_(\w+)_\b/'   => '<em>$1</em>',         # italic
-		'/\b\*(\w+)\*\b/' => '<strong>$1</strong>', # bold
+		'{^(/data/.*\.jpe?g)\z}m'      => '<img src="/thumb/640x/\1" />', # image reference
+		"/^[-*] (.*)$\n?/m"            => '<li>$1</li>',         # list item
+		"/^(.+)$\n?/m"                 => "<p>$1</p>\n",         # paragraph
+		"{^<p>(<li>.*</li>)(?:</p>\n)?}m" => "<ul>$1</ul>\n",    # list container
+		'/_(?<!\w_)(.+?)_(?!\w)/'      => '<em>$1</em>',         # italic
+		'/\*(?<!\w\*)(.+?)\*(?!\w)/'   => '<strong>$1</strong>', # bold
+		'/~(?<!\w~)(.+?)~(?!\w)/'      => '<s>$1</s>',           # stricken
+		'/`(?<!\w`)(.+?)`(?!\w)/'      => '<code>$1</code>',     # monospace
 	];
-	$html = preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
-	return "<p>$html</p>";
+	return preg_replace(array_keys($markup), array_values($markup), htmlspecialchars($input));
+}
+
+function createcomment($input, &$Issue = NULL)
+{
+	# insert user message as database issue/reply
+	global $User, $Db, $Page, $journalcol;
+
+	$reply = [];
+	if (isset($input['reply']) and $body = $input['reply']) {
+		$reply['raw'] = $body;
+		$reply['message'] = messagehtml($body);
+	}
+	if ($_FILES and !empty($_FILES['image'])) {
+		$target = 'data/upload';
+		if (!file_exists($target)) {
+			throw new Exception("er is geen uploadmap aanwezig op $target");
+		}
+		$target .= '/' . $User->login;
+		if ($result = userupload($_FILES['image'], $target)) {
+			$reply['raw'] = $reply['raw'] ?? '';
+			$reply['raw'] .= "/$result";
+			$reply['message'] = $reply['message'] ?? '';
+			if (preg_match('(^image/)', $_FILES['image']['type'])) {
+				$reply['message'] .= sprintf('<p><img src="/thumb/640x/%s" /></p>', $result);
+			}
+			else {
+				$reply['message'] .= sprintf('<p>Bijgevoegd bestand: <a href="/%s" />%s</a></p>',
+					$result, basename($result)
+				);
+			}
+		}
+	}
+	if (!$reply) {
+		throw new Exception("lege inhoud");
+	}
+	if (isset($input['announce'])) {
+		$reply['announced'] = !!$input['announce'];
+	}
+	if (isset($input['page'])) {
+		$reply['page'] = $input['page'];
+	}
+
+	if (isset($input['id'])) {
+		$newcomment = $input['id'];
+		$filter = ['id = ?', $newcomment];
+		$oldcomment = $Db->query("SELECT * FROM comments WHERE $filter[0]", [$filter[1]])->fetch();
+		if (empty($oldcomment)) {
+			throw new Exception('Antwoord niet gevonden');
+		}
+
+		$reply += [
+			'updated' => ['now()'],
+		];
+		$query = $Db->set('comments', $reply, $filter);
+		if (!$query->rowCount()) {
+			throw new Exception('Fout bij aanpassen');
+		}
+
+		if ($updated = $query->fetch()) {
+			foreach (array_keys(get_object_vars($updated)) as $col) {
+				if ($updated->$col === $oldcomment->$col) {
+					continue; # unaltered
+				}
+				$Db->set('journal', [
+					'comment_id' => $newcomment,
+					'property'   => 'col',
+					'col'        => $col,
+					'old_value'  => $oldcomment->$col,
+					'value'      => $updated->$col,
+				]);
+			}
+		}
+	}
+	else {
+		$reply += [
+			'page'    => "{$Page->handler}/{$Issue->id}",
+			'author'  => $User->login,
+		];
+		$query = $Db->set('comments', $reply);
+		if (!$query->rowCount()) {
+			throw new Exception('Fout bij opslaan');
+		}
+		$newcomment = $Db->dbh->lastInsertId('comments_id_seq');
+	}
+
+	if (isset($Issue)) {
+		$row = [];
+		foreach (array_keys($journalcol) as $col) {
+			if (!isset($input[$col])) continue;
+			$row[$col] = $input[$col] ?: NULL;
+		}
+		if (isset($input['status'])) {
+			$reset = !empty($input['status']);
+			if (isset($Issue->closed) !== $reset) {
+				$row['closed'] = $reset ? ['now()'] : NULL;
+			}
+		}
+		$derived = ['updated' => ['now()']];
+		$filter = ['id = ?', $Issue->id];
+		$subquery = $Db->set('issues', $row + $derived, $filter);
+
+		if ($updated = $subquery->fetch()) {
+			foreach (array_keys($row) as $col) {
+				if ($updated->$col === $Issue->$col) {
+					continue; # unaltered
+				}
+				$Db->set('journal', [
+					'comment_id' => $newcomment,
+					'property'   => 'attr',
+					'col'        => $col,
+					'old_value'  => $Issue->$col,
+					'value'      => $updated->$col,
+				]);
+			}
+			$Issue = $updated;
+		}
+	}
+
+	return $newcomment;
 }