From b04a05494a70a64ded312439211606071e2f096d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81abanowski?= <marcin@6irc.net>
Date: Wed, 23 Jan 2013 18:54:41 +0100
Subject: [PATCH] Revert "[EDIT] basic edit support"

This reverts commit 9fec3646fa5ef5ec856f0a0b3a7bc9bba03de7fc.

Conflicts:
	inc/mod/pages.php
---
 inc/config.php                    |  2 +-
 inc/mod/pages.php                 | 42 ++++---------------------------
 templates/mod/edit_post_form.html | 35 ++++++++++++++++++--------
 3 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index 4d5950c3..9eb1e64b 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -963,7 +963,7 @@
 	// View whether a thread has been bumplocked ("-1" to allow non-mods to see too)
 	$config['mod']['view_bumplock'] = MOD;
 	// Edit posts (EXPERIMENTAL)
-	$config['mod']['editpost'] = MOD;
+	$config['mod']['editpost'] = DISABLED;
 	// "Move" a thread to another board (EXPERIMENTAL; has some known bugs)
 	$config['mod']['move'] = DISABLED;
 	// Bypass "field_disable_*" (forced anonymity, etc.)
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 01b6dc27..a3020e1d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -995,43 +995,11 @@ function mod_edit_post($board, $post) {
 	if (!hasPermission($config['mod']['editpost'], $board))
 		error($config['error']['noaccess']);
 
-	$security_token = make_secure_link_token($board . '/ban/' . $post);
-	
-	$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id', $board));
-	$query->bindValue(':id', $post);
-	$query->execute() or error(db_error($query));
-
-	if (!$_post = $query->fetch(PDO::FETCH_ASSOC))
-		error($config['error']['404']);
-	
-	if(isset($_POST['mode']) && $_POST['mode'] == "edit")
-	{
-		$query = prepare(sprintf("UPDATE `posts_%s` SET `name` = :name,`email` = :email,`subject` = :subject,`body` = :body WHERE `id` = :id",$board));
-		$query->bindValue(':id', $post);
-		$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));
-
-		$thread = $_post['thread'];
-		buildThread($thread ? $thread : $post);
-		modLog("Edited post #{$post}");
-		buildIndex();
-
-		header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);		
-	} else {
-		$args = array(
-			'token' => $security_token,
-			'name' => $_post['name'],
-			'email' => $_post['email'],
-			'subject' => $_post['subject'],
-			'body' => $_post['body'],
-			'mode' => "edit"
-		);
-
-		mod_page(_('Edit post'), 'mod/edit_post_form.html', $args);
-	}
+	// error("Unimplemented!");		
+	$args = array(
+		'test' => 1
+	);
+	mod_page(_('Edit post'), 'mod/edit_post_form.html', $args);
 }
 
 function mod_delete($board, $post) {
diff --git a/templates/mod/edit_post_form.html b/templates/mod/edit_post_form.html
index 6748435e..ac7e207f 100644
--- a/templates/mod/edit_post_form.html
+++ b/templates/mod/edit_post_form.html
@@ -1,27 +1,27 @@
 <form name="post" enctype="multipart/form-data" action="{{ action }}" method="post">
 	<table>
-		<tr>
+		{% if not config.field_disable_name or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
 			<th>
 				{% trans %}Name{% endtrans %}
 			</th>
 			<td>
-				<input type="text" name="name" size="25" maxlength="35" autocomplete="off" value="{{ name }}">
+				<input type="text" name="name" size="25" maxlength="35" autocomplete="off">
 			</td>
-		</tr>
-		<tr>
+		</tr>{% endif %}
+		{% if not config.field_disable_email or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
 			<th>
 				{% trans %}Email{% endtrans %}
 			</th>
 			<td>
-				<input type="text" name="email" size="25" maxlength="40" autocomplete="off" value="{{ email }}">
+				<input type="text" name="email" size="25" maxlength="40" autocomplete="off">
 			</td>
-		</tr>
+		</tr>{% endif %}
 		<tr>
 			<th>
 				{% trans %}Subject{% endtrans %}
 			</th>
 			<td>
-				<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off" value="{{ subject }}">
+				<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
 			</td>
 		</tr>
 		<tr>
@@ -29,12 +29,27 @@
 				{% trans %}Comment{% endtrans %}
 			</th>
 			<td>
-				<textarea name="body" id="body" rows="5" cols="35">{{ body }}</textarea>
+				<textarea name="body" id="body" rows="5" cols="35"></textarea>
 			</td>
 		</tr>
 		<tr>
-			<th><input type="hidden" name="mode" value="{{ mode }}"></th>
-			<td><input name="sub" type="submit" value="{% trans 'Submit' %}"></td>
+			<th>
+				{% trans %}Flags{% endtrans %}
+			</th>
+			<td>
+				{% if not id and post.mod|hasPermission(config.mod.sticky, board.uri) %}<div>
+					<label for="sticky">{% trans %}Sticky{% endtrans %}</label>
+					<input title="{% trans %}Sticky{% endtrans %}" type="checkbox" name="sticky" id="sticky"><br>
+				</div>{% endif %}
+				{% if not id and post.mod|hasPermission(config.mod.lock, board.uri) %}<div>
+					<label for="lock">{% trans %}Lock{% endtrans %}</label><br>
+					<input title="{% trans %}Lock{% endtrans %}" type="checkbox" name="lock" id="lock">
+				</div>{% endif %}
+				{% if post.mod|hasPermission(config.mod.rawhtml, board.uri) %}<div>
+					<label for="raw">{% trans %}Raw HTML{% endtrans %}</label><br>
+					<input title="{% trans %}Raw HTML{% endtrans %}" type="checkbox" name="raw" id="raw">
+				</div>{% endif %}
+			</td>
 		</tr>
 	</table>
 </form>