kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Revert "[EDIT] basic edit support"

Browse Source 
This reverts commit 9fec3646fa.

Conflicts:
	inc/mod/pages.php
This commit is contained in:
Marcin Łabanowski 2013-01-23 18:54:41 +01:00
parent 25268f3876
commit b04a05494a
3 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/config.php
View File

@ -963,7 +963,7 @@
// View whether a thread has been bumplocked ("-1" to allow non-mods to see too) // View whether a thread has been bumplocked ("-1" to allow non-mods to see too)
$config['mod']['view_bumplock'] = MOD; $config['mod']['view_bumplock'] = MOD;
// Edit posts (EXPERIMENTAL) // Edit posts (EXPERIMENTAL)
$config['mod']['editpost'] = MOD; $config['mod']['editpost'] = DISABLED;
// "Move" a thread to another board (EXPERIMENTAL; has some known bugs) // "Move" a thread to another board (EXPERIMENTAL; has some known bugs)
$config['mod']['move'] = DISABLED; $config['mod']['move'] = DISABLED;
// Bypass "field_disable_*" (forced anonymity, etc.) // Bypass "field_disable_*" (forced anonymity, etc.)

42
inc/mod/pages.php
View File

@ -995,43 +995,11 @@ function mod_edit_post($board, $post) {
if (!hasPermission($config['mod']['editpost'], $board)) if (!hasPermission($config['mod']['editpost'], $board))
error($config['error']['noaccess']); error($config['error']['noaccess']);
$security_token = make_secure_link_token($board . '/ban/' . $post); // error("Unimplemented!");
$args = array(
$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id', $board)); 'test' => 1
$query->bindValue(':id', $post); );
$query->execute() or error(db_error($query)); mod_page(_('Edit post'), 'mod/edit_post_form.html', $args);
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);
}
} }
function mod_delete($board, $post) { function mod_delete($board, $post) {

35
templates/mod/edit_post_form.html
View File

@ -1,27 +1,27 @@
<form name="post" enctype="multipart/form-data" action="{{ action }}" method="post"> <form name="post" enctype="multipart/form-data" action="{{ action }}" method="post">
<table> <table>
<tr> {% if not config.field_disable_name or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
<th> <th>
{% trans %}Name{% endtrans %} {% trans %}Name{% endtrans %}
</th> </th>
<td> <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> </td>
</tr> </tr>{% endif %}
<tr> {% if not config.field_disable_email or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri)) %}<tr>
<th> <th>
{% trans %}Email{% endtrans %} {% trans %}Email{% endtrans %}
</th> </th>
<td> <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> </td>
</tr> </tr>{% endif %}
<tr> <tr>
<th> <th>
{% trans %}Subject{% endtrans %} {% trans %}Subject{% endtrans %}
</th> </th>
<td> <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> </td>
</tr> </tr>
<tr> <tr>
@ -29,12 +29,27 @@
{% trans %}Comment{% endtrans %} {% trans %}Comment{% endtrans %}
</th> </th>
<td> <td>
<textarea name="body" id="body" rows="5" cols="35">{{ body }}</textarea> <textarea name="body" id="body" rows="5" cols="35"></textarea>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><input type="hidden" name="mode" value="{{ mode }}"></th> <th>
<td><input name="sub" type="submit" value="{% trans 'Submit' %}"></td> {% 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> </tr>
</table> </table>
</form> </form>