merge with vichan-gold

1 files changed, 23 insertions, 11 deletions

diff --git a/post.php b/post.php
index 56091040..2825b40b 100644
--- a/post.php
+++ b/post.php
@@ -80,6 +80,7 @@ if (isset($_POST['delete'])) {
 	$is_mod = isset($_POST['mod']) && $_POST['mod'];
 	$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
 	
+	if (!$is_mod) header('X-Associated-Content: "' . $root . $board['dir'] . $config['file_index'] . '"');
 	header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
 
 } elseif (isset($_POST['report'])) {
@@ -137,6 +138,7 @@ if (isset($_POST['delete'])) {
 	$is_mod = isset($_POST['mod']) && $_POST['mod'];
 	$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
 	
+	if (!$is_mod) header('X-Associated-Content: "' . $root . $board['dir'] . $config['file_index'] . '"');
 	header('Location: ' . $root . $board['dir'] . $config['file_index'], true, $config['redirect_http']);
 } elseif (isset($_POST['post'])) {
 	
@@ -308,13 +310,21 @@ if (isset($_POST['delete'])) {
 		}
 	}
 	
-	// Check if thread is locked
-	// but allow mods to post
-	if (!$post['op'] && !hasPermission($config['mod']['postinlocked'], $board['uri'])) {
-		if ($thread['locked'])
+	if (!$post['op']) {
+		// Check if thread is locked
+		// but allow mods to post
+		if ($thread['locked'] && !hasPermission($config['mod']['postinlocked'], $board['uri']))
 			error($config['error']['locked']);
+		
+		$numposts = numPosts($post['thread']);
+		
+		if ($config['reply_hard_limit'] != 0 && $config['reply_hard_limit'] <= $numposts['replies'])
+			error($config['error']['reply_hard_limit']);
+		
+		if ($post['has_file'] && $config['image_hard_limit'] != 0 && $config['image_hard_limit'] <= $numposts['images'])
+			error($config['error']['image_hard_limit']);
 	}
-	
+		
 	if ($post['has_file']) {
 		$size = $_FILES['file']['size'];
 		if ($size > $config['max_filesize'])
@@ -625,10 +635,6 @@ if (isset($_POST['delete'])) {
 		incrementSpamHash($post['antispam_hash']);
 	}
 	
-	if (isset($post['antispam_hash'])) {
-		incrementSpamHash($post['antispam_hash']);
-	}
-	
 	if (isset($post['tracked_cites'])) {
 		foreach ($post['tracked_cites'] as $cite) {
 			$query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)');
@@ -642,7 +648,7 @@ if (isset($_POST['delete'])) {
 	
 	buildThread($post['op'] ? $id : $post['thread']);
 	
-	if (!$post['op'] && strtolower($post['email']) != 'sage' && !$thread['sage'] && ($config['reply_limit'] == 0 || numPosts($post['thread']) < $config['reply_limit'])) {
+	if (!$post['op'] && strtolower($post['email']) != 'sage' && !$thread['sage'] && ($config['reply_limit'] == 0 || $numposts['replies']+1 < $config['reply_limit'])) {
 		bumpThread($post['thread']);
 	}
 	
@@ -679,7 +685,13 @@ if (isset($_POST['delete'])) {
 		_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
 			sprintf($config['file_page'], $post['op'] ? $id : $post['thread']) . (!$post['op'] ? '#' . $id : ''));
 	
-	rebuildThemes('post');
+	if (!$post['mod']) header('X-Associated-Content: "' . $redirect . '"');
+
+	if ($post['op'])
+		rebuildThemes('post-thread', $board['uri']);
+	else
+		rebuildThemes('post', $board['uri']);
+	
 	header('Location: ' . $redirect, true, $config['redirect_http']);
 } else {
 	if (!file_exists($config['has_installed'])) {