1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-17 19:29:28 +01:00

Merge vichan

This commit is contained in:
Fredrick Brennan 2015-03-31 16:17:20 +08:00
parent a8c537a70e
commit 5f3778036a

View File

@ -93,20 +93,23 @@ if (isset($_POST['delete'])) {
buildIndex(); buildIndex();
rebuildThemes('post-delete', $board['uri']);
$is_mod = isset($_POST['mod']) && $_POST['mod']; $is_mod = isset($_POST['mod']) && $_POST['mod'];
$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root']; $root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
if (!isset($_POST['json_response'])) { if (!isset($_POST['json_response'])) {
header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']); header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
} else { } else {
header('Content-Type: text/json'); header('Content-Type: text/json');
echo json_encode(array('success' => true)); echo json_encode(array('success' => true));
} }
}
elseif (isset($_POST['report'])) { // We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
if (function_exists('fastcgi_finish_request'))
@fastcgi_finish_request();
rebuildThemes('post-delete', $board['uri']);
} elseif (isset($_POST['report'])) {
if (!isset($_POST['board'], $_POST['reason'])) if (!isset($_POST['board'], $_POST['reason']))
error($config['error']['bot']); error($config['error']['bot']);
@ -921,20 +924,6 @@ elseif (isset($_POST['post'])) {
bumpThread($post['thread']); bumpThread($post['thread']);
} }
$pid = $post['op'] ? $id : $post['thread'];
buildThread($pid);
if ($config['try_smarter'] && $post['op'])
$build_pages = range(1, $config['max_pages']);
if ($post['op'])
clean($pid);
event('post-after', $post);
buildIndex();
if (isset($_SERVER['HTTP_REFERER'])) { if (isset($_SERVER['HTTP_REFERER'])) {
// Tell Javascript that we posted successfully // Tell Javascript that we posted successfully
if (isset($_COOKIE[$config['cookies']['js']])) if (isset($_COOKIE[$config['cookies']['js']]))
@ -970,6 +959,8 @@ elseif (isset($_POST['post'])) {
$redirect = $root . $board['dir'] . $config['file_index']; $redirect = $root . $board['dir'] . $config['file_index'];
} }
buildThread($post['op'] ? $id : $post['thread']);
if ($config['syslog']) if ($config['syslog'])
_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] . _syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
@ -977,11 +968,6 @@ elseif (isset($_POST['post'])) {
if (!$post['mod']) header('X-Associated-Content: "' . $redirect . '"'); if (!$post['mod']) header('X-Associated-Content: "' . $redirect . '"');
if ($post['op'])
rebuildThemes('post-thread', $board['uri']);
else
rebuildThemes('post', $board['uri']);
if (!isset($_POST['json_response'])) { if (!isset($_POST['json_response'])) {
header('Location: ' . $redirect, true, $config['redirect_http']); header('Location: ' . $redirect, true, $config['redirect_http']);
} else { } else {
@ -992,8 +978,27 @@ elseif (isset($_POST['post'])) {
'id' => $id 'id' => $id
)); ));
} }
}
elseif (isset($_POST['appeal'])) { if ($config['try_smarter'] && $post['op'])
$build_pages = range(1, $config['max_pages']);
if ($post['op'])
clean();
event('post-after', $post);
buildIndex();
// We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
if (function_exists('fastcgi_finish_request'))
@fastcgi_finish_request();
if ($post['op'])
rebuildThemes('post-thread', $board['uri']);
else
rebuildThemes('post', $board['uri']);
} elseif (isset($_POST['appeal'])) {
if (!isset($_POST['ban_id'])) if (!isset($_POST['ban_id']))
error($config['error']['bot']); error($config['error']['bot']);