large cleanup

1 files changed, 392 insertions, 396 deletions

diff --git a/inc/display.php b/inc/display.php
index ef6d1efc..9b118a00 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -1,445 +1,441 @@
 <?php
-	if($_SERVER['SCRIPT_FILENAME'] == str_replace('\\', '/', __FILE__)) {
-		// You cannot request this file directly.
-		header('Location: ../', true, 302);
-		exit;
+
+/*
+ *  Copyright (c) 2010-2012 Tinyboard Development Group
+ */
+
+if(realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
+	// You cannot request this file directly.
+	exit;
+}
+
+/* 
+	joaoptm78@gmail.com
+	http://www.php.net/manual/en/function.filesize.php#100097
+*/
+function format_bytes($size) {
+	$units = array(' B', ' KB', ' MB', ' GB', ' TB');
+	for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
+	return round($size, 2).$units[$i];
+}
+
+function doBoardListPart($list, $root) {
+	global $config;
+	
+	$body = '';
+	foreach($list as $board) {
+		if(is_array($board))
+			$body .= ' [' . doBoardListPart($board, $root) . '] ';
+		else {
+			if(($key = array_search($board, $list)) && gettype($key) == 'string') {
+				$body .= ' <a href="' . $board . '">' . $key . '</a> /';
+			} else {			
+				$body .= ' <a href="' . $root . $board . '/' . $config['file_index'] . '">' . $board . '</a> /';
+			}
+		}
 	}
+	$body = preg_replace('/\/$/', '', $body);
 	
-	/*
-		Stuff to help with the display.
-	*/
+	return $body;
+}
+
+function createBoardlist($mod=false) {
+	global $config;
 	
+	if(!isset($config['boards'])) return Array('top'=>'','bottom'=>'');
 	
-	/* 
-		joaoptm78@gmail.com
-		http://www.php.net/manual/en/function.filesize.php#100097
-	*/
-	function format_bytes($size) {
-		$units = array(' B', ' KB', ' MB', ' GB', ' TB');
-		for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
-		return round($size, 2).$units[$i];
-	}
+	$body = doBoardListPart($config['boards'], $mod?'?/':$config['root']);
+	if(!preg_match('/\] $/', $body))
+		$body = '[' . $body . ']';
 	
-	function commaize($n) {
-		$n = strval($n);
-		return (intval($n) < 1000) ? $n : commaize(substr($n, 0, -3)) . ',' . substr($n, -3);
-	}
+	$body = trim($body);
 	
-	function doBoardListPart($list, $root) {
-		global $config;
-		
-		$body = '';
-		foreach($list as $board) {
-			if(is_array($board))
-				$body .= ' [' . doBoardListPart($board, $root) . '] ';
-			else {
-				if(($key = array_search($board, $list)) && gettype($key) == 'string') {
-					$body .= ' <a href="' . $board . '">' . $key . '</a> /';
-				} else {			
-					$body .= ' <a href="' . $root . $board . '/' . $config['file_index'] . '">' . $board . '</a> /';
-				}
-			}
-		}
-		$body = preg_replace('/\/$/', '', $body);
-		
-		return $body;
-	}
+	return Array(
+		'top' => '<div class="boardlist">' . $body . '</div>',
+		'bottom' => '<div class="boardlist bottom">' . $body . '</div>'
+	);
+}
+
+function error($message, $priority = true) {
+	global $board, $mod, $config;
 	
-	function createBoardlist($mod=false) {
-		global $config;
-		
-		if(!isset($config['boards'])) return Array('top'=>'','bottom'=>'');
-		
-		$body = doBoardListPart($config['boards'], $mod?'?/':$config['root']);
-		if(!preg_match('/\] $/', $body))
-			$body = '[' . $body . ']';
-		
-		$body = trim($body);
-		
-		return Array(
-			'top' => '<div class="boardlist">' . $body . '</div>',
-			'bottom' => '<div class="boardlist bottom">' . $body . '</div>'
-		);
+	if($config['syslog'] && $priority !== false) {
+		// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
+		_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
 	}
 	
-	function error($message, $priority = true) {
-		global $board, $mod, $config;
-		
-		if($config['syslog'] && $priority !== false) {
-			// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
-			_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
-		}
-		
-		if(defined('STDIN')) {
-			// Running from CLI
-			die('Error: ' . $message . "\n");
-		}
-		
-		die(Element('page.html', Array(
-			'config'=>$config,
-			'title'=>'Error',
-			'subtitle'=>'An error has occured.',
-			'body'=>'<center>' .
-			        '<h2>' . _($message) . '</h2>' .
-				(isset($board) ? 
-					"<p><a href=\"" . $config['root'] .
-						($mod ? $config['file_mod'] . '?/' : '') .
-						$board['dir'] . $config['file_index'] . "\">Go back</a>.</p>" : '') .
-			        '</center>'
-		)));
+	if(defined('STDIN')) {
+		// Running from CLI
+		die('Error: ' . $message . "\n");
 	}
 	
-	function loginForm($error=false, $username=false, $redirect=false) {
-		global $config;
-		
-		die(Element('page.html', Array(
-			'index'=>$config['root'],
-			'title'=>_('Login'),
+	die(Element('page.html', Array(
+		'config'=>$config,
+		'title'=>'Error',
+		'subtitle'=>'An error has occured.',
+		'body'=>'<center>' .
+		        '<h2>' . _($message) . '</h2>' .
+			(isset($board) ? 
+				"<p><a href=\"" . $config['root'] .
+					($mod ? $config['file_mod'] . '?/' : '') .
+					$board['dir'] . $config['file_index'] . "\">Go back</a>.</p>" : '') .
+		        '</center>'
+	)));
+}
+
+function loginForm($error=false, $username=false, $redirect=false) {
+	global $config;
+	
+	die(Element('page.html', Array(
+		'index'=>$config['root'],
+		'title'=>_('Login'),
+		'config'=>$config,
+		'body'=>Element('login.html', Array(
 			'config'=>$config,
-			'body'=>Element('login.html', Array(
-				'config'=>$config,
-				'error'=>$error,
-				'username'=>utf8tohtml($username),
-				'redirect'=>$redirect
-				)
+			'error'=>$error,
+			'username'=>utf8tohtml($username),
+			'redirect'=>$redirect
 			)
-		)));
+		)
+	)));
+}
+
+function pm_snippet($body, $len=null) {
+	global $config;
+	
+	if(!isset($len))
+		$len = &$config['mod']['snippet_length'];
+	
+	// Replace line breaks with some whitespace
+	$body = str_replace('<br/>', '  ', $body);
+	
+	// Strip tags
+	$body = strip_tags($body);
+	
+	// Unescape HTML characters, to avoid splitting them in half
+	$body = html_entity_decode($body, ENT_COMPAT, 'UTF-8');
+	
+	// calculate strlen() so we can add "..." after if needed
+	$strlen = mb_strlen($body);
+	
+	$body = substr($body, 0, $len);
+	
+	// Re-escape the characters.
+	return '<em>' . utf8tohtml($body) . ($strlen > $len ? '&hellip;' : '') . '</em>';
+}
+
+function capcode($cap) {
+	global $config;
+	
+	if(!$cap)
+		return false;
+	
+	$capcode = Array();
+	if(isset($config['custom_capcode'][$cap])) {
+		if(is_array($config['custom_capcode'][$cap])) {
+			$capcode['cap'] = sprintf($config['custom_capcode'][$cap][0], $cap);
+			if(isset($config['custom_capcode'][$cap][1]))
+				$capcode['name'] = $config['custom_capcode'][$cap][1];
+			if(isset($config['custom_capcode'][$cap][2]))
+				$capcode['trip'] = $config['custom_capcode'][$cap][2];
+		} else {
+			$capcode['cap'] = sprintf($config['custom_capcode'][$cap], $cap);
+		}
+	} else {
+		$capcode['cap'] = sprintf($config['capcode'], $cap);
 	}
 	
-	function pm_snippet($body, $len=null) {
-		global $config;
-		
-		if(!isset($len))
-			$len = &$config['mod']['snippet_length'];
-		
-		// Replace line breaks with some whitespace
-		$body = str_replace('<br/>', '  ', $body);
-		
-		// Strip tags
-		$body = strip_tags($body);
-		
-		// Unescape HTML characters, to avoid splitting them in half
-		$body = html_entity_decode($body, ENT_COMPAT, 'UTF-8');
-		
-		// calculate strlen() so we can add "..." after if needed
-		$strlen = mb_strlen($body);
-		
-		$body = substr($body, 0, $len);
-		
-		// Re-escape the characters.
-		return '<em>' . utf8tohtml($body) . ($strlen > $len ? '&hellip;' : '') . '</em>';
+	return $capcode;
+}
+
+function truncate($body, $url, $max_lines = false, $max_chars = false) {
+	global $config;
+	
+	if($max_lines === false)
+		$max_lines = $config['body_truncate'];
+	if($max_chars === false)
+		$max_chars = $config['body_truncate_char'];
+	$original_body = $body;
+	
+	$lines = substr_count($body, '<br/>');
+	
+	// Limit line count
+	if($lines > $max_lines) {
+		if(preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m))
+			$body = $m[0];
 	}
 	
-	function capcode($cap) {
-		global $config;
-		
-		if(!$cap)
-			return false;
+	$body = substr($body, 0, $max_chars);
+	
+	if($body != $original_body) {
+		// Remove any corrupt tags at the end
+		$body = preg_replace('/<([\w]+)?([^>]*)?$/', '', $body);
 		
-		$capcode = Array();
-		if(isset($config['custom_capcode'][$cap])) {
-			if(is_array($config['custom_capcode'][$cap])) {
-				$capcode['cap'] = sprintf($config['custom_capcode'][$cap][0], $cap);
-				if(isset($config['custom_capcode'][$cap][1]))
-					$capcode['name'] = $config['custom_capcode'][$cap][1];
-				if(isset($config['custom_capcode'][$cap][2]))
-					$capcode['trip'] = $config['custom_capcode'][$cap][2];
-			} else {
-				$capcode['cap'] = sprintf($config['custom_capcode'][$cap], $cap);
+		// Open tags
+		if(preg_match_all('/<([\w]+)[^>]*>/', $body, $open_tags)) {
+			
+			$tags = Array();
+			for($x=0;$x<count($open_tags[0]);$x++) {
+				if(!preg_match('/\/(\s+)?>$/', $open_tags[0][$x]))
+					$tags[] = $open_tags[1][$x];
+			}
+			
+			// List successfully closed tags
+			if(preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
+				for($x=0;$x<count($closed_tags[0]);$x++) {
+					unset($tags[array_search($closed_tags[2][$x], $tags)]);
+				}
+			}
+			
+			// remove broken HTML entity at the end (if existent)
+			$body = preg_replace('/&[^;]+$/', '', $body);
+			
+			// Close any open tags
+			foreach($tags as &$tag) {
+				$body .= "</{$tag}>";
 			}
 		} else {
-			$capcode['cap'] = sprintf($config['capcode'], $cap);
+			// remove broken HTML entity at the end (if existent)
+			$body = preg_replace('/&[^;]+$/', '', $body);
 		}
 		
-		return $capcode;
+		$body .= '<span class="toolong">Post too long. Click <a href="' . $url . '">here</a> to view the full text.</span>';
 	}
 	
-	function truncate($body, $url, $max_lines = false, $max_chars = false) {
+	return $body;
+}
+
+function confirmLink($text, $title, $confirm, $href) {
+	global $config, $mod;
+	if($config['mod']['server-side_confirm'])
+		return '<a onclick="if(confirm(\'' . htmlentities(addslashes($confirm)) . '\')) document.location=\'?/' . htmlentities(addslashes($href)) . '\';return false;" title="' . htmlentities($title) . '" href="?/confirm/' . $href . '">' . $text . '</a>';
+	else
+		return '<a onclick="return confirm(\'' . htmlentities(addslashes($confirm)) . '\')" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
+}
+
+class Post {
+	public function __construct($id, $thread, $subject, $email, $name, $trip, $capcode, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $embed, $root=null, $mod=false) {
 		global $config;
+		if(!isset($root))
+			$root = &$config['root'];
 		
-		if($max_lines === false)
-			$max_lines = $config['body_truncate'];
-		if($max_chars === false)
-			$max_chars = $config['body_truncate_char'];
-		$original_body = $body;
+		$this->id = $id;
+		$this->thread = $thread;
+		$this->subject = utf8tohtml($subject);
+		$this->email = $email;
+		$this->name = utf8tohtml($name);
+		$this->trip = $trip;
+		$this->capcode = $capcode;
+		$this->body = $body;
+		$this->time = $time;
+		$this->thumb = $thumb;
+		$this->thumbx = $thumbx;
+		$this->thumby = $thumby;
+		$this->file = $file;
+		$this->filex = $filex;
+		$this->filey = $filey;
+		$this->filesize = $filesize;
+		$this->filename = $filename;
+		$this->ip = $ip;
+		$this->embed = $embed;
+		$this->root = $root;
+		$this->mod = $mod;
 		
-		$lines = substr_count($body, '<br/>');
-		
-		// Limit line count
-		if($lines > $max_lines) {
-			if(preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m))
-				$body = $m[0];
-		}
+		if($this->mod)
+			// Fix internal links
+			// Very complicated regex
+			$this->body = preg_replace(
+				'/<a((([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*)href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
+				'<a $1href="?/$4',
+				$this->body
+			);
+	}
+	public function link($pre = '') {
+		global $config, $board;
 		
-		$body = substr($body, 0, $max_chars);
+		return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->thread) . '#' . $pre . $this->id;
+	}
+	public function postControls() {
+		global $board, $config;
 		
-		if($body != $original_body) {
-			// Remove any corrupt tags at the end
-			$body = preg_replace('/<([\w]+)?([^>]*)?$/', '', $body);
+		$built = '';
+		if($this->mod) {
+			// Mod controls (on posts)
 			
-			// Open tags
-			if(preg_match_all('/<([\w]+)[^>]*>/', $body, $open_tags)) {
-				
-				$tags = Array();
-				for($x=0;$x<count($open_tags[0]);$x++) {
-					if(!preg_match('/\/(\s+)?>$/', $open_tags[0][$x]))
-						$tags[] = $open_tags[1][$x];
-				}
-				
-				// List successfully closed tags
-				if(preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
-					for($x=0;$x<count($closed_tags[0]);$x++) {
-						unset($tags[array_search($closed_tags[2][$x], $tags)]);
-					}
-				}
-				
-				// remove broken HTML entity at the end (if existent)
-				$body = preg_replace('/&[^;]+$/', '', $body);
-				
-				// Close any open tags
-				foreach($tags as &$tag) {
-					$body .= "</{$tag}>";
-				}
-			} else {
-				// remove broken HTML entity at the end (if existent)
-				$body = preg_replace('/&[^;]+$/', '', $body);
-			}
+			// Delete
+			if(hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_delete'], 'Delete', 'Are you sure you want to delete this?', $board['uri'] . '/delete/' . $this->id);
+			
+			// Delete all posts by IP
+			if(hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_deletebyip'], 'Delete all posts by IP', 'Are you sure you want to delete all posts by this IP address?', $board['uri'] . '/deletebyip/' . $this->id);
+			
+			// Delete all posts by IP (global)
+			if(hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_deletebyip_global'], 'Delete all posts by IP across all boards', 'Are you sure you want to delete all posts by this IP address, across all boards?', $board['uri'] . '/deletebyip/' . $this->id . '/global');
+			
+			// Ban
+			if(hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
+				$built .= ' <a title="Ban" href="?/' . $board['uri'] . '/ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
+			
+			// Ban & Delete
+			if(hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
+				$built .= ' <a title="Ban & Delete" href="?/' . $board['uri'] . '/ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
 			
-			$body .= '<span class="toolong">Post too long. Click <a href="' . $url . '">here</a> to view the full text.</span>';
+			// Delete file (keep post)
+			if(!empty($this->file) && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
+				$built .= ' <a title="Remove file" href="?/' . $board['uri'] . '/deletefile/' . $this->id . '">' . $config['mod']['link_deletefile'] . '</a>';
+			
+			// Edit post
+			if(hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
+				$built .= ' <a title="Edit post" href="?/' . $board['uri'] . '/edit/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
+			
+			if(!empty($built))
+				$built = '<span class="controls">' . $built . '</span>';
 		}
-		
-		return $body;
+		return $built;
 	}
 	
-	function confirmLink($text, $title, $confirm, $href) {
-		global $config, $mod;
-		if($config['mod']['server-side_confirm'])
-			return '<a onclick="if(confirm(\'' . htmlentities(addslashes($confirm)) . '\')) document.location=\'?/' . htmlentities(addslashes($href)) . '\';return false;" title="' . htmlentities($title) . '" href="?/confirm/' . $href . '">' . $text . '</a>';
-		else
-			return '<a onclick="return confirm(\'' . htmlentities(addslashes($confirm)) . '\')" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
+	public function build($index=false) {
+		global $board, $config;
+		
+		return Element('post_reply.html', Array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
 	}
-	
-	class Post {
-		public function __construct($id, $thread, $subject, $email, $name, $trip, $capcode, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $embed, $root=null, $mod=false) {
-			global $config;
-			if(!isset($root)) $root = &$config['root'];
+};
+
+class Thread {
+	public function __construct($id, $subject, $email, $name, $trip, $capcode, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $sticky, $locked, $bumplocked, $embed, $root=null, $mod=false, $hr=true) {
+		global $config;
+		if(!isset($root))
+			$root = &$config['root'];
+		
+		$this->id = $id;
+		$this->subject = utf8tohtml($subject);
+		$this->email = $email;
+		$this->name = utf8tohtml($name);
+		$this->trip = $trip;
+		$this->capcode = $capcode;
+		$this->body = $body;
+		$this->time = $time;
+		$this->thumb = $thumb;
+		$this->thumbx = $thumbx;
+		$this->thumby = $thumby;
+		$this->file = $file;
+		$this->filex = $filex;
+		$this->filey = $filey;
+		$this->filesize = $filesize;
+		$this->filename = $filename;
+		$this->omitted = 0;
+		$this->omitted_images = 0;
+		$this->posts = Array();
+		$this->ip = $ip;
+		$this->sticky = $sticky;
+		$this->locked = $locked;
+		$this->bumplocked = $bumplocked;
+		$this->embed = $embed;
+		$this->root = $root;
+		$this->mod = $mod;
+		$this->hr = $hr;
+		
+		if($this->mod)
+			// Fix internal links
+			// Very complicated regex
+			$this->body = preg_replace(
+				'/<a(([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
+				'<a href="?/$3',
+				$this->body
+			);
+	}
+	public function link($pre = '') {
+		global $config, $board;
+		
+		return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->id) . '#' . $pre . $this->id;
+	}
+	public function add(Post $post) {
+		$this->posts[] = $post;
+	}
+	public function postControls() {
+		global $board, $config;
+		
+		$built = '';
+		if($this->mod) {
+			// Mod controls (on posts)
+			// Delete
+			if(hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_delete'], 'Delete', 'Are you sure you want to delete this?', $board['uri'] . '/delete/' . $this->id);
 			
-			$this->id = $id;
-			$this->thread = $thread;
-			$this->subject = utf8tohtml($subject);
-			$this->email = $email;
-			$this->name = utf8tohtml($name);
-			$this->trip = $trip;
-			$this->capcode = $capcode;
-			$this->body = $body;
-			$this->time = $time;
-			$this->thumb = $thumb;
-			$this->thumbx = $thumbx;
-			$this->thumby = $thumby;
-			$this->file = $file;
-			$this->filex = $filex;
-			$this->filey = $filey;
-			$this->filesize = $filesize;
-			$this->filename = $filename;
-			$this->ip = $ip;
-			$this->embed = $embed;
-			$this->root = $root;
-			$this->mod = $mod;
+			// Delete all posts by IP
+			if(hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_deletebyip'], 'Delete all posts by IP', 'Are you sure you want to delete all posts by this IP address?', $board['uri'] . '/deletebyip/' . $this->id);
 			
-			if($this->mod)
-				// Fix internal links
-				// Very complicated regex
-				$this->body = preg_replace(
-					'/<a((([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*)href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
-					'<a $1href="?/$4',
-					$this->body
-				);
-		}
-		public function link($pre = '') {
-			global $config, $board;
+			// Delete all posts by IP (global)
+			if(hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
+				$built .= ' ' . confirmLink($config['mod']['link_deletebyip_global'], 'Delete all posts by IP across all boards', 'Are you sure you want to delete all posts by this IP address, across all boards?', $board['uri'] . '/deletebyip/' . $this->id . '/global');
 			
-			return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->thread) . '#' . $pre . $this->id;
-		}
-		public function postControls() {
-			global $board, $config;
+			// Ban
+			if(hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
+				$built .= ' <a title="Ban" href="?/' . $board['uri'] . '/ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
 			
-			$built = '';
-			if($this->mod) {
-				// Mod controls (on posts)
-				
-				// Delete
-				if(hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_delete'], 'Delete', 'Are you sure you want to delete this?', $board['uri'] . '/delete/' . $this->id);
-				
-				// Delete all posts by IP
-				if(hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_deletebyip'], 'Delete all posts by IP', 'Are you sure you want to delete all posts by this IP address?', $board['uri'] . '/deletebyip/' . $this->id);
-				
-				// Delete all posts by IP (global)
-				if(hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_deletebyip_global'], 'Delete all posts by IP across all boards', 'Are you sure you want to delete all posts by this IP address, across all boards?', $board['uri'] . '/deletebyip/' . $this->id . '/global');
-				
-				// Ban
-				if(hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
-					$built .= ' <a title="Ban" href="?/' . $board['uri'] . '/ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
-				
-				// Ban & Delete
-				if(hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
-					$built .= ' <a title="Ban & Delete" href="?/' . $board['uri'] . '/ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
-				
-				// Delete file (keep post)
-				if(!empty($this->file) && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
-					$built .= ' <a title="Remove file" href="?/' . $board['uri'] . '/deletefile/' . $this->id . '">' . $config['mod']['link_deletefile'] . '</a>';
-				
-				// Edit post
-				if(hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
-					$built .= ' <a title="Edit post" href="?/' . $board['uri'] . '/edit/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
-				
-				if(!empty($built))
-					$built = '<span class="controls">' . $built . '</span>';
-			}
-			return $built;
-		}
-		
-		public function build($index=false) {
-			global $board, $config;
+			// Ban & Delete
+			if(hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
+				$built .= ' <a title="Ban & Delete" href="?/' . $board['uri'] . '/ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
 			
-			return Element('post_reply.html', Array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
-		}
-	};
-	
-	class Thread {
-		public function __construct($id, $subject, $email, $name, $trip, $capcode, $body, $time, $thumb, $thumbx, $thumby, $file, $filex, $filey, $filesize, $filename, $ip, $sticky, $locked, $bumplocked, $embed, $root=null, $mod=false, $hr=true) {
-			global $config;
-			if(!isset($root)) $root = &$config['root'];
+			// Delete file (keep post)
+			if(!empty($this->file) && $this->file != 'deleted' && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
+				$built .= ' <a title="Remove file" href="?/' . $board['uri'] . '/deletefile/' . $this->id . '">' . $config['mod']['link_deletefile'] . '</a>';
 			
-			$this->id = $id;
-			$this->subject = utf8tohtml($subject);
-			$this->email = $email;
-			$this->name = utf8tohtml($name);
-			$this->trip = $trip;
-			$this->capcode = $capcode;
-			$this->body = $body;
-			$this->time = $time;
-			$this->thumb = $thumb;
-			$this->thumbx = $thumbx;
-			$this->thumby = $thumby;
-			$this->file = $file;
-			$this->filex = $filex;
-			$this->filey = $filey;
-			$this->filesize = $filesize;
-			$this->filename = $filename;
-			$this->omitted = 0;
-			$this->omitted_images = 0;
-			$this->posts = Array();
-			$this->ip = $ip;
-			$this->sticky = $sticky;
-			$this->locked = $locked;
-			$this->bumplocked = $bumplocked;
-			$this->embed = $embed;
-			$this->root = $root;
-			$this->mod = $mod;
-			$this->hr = $hr;
+			// Sticky
+			if(hasPermission($config['mod']['sticky'], $board['uri'], $this->mod))
+				if($this->sticky)
+					$built .= ' <a title="Make thread not sticky" href="?/' . $board['uri'] . '/unsticky/' . $this->id . '">' . $config['mod']['link_desticky'] . '</a>';
+				else
+					$built .= ' <a title="Make thread sticky" href="?/' . $board['uri'] . '/sticky/' . $this->id . '">' . $config['mod']['link_sticky'] . '</a>';
 			
-			if($this->mod)
-				// Fix internal links
-				// Very complicated regex
-				$this->body = preg_replace(
-					'/<a(([a-zA-Z]+="[^"]+")|[a-zA-Z]+=[a-zA-Z]+|\s)*href="' . preg_quote($config['root'], '/') . '(' . sprintf(preg_quote($config['board_path'], '/'), '\w+') . ')/',
-					'<a href="?/$3',
-					$this->body
-				);
-		}
-		public function link($pre = '') {
-			global $config, $board;
+			if(hasPermission($config['mod']['bumplock'], $board['uri'], $this->mod))
+				if($this->bumplocked)
+					$built .= ' <a title="Allow thread to be bumped" href="?/' . $board['uri'] . '/bumpunlock/' . $this->id . '">' . $config['mod']['link_bumpunlock'] . '</a>';
+				else
+					$built .= ' <a title="Prevent thread from being bumped" href="?/' . $board['uri'] . '/bumplock/' . $this->id . '">' . $config['mod']['link_bumplock'] . '</a>';
 			
-			return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->id) . '#' . $pre . $this->id;
-		}
-		public function add(Post $post) {
-			$this->posts[] = $post;
-		}
-		public function postControls() {
-			global $board, $config;
+			// Lock
+			if(hasPermission($config['mod']['lock'], $board['uri'], $this->mod))
+				if($this->locked)
+					$built .= ' <a title="Unlock thread" href="?/' . $board['uri'] . '/unlock/' . $this->id . '">' . $config['mod']['link_unlock'] . '</a>';
+				else
+					$built .= ' <a title="Lock thread" href="?/' . $board['uri'] . '/lock/' . $this->id . '">' . $config['mod']['link_lock'] . '</a>';
 			
-			$built = '';
-			if($this->mod) {
-				// Mod controls (on posts)
-				// Delete
-				if(hasPermission($config['mod']['delete'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_delete'], 'Delete', 'Are you sure you want to delete this?', $board['uri'] . '/delete/' . $this->id);
-				
-				// Delete all posts by IP
-				if(hasPermission($config['mod']['deletebyip'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_deletebyip'], 'Delete all posts by IP', 'Are you sure you want to delete all posts by this IP address?', $board['uri'] . '/deletebyip/' . $this->id);
-				
-				// Delete all posts by IP (global)
-				if(hasPermission($config['mod']['deletebyip_global'], $board['uri'], $this->mod))
-					$built .= ' ' . confirmLink($config['mod']['link_deletebyip_global'], 'Delete all posts by IP across all boards', 'Are you sure you want to delete all posts by this IP address, across all boards?', $board['uri'] . '/deletebyip/' . $this->id . '/global');
-				
-				// Ban
-				if(hasPermission($config['mod']['ban'], $board['uri'], $this->mod))
-					$built .= ' <a title="Ban" href="?/' . $board['uri'] . '/ban/' . $this->id . '">' . $config['mod']['link_ban'] . '</a>';
-				
-				// Ban & Delete
-				if(hasPermission($config['mod']['bandelete'], $board['uri'], $this->mod))
-					$built .= ' <a title="Ban & Delete" href="?/' . $board['uri'] . '/ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
-				
-				// Delete file (keep post)
-				if(!empty($this->file) && $this->file != 'deleted' && hasPermission($config['mod']['deletefile'], $board['uri'], $this->mod))
-					$built .= ' <a title="Remove file" href="?/' . $board['uri'] . '/deletefile/' . $this->id . '">' . $config['mod']['link_deletefile'] . '</a>';
-				
-				// Sticky
-				if(hasPermission($config['mod']['sticky'], $board['uri'], $this->mod))
-					if($this->sticky)
-						$built .= ' <a title="Make thread not sticky" href="?/' . $board['uri'] . '/unsticky/' . $this->id . '">' . $config['mod']['link_desticky'] . '</a>';
-					else
-						$built .= ' <a title="Make thread sticky" href="?/' . $board['uri'] . '/sticky/' . $this->id . '">' . $config['mod']['link_sticky'] . '</a>';
-				
-				if(hasPermission($config['mod']['bumplock'], $board['uri'], $this->mod))
-					if($this->bumplocked)
-						$built .= ' <a title="Allow thread to be bumped" href="?/' . $board['uri'] . '/bumpunlock/' . $this->id . '">' . $config['mod']['link_bumpunlock'] . '</a>';
-					else
-						$built .= ' <a title="Prevent thread from being bumped" href="?/' . $board['uri'] . '/bumplock/' . $this->id . '">' . $config['mod']['link_bumplock'] . '</a>';
-				
-				// Lock
-				if(hasPermission($config['mod']['lock'], $board['uri'], $this->mod))
-					if($this->locked)
-						$built .= ' <a title="Unlock thread" href="?/' . $board['uri'] . '/unlock/' . $this->id . '">' . $config['mod']['link_unlock'] . '</a>';
-					else
-						$built .= ' <a title="Lock thread" href="?/' . $board['uri'] . '/lock/' . $this->id . '">' . $config['mod']['link_lock'] . '</a>';
-				
-				if(hasPermission($config['mod']['move'], $board['uri'], $this->mod))
-					$built .= ' <a title="Move thread to another board" href="?/' . $board['uri'] . '/move/' . $this->id . '">' . $config['mod']['link_move'] . '</a>';
-				
-				// Edit post
-				if(hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
-					$built .= ' <a title="Edit post" href="?/' . $board['uri'] . '/edit/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
-				
-				if(!empty($built))
-					$built = '<span class="controls op">' . $built . '</span>';
-			}
-			return $built;
-		}
-		
-		public function ratio() {
-			return fraction($this->filex, $this->filey, ':');
-		}
-		
-		public function build($index=false) {
-			global $board, $config, $debug;
+			if(hasPermission($config['mod']['move'], $board['uri'], $this->mod))
+				$built .= ' <a title="Move thread to another board" href="?/' . $board['uri'] . '/move/' . $this->id . '">' . $config['mod']['link_move'] . '</a>';
 			
-			$built = Element('post_thread.html', Array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
+			// Edit post
+			if(hasPermission($config['mod']['editpost'], $board['uri'], $this->mod))
+				$built .= ' <a title="Edit post" href="?/' . $board['uri'] . '/edit/' . $this->id . '">' . $config['mod']['link_editpost'] . '</a>';
 			
-			if(!$this->mod && $index && $config['cache']['enabled']) {
-				cache::set($this->cache_key($index), $built);
-			}
-			
-			return $built;
+			if(!empty($built))
+				$built = '<span class="controls op">' . $built . '</span>';
 		}
-		function cache_key($index) {
-			global $board;
-			
-			return 'thread_' . ($index ? 'index_' : '') . $board['uri'] . '_' . $this->id;
+		return $built;
+	}
+	
+	public function ratio() {
+		return fraction($this->filex, $this->filey, ':');
+	}
+	
+	public function build($index=false) {
+		global $board, $config, $debug;
+		
+		$built = Element('post_thread.html', Array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index));
+		
+		if(!$this->mod && $index && $config['cache']['enabled']) {
+			cache::set($this->cache_key($index), $built);
 		}
-	};
-?>
+		
+		return $built;
+	}
+	function cache_key($index) {
+		global $board;
+		
+		return 'thread_' . ($index ? 'index_' : '') . $board['uri'] . '_' . $this->id;
+	}
+};
+