From bdb6001f3f7e93e0b9655c0491bbef6f1df8a5fa Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 10 Mar 2015 12:48:59 +0100
Subject: support for slugified links; may introduce a few bugs

---
 post.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'post.php')

diff --git a/post.php b/post.php
index d33c8150..93592590 100644
--- a/post.php
+++ b/post.php
@@ -85,7 +85,7 @@ if (isset($_POST['delete'])) {
 			}
 			
 			_syslog(LOG_INFO, 'Deleted post: ' .
-				'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '')
+				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($post['thread'] ? '#' . $id : '')
 			);
 		}
 	}
@@ -142,7 +142,7 @@ if (isset($_POST['delete'])) {
 		
 		if ($config['syslog'])
 			_syslog(LOG_INFO, 'Reported post: ' .
-				'/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $thread ? $thread : $id) . ($thread ? '#' . $id : '') .
+				'/' . $board['dir'] . $config['dir']['res'] . link_for($post) . ($thread ? '#' . $id : '') .
 				' for "' . $reason . '"'
 			);
 		$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
@@ -250,7 +250,7 @@ if (isset($_POST['delete'])) {
 	
 	//Check if thread exists
 	if (!$post['op']) {
-		$query = prepare(sprintf("SELECT `sticky`,`locked`,`sage` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
+		$query = prepare(sprintf("SELECT `sticky`,`locked`,`sage`,`slug` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
 		$query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
 		$query->execute() or error(db_error());
 		
@@ -259,6 +259,9 @@ if (isset($_POST['delete'])) {
 			error($config['error']['nonexistant']);
 		}
 	}
+	else {
+		$thread = false;
+	}
 		
 	
 	// Check for an embed field
@@ -782,6 +785,7 @@ if (isset($_POST['delete'])) {
 	
 	$post = (object)$post;
 	$post->files = array_map(function($a) { return (object)$a; }, $post->files);
+
 	$error = event('post', $post);
 	$post->files = array_map(function($a) { return (array)$a; }, $post->files);
 
@@ -845,19 +849,20 @@ if (isset($_POST['delete'])) {
 	
 	if ($noko) {
 		$redirect = $root . $board['dir'] . $config['dir']['res'] .
-			sprintf($config['file_page'], $post['op'] ? $id:$post['thread']) . (!$post['op'] ? '#' . $id : '');
+			link_for($post, false, false, $thread) . (!$post['op'] ? '#' . $id : '');
 	   	
 		if (!$post['op'] && isset($_SERVER['HTTP_REFERER'])) {
 			$regex = array(
 				'board' => str_replace('%s', '(\w{1,8})', preg_quote($config['board_path'], '/')),
 				'page' => str_replace('%d', '(\d+)', preg_quote($config['file_page'], '/')),
-				'page50' => str_replace('%d', '(\d+)', preg_quote($config['file_page50'], '/')),
+				'page50' => '(' . str_replace('%d', '(\d+)', preg_quote($config['file_page50'], '/')) . '|' .
+						  str_replace(array('%d', '%s'), array('(\d+)', '[a-z0-9-]+'), preg_quote($config['file_page50_slug'], '/')) . ')',
 				'res' => preg_quote($config['dir']['res'], '/'),
 			);
 
 			if (preg_match('/\/' . $regex['board'] . $regex['res'] . $regex['page50'] . '([?&].*)?$/', $_SERVER['HTTP_REFERER'])) {
 				$redirect = $root . $board['dir'] . $config['dir']['res'] .
-					sprintf($config['file_page50'], $post['op'] ? $id:$post['thread']) . (!$post['op'] ? '#' . $id : '');
+					link_for($post, true, false, $thread) . (!$post['op'] ? '#' . $id : '');
 			}
 		}
 	} else {
@@ -867,7 +872,7 @@ if (isset($_POST['delete'])) {
 	
 	if ($config['syslog'])
 		_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
-			sprintf($config['file_page'], $post['op'] ? $id : $post['thread']) . (!$post['op'] ? '#' . $id : ''));
+			link_for($post) . (!$post['op'] ? '#' . $id : ''));
 	
 	if (!$post['mod']) header('X-Associated-Content: "' . $redirect . '"');
 
-- 
cgit v1.3