Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into HEAD

Conflicts:
	mod.php

1 files changed, 39 insertions, 0 deletions

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index daa2f0ab..643786b4 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -986,6 +986,45 @@ function mod_ban_post($board, $delete, $post, $token = false) {
 	mod_page(_('New ban'), 'mod/ban_form.html', $args);
 }
 
+function mod_edit_post($board, $postID) {
+	global $config, $mod;
+
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+
+	if (!hasPermission($config['mod']['editpost'], $board))
+		error($config['error']['noaccess']);
+
+	$security_token = make_secure_link_token($board . '/edit/' . $postID);
+	
+	$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id', $board));
+	$query->bindValue(':id', $postID);
+	$query->execute() or error(db_error($query));
+
+	if (!$post = $query->fetch(PDO::FETCH_ASSOC))
+		error($config['error']['404']);
+	
+	if (isset($_POST['name'], $_POST['email'], $_POST['subject'], $_POST['body'])) {
+		$query = prepare(sprintf('UPDATE `posts_%s` SET `name` = :name, `email` = :email, `subject` = :subject, `body_nomarkup` = :body WHERE `id` = :id', $board));
+		$query->bindValue(':id', $postID);
+		$query->bindValue('name', $_POST['name']);
+		$query->bindValue(':email', $_POST['email']);
+		$query->bindValue(':subject', $_POST['subject']);
+		$query->bindValue(':body', $_POST['body']);
+		$query->execute() or error(db_error($query));
+		
+		rebuildPost($postID);
+		buildIndex();
+		
+		header('Location: ?/' . sprintf($config['board_path'], $board) . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $postID) . '#' . $postID, true, $config['redirect_http']);
+	} else {
+		if ($config['minify_html'])
+			$post['body_nomarkup'] = str_replace("\n", '
', $post['body_nomarkup']);
+		
+		mod_page(_('Edit post'), 'mod/edit_post_form.html', array('token' => $security_token, 'post' => $post));
+	}
+}
+
 function mod_delete($board, $post) {
 	global $config, $mod;