From 96495504631d6a4d466b93a835d7d66853e2e12b Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 02:11:41 +1000
Subject: start on mod interface rewrite

---
 templates/index.html  |  6 +++---
 templates/login.html  | 27 ---------------------------
 templates/thread.html |  6 +++---
 3 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 templates/login.html

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index f89199aa..f12e2517 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -35,10 +35,10 @@
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
-		<h1>{{ board.url }} - {{ board.name }}</h1>
+		<h1>{{ board.url }} - {{ board.title }}</h1>
 		<div class="subtitle">
-			{% if board.title %}
-				{{ board.title }}
+			{% if board.subtitle %}
+				{{ board.subtitle }}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
diff --git a/templates/login.html b/templates/login.html
deleted file mode 100644
index 709bad86..00000000
--- a/templates/login.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% if error %}<h2 style="text-align:center">{{ error }}</h2>{% endif %}
-<form action="" method="post">
-{% if redirect %}<input type="hidden" name="redirect" value="{{ redirect }}" />{% endif %}
-<table style="margin-top:25px;">
-	<tr>
-		<th>
-			{% trans %}Username{% endtrans %}
-		</th>
-		<td>
-			<input type="text" name="username" size="20" maxlength="30" value="{{ username }}">
-		</td>
-	</tr>
-	<tr>
-		<th>
-			{% trans %}Password{% endtrans %}
-		</th>
-		<td>
-			<input type="password" name="password" size="20" maxlength="30" value="">
-		</td>
-	</tr>
-	<tr>
-		<td></td>
-		<td>
-			<input type="submit" name="login" value="{% trans %}Continue{% endtrans %}" />
-		</td>
-</table>
-</form>
diff --git a/templates/thread.html b/templates/thread.html
index 2708b04d..9a56a50f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -36,10 +36,10 @@
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
-		<h1>{{ board.url }} - {{ board.name }}</h1>
+		<h1>{{ board.url }} - {{ board.title }}</h1>
 		<div class="subtitle">
-			{% if board.title %}
-				{{ board.title }}
+			{% if board.subtitle %}
+				{{ board.subtitle }}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
-- 
cgit v1.3


From 78f3ea783394dba14b51b27f7f2db3974ce8b8b3 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 09:29:08 +1000
Subject: View IP adress page, ban form.

---
 inc/mod/ban.php              | 77 +++++++++++++++++++++++++++++++++++++++++
 inc/mod/pages.php            | 28 +++++++++++++--
 mod.php                      |  3 +-
 templates/mod/ban_form.html  | 59 ++++++++++++++++++++++++++++++++
 templates/mod/dashboard.html | 81 ++++++++++++++++++++++++++++++++++++++++++++
 templates/mod/login.html     | 26 ++++++++++++++
 templates/mod/view_ip.html   | 18 ++++++++++
 7 files changed, 289 insertions(+), 3 deletions(-)
 create mode 100644 inc/mod/ban.php
 create mode 100644 templates/mod/ban_form.html
 create mode 100644 templates/mod/dashboard.html
 create mode 100644 templates/mod/login.html
 create mode 100644 templates/mod/view_ip.html

(limited to 'templates')

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
new file mode 100644
index 00000000..236b2b14
--- /dev/null
+++ b/inc/mod/ban.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ *  Copyright (c) 2010-2012 Tinyboard Development Group
+ */
+
+if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
+	// You cannot request this file directly.
+	exit;
+}
+
+function parse_time($str) {
+	if(empty($str))
+		return false;
+	
+	if (($time = @strtotime($str)) !== false)
+		return $time;
+	
+	if (!preg_match('/^((\d+)\s*ye?a?r?s?)?\s*+((\d+)\s*mon?t?h?s?)?\s*((\d+)\s*we?e?k?s?)?\s*((\d+)\s*da?y?s?)?((\d+)\s*ho?u?r?s?)?\s*((\d+)\s*mi?n?u?t?e?s?)?\s*+((\d+)\s*se?c?o?n?d?s?)?$/', $str, $matches))
+		return false;
+	$expire = time();
+	
+	if (isset($m[2])) {
+		// Years
+		$expire += $m[2]*60*60*24*365;
+	}
+	if (isset($m[4])) {
+		// Months
+		$expire += $m[4]*60*60*24*30;
+	}
+	if (isset($m[6])) {
+		// Weeks
+		$expire += $m[6]*60*60*24*7;
+	}
+	if (isset($m[8])) {
+		// Days
+		$expire += $m[8]*60*60*24;
+	}
+	if (isset($m[10])) {
+		// Hours
+		$expire += $m[10]*60*60;
+	}
+	if (isset($m[12])) {
+		// Minutes
+		$expire += $m[12]*60;
+	}
+	if (isset($m[14])) {
+		// Seconds
+		$expire += $m[14];
+	}
+	
+	return $expire;
+}
+
+function ban($mask, $reason, $length, $board) {
+	global $mod;
+	
+	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, UNIX_TIMESTAMP(), :expires, :reason, :board)");
+	$query->bindValue(':ip', $mask);
+	$query->bindValue(':mod', $mod['id']);
+	if ($reason !== '')
+		$query->bindValue(':reason', $reason);
+	else
+		$query->bindValue(':reason', null, PDO::PARAM_NULL);
+	
+	if ($length > 0)
+		$query->bindValue(':expires', time() + $length);
+	else
+		$query->bindValue(':expires', null, PDO::PARAM_NULL);
+	
+	if ($board)
+		$query->bindValue(':board', $board);
+	else
+		$query->bindValue(':board', null, PDO::PARAM_NULL);
+	
+	$query->execute() or error(db_error($query));
+}
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 9d154181..c00cd672 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -94,12 +94,17 @@ function mod_view_thread($boardName, $thread) {
 function mod_page_ip($ip) {
 	global $config, $mod;
 	
+	if(filter_var($ip, FILTER_VALIDATE_IP) === false)
+		error("Invalid IP address.");
+	
 	$args = array();
 	$args['ip'] = $ip;
 	$args['posts'] = array();
 	
 	$boards = listBoards();
 	foreach ($boards as $board) {
+		openBoard($board['uri']);
+		
 		$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `ip` = :ip ORDER BY `sticky` DESC, `id` DESC LIMIT :limit', $board['uri']));
 		$query->bindValue(':ip', $ip);
 		$query->bindValue(':limit', $config['mod']['ip_recentposts'], PDO::PARAM_INT);
@@ -122,11 +127,30 @@ function mod_page_ip($ip) {
 			}
 			
 			if (!isset($args['posts'][$board['uri']]))
-				$args['posts'][$board['uri']] = array();
-			$args['posts'][$board['uri']][] = $po->build(true);
+				$args['posts'][$board['uri']] = array('board' => $board, 'posts' => array());
+			$args['posts'][$board['uri']]['posts'][] = $po->build(true);
 		}
 	}
 	
+	$args['boards'] = $boards;
+	
 	mod_page("IP: $ip", 'mod/view_ip.html', $args);
 }
 
+function mod_page_ban() {
+	if(!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board']))
+		error($config['error']['missedafield']);
+	
+	$ip = $_POST['ip'];
+	
+	require_once 'inc/mod/ban.php';
+	
+	ban($_POST['ip'], $_POST['reason'], parse_time($_POST['length']), $_POST['board'] == '*' ? false : $_POST['board']);
+	
+	
+	if(isset($_POST['redirect']))
+		header('Location: ' . $_POST['redirect'], true, $config['redirect_http']);
+	else
+		header('Location: ?/', true, $config['redirect_http']);
+}
+
diff --git a/mod.php b/mod.php
index 0ac83f46..5f2cad56 100644
--- a/mod.php
+++ b/mod.php
@@ -25,10 +25,11 @@ $pages = array(
 	'!^/$!'		=> 'dashboard',		// dashboard
 	
 	'!^/IP/(.+)$!'	=> 'ip',		// view ip address
+	'!^/ban$!'	=> 'ban',		// new ban
 	
 	// This should always be at the end:
 	'!^/(\w+)/' . preg_quote($config['file_index'], '!') . '?$!'					=> 'view_board',
-	'!^/(\w+)/' . str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!/'	=> 'view_board',
+	'!^/(\w+)/' . str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'	=> 'view_board',
 	'!^/(\w+)/' . preg_quote($config['dir']['res'], '!') .
 			str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'	=> 'view_thread',
 );
diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
new file mode 100644
index 00000000..1b94e725
--- /dev/null
+++ b/templates/mod/ban_form.html
@@ -0,0 +1,59 @@
+<form action="?/ban" method="post">
+	{% if redirect %}
+		<input type="hidden" name="redirect" value="{{ redirect|e }}">
+	{% endif %}
+	
+	<table>
+		<tr>
+			<th>
+				<label for="ip">IP <span class="unimportant">(or subnet)</span></label>
+			</th>
+			<td>
+				<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
+			</td>
+		</tr>
+		<tr>
+			<th>
+				<label for="reason">Reason</label>
+			</th>
+			<td>
+				<textarea name="reason" id="reason" rows="5" cols="30">{{ reason|e }}</textarea>
+			</td>
+		</tr>
+		<tr>
+			<th>
+				<label for="length">Length</label>
+			</th>
+			<td>
+				<input type="text" name="length" id="length" size="20" maxlength="40"> 
+					<span class="unimportant">(eg. "2d1h30m" or "2 days")</span></td>
+			</tr>
+		<tr>
+			<th>Board</th>
+			<td>
+				<ul style="list-style:none;padding:2px 5px">
+					<li>
+						<input type="radio" name="board" value="*" id="ban-allboards" checked> 
+						<label style="display:inline" for="ban-allboards">
+							<em>all boards</em>
+						</label>
+					</li>
+					
+					{% for board in boards %}
+						<li>
+							<input type="radio" name="board" value="{{ board.uri }}" id="ban-board-{{ board.uri }}"> 
+							<label style="display:inline" for="ban-board-{{ board.uri }}">
+								{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title }}
+							</label>
+						</li>
+					{% endfor %}
+				</ul>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input name="new_ban" type="submit" value="New Ban"></td>
+		</tr>
+	</table>
+</form>
+
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
new file mode 100644
index 00000000..2a90d709
--- /dev/null
+++ b/templates/mod/dashboard.html
@@ -0,0 +1,81 @@
+<fieldset>
+	<legend>Boards</legend>
+	
+	<ul>
+		{% for board in boards %}
+			<li>
+				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
+					 - 
+				{{ board.title }}
+				{% if board.subtitle %}
+					 <small>&mdash; {{ board.subtitle }}</small>
+				{% endif %}
+				
+				{% if mod|hasPermission(config.mod.manageboards) %}
+					 <a href="?/manage/{{ board.uri }}"><small>[manage]</small></a>
+				{% endif %}
+			</li>
+		{% endfor %}
+		
+		{% if mod|hasPermission(config.mod.newboard) %}
+			<li style="margin-top:15px"><a href="?/new_board"><strong>Create new board</strong></a></li>
+		{% endif %}
+	</ul>
+</fieldset>
+
+{% if mod|hasPermission(config.mod.noticeboard) %}
+	<fieldset>
+		<legend>Noticeboard</legend>
+	
+		{# TODO #}
+	</fieldset>
+{% endif %}
+
+<fieldset>
+	<legend>Administration</legend>
+	
+	<ul>
+		{% if mod|hasPermission(config.mod.reports) %}
+			<li><a href="?/reports">Report queue</a></li>
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.view_banlist) %}
+			<li><a href="?/bans">Ban list</a></li>
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.manageusers) %}
+			<li><a href="?/users">Manage users</a></li>
+		{% elseif mod|hasPermission(config.mod.change_password) %}
+			<li><a href="?/users/{{ mod.id }}">Change password</a></li>
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.modlog) %}
+			<li><a href="?/log">Moderation log</a></li>
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.rebuild) %}
+			<li><a href="?/rebuild">Rebuild</a></li>
+			{% if config.cache.enabled %}
+				<li><a href="?/flushcache">Clear cache</a></li>
+			{% endif %}
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.show_config) %}
+			<li><a href="?/config">Configuration</a></li>
+		{% endif %}
+	</ul>
+</fieldset>
+
+{% if mod|hasPermission(config.mod.themes) %}
+	<fieldset>
+		<legend>Themes</legend>
+	
+		{# TODO #}
+	</fieldset>
+{% endif %}
+
+<fieldset>
+	<legend>Search</legend>
+	
+	{# TODO #}
+</fieldset>
diff --git a/templates/mod/login.html b/templates/mod/login.html
new file mode 100644
index 00000000..5ac308a3
--- /dev/null
+++ b/templates/mod/login.html
@@ -0,0 +1,26 @@
+{% if error %}<h2 style="text-align:center">{{ error }}</h2>{% endif %}
+<form action="" method="post">
+<table style="margin-top:25px;">
+	<tr>
+		<th>
+			{% trans %}Username{% endtrans %}
+		</th>
+		<td>
+			<input type="text" name="username" size="20" maxlength="30" value="{{ username|e }}">
+		</td>
+	</tr>
+	<tr>
+		<th>
+			{% trans %}Password{% endtrans %}
+		</th>
+		<td>
+			<input type="password" name="password" size="20" maxlength="30" value="">
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+		<td>
+			<input type="submit" name="login" value="{% trans %}Continue{% endtrans %}" />
+		</td>
+</table>
+</form>
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
new file mode 100644
index 00000000..3b558e4b
--- /dev/null
+++ b/templates/mod/view_ip.html
@@ -0,0 +1,18 @@
+{% for board_posts in posts %}
+	<fieldset>
+		<legend>
+			<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}</a>
+			 - 
+			 {{ board_posts.board.title }}
+		</legend>
+		{{ board_posts.posts|join('<hr>') }}
+	</fieldset>
+{% endfor %}
+
+{% set redirect = '?/IP/' ~ ip %}
+
+<fieldset>
+	<legend>New ban</legend>
+	{% include 'mod/ban_form.html' %}
+</fieldset>
+
-- 
cgit v1.3


From 2843ddc4826f250a8af6203cff437929ab807a41 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 09:47:27 +1000
Subject: view bans / unban

---
 inc/mod/ban.php            | 19 ++++++++----
 inc/mod/pages.php          | 18 ++++++++++--
 inc/template.php           |  2 +-
 templates/mod/view_ip.html | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 9 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index 236b2b14..33b64975 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -10,7 +10,7 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
 }
 
 function parse_time($str) {
-	if(empty($str))
+	if (empty($str))
 		return false;
 	
 	if (($time = @strtotime($str)) !== false)
@@ -55,16 +55,18 @@ function parse_time($str) {
 function ban($mask, $reason, $length, $board) {
 	global $mod;
 	
-	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, UNIX_TIMESTAMP(), :expires, :reason, :board)");
+	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board)");
 	$query->bindValue(':ip', $mask);
 	$query->bindValue(':mod', $mod['id']);
-	if ($reason !== '')
+	$query->bindValue(':time', time());
+	if ($reason !== '') {
+		markup($reason);
 		$query->bindValue(':reason', $reason);
-	else
+	} else
 		$query->bindValue(':reason', null, PDO::PARAM_NULL);
 	
 	if ($length > 0)
-		$query->bindValue(':expires', time() + $length);
+		$query->bindValue(':expires', $length);
 	else
 		$query->bindValue(':expires', null, PDO::PARAM_NULL);
 	
@@ -75,3 +77,10 @@ function ban($mask, $reason, $length, $board) {
 	
 	$query->execute() or error(db_error($query));
 }
+
+function unban($id) {
+	$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+}
+
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index c00cd672..e7e4f065 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -94,9 +94,17 @@ function mod_view_thread($boardName, $thread) {
 function mod_page_ip($ip) {
 	global $config, $mod;
 	
-	if(filter_var($ip, FILTER_VALIDATE_IP) === false)
+	if (filter_var($ip, FILTER_VALIDATE_IP) === false)
 		error("Invalid IP address.");
 	
+	if (isset($_POST['ban_id'], $_POST['unban'])) {
+		require_once 'inc/mod/ban.php';
+		
+		unban($_POST['ban_id']);
+		header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+		return;
+	}
+	
 	$args = array();
 	$args['ip'] = $ip;
 	$args['posts'] = array();
@@ -134,6 +142,11 @@ function mod_page_ip($ip) {
 	
 	$args['boards'] = $boards;
 	
+	$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+	$query->bindValue(':ip', $ip);
+	$query->execute() or error(db_error($query));
+	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);	
+	
 	mod_page("IP: $ip", 'mod/view_ip.html', $args);
 }
 
@@ -147,8 +160,7 @@ function mod_page_ban() {
 	
 	ban($_POST['ip'], $_POST['reason'], parse_time($_POST['length']), $_POST['board'] == '*' ? false : $_POST['board']);
 	
-	
-	if(isset($_POST['redirect']))
+	if (isset($_POST['redirect']))
 		header('Location: ' . $_POST['redirect'], true, $config['redirect_http']);
 	else
 		header('Location: ?/', true, $config['redirect_http']);
diff --git a/inc/template.php b/inc/template.php
index 8d679d25..ab220454 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -26,7 +26,7 @@ function load_twig() {
 	$loader->setPaths($config['dir']['template']);
 	$twig = new Twig_Environment($loader, array(
 		'autoescape' => false,
-		'cache' => "{$config['dir']['template']}/cache",
+		//'cache' => "{$config['dir']['template']}/cache",
 		'debug' => ($config['debug'] ? true : false),
 	));
 	$twig->addExtension(new Twig_Extensions_Extension_Tinyboard());
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 3b558e4b..a9676dd7 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -11,6 +11,79 @@
 
 {% set redirect = '?/IP/' ~ ip %}
 
+{% if bans|count > 0 %}
+	<fieldset>
+		<legend>Ban{% if bans|count != 1 %}s{% endif %} on record</legend>
+		
+		{% for ban in bans %}
+			<form action="" method="post" style="text-align:center">
+				<table style="width:400px;margin-bottom:10px;border-bottom:1px solid #ddd;padding:5px">
+					<tr>
+						<th>Status</th>
+						<td>
+							{% if config.mod.view_banexpired and ban.expires != 0 and ban.expires < time() %}
+								Expired
+							{% else %}
+								Active
+							{% endif %}
+						</td>
+					</tr>
+					<tr>
+						<th>IP</th>
+						<td>{{ ban.ip }}</td>
+					</tr>
+					<tr>
+						<th>Reason</th>
+						<td>
+							{% if ban.reason %}
+								{{ ban.reason }}
+							{% else %}
+								<em>no reason</em>
+							{% endif %}
+						</td>
+					</tr>
+					<tr>
+						<th>Board</th>
+						<td>
+							{% if ban.board %}
+								{{ config.board_abbreviation|sprintf(ban.board) }}
+							{% else %}
+								<em>all boards</em>
+							{% endif %}
+						</td>
+					</tr>
+					<tr>
+						<th>Set</th>
+						<td>{{ ban.set|date(config.post_date) }}</td>
+					</tr>
+					<tr>
+						<th>Expires</th>
+						<td>
+							{% if ban.expires %}
+								{{ ban.expires|date(config.post_date) }}
+							{% else %}
+								<em>never</em>
+							{% endif %}
+						</td>
+					</tr>
+					<tr>
+						<th>Staff</th>
+						<td>
+							{% if ban.username %}
+								{{ ban.username }}
+							{% else %}
+								<em>deleted?</em>
+							{% endif %}
+						</td>
+					</tr>
+				</table>
+				<input type="hidden" name="ban_id" value="{{ ban.id }}">
+				<input type="submit" name="unban" value="Remove ban">
+			</form>
+		{% endfor %}
+	</fieldset>
+{% endif %}
+
 <fieldset>
 	<legend>New ban</legend>
 	{% include 'mod/ban_form.html' %}
-- 
cgit v1.3


From 7f6f836bf85350fe92d3975d2fb3973343923aeb Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 10:41:30 +1000
Subject: IP notes

---
 inc/mod/ban.php            |  4 +++
 inc/mod/pages.php          | 90 +++++++++++++++++++++++++++++++++++++++++++---
 mod.php                    | 15 +++++---
 templates/mod/confirm.html |  7 ++++
 templates/mod/log.html     | 11 ++++++
 templates/mod/view_ip.html | 80 +++++++++++++++++++++++++++++++++++++----
 6 files changed, 191 insertions(+), 16 deletions(-)
 create mode 100644 templates/mod/confirm.html
 create mode 100644 templates/mod/log.html

(limited to 'templates')

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index 33b64975..8d86cbcd 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -55,6 +55,8 @@ function parse_time($str) {
 function ban($mask, $reason, $length, $board) {
 	global $mod;
 	
+	// TODO: permissions
+	
 	$query = prepare("INSERT INTO `bans` VALUES (NULL, :ip, :mod, :time, :expires, :reason, :board)");
 	$query->bindValue(':ip', $mask);
 	$query->bindValue(':mod', $mod['id']);
@@ -79,6 +81,8 @@ function ban($mask, $reason, $length, $board) {
 }
 
 function unban($id) {
+	// TODO: permissions
+	
 	$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index e7e4f065..73015cf9 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -52,7 +52,11 @@ function mod_login() {
 	if (isset($_POST['username']))
 		$args['username'] = $_POST['username'];
 
-	mod_page('Dashboard', 'mod/login.html', $args);
+	mod_page('Login', 'mod/login.html', $args);
+}
+
+function mod_confirm($request) {
+	mod_page('Confirm action', 'mod/confirm.html', array('request' => $request));
 }
 
 function mod_dashboard() {
@@ -63,6 +67,21 @@ function mod_dashboard() {
 	mod_page('Dashboard', 'mod/dashboard.html', $args);
 }
 
+function mod_log($page_no = 1) {
+	global $config;
+	
+	if (!hasPermission($config['mod']['modlog']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare("SELECT `username`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY `time` DESC LIMIT :offset, :limit");
+	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$logs = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	mod_page('Moderation log', 'mod/log.html', array('logs' => $logs));
+}
+
 function mod_view_board($boardName, $page_no = 1) {
 	global $config, $mod;
 	
@@ -91,6 +110,20 @@ function mod_view_thread($boardName, $thread) {
 	echo $page;
 }
 
+function mod_ip_remove_note($ip, $id) {
+	global $config, $mod;
+	
+	if (filter_var($ip, FILTER_VALIDATE_IP) === false)
+		error("Invalid IP address.");
+	
+	$query = prepare('DELETE FROM `ip_notes` WHERE `ip` = :ip AND `id` = :id');
+	$query->bindValue(':ip', $ip);
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+}
+
 function mod_page_ip($ip) {
 	global $config, $mod;
 	
@@ -105,6 +138,21 @@ function mod_page_ip($ip) {
 		return;
 	}
 	
+	if (isset($_POST['note'])) {
+		// TODO: permissions
+		
+		markup($_POST['note']);
+		$query = prepare('INSERT INTO `ip_notes` VALUES (NULL, :ip, :mod, :time, :body)');
+		$query->bindValue(':ip', $ip);
+		$query->bindValue(':mod', $mod['id']);
+		$query->bindValue(':time', time());
+		$query->bindValue(':body', $_POST['note']);
+		$query->execute() or error(db_error($query));
+		
+		header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+		return;
+	}
+	
 	$args = array();
 	$args['ip'] = $ip;
 	$args['posts'] = array();
@@ -145,14 +193,26 @@ function mod_page_ip($ip) {
 	$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
 	$query->bindValue(':ip', $ip);
 	$query->execute() or error(db_error($query));
-	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);	
+	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	$query = prepare("SELECT `ip_notes`.*, `username` FROM `ip_notes` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+	$query->bindValue(':ip', $ip);
+	$query->execute() or error(db_error($query));
+	$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
 	mod_page("IP: $ip", 'mod/view_ip.html', $args);
 }
 
-function mod_page_ban() {
-	if(!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board']))
-		error($config['error']['missedafield']);
+function mod_ban() {
+	if (!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'])) {
+		mod_page("New ban", 'mod/ban_form.html', array());
+		return;
+	}
+	
+	$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+	$query->bindValue(':ip', $ip);
+	$query->execute() or error(db_error($query));
+	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
 	$ip = $_POST['ip'];
 	
@@ -166,3 +226,23 @@ function mod_page_ban() {
 		header('Location: ?/', true, $config['redirect_http']);
 }
 
+function mod_delete($board, $post) {
+	global $config, $mod;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['delete'], $board))
+		error($config['error']['noaccess']);
+	
+	// Delete post
+	deletePost($post);
+	// Record the action
+	modLog("Deleted post #{$post}");
+	// Rebuild board
+	buildIndex();
+	
+	// Redirect
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
diff --git a/mod.php b/mod.php
index 5f2cad56..c89c2f01 100644
--- a/mod.php
+++ b/mod.php
@@ -21,11 +21,18 @@ if (get_magic_quotes_gpc()) {
 $query = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
 
 $pages = array(
-	'!^$!'		=> ':?/',		// redirect to dashboard
-	'!^/$!'		=> 'dashboard',		// dashboard
+	'!^$!'					=> ':?/',		// redirect to dashboard
+	'!^/$!'					=> 'dashboard',		// dashboard
+	'!^/log$!'				=> 'log',		// modlog
+	'!^/log/(\d+)/$!'			=> 'log',		// modlog
 	
-	'!^/IP/(.+)$!'	=> 'ip',		// view ip address
-	'!^/ban$!'	=> 'ban',		// new ban
+	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
+	
+	'!^/ban$!'				=> 'ban',		// new ban
+	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
+	'!^/IP/([\w.:]+)/remove_note/(\d+)$!'	=> 'ip_remove_note',	// remove note from ip address
+	
+	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
 	
 	// This should always be at the end:
 	'!^/(\w+)/' . preg_quote($config['file_index'], '!') . '?$!'					=> 'view_board',
diff --git a/templates/mod/confirm.html b/templates/mod/confirm.html
new file mode 100644
index 00000000..7509ce3c
--- /dev/null
+++ b/templates/mod/confirm.html
@@ -0,0 +1,7 @@
+<p style="text-align:center;font-size:1.1em">
+	Are you sure you want to do that? <a href="?/{{ request }}">Click to proceed to ?/{{ request }}</a>.
+</p>
+<p class="unimportant" style="text-align:center">
+	You are seeing this message because we were unable to serve a confirmation dialog, probably due to Javascript being disabled.
+</p>
+
diff --git a/templates/mod/log.html b/templates/mod/log.html
new file mode 100644
index 00000000..2aa0ea0a
--- /dev/null
+++ b/templates/mod/log.html
@@ -0,0 +1,11 @@
+<table class="modlog">
+	<tr>
+		<th>
+		
+		</th>
+	</tr>
+	{% for log in logs %}
+		
+	{% endfor %}
+</table>
+
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index a9676dd7..3bc9654c 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -9,9 +9,73 @@
 	</fieldset>
 {% endfor %}
 
-{% set redirect = '?/IP/' ~ ip %}
+{% if mod|hasPermission(config.mod.view_notes) %}
+	<fieldset>
+		<legend>
+			{{ notes|count }} note{% if notes|count != 1 %}s{% endif %} on record
+		</legend>
+		
+		{% if notes|count > 0 %}
+			<table class="modlog">
+				<tr>
+					<th>Staff</th>
+					<th>Note</th>
+					<th>Date</th>
+					{% if mod|hasPermission(config.mod.remove_notes) %}
+						<th>Actions</th>
+					{% endif %}
+				</tr>
+				{% for note in notes %}
+					<tr>
+						<td class="minimal">
+							{% if note.username %}
+								<a href="?/new_PM/{{ note.username }}">{{ note.username }}</a>
+							{% else %}
+								<em>deleted?</em>
+							{% endif %}
+						</td>
+						<td>
+							{{ note.body }}
+						</td>
+						<td class="minimal">
+							{{ note.time|date(config.post_date) }}
+						</td>
+						{% if mod|hasPermission(config.mod.remove_notes) %}
+							<td class="minimal">
+								<a href="?/IP/{{ ip }}/remove_note/{{ note.id }}"><small>[remove]</small></a>
+							</td>
+						{% endif %}
+					</tr>
+				{% endfor %}
+			</table>
+		{% endif %}
+		
+		{% if mod|hasPermission(config.mod.create_notes) %}
+			<form action="" method="post" style="margin:0">
+				<table>
+					<tr>
+						<th>Staff</th>
+						<td>{{ mod.username }}</td>
+					</tr>
+					<tr>
+						<th>
+							<label for="note">Note</label>
+						</th>
+						<td>
+							<textarea id="note" name="note" rows="5" cols="30"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td></td>
+						<td><input type="submit" value="New note"></td>
+					</tr>
+				</table>
+			</form>
+		{% endif %}
+	</fieldset>
+{% endif %}
 
-{% if bans|count > 0 %}
+{% if bans|count > 0 and mod|hasPermission(config.mod.view_ban) %}
 	<fieldset>
 		<legend>Ban{% if bans|count != 1 %}s{% endif %} on record</legend>
 		
@@ -84,8 +148,10 @@
 	</fieldset>
 {% endif %}
 
-<fieldset>
-	<legend>New ban</legend>
-	{% include 'mod/ban_form.html' %}
-</fieldset>
-
+{% if mod|hasPermission(config.mod.ban) %}
+	<fieldset>
+		<legend>New ban</legend>
+		{% set redirect = '?/IP/' ~ ip %}
+		{% include 'mod/ban_form.html' %}
+	</fieldset>
+{% endif %}
-- 
cgit v1.3


From e92ee2b4879d110f4076c17c0033267dfbbc9197 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 20:48:37 +1000
Subject: moderation log

---
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |  1 +
 templates/mod/log.html                          | 30 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'templates')

diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index cbb2e752..4111fc3c 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -21,6 +21,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 			'poster_id' => new Twig_Filter_Function('poster_id', array('needs_environment' => false)),
 			'remove_whitespace' => new Twig_Filter_Function('twig_remove_whitespace_filter', array('needs_environment' => false)),
 			'count' => new Twig_Filter_Function('count', array('needs_environment' => false)),
+			'ago' => new Twig_Filter_Function('ago', array('needs_environment' => false)),
 			'until' => new Twig_Filter_Function('until', array('needs_environment' => false))
 		);
 	}
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 2aa0ea0a..4f2beb40 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -1,11 +1,33 @@
 <table class="modlog">
 	<tr>
-		<th>
-		
-		</th>
+		<th>Staff</th>
+		<th>IP address</th>
+		<th>Ago</th>
+		<th>Board</th>
+		<th>Action</th>
 	</tr>
 	{% for log in logs %}
-		
+		<tr>
+			<td class="minimal">
+				<a href="?/new_PM/{{ log.username }}">{{ log.username }}</a>
+			</td>
+			<td class="minimal">
+				<a href="?/IP/{{ log.ip }}">{{ log.ip }}</a>
+			</td>
+			<td class="minimal">
+				<span title="{{ log.time|date(config.post_date) }}">{{ log.time|ago }}</span>
+			</td>
+			<td class="minimal">
+				{% if log.board %}
+					<a href="?/{{ config.board_path|sprintf(log.board) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(log.board) }}</a>
+				{% else %}
+					-
+				{% endif %}
+			</td>
+			<td>
+				{{ log.text }}
+			</td>
+		</tr>
 	{% endfor %}
 </table>
 
-- 
cgit v1.3


From d1876a0dd66422570409787bae40aad371011b89 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 20:57:59 +1000
Subject: paginate moderation log

---
 inc/mod/pages.php      | 6 +++++-
 mod.php                | 2 +-
 templates/mod/log.html | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 73015cf9..942cfd50 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -79,7 +79,11 @@ function mod_log($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$logs = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	mod_page('Moderation log', 'mod/log.html', array('logs' => $logs));
+	$query = prepare("SELECT COUNT(*) AS `count` FROM `modlogs`");
+	$query->execute() or error(db_error($query));
+	$count = $query->fetchColumn(0);
+	
+	mod_page('Moderation log', 'mod/log.html', array('logs' => $logs, 'count' => $count));
 }
 
 function mod_view_board($boardName, $page_no = 1) {
diff --git a/mod.php b/mod.php
index c89c2f01..3aba6fe4 100644
--- a/mod.php
+++ b/mod.php
@@ -24,7 +24,7 @@ $pages = array(
 	'!^$!'					=> ':?/',		// redirect to dashboard
 	'!^/$!'					=> 'dashboard',		// dashboard
 	'!^/log$!'				=> 'log',		// modlog
-	'!^/log/(\d+)/$!'			=> 'log',		// modlog
+	'!^/log/(\d+)$!'			=> 'log',		// modlog
 	
 	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
 	
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 4f2beb40..fe1c5c1f 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -31,3 +31,9 @@
 	{% endfor %}
 </table>
 
+<p class="unimportant" style="text-align:center;word-wrap:break-word">
+	{% for i in range(0, count / config.mod.modlog_page) %}
+		<a href="?/log/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+	{% endfor %}
+</p>
+
-- 
cgit v1.3


From 761cb4feab1a052e2e611a1d09d0a3513e011c06 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 21:43:01 +1000
Subject: ?/users (user list)

---
 inc/lib/Twig/Extensions/Extension/Tinyboard.php | 45 +++++++++++++++----------
 inc/mod/pages.php                               | 12 +++++++
 mod.php                                         |  4 ++-
 templates/mod/log.html                          | 12 ++++---
 4 files changed, 50 insertions(+), 23 deletions(-)

(limited to 'templates')

diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 4111fc3c..2691cc55 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -10,19 +10,21 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 	public function getFilters()
 	{
 		return Array(
-			'filesize' => new Twig_Filter_Function('format_bytes', Array('needs_environment' => false)),
-			'truncate' => new Twig_Filter_Function('twig_truncate_filter', array('needs_environment' => false)),
-			'truncate_body' => new Twig_Filter_Function('truncate', array('needs_environment' => false)),
-			'extension' => new Twig_Filter_Function('twig_extension_filter', array('needs_environment' => false)),
-			'sprintf' => new Twig_Filter_Function('sprintf', array('needs_environment' => false)),
-			'capcode' => new Twig_Filter_Function('capcode', array('needs_environment' => false)),
-			'hasPermission' => new Twig_Filter_Function('twig_hasPermission_filter', array('needs_environment' => false)),
-			'date' => new Twig_Filter_Function('twig_date_filter', array('needs_environment' => false)),
-			'poster_id' => new Twig_Filter_Function('poster_id', array('needs_environment' => false)),
-			'remove_whitespace' => new Twig_Filter_Function('twig_remove_whitespace_filter', array('needs_environment' => false)),
-			'count' => new Twig_Filter_Function('count', array('needs_environment' => false)),
-			'ago' => new Twig_Filter_Function('ago', array('needs_environment' => false)),
-			'until' => new Twig_Filter_Function('until', array('needs_environment' => false))
+			'filesize' => new Twig_Filter_Function('format_bytes'),
+			'truncate' => new Twig_Filter_Function('twig_truncate_filter'),
+			'truncate_body' => new Twig_Filter_Function('truncate'),
+			'extension' => new Twig_Filter_Function('twig_extension_filter'),
+			'sprintf' => new Twig_Filter_Function('sprintf'),
+			'capcode' => new Twig_Filter_Function('capcode'),
+			'hasPermission' => new Twig_Filter_Function('twig_hasPermission_filter'),
+			'date' => new Twig_Filter_Function('twig_date_filter'),
+			'poster_id' => new Twig_Filter_Function('poster_id'),
+			'remove_whitespace' => new Twig_Filter_Function('twig_remove_whitespace_filter'),
+			'count' => new Twig_Filter_Function('count'),
+			'ago' => new Twig_Filter_Function('ago'),
+			'until' => new Twig_Filter_Function('until'),
+			'split' => new Twig_Filter_Function('twig_split_filter'),
+			'push' => new Twig_Filter_Function('twig_push_filter'),
 		);
 	}
 	
@@ -34,10 +36,10 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 	public function getFunctions()
 	{
 		return Array(
-			'time' => new Twig_Filter_Function('time', array('needs_environment' => false)),
-			'timezone' => new Twig_Filter_Function('twig_timezone_function', array('needs_environment' => false)),
-			'hiddenInputs' => new Twig_Filter_Function('hiddenInputs', array('needs_environment' => false)),
-			'hiddenInputsHash' => new Twig_Filter_Function('hiddenInputsHash', array('needs_environment' => false))
+			'time' => new Twig_Filter_Function('time'),
+			'timezone' => new Twig_Filter_Function('twig_timezone_function'),
+			'hiddenInputs' => new Twig_Filter_Function('hiddenInputs'),
+			'hiddenInputsHash' => new Twig_Filter_Function('hiddenInputsHash'),
 		);
 	}
 	
@@ -57,6 +59,15 @@ function twig_timezone_function() {
 	return sprintf("%s%02d", ($hr = (int)floor(($tz = date('Z')) / 3600)) > 0 ? '+' : '-', abs($hr)) . ':' . sprintf("%02d", (($tz / 3600) - $hr) * 60);
 }
 
+function twig_split_filter($str, $delim) {
+	return explode($delim, $str);
+}
+
+function twig_push_filter($array, $value) {
+	array_push($array, $value);
+	return $array;
+}
+
 function twig_remove_whitespace_filter($data) {
 	return preg_replace('/[\t\r\n]/', '', $data);
 }
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 942cfd50..2b5487fd 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -250,3 +250,15 @@ function mod_delete($board, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_users() {
+	global $config;
+	if(!hasPermission($config['mod']['manageusers']))
+		error($config['error']['noaccess']);
+	
+	$args = array();
+	$query = query("SELECT *, (SELECT `time` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM `mods` ORDER BY `type` DESC,`id`") or error(db_error());
+	$args['users'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	mod_page("Manage users", 'mod/users.html', $args);
+}
+
diff --git a/mod.php b/mod.php
index 3aba6fe4..d95f9552 100644
--- a/mod.php
+++ b/mod.php
@@ -23,10 +23,12 @@ $query = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
 $pages = array(
 	'!^$!'					=> ':?/',		// redirect to dashboard
 	'!^/$!'					=> 'dashboard',		// dashboard
+	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
 	'!^/log$!'				=> 'log',		// modlog
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
+
+	'!^/users$!'				=> 'users',		// manage users
 	
-	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
 	
 	'!^/ban$!'				=> 'ban',		// new ban
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
diff --git a/templates/mod/log.html b/templates/mod/log.html
index fe1c5c1f..61243202 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -31,9 +31,11 @@
 	{% endfor %}
 </table>
 
-<p class="unimportant" style="text-align:center;word-wrap:break-word">
-	{% for i in range(0, count / config.mod.modlog_page) %}
-		<a href="?/log/{{ i + 1 }}">[{{ i + 1 }}]</a> 
-	{% endfor %}
-</p>
+{% if count > logs|count %}
+	<p class="unimportant" style="text-align:center;word-wrap:break-word">
+		{% for i in range(0, count / config.mod.modlog_page) %}
+			<a href="?/log/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+		{% endfor %}
+	</p>
+{% endif %}
 
-- 
cgit v1.3


From e49ece459e2ee225ba677f8e0758a38a98b930f5 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 13 Apr 2012 22:00:40 +1000
Subject: new PM

---
 inc/mod/auth.php          | 13 ++++++++++++
 inc/mod/pages.php         | 33 +++++++++++++++++++++++++++--
 mod.php                   |  2 +-
 templates/mod/new_pm.html | 22 +++++++++++++++++++
 templates/mod/users.html  | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 templates/mod/new_pm.html
 create mode 100644 templates/mod/users.html

(limited to 'templates')

diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 2e90b757..f9b863c8 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -122,3 +122,16 @@ if (isset($_COOKIE[$config['cookies']['mod']])) {
 	);
 }
 
+function create_pm_header() {
+	global $mod;
+	$query = prepare("SELECT `id` FROM `pms` WHERE `to` = :id AND `unread` = 1");
+	$query->bindValue(':id', $mod['id'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	
+	if ($pm = $query->fetch()) {
+		return Array('id' => $pm['id'], 'waiting' => $query->rowCount() - 1);
+	}
+	
+	return false;
+}
+
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 2b5487fd..4903567a 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -252,13 +252,42 @@ function mod_delete($board, $post) {
 
 function mod_users() {
 	global $config;
-	if(!hasPermission($config['mod']['manageusers']))
+	
+	if (!hasPermission($config['mod']['manageusers']))
 		error($config['error']['noaccess']);
 	
 	$args = array();
 	$query = query("SELECT *, (SELECT `time` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM `mods` ORDER BY `type` DESC,`id`") or error(db_error());
 	$args['users'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	mod_page("Manage users", 'mod/users.html', $args);
+	mod_page('Manage users', 'mod/users.html', $args);
+}
+
+function mod_new_pm($username) {
+	global $config, $mod;
+	
+	if (!hasPermission($config['mod']['create_pm']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare("SELECT `id` FROM `mods` WHERE `username` = :username");
+	$query->bindValue(':username', $username);
+	$query->execute() or error(db_error($query));
+	if (!$id = $query->fetchColumn(0))
+		error($config['error']['404']);
+	
+	if (isset($_POST['message'])) {
+		markup($_POST['message']);
+		
+		$query = prepare("INSERT INTO `pms` VALUES (NULL, :me, :id, :message, :time, 1)");
+		$query->bindValue(':me', $mod['id']);
+		$query->bindValue(':id', $id);
+		$query->bindValue(':message', $_POST['message']);
+		$query->bindValue(':time', time());
+		$query->execute() or error(db_error($query));
+		
+		header('Location: ?/', true, $config['redirect_http']);
+	}
+	
+	mod_page("New PM for {$username}", 'mod/new_pm.html', array('username' => $username, 'id' => $id));
 }
 
diff --git a/mod.php b/mod.php
index d95f9552..e7134603 100644
--- a/mod.php
+++ b/mod.php
@@ -28,7 +28,7 @@ $pages = array(
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
 
 	'!^/users$!'				=> 'users',		// manage users
-	
+	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
 	
 	'!^/ban$!'				=> 'ban',		// new ban
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
diff --git a/templates/mod/new_pm.html b/templates/mod/new_pm.html
new file mode 100644
index 00000000..d694bc26
--- /dev/null
+++ b/templates/mod/new_pm.html
@@ -0,0 +1,22 @@
+{#{% if id == mod.id %}
+	{% set username = 'me' %}
+{% endif %}#}
+
+<form action="" method="post">
+	<table>
+		<tr>
+			<th>To</th>
+			{% if mod|hasPermission(config.mod.editusers) %}
+				<td><a href="?/users/{{ id }}">{{ username|e }}</a></td>
+			{% else %}
+				<td>{{ username|e }}</td>
+			{% endif %}
+		</tr>
+		<tr>
+			<th>Message</th>
+			<td><textarea name="message" rows="10" cols="40"></textarea></td>
+		</tr>
+	</table>
+
+	<p style="text-align:center"><input type="submit" value="Send message"></p>
+</form>
diff --git a/templates/mod/users.html b/templates/mod/users.html
new file mode 100644
index 00000000..aeacc8b5
--- /dev/null
+++ b/templates/mod/users.html
@@ -0,0 +1,54 @@
+<table class="modlog" style="width:auto">
+	<tr>
+		<th>ID</th>
+		<th>Username</th>
+		<th>Type</th>
+		<th>Boards</th>
+		<th>Last action</th>
+		<th>&hellip;</th>
+	</tr>
+	
+	{% for user in users %}
+		<tr>
+			<td><small>{{ user.id }}</small></td>
+			<td>{{ user.username }}</td>
+			<td>
+				{% if user.type == constant('JANITOR') %}Janitor
+				{% elseif user.type == constant('MOD') %}Mod
+				{% elseif user.type == constant('ADMIN') %}Admin
+				{% endif %}
+			</td>
+			<td>
+				{# This is really messy, but IMO it beats doing it in PHP. #}
+				{% set boards = user.boards|split(',') %}
+				{% set _boards = [] %}
+				{% for board in boards %}
+					{% set _boards = _boards|push(board == '*' ? '*' : config.board_abbreviation|sprintf(board)) %}
+				{% endfor %}
+				{% set _boards = _boards|sort %}
+				{{ _boards|join(', ') }}
+			</td>
+			<td>
+				{% if mod|hasPermission(config.mod.modlog) %}
+					<span title="{{ user.action|e }}">{{ user.last|ago }}</span>
+				{% else %}
+					&ndash;
+				{% endif %}
+			</td>
+			<td>
+				{% if mod|hasPermission(config.mod.promoteusers) and user.type < constant('ADMIN') %}
+					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote" title="Promote">&#9650;</a> 
+				{% endif %}
+				{% if mod|hasPermission(config.mod.promoteusers) and user.type > constant('JANITOR') %}
+					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/demote" title="Demote">&#9660;</a> 
+				{% endif %}
+				{% if mod|hasPermission(config.editusers) or (mod|hasPermission(config.change_password) and mod.id == user.id) %}
+					<a class="unimportant" style="margin-left:5px;float:right" href="?/users/{{ user.id }}">[edit]</a> 
+				{% endif %}
+				{% if mod|hasPermission(config.mod.create_pm) %}
+					<a class="unimportant" style="margin-left:5px;float:right" href="?/new_PM/{{ user.username }}">[PM]</a>
+				{% endif %}
+			</td>
+		</tr>
+	{% endfor %}
+</table>
-- 
cgit v1.3


From 87281687ed3ed06fd76d7bbb6c29404bb883418a Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 14 Apr 2012 22:28:21 +1000
Subject: promote/demote users, started on rebuild

---
 inc/mod/pages.php          | 67 ++++++++++++++++++++++++++++++++++++-------
 inc/template.php           |  2 +-
 mod.php                    |  3 ++
 templates/mod/rebuild.html | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 templates/mod/users.html   |  6 +++-
 5 files changed, 136 insertions(+), 13 deletions(-)
 create mode 100644 templates/mod/rebuild.html

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 4903567a..d78ebf0d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -143,7 +143,12 @@ function mod_page_ip($ip) {
 	}
 	
 	if (isset($_POST['note'])) {
-		// TODO: permissions
+		if (hasPermission($config['mod']['create_notes'])) {
+			$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+			$query->bindValue(':ip', $ip);
+			$query->execute() or error(db_error($query));
+			$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
+		}
 		
 		markup($_POST['note']);
 		$query = prepare('INSERT INTO `ip_notes` VALUES (NULL, :ip, :mod, :time, :body)');
@@ -194,20 +199,30 @@ function mod_page_ip($ip) {
 	
 	$args['boards'] = $boards;
 	
-	$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
-	$query->bindValue(':ip', $ip);
-	$query->execute() or error(db_error($query));
-	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	$query = prepare("SELECT `ip_notes`.*, `username` FROM `ip_notes` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
-	$query->bindValue(':ip', $ip);
-	$query->execute() or error(db_error($query));
-	$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	if (hasPermission($config['mod']['view_ban'])) {
+		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+		$query->bindValue(':ip', $ip);
+		$query->execute() or error(db_error($query));
+		$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	}
+	
+	if (hasPermission($config['mod']['view_notes'])) {
+		$query = prepare("SELECT `ip_notes`.*, `username` FROM `ip_notes` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
+		$query->bindValue(':ip', $ip);
+		$query->execute() or error(db_error($query));
+		$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	}
 	
 	mod_page("IP: $ip", 'mod/view_ip.html', $args);
 }
 
 function mod_ban() {
+	global $config;
+	
+	if (!hasPermission($config['mod']['ban']))
+		error($config['error']['noaccess']);
+	
 	if (!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'])) {
 		mod_page("New ban", 'mod/ban_form.html', array());
 		return;
@@ -263,6 +278,19 @@ function mod_users() {
 	mod_page('Manage users', 'mod/users.html', $args);
 }
 
+function mod_user_promote($uid, $action) {
+	global $config;
+	
+	if (!hasPermission($config['mod']['promoteusers']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare("UPDATE `mods` SET `type` = `type` " . ($action == 'promote' ? "+1 WHERE `type` < " . (int)ADMIN : "-1 WHERE `type` > " . (int)JANITOR) . " AND `id` = :id");
+	$query->bindValue(':id', $uid);
+	$query->execute() or error(db_error($query));
+	
+	header('Location: ?/users', true, $config['redirect_http']);
+}
+
 function mod_new_pm($username) {
 	global $config, $mod;
 	
@@ -272,8 +300,16 @@ function mod_new_pm($username) {
 	$query = prepare("SELECT `id` FROM `mods` WHERE `username` = :username");
 	$query->bindValue(':username', $username);
 	$query->execute() or error(db_error($query));
-	if (!$id = $query->fetchColumn(0))
-		error($config['error']['404']);
+	if (!$id = $query->fetchColumn(0)) {
+		// Old style ?/PM: by user ID
+		$query = prepare("SELECT `username` FROM `mods` WHERE `id` = :username");
+		$query->bindValue(':username', $username);
+		$query->execute() or error(db_error($query));
+		if ($username = $query->fetchColumn(0))
+			header('Location: ?/new_PM/' . $username, true, $config['redirect_http']);
+		else
+			error($config['error']['404']);
+	}
 	
 	if (isset($_POST['message'])) {
 		markup($_POST['message']);
@@ -291,3 +327,12 @@ function mod_new_pm($username) {
 	mod_page("New PM for {$username}", 'mod/new_pm.html', array('username' => $username, 'id' => $id));
 }
 
+function mod_rebuild() {
+	global $config;
+	
+	if (!hasPermission($config['mod']['rebuild']))
+		error($config['error']['noaccess']);
+	
+	mod_page("Rebuild", 'mod/rebuild.html', array('boards' => listBoards()));
+}
+
diff --git a/inc/template.php b/inc/template.php
index ab220454..8d679d25 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -26,7 +26,7 @@ function load_twig() {
 	$loader->setPaths($config['dir']['template']);
 	$twig = new Twig_Environment($loader, array(
 		'autoescape' => false,
-		//'cache' => "{$config['dir']['template']}/cache",
+		'cache' => "{$config['dir']['template']}/cache",
 		'debug' => ($config['debug'] ? true : false),
 	));
 	$twig->addExtension(new Twig_Extensions_Extension_Tinyboard());
diff --git a/mod.php b/mod.php
index e7134603..f641d371 100644
--- a/mod.php
+++ b/mod.php
@@ -28,8 +28,11 @@ $pages = array(
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
 
 	'!^/users$!'				=> 'users',		// manage users
+	'!^/users/(\d+)/(promote|demote)$!'	=> 'user_promote',	// prmote/demote user
 	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
 	
+	'!^/rebuild$!'				=> 'rebuild',		// rebuild static files
+	
 	'!^/ban$!'				=> 'ban',		// new ban
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
 	'!^/IP/([\w.:]+)/remove_note/(\d+)$!'	=> 'ip_remove_note',	// remove note from ip address
diff --git a/templates/mod/rebuild.html b/templates/mod/rebuild.html
new file mode 100644
index 00000000..763eb624
--- /dev/null
+++ b/templates/mod/rebuild.html
@@ -0,0 +1,71 @@
+<form style="width:200px;margin:auto" action="?/rebuild" method="post">
+	<ul id="rebuild">
+		<li style="margin-bottom:8px">
+			<input type="checkbox" name="rebuild_all" id="rebuild_all" onchange="toggleall(this.checked)"> 
+			<label for="rebuild_all"><strong>Toggle all</strong></label>
+			<script>
+				function toggleall(val) {
+					/* TODO: something more suitable for all browsers? */
+					var elements = document.getElementById('rebuild').querySelectorAll('input');
+					for (i in elements) {
+						elements[i].checked = val;
+					}
+				}
+			</script>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_cache" id="rebuild_cache" checked> 
+			<label for="rebuild_cache">Flush cache</label>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_javascript" id="rebuild_javascript" checked> 
+			<label for="rebuild_javascript">Rebuild Javascript</label>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_index" id="rebuild_index" checked> 
+			<label for="rebuild_index">Rebuild index pages</label>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_thread" id="rebuild_thread" checked> 
+			<label for="rebuild_thread">Rebuild thread pages</label>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_themes" id="rebuild_themes" checked> 
+			<label for="rebuild_themes">Rebuild themes</label>
+		</li>
+		<li>
+			<input type="checkbox" name="rebuild_posts" id="rebuild_posts"> 
+			<label for="rebuild_posts">Rebuild replies</label>
+		</li>
+	</ul>
+	
+	<hr>
+	
+	<ul id="boards">
+		<li style="margin-bottom:8px">
+			<input type="checkbox" name="boards_all" id="boards_all" onchange="toggleallboards(this.checked)" checked> 
+			<label for="boards_all"><strong>All boards</strong></label>
+			<script>
+				function toggleallboards(val) {
+					/* TODO: something more suitable for all browsers? */
+					var elements = document.getElementById('boards').querySelectorAll('input');
+					for (i in elements) {
+						elements[i].checked = val;
+					}
+				}
+			</script>
+		</li>
+		{% for board in boards %}
+			<li>
+				<input type="checkbox" name="board_{{ board.uri }}" id="board-{{ board.uri }}" checked> 
+				<label for="board-{{ board.uri }}">
+					{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title }}
+				</label>
+			</li>
+		{% endfor %}
+	</ul>
+	
+	<p style="text-align:center">
+		<input type="submit" value="Rebuild">
+	</p>
+</form>
diff --git a/templates/mod/users.html b/templates/mod/users.html
index aeacc8b5..63d799d5 100644
--- a/templates/mod/users.html
+++ b/templates/mod/users.html
@@ -30,7 +30,11 @@
 			</td>
 			<td>
 				{% if mod|hasPermission(config.mod.modlog) %}
-					<span title="{{ user.action|e }}">{{ user.last|ago }}</span>
+					{% if user.last %}
+						<span title="{{ user.action|e }}">{{ user.last|ago }}</span>
+					{% else %}
+						<em>never</em>
+					{% endif %}
 				{% else %}
 					&ndash;
 				{% endif %}
-- 
cgit v1.3


From de8cc487d81e7cb9a00acee30962aa1933c0c0c6 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 14 Apr 2012 22:58:36 +1000
Subject: rebuild

---
 inc/mod/pages.php          | 62 ++++++++++++++++++++++++++++++++++++++++------
 templates/mod/rebuild.html |  2 +-
 templates/mod/rebuilt.html | 12 +++++++++
 3 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 templates/mod/rebuilt.html

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index d78ebf0d..d8352671 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -117,6 +117,9 @@ function mod_view_thread($boardName, $thread) {
 function mod_ip_remove_note($ip, $id) {
 	global $config, $mod;
 	
+	if (!hasPermission($config['mod']['remove_notes']))
+			error($config['error']['noaccess']);
+	
 	if (filter_var($ip, FILTER_VALIDATE_IP) === false)
 		error("Invalid IP address.");
 	
@@ -135,6 +138,9 @@ function mod_page_ip($ip) {
 		error("Invalid IP address.");
 	
 	if (isset($_POST['ban_id'], $_POST['unban'])) {
+		if (!hasPermission($config['mod']['unban']))
+			error($config['error']['noaccess']);
+		
 		require_once 'inc/mod/ban.php';
 		
 		unban($_POST['ban_id']);
@@ -143,12 +149,8 @@ function mod_page_ip($ip) {
 	}
 	
 	if (isset($_POST['note'])) {
-		if (hasPermission($config['mod']['create_notes'])) {
-			$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
-			$query->bindValue(':ip', $ip);
-			$query->execute() or error(db_error($query));
-			$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
-		}
+		if (!hasPermission($config['mod']['create_notes']))
+			error($config['error']['noaccess']);
 		
 		markup($_POST['note']);
 		$query = prepare('INSERT INTO `ip_notes` VALUES (NULL, :ip, :mod, :time, :body)');
@@ -328,11 +330,57 @@ function mod_new_pm($username) {
 }
 
 function mod_rebuild() {
-	global $config;
+	global $config, $twig;
 	
 	if (!hasPermission($config['mod']['rebuild']))
 		error($config['error']['noaccess']);
 	
+	if (isset($_POST['rebuild'])) {
+		$log = array();
+		$boards = listBoards();
+		$rebuilt_scripts = array();
+		
+		if (isset($_POST['rebuild_cache'])) {
+			$log[] = 'Clearing template cache';
+			load_twig();
+			$twig->clearCacheFiles();
+		}
+		
+		if (isset($_POST['rebuild_themes'])) {
+			$log[] = 'Regenerating theme files';
+			rebuildThemes('all');
+		}
+		
+		if (isset($_POST['rebuild_javascript'])) {
+			$log[] = 'Rebuilding <strong>' . $config['file_script'] . '</strong>';
+			buildJavascript();
+			$rebuilt_scripts[] = $config['file_script'];
+		}
+		
+		foreach ($boards as $board) {
+			if (!(isset($_POST['boards_all']) || isset($_POST['boards_' . $board['uri']])))
+				continue;
+			
+			openBoard($board['uri']);
+			$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Creating index pages';
+			
+			if (!in_array($config['file_script'], $rebuilt_scripts)) {
+				$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Rebuilding <strong>' . $config['file_script'] . '</strong>';
+				buildJavascript();
+				$rebuilt_scripts[] = $config['file_script'];
+			}
+			
+			$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
+			while($post = $query->fetch()) {
+				$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Rebuilding thread #' . $post['id'];
+				buildThread($post['id']);
+			}
+		}
+		
+		mod_page("Rebuild", 'mod/rebuilt.html', array('logs' => $log));
+		return;
+	}
+	
 	mod_page("Rebuild", 'mod/rebuild.html', array('boards' => listBoards()));
 }
 
diff --git a/templates/mod/rebuild.html b/templates/mod/rebuild.html
index 763eb624..7a586b95 100644
--- a/templates/mod/rebuild.html
+++ b/templates/mod/rebuild.html
@@ -66,6 +66,6 @@
 	</ul>
 	
 	<p style="text-align:center">
-		<input type="submit" value="Rebuild">
+		<input type="submit" value="Rebuild" name="rebuild">
 	</p>
 </form>
diff --git a/templates/mod/rebuilt.html b/templates/mod/rebuilt.html
new file mode 100644
index 00000000..8cc10bf9
--- /dev/null
+++ b/templates/mod/rebuilt.html
@@ -0,0 +1,12 @@
+<div class="ban">
+	<h2>Rebuilt</h2>
+	<ul>
+		{% for log in logs %}
+			<li>{{ log }}</li>
+		{% endfor %}
+	</ul>
+	<p>
+		<a href="?/rebuild">Go back and rebuild again</a>.
+	</p>
+</div>
+
-- 
cgit v1.3


From fb3e8191328c12bc1ab5bce8a3aef58582ee1a64 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 15 Apr 2012 20:06:24 +1000
Subject: styling of ?/rebuild

---
 templates/mod/rebuild.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/mod/rebuild.html b/templates/mod/rebuild.html
index 7a586b95..856855d7 100644
--- a/templates/mod/rebuild.html
+++ b/templates/mod/rebuild.html
@@ -1,4 +1,4 @@
-<form style="width:200px;margin:auto" action="?/rebuild" method="post">
+<form style="width:300px;margin:auto" action="?/rebuild" method="post">
 	<ul id="rebuild">
 		<li style="margin-bottom:8px">
 			<input type="checkbox" name="rebuild_all" id="rebuild_all" onchange="toggleall(this.checked)"> 
-- 
cgit v1.3


From ad55a634bf3f9301489f5371942c73940361a24c Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 16:40:24 +1000
Subject: various improvements

---
 inc/mod/ban.php             |  41 +++++++++--------
 inc/mod/pages.php           | 105 +++++++++++++++++++++++++++++++++++++++-----
 mod.php                     |   4 +-
 stylesheets/style.css       |  15 ++++---
 templates/mod/ban_list.html |  74 +++++++++++++++++++++++++++++++
 templates/mod/new_pm.html   |   4 +-
 templates/mod/pm.html       |  41 +++++++++++++++++
 7 files changed, 247 insertions(+), 37 deletions(-)
 create mode 100644 templates/mod/ban_list.html
 create mode 100644 templates/mod/pm.html

(limited to 'templates')

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index 8d86cbcd..e7110edf 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -16,44 +16,45 @@ function parse_time($str) {
 	if (($time = @strtotime($str)) !== false)
 		return $time;
 	
-	if (!preg_match('/^((\d+)\s*ye?a?r?s?)?\s*+((\d+)\s*mon?t?h?s?)?\s*((\d+)\s*we?e?k?s?)?\s*((\d+)\s*da?y?s?)?((\d+)\s*ho?u?r?s?)?\s*((\d+)\s*mi?n?u?t?e?s?)?\s*+((\d+)\s*se?c?o?n?d?s?)?$/', $str, $matches))
+	if (!preg_match('/^((\d+)\s?ye?a?r?s?)?\s?+((\d+)\s?mon?t?h?s?)?\s?+((\d+)\s?we?e?k?s?)?\s?+((\d+)\s?da?y?s?)?((\d+)\s?ho?u?r?s?)?\s?+((\d+)\s?mi?n?u?t?e?s?)?\s?+((\d+)\s?se?c?o?n?d?s?)?$/', $str, $matches))
 		return false;
-	$expire = time();
 	
-	if (isset($m[2])) {
+	$expire = 0;
+	
+	if (isset($matches[2])) {
 		// Years
-		$expire += $m[2]*60*60*24*365;
+		$expire += $matches[2]*60*60*24*365;
 	}
-	if (isset($m[4])) {
+	if (isset($matches[4])) {
 		// Months
-		$expire += $m[4]*60*60*24*30;
+		$expire += $matches[4]*60*60*24*30;
 	}
-	if (isset($m[6])) {
+	if (isset($matches[6])) {
 		// Weeks
-		$expire += $m[6]*60*60*24*7;
+		$expire += $matches[6]*60*60*24*7;
 	}
-	if (isset($m[8])) {
+	if (isset($matches[8])) {
 		// Days
-		$expire += $m[8]*60*60*24;
+		$expire += $matches[8]*60*60*24;
 	}
-	if (isset($m[10])) {
+	if (isset($matches[10])) {
 		// Hours
-		$expire += $m[10]*60*60;
+		$expire += $matches[10]*60*60;
 	}
-	if (isset($m[12])) {
+	if (isset($matches[12])) {
 		// Minutes
-		$expire += $m[12]*60;
+		$expire += $matches[12]*60;
 	}
-	if (isset($m[14])) {
+	if (isset($matches[14])) {
 		// Seconds
-		$expire += $m[14];
+		$expire += $matches[14];
 	}
 	
-	return $expire;
+	return time() + $expire;
 }
 
 function ban($mask, $reason, $length, $board) {
-	global $mod;
+	global $mod, $pdo;
 	
 	// TODO: permissions
 	
@@ -78,6 +79,8 @@ function ban($mask, $reason, $length, $board) {
 		$query->bindValue(':board', null, PDO::PARAM_NULL);
 	
 	$query->execute() or error(db_error($query));
+	
+	modLog('Created a new ban (<small>#' . $pdo->lastInsertId() . '</small>) for <strong>' . utf8tohtml($mask) . '</strong> with ' . ($reason ? 'reason: <small>' . $reason . '</small>' : 'no reason'));
 }
 
 function unban($id) {
@@ -86,5 +89,7 @@ function unban($id) {
 	$query = prepare("DELETE FROM `bans` WHERE `id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
+	
+	modLog("Removed ban #{$id}");
 }
 
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 7518b9fb..60f101ea 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -39,7 +39,7 @@ function mod_login() {
 			
 			$args['error'] = $config['error']['invalid'];
 		} else {
-			modLog("Logged in.");
+			modLog('Logged in');
 			
 			// Login successful
 			// Set cookies
@@ -101,6 +101,7 @@ function mod_view_board($boardName, $page_no = 1) {
 	$page['btn'] = getPageButtons($page['pages'], true);
 	$page['mod'] = true;
 	$page['config'] = $config;
+	
 	echo Element('index.html', $page);
 }
 
@@ -128,6 +129,8 @@ function mod_ip_remove_note($ip, $id) {
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
 	
+	modLog("Removed a note for <a href=\"?/IP/{$ip}\">{$ip}</a>");
+	
 	header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
 }
 
@@ -160,6 +163,8 @@ function mod_page_ip($ip) {
 		$query->bindValue(':body', $_POST['note']);
 		$query->execute() or error(db_error($query));
 		
+		modLog("Added a note for <a href=\"?/IP/{$ip}\">{$ip}</a>");
+		
 		header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
 		return;
 	}
@@ -177,8 +182,9 @@ function mod_page_ip($ip) {
 		$query->bindValue(':limit', $config['mod']['ip_recentposts'], PDO::PARAM_INT);
 		$query->execute() or error(db_error($query));
 		
-		while ($post = $query->fetch()) {
+		while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 			if (!$post['thread']) {
+				// TODO: There is no reason why this should be such a fucking mess.
 				$po = new Thread(
 					$post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['capcode'], $post['body'],
 					$post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'],
@@ -230,13 +236,6 @@ function mod_ban() {
 		return;
 	}
 	
-	$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` WHERE `ip` = :ip");
-	$query->bindValue(':ip', $ip);
-	$query->execute() or error(db_error($query));
-	$args['bans'] = $query->fetchAll(PDO::FETCH_ASSOC);
-	
-	$ip = $_POST['ip'];
-	
 	require_once 'inc/mod/ban.php';
 	
 	ban($_POST['ip'], $_POST['reason'], parse_time($_POST['length']), $_POST['board'] == '*' ? false : $_POST['board']);
@@ -247,6 +246,51 @@ function mod_ban() {
 		header('Location: ?/', true, $config['redirect_http']);
 }
 
+function mod_bans() {
+	global $config;
+	
+	if (!hasPermission($config['mod']['view_banlist']))
+		error($config['error']['noaccess']);
+	
+	if (isset($_POST['unban'])) {
+		if (!hasPermission($config['mod']['unban']))
+			error($config['error']['noaccess']);
+		
+		$unban = array();
+		foreach ($_POST as $name => $unused) {
+			if (preg_match('/^ban_(\d+)$/', $name, $match))
+				$unban[] = $match[1];
+		}
+		
+		query('DELETE FROM `bans` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
+		
+		foreach ($unban as $id) {
+			modLog("Removed ban #{$id}");
+		}
+		
+		header('Location: ?/bans', true, $config['redirect_http']);
+	}
+	
+	if ($config['mod']['view_banexpired']) {
+		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY (`expires` IS NOT NULL AND `expires` < :time), `set` DESC");
+		$query->bindValue(':time', time(), PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+	} else {
+		// Filter out expired bans
+		$query = prepare("SELECT `bans`.*, `username` FROM `bans` INNER JOIN `mods` ON `mod` = `mods`.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC");
+		$query->bindValue(':time', time(), PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+	}
+	$bans = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	foreach ($bans as &$ban) {
+		if (filter_var($ban['ip'], FILTER_VALIDATE_IP) !== false)
+			$ban['real_ip'] = true;
+	}
+	
+	mod_page('Ban list', 'mod/ban_list.html', array('bans' => $bans));
+}
+
 function mod_delete($board, $post) {
 	global $config, $mod;
 	
@@ -290,9 +334,48 @@ function mod_user_promote($uid, $action) {
 	$query->bindValue(':id', $uid);
 	$query->execute() or error(db_error($query));
 	
+	modLog(($action == 'promote' ? 'Promoted' : 'Demoted') . " user #{$uid}");
+	
 	header('Location: ?/users', true, $config['redirect_http']);
 }
 
+function mod_pm($id, $reply = false) {
+	global $mod, $config;
+	
+	$query = prepare("SELECT `mods`.`username`, `mods_to`.`username` AS `to_username`, `pms`.* FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` LEFT JOIN `mods` AS `mods_to` ON `mods_to`.`id` = `to` WHERE `pms`.`id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	if ((!$pm = $query->fetch(PDO::FETCH_ASSOC)) || ($pm['to'] != $mod['id'] && !hasPermission($config['mod']['master_pm'])))
+		error($config['error']['404']);
+	
+	if (isset($_POST['delete'])) {
+		$query = prepare("DELETE FROM `pms` WHERE `id` = :id");
+		$query->bindValue(':id', $id);
+		$query->execute() or error(db_error($query));
+		
+		header('Location: ?/', true, $config['redirect_http']);
+		return;
+	}
+	
+	if ($pm['unread'] && $pm['to'] == $mod['id']) {
+		$query = prepare("UPDATE `pms` SET `unread` = 0 WHERE `id` = :id");
+		$query->bindValue(':id', $id);
+		$query->execute() or error(db_error($query));
+		
+		modLog('Read a PM');
+	}
+	
+	if ($reply) {
+		if (!$pm['to_username'])
+			error($config['error']['404']); // deleted?
+		
+		mod_page("New PM for {$pm['to_username']}", 'mod/new_pm.html', array('username' => $pm['to_username'], 'id' => $pm['to'], 'message' => quote($pm['message'])));
+	} else {
+		mod_page("Private message &ndash; #$id", 'mod/pm.html', $pm);
+	}
+}
+
 function mod_new_pm($username) {
 	global $config, $mod;
 	
@@ -323,6 +406,8 @@ function mod_new_pm($username) {
 		$query->bindValue(':time', time());
 		$query->execute() or error(db_error($query));
 		
+		modLog('Sent a PM to ' . utf8tohtml($username));
+		
 		header('Location: ?/', true, $config['redirect_http']);
 	}
 	
@@ -371,7 +456,7 @@ function mod_rebuild() {
 			}
 			
 			$query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error());
-			while($post = $query->fetch()) {
+			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$log[] = '<strong>' . sprintf($config['board_abbreviation'], $board['uri']) . '</strong>: Rebuilding thread #' . $post['id'];
 				buildThread($post['id']);
 			}
diff --git a/mod.php b/mod.php
index f641d371..6fc216f8 100644
--- a/mod.php
+++ b/mod.php
@@ -26,16 +26,18 @@ $pages = array(
 	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
 	'!^/log$!'				=> 'log',		// modlog
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
-
+	
 	'!^/users$!'				=> 'users',		// manage users
 	'!^/users/(\d+)/(promote|demote)$!'	=> 'user_promote',	// prmote/demote user
 	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
+	'!^/PM/(\d+)(/reply)?$!'		=> 'pm',		// read a pm
 	
 	'!^/rebuild$!'				=> 'rebuild',		// rebuild static files
 	
 	'!^/ban$!'				=> 'ban',		// new ban
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
 	'!^/IP/([\w.:]+)/remove_note/(\d+)$!'	=> 'ip_remove_note',	// remove note from ip address
+	'!^/bans$!'				=> 'bans',		// ban list
 	
 	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
 	
diff --git a/stylesheets/style.css b/stylesheets/style.css
index d77f05b5..edebf0c1 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -68,15 +68,18 @@ form table input {
 }
 input[type="text"], input[type="password"], textarea {
 	border: 1px solid #a9a9a9;
-	text-indent: 0px;
+	text-indent: 0;
 	text-shadow: none;
 	text-transform: none;
 	word-spacing: normal;
 }
 form table tr td {
 	text-align: left;
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
+}
+form table.mod tr td {
+	padding: 2px;
 }
 form table tr th {
 	text-align: left;
@@ -102,7 +105,7 @@ form table tr td div label {
 }
 p.fileinfo {
 	display: block;
-	margin: 0px;
+	margin: 0;
 	padding-right: 7em;
 }
 div.banner {
@@ -326,7 +329,7 @@ div.pages form input {
 hr {
 	border: none;
 	border-top: 1px solid #B7C5D9;
-	height: 0px;
+	height: 0;
 	clear: left;
 }
 div.boardlist {
@@ -349,7 +352,7 @@ table.modlog {
 }
 table.modlog tr td {
 	text-align: left;
-	margin: 0px;
+	margin: 0;
 	padding: 4px 15px 0 0;
 }
 table.modlog tr th {
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
new file mode 100644
index 00000000..00b8a0f4
--- /dev/null
+++ b/templates/mod/ban_list.html
@@ -0,0 +1,74 @@
+{% if bans|count == 0 %}
+	<p style="text-align:center" class="unimportant">(There are no active bans.)</p>
+{% else %}
+	<form action="" method="post">
+		<table class="mod">
+			<tr>
+				<th>{% trans %}IP address{% endtrans %}</th>
+				<th>{% trans %}Reason{% endtrans %}</th>
+				<th>{% trans %}Board{% endtrans %}</th>
+				<th>{% trans %}Set{% endtrans %}</th>
+				<th>{% trans %}Expires{% endtrans %}</th>
+				<th>{% trans %}Staff{% endtrans %}</th>
+			</tr>
+			{% for ban in bans %}
+				<tr{% if ban.expires != 0 and ban.expires < time() %} style="text-decoration:line-through"{% endif %}>
+					<td style="white-space: nowrap">
+						<input type="checkbox" name="ban_{{ ban.id }}"> 
+						{% if ban.real_ip %}
+							<a href="?/IP/{{ ban.ip }}">{{ ban.ip }}</a>
+						{% else %}
+							{{ ban.ip|e }}
+						{% endif %}
+					</td>
+					<td>
+						{% if ban.reason %}
+							{{ ban.reason }}
+						{% else %}
+							-
+						{% endif %}
+					</td>
+					<td  style="white-space: nowrap">
+						{% if ban.board %}
+							{{ config.board_abbreviation|sprintf(ban.board) }}
+						{% else %}
+							<em>{% trans %}all boards{% endtrans %}
+						{% endif %}					
+					</td>
+					<td style="white-space: nowrap">
+						{{ ban.set|date(config.post_date) }}
+					</td>
+					<td style="white-space: nowrap">
+						{% if ban.expires == 0 %}
+							<em>never</em>
+						{% else %}
+							{{ ban.expires|date(config.post_date) }} 
+							{% if ban.expires > time() %}
+								<small>({{ ban.expires|until }})</small>
+							{% endif %}
+						{% endif %}
+					</td>
+					<td>
+						{% if ban.username %}
+							{% if mod|hasPermission(config.mod.view_banstaff) %}
+								<a href="?/new_PM/{{ ban.username|e }}">{{ ban.username|e }}</a>
+							{% else %}
+								{% if mod|hasPermission(config.mod.view_banquestionmark) %}
+									<em>?</em>
+								{% else %}
+							
+								{% endif %}
+							{% endif %}
+						{% else %}
+							<em>deleted?</em>
+						{% endif %}
+					</td>
+				</tr>
+			{% endfor %}
+		</table>
+		
+		<p style="text-align:center">
+			<input type="submit" name="unban" value="Unban selected">
+		</p>
+	</form>
+{% endif %}
diff --git a/templates/mod/new_pm.html b/templates/mod/new_pm.html
index d694bc26..ece1325c 100644
--- a/templates/mod/new_pm.html
+++ b/templates/mod/new_pm.html
@@ -2,7 +2,7 @@
 	{% set username = 'me' %}
 {% endif %}#}
 
-<form action="" method="post">
+<form action="?/new_PM/{{ username|e }}" method="post">
 	<table>
 		<tr>
 			<th>To</th>
@@ -14,7 +14,7 @@
 		</tr>
 		<tr>
 			<th>Message</th>
-			<td><textarea name="message" rows="10" cols="40"></textarea></td>
+			<td><textarea name="message" rows="10" cols="40">{{ message }}</textarea></td>
 		</tr>
 	</table>
 
diff --git a/templates/mod/pm.html b/templates/mod/pm.html
new file mode 100644
index 00000000..511bcfef
--- /dev/null
+++ b/templates/mod/pm.html
@@ -0,0 +1,41 @@
+<form action="" method="post">
+	<table>
+		<tr>
+			<th>From</th>
+			{% if username %}
+				<td><a href="?/new_PM/{{ username|e }}">{{ username|e }}</a></td>
+			{% else %}
+				<td><em>deleted?</em></td>
+			{% endif %}
+		</tr>
+		{% if to != mod.id %}
+			<tr>
+				<th>To</th>
+				{% if to_username %}
+					<td><a href="?/new_PM/{{ to_username|e }}">{{ to_username|e }}</a></td>
+				{% else %}
+					<td><em>deleted?</em></td>
+				{% endif %}
+			</tr>
+		{% endif %}
+		<tr>
+			<th>Date</th>
+			<td>{{ time|date(config.post_date) }}</td>
+		</tr>
+		<tr>
+			<th>Message</th>
+			<td>{{ message }}</td>
+		</tr>
+	</table>
+	
+	<ul style="list-style:none;text-align:center;padding:0">
+		<li style="padding:5px 0">
+			<input type="submit" name="delete" value="Delete forever">
+		</li>
+		<li style="padding:5px 0">
+			<a href="?/PM/{{ id }}/reply">
+				Reply with quote
+			</a>
+		</li>
+	</ul>
+</form>
-- 
cgit v1.3


From 41e1a2481b4d2b3217b667063d9bf5115dfec9ab Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 17:28:57 +1000
Subject: report queue

---
 inc/mod/pages.php          | 121 +++++++++++++++++++++++++++++++++++++++++++++
 inc/template.php           |   2 +-
 mod.php                    |   2 +
 templates/mod/report.html  |  26 ++++++++++
 templates/mod/reports.html |   5 ++
 5 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 templates/mod/report.html
 create mode 100644 templates/mod/reports.html

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 60f101ea..2532e2e7 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -469,3 +469,124 @@ function mod_rebuild() {
 	mod_page("Rebuild", 'mod/rebuild.html', array('boards' => listBoards()));
 }
 
+function mod_reports() {
+	global $config, $mod;
+	
+	if (!hasPermission($config['mod']['reports']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare("SELECT * FROM `reports` ORDER BY `time` DESC LIMIT :limit");
+	$query->bindValue(':limit', $config['mod']['recent_reports'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$reports = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	$report_queries = array();
+	foreach ($reports as $report) {
+		if (!isset($report_queries[$report['board']]))
+			$report_queries[$report['board']] = array();
+		$report_queries[$report['board']][] = $report['post'];
+	}
+	
+	$report_posts = array();
+	foreach ($report_queries as $board => $posts) {
+		$report_posts[$board] = array();
+		
+		$query = query(sprintf('SELECT * FROM `posts_%s` WHERE `id` = ' . implode(' OR `id` = ', $posts), $board)) or error(db_error());
+		while ($post = $query->fetch()) {
+			$report_posts[$board][$post['id']] = $post;
+		}
+	}
+	
+	$body = '';
+	foreach ($reports as $report) {
+		if (!isset($report_posts[$report['board']][$report['post']])) {
+			// // Invalid report (post has since been deleted)
+			$query = prepare("DELETE FROM `reports` WHERE `post` = :id AND `board` = :board");
+			$query->bindValue(':id', $report['post'], PDO::PARAM_INT);
+			$query->bindValue(':board', $report['board']);
+			$query->execute() or error(db_error($query));
+			continue;
+		}
+		
+		openBoard($report['board']);
+		
+		$post = &$report_posts[$report['board']][$report['post']];
+		
+		if (!$post['thread']) {
+			// Still need to fix this:
+			$po = new Thread(
+				$post['id'], $post['subject'], $post['email'], $post['name'], $post['trip'],
+				$post['capcode'], $post['body'], $post['time'], $post['thumb'],
+				$post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'],
+				$post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $post['sticky'],
+				$post['locked'], $post['sage'], $post['embed'], '?/', $mod, false
+			);
+		} else {
+			$po = new Post(
+				$post['id'], $post['thread'], $post['subject'], $post['email'], $post['name'], $post['trip'], $post['capcode'],
+				$post['body'], $post['time'], $post['thumb'], $post['thumbwidth'], $post['thumbheight'], $post['file'], $post['filewidth'],
+				$post['fileheight'], $post['filesize'], $post['filename'], $post['ip'], $post['embed'], '?/', $mod
+			);
+		}
+		
+		// a little messy and inefficient
+		$append_html = Element('mod/report.html', array('report' => $report, 'config' => $config, 'mod' => $mod));
+		
+		// Bug fix for https://github.com/savetheinternet/Tinyboard/issues/21
+		$po->body = truncate($po->body, $po->link(), $config['body_truncate'] - substr_count($append_html, '<br>'));
+		
+		if (mb_strlen($po->body) + mb_strlen($append_html) > $config['body_truncate_char']) {
+			// still too long; temporarily increase limit in the config
+			$__old_body_truncate_char = $config['body_truncate_char'];
+			$config['body_truncate_char'] = mb_strlen($po->body) + mb_strlen($append_html);
+		}
+		
+		$po->body .= $append_html;
+		
+		$body .= $po->build(true) . '<hr>';
+		
+		if(isset($__old_body_truncate_char))
+			$config['body_truncate_char'] = $__old_body_truncate_char;
+	}
+	
+	mod_page("Report queue", 'mod/reports.html', array('reports' => $body));
+}
+
+function mod_report_dismiss($id, $all = false) {
+	global $config;
+	
+	$query = prepare("SELECT `post`, `board`, `ip` FROM `reports` WHERE `id` = :id");
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	if ($report = $query->fetch(PDO::FETCH_ASSOC)) {
+		$ip = $report['ip'];
+		$board = $report['board'];
+		$post = $report['post'];
+	} else
+		error($config['error']['404']);
+	
+	if (!$all && !hasPermission($config['mod']['report_dismiss'], $board))
+		error($config['error']['noaccess']);
+	
+	if ($all && !hasPermission($config['mod']['report_dismiss_ip'], $board))
+		error($config['error']['noaccess']);
+	
+	if ($all) {
+		$query = prepare("DELETE FROM `reports` WHERE `ip` = :ip");
+		$query->bindValue(':ip', $ip);
+	} else {
+		$query = prepare("DELETE FROM `reports` WHERE `id` = :id");
+		$query->bindValue(':id', $id);
+	}
+	$query->execute() or error(db_error($query));
+	
+	
+	if ($all)
+		modLog("Dismissed all reports by <a href=\"?/IP/$ip\">$ip</a>");
+	else
+		modLog("Dismissed a report for post #{$id}", $board);
+	
+	header('Location: ?/reports', true, $config['redirect_http']);
+}
+
+
diff --git a/inc/template.php b/inc/template.php
index 8d679d25..5355e18c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -39,7 +39,7 @@ function Element($templateFile, array $options) {
 	if (!$twig)
 		load_twig();
 	
-	if (function_exists('create_pm_header') && ((isset($options['mod']) && $options['mod']) || isset($options['__mod']))) {
+	if (function_exists('create_pm_header') && ((isset($options['mod']) && $options['mod']) || isset($options['__mod'])) && !preg_match('!^mod/!', $templateFile)) {
 		$options['pm'] = create_pm_header();
 	}
 	
diff --git a/mod.php b/mod.php
index 6fc216f8..78205bd3 100644
--- a/mod.php
+++ b/mod.php
@@ -33,6 +33,8 @@ $pages = array(
 	'!^/PM/(\d+)(/reply)?$!'		=> 'pm',		// read a pm
 	
 	'!^/rebuild$!'				=> 'rebuild',		// rebuild static files
+	'!^/reports$!'				=> 'reports',		// report queue
+	'!^/reports/(\d+)/dismiss(all)?$!'	=> 'report_dismiss',	// dismiss a report
 	
 	'!^/ban$!'				=> 'ban',		// new ban
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
diff --git a/templates/mod/report.html b/templates/mod/report.html
new file mode 100644
index 00000000..c84e3c89
--- /dev/null
+++ b/templates/mod/report.html
@@ -0,0 +1,26 @@
+<div class="report">
+	<hr>
+	Board: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
+	<br>
+	Reason: {{ report.reason }}
+	<br>
+	Report date: {{ report.time|date(config.post_date) }}
+	<br>
+	{% if mod|hasPermission(config.mod.show_ip, report.board) %}
+		Reported by: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
+		<br>
+	{% endif %}
+	{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
+		<hr>
+		{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
+			<a title="Discard abuse report" href="?/reports/{{ report.id }}/dismiss">Dismiss</a>
+		{% endif %}
+		{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
+			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
+			 | 
+			{% endif %}
+			<a title="Discard all abuse reports by this IP address" href="?/reports/{{ report.id }}/dismissall">Dismiss+</a>
+		{% endif %}
+	{% endif %}
+</div>
+
diff --git a/templates/mod/reports.html b/templates/mod/reports.html
new file mode 100644
index 00000000..37322e35
--- /dev/null
+++ b/templates/mod/reports.html
@@ -0,0 +1,5 @@
+{% if reports %}
+	{{ reports }}
+{% else %}
+	<p style="text-align:center" class="unimportant">(There are no reports.)</p>
+{% endif %}
-- 
cgit v1.3


From f0412b08140e256056fd1ea41ea1930fcc321d22 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 19:13:30 +1000
Subject: paginate ban list

---
 inc/config.php              |  2 ++
 inc/mod/pages.php           | 20 ++++++++++++--------
 mod.php                     |  1 +
 templates/mod/ban_list.html |  9 +++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 0ea25b46..2cbecdc3 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -826,6 +826,8 @@
 	
 	// How many actions to show per page in the moderation log
 	$config['mod']['modlog_page'] = 350;
+	// How many bans to show per page in the ban list
+	$config['mod']['banlist_page'] = 350;
 	
 	// Maximum number of results to display for a search, per board
 	$config['mod']['search_results'] = 75;
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 98851c52..3c3c08a4 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -246,7 +246,7 @@ function mod_ban() {
 		header('Location: ?/', true, $config['redirect_http']);
 }
 
-function mod_bans() {
+function mod_bans($page_no = 1) {
 	global $config;
 	
 	if (!hasPermission($config['mod']['view_banlist']))
@@ -272,23 +272,27 @@ function mod_bans() {
 	}
 	
 	if ($config['mod']['view_banexpired']) {
-		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY (`expires` IS NOT NULL AND `expires` < :time), `set` DESC");
-		$query->bindValue(':time', time(), PDO::PARAM_INT);
-		$query->execute() or error(db_error($query));
+		$query = prepare("SELECT `bans`.*, `username` FROM `bans` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY (`expires` IS NOT NULL AND `expires` < :time), `set` DESC LIMIT :offset, :limit");
 	} else {
 		// Filter out expired bans
-		$query = prepare("SELECT `bans`.*, `username` FROM `bans` INNER JOIN `mods` ON `mod` = `mods`.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC");
-		$query->bindValue(':time', time(), PDO::PARAM_INT);
-		$query->execute() or error(db_error($query));
+		$query = prepare("SELECT `bans`.*, `username` FROM `bans` INNER JOIN `mods` ON `mod` = `mods`.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC LIMIT :offset, :limit");
 	}
+	$query->bindValue(':time', time(), PDO::PARAM_INT);
+	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
 	$bans = $query->fetchAll(PDO::FETCH_ASSOC);
 	
+	$query = prepare("SELECT COUNT(*) FROM `bans`");
+	$query->execute() or error(db_error($query));
+	$count = $query->fetchColumn(0);
+	
 	foreach ($bans as &$ban) {
 		if (filter_var($ban['ip'], FILTER_VALIDATE_IP) !== false)
 			$ban['real_ip'] = true;
 	}
 	
-	mod_page('Ban list', 'mod/ban_list.html', array('bans' => $bans));
+	mod_page('Ban list', 'mod/ban_list.html', array('bans' => $bans, 'count' => $count));
 }
 
 function mod_delete($board, $post) {
diff --git a/mod.php b/mod.php
index 78205bd3..86169b59 100644
--- a/mod.php
+++ b/mod.php
@@ -40,6 +40,7 @@ $pages = array(
 	'!^/IP/([\w.:]+)$!'			=> 'ip',		// view ip address
 	'!^/IP/([\w.:]+)/remove_note/(\d+)$!'	=> 'ip_remove_note',	// remove note from ip address
 	'!^/bans$!'				=> 'bans',		// ban list
+	'!^/bans/(\d+)$!'			=> 'bans',		// ban list
 	
 	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
 	
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 00b8a0f4..66471d6d 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -72,3 +72,12 @@
 		</p>
 	</form>
 {% endif %}
+
+{% if count > bans|count %}
+	<p class="unimportant" style="text-align:center;word-wrap:break-word">
+		{% for i in range(0, count / config.mod.modlog_page) %}
+			<a href="?/bans/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+		{% endfor %}
+	</p>
+{% endif %}
+
-- 
cgit v1.3


From cc614e36b4135d5b8ac000bad8ed450df0e61ffe Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 20:11:10 +1000
Subject: multiple improvements

---
 inc/mod/ban.php                   |  2 +-
 inc/mod/pages.php                 | 80 ++++++++++++++++++++++++++++++++++++---
 mod.php                           | 11 +++++-
 templates/mod/dashboard.html      | 10 +++++
 templates/mod/debug/antispam.html | 42 ++++++++++++++++++++
 templates/page.html               |  2 +-
 6 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 templates/mod/debug/antispam.html

(limited to 'templates')

diff --git a/inc/mod/ban.php b/inc/mod/ban.php
index e7110edf..4d73488f 100644
--- a/inc/mod/ban.php
+++ b/inc/mod/ban.php
@@ -80,7 +80,7 @@ function ban($mask, $reason, $length, $board) {
 	
 	$query->execute() or error(db_error($query));
 	
-	modLog('Created a new ban (<small>#' . $pdo->lastInsertId() . '</small>) for <strong>' . utf8tohtml($mask) . '</strong> with ' . ($reason ? 'reason: <small>' . $reason . '</small>' : 'no reason'));
+	modLog('Created a new ban (<small>#' . $pdo->lastInsertId() . '</small>) for <strong>' . utf8tohtml($mask) . '</strong> with ' . ($reason ? 'reason: ' . utf8tohtml($reason) . '' : 'no reason'));
 }
 
 function unban($id) {
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 3c3c08a4..7e6cddfe 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -15,6 +15,7 @@ function mod_page($title, $template, $args) {
 	echo Element('page.html', array(
 		'config' => $config,
 		'mod' => $mod,
+		'hide_dashboard_link' => $template == 'mod/dashboard.html',
 		'title' => $title,
 		'body' => Element($template,
 				array_merge(
@@ -262,10 +263,12 @@ function mod_bans($page_no = 1) {
 				$unban[] = $match[1];
 		}
 		
-		query('DELETE FROM `bans` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
+		if (!empty($unban)) {
+			query('DELETE FROM `bans` WHERE `id` = ' . implode(' OR `id` = ', $unban)) or error(db_error());
 		
-		foreach ($unban as $id) {
-			modLog("Removed ban #{$id}");
+			foreach ($unban as $id) {
+				modLog("Removed ban #{$id}");
+			}
 		}
 		
 		header('Location: ?/bans', true, $config['redirect_http']);
@@ -278,8 +281,8 @@ function mod_bans($page_no = 1) {
 		$query = prepare("SELECT `bans`.*, `username` FROM `bans` INNER JOIN `mods` ON `mod` = `mods`.`id` WHERE `expires` = 0 OR `expires` > :time ORDER BY `set` DESC LIMIT :offset, :limit");
 	}
 	$query->bindValue(':time', time(), PDO::PARAM_INT);
-	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
-	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
+	$query->bindValue(':limit', $config['mod']['banlist_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['banlist_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
 	$bans = $query->fetchAll(PDO::FETCH_ASSOC);
 	
@@ -295,6 +298,58 @@ function mod_bans($page_no = 1) {
 	mod_page('Ban list', 'mod/ban_list.html', array('bans' => $bans, 'count' => $count));
 }
 
+
+function mod_lock($board, $unlock, $post) {
+	global $config;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['lock'], $board))
+		error($config['error']['noaccess']);
+	
+	$query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = :locked WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query->bindValue(':id', $post);
+	$query->bindValue(':locked', $unlock ? 0 : 1);
+	$query->execute() or error(db_error($query));
+	
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
+function mod_sticky($board, $unsticky, $post) {
+	global $config;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['sticky'], $board))
+		error($config['error']['noaccess']);
+	
+	$query = prepare(sprintf('UPDATE `posts_%s` SET `sticky` = :sticky WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query->bindValue(':id', $post);
+	$query->bindValue(':sticky', $unsticky ? 0 : 1);
+	$query->execute() or error(db_error($query));
+	
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
+function mod_bumplock($board, $unbumplock, $post) {
+	global $config;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['bumplock'], $board))
+		error($config['error']['noaccess']);
+	
+	$query = prepare(sprintf('UPDATE `posts_%s` SET `sage` = :bumplock WHERE `id` = :id AND `thread` IS NULL', $board));
+	$query->bindValue(':id', $post);
+	$query->bindValue(':bumplock', $unbumplock ? 0 : 1);
+	$query->execute() or error(db_error($query));
+	
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
 function mod_delete($board, $post) {
 	global $config, $mod;
 	
@@ -599,4 +654,19 @@ function mod_report_dismiss($id, $all = false) {
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
 
+function mod_debug_antispam() {
+	$args = array();
+	
+	$query = query('SELECT COUNT(*) FROM `antispam`') or error(db_error());
+	$args['total'] = number_format($query->fetchColumn(0));
+	
+	$query = query('SELECT COUNT(*) FROM `antispam` WHERE `expires` IS NOT NULL') or error(db_error());
+	$args['expiring'] = number_format($query->fetchColumn(0));
+	
+	$query = query('SELECT * FROM `antispam` /* WHERE `passed` > 0 */ ORDER BY `passed` DESC LIMIT 25') or error(db_error());
+	$args['top'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	mod_page("Debug: Anti-spam", 'mod/debug/antispam.html', $args);
+}
+
 
diff --git a/mod.php b/mod.php
index 86169b59..8af74a7b 100644
--- a/mod.php
+++ b/mod.php
@@ -43,10 +43,17 @@ $pages = array(
 	'!^/bans/(\d+)$!'			=> 'bans',		// ban list
 	
 	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
+	'!^/(\w+)/(un)?lock/(\d+)$!'		=> 'lock',		// lock thread
+	'!^/(\w+)/(un)?sticky/(\d+)$!'		=> 'sticky',		// sticky thread
+	'!^/(\w+)/bump(un)?lock/(\d+)$!'	=> 'bumplock',		// "bumplock" thread
+	
+	// these pages aren't listed in the dashboard without $config['debug']
+	'!^/debug/antispam$!'			=> 'debug_antispam',
 	
 	// This should always be at the end:
-	'!^/(\w+)/' . preg_quote($config['file_index'], '!') . '?$!'					=> 'view_board',
-	'!^/(\w+)/' . str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'	=> 'view_board',
+	'!^/(\w+)/$!'											=> 'view_board',
+	'!^/(\w+)/' . preg_quote($config['file_index'], '!') . '$!'					=> 'view_board',
+	'!^/(\w+)/' . str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'		=> 'view_board',
 	'!^/(\w+)/' . preg_quote($config['dir']['res'], '!') .
 			str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'	=> 'view_thread',
 );
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 2a90d709..e9290e12 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -79,3 +79,13 @@
 	
 	{# TODO #}
 </fieldset>
+
+{% if config.debug %}
+	<fieldset>
+		<legend>Debug</legend>
+		<ul>
+			<li><a href="?/debug/antispam">Anti-spam</a></li>
+		</ul>
+	</fieldset>
+{% endif %}
+
diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html
new file mode 100644
index 00000000..af5354ed
--- /dev/null
+++ b/templates/mod/debug/antispam.html
@@ -0,0 +1,42 @@
+<p style="text-align:center">
+	Most used (in active):
+</p>
+<table class="modlog" style="width:600px;margin:auto">
+	<tr>
+		<th>Board</th>
+		<th>Thread</th>
+		<th>Hash (CRC32)</th>
+		<th>Created</th>
+		<th>Expires</th>
+		<th>Passed</th>
+	</tr>
+	{% for hash in top %}
+		<tr>
+			<td>{{ config.board_abbreviation|sprintf(hash.board) }}</td>
+			<td>
+				{% if hash.thread %}
+					{{ hash.thread }}
+				{% else %}
+					-
+				{% endif %}</td>
+			<td>{{ hash.hash }}</td>
+			<td>
+				<span title="{{ hash.created|date(config.post_date) }}">{{ hash.created|ago }} ago</span>
+			</td>
+			<td>
+				{% if hash.expires %}
+					<span title="{{ hash.expires|date(config.post_date) }}">
+						{{ hash.expires|until }}
+					</span>
+				{% else %}
+					-
+				{% endif %}
+			</td>
+			<td>{{ hash.passed }}</td>
+		</tr>
+	{% endfor %}
+</table>
+<p style="text-align:center">
+	Total: <strong>{{ total }}</strong> (<strong>{{ expiring }}</strong> set to expire)
+</p>
+
diff --git a/templates/page.html b/templates/page.html
index 39d73bbd..0c0264d1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -17,7 +17,7 @@
 			{% if subtitle %}
 				{{ subtitle }}
 			{% endif %}
-			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
+			{% if mod and not hide_dashboard_link %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
 	</header>
 	{{ body }}
-- 
cgit v1.3


From a340c5b6eec89d0e023fc606081ec857f44a0b3d Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 16 Apr 2012 23:18:07 +1000
Subject: edit users

---
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |  2 +-
 inc/mod/pages.php                               | 82 ++++++++++++++++++++++
 mod.php                                         |  1 +
 templates/mod/log.html                          |  2 +-
 templates/mod/user.html                         | 93 +++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 2 deletions(-)
 create mode 100644 templates/mod/user.html

(limited to 'templates')

diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 2691cc55..df652444 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -76,7 +76,7 @@ function twig_date_filter($date, $format) {
 	return strftime($format, $date);
 }
 
-function twig_hasPermission_filter($mod, $permission, $board = false) {
+function twig_hasPermission_filter($mod, $permission, $board = null) {
 	return hasPermission($permission, $board, $mod);
 }
 
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 31c78528..e388c509 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -313,6 +313,7 @@ function mod_lock($board, $unlock, $post) {
 	$query->bindValue(':locked', $unlock ? 0 : 1);
 	$query->execute() or error(db_error($query));
 	if($query->rowCount()) {
+		modLog(($unlock ? 'Unlocked' : 'Locked') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
 	}
@@ -334,6 +335,7 @@ function mod_sticky($board, $unsticky, $post) {
 	$query->bindValue(':sticky', $unsticky ? 0 : 1);
 	$query->execute() or error(db_error($query));
 	if($query->rowCount()) {
+		modLog(($unlock ? 'Unstickied' : 'Stickied') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
 	}
@@ -355,6 +357,7 @@ function mod_bumplock($board, $unbumplock, $post) {
 	$query->bindValue(':bumplock', $unbumplock ? 0 : 1);
 	$query->execute() or error(db_error($query));
 	if($query->rowCount()) {
+		modLog(($unlock ? 'Unbumplocked' : 'Bumplocked') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
 	}
@@ -382,6 +385,85 @@ function mod_delete($board, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_user($uid) {
+	global $config, $mod;
+	
+	if (!hasPermission($config['mod']['editusers']) && !(hasPermission($config['mod']['change_password']) && $uid == $mod['id']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare('SELECT * FROM `mods` WHERE `id` = :id');
+	$query->bindValue(':id', $uid);
+	$query->execute() or error(db_error($query));
+	if (!$user = $query->fetch(PDO::FETCH_ASSOC))
+		error($config['error']['404']);
+	
+	if (hasPermission($config['mod']['editusers']) && isset($_POST['username'], $_POST['password'])) {
+		if (isset($_POST['allboards'])) {
+			$boards = array('*');
+		} else {
+			$_boards = listBoards();
+			foreach ($_boards as &$board) {
+				$board = $board['uri'];
+			}
+		
+			$boards = array();
+			foreach ($_POST as $name => $value) {
+				if (preg_match('/^board_(\w+)$/', $name, $matches) && in_array($matches[1], $_boards))
+					$boards[] = $matches[1];
+			}
+		}
+		
+		$query = prepare('UPDATE `mods` SET `username` = :username, `boards` = :boards WHERE `id` = :id');
+		$query->bindValue(':id', $uid);
+		$query->bindValue(':username', $_POST['username']);
+		$query->bindValue(':boards', implode(',', $boards));
+		$query->execute() or error(db_error($query));
+		
+		if ($_POST['password'] != '') {
+			$query = prepare('UPDATE `mods` SET `password` = SHA1(:password) WHERE `id` = :id');
+			$query->bindValue(':id', $uid);
+			$query->bindValue(':password', $_POST['password']);
+			$query->execute() or error(db_error($query));
+			
+			if ($uid == $mod['id']) {
+				login($_POST['username'], $_POST['password']);
+				setCookies();
+			}
+		}
+		
+		header('Location: ?/users', true, $config['redirect_http']);
+		return;
+	}
+	
+	if (hasPermission($config['mod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
+		if ($_POST['password'] != '') {
+			$query = prepare('UPDATE `mods` SET `password` = SHA1(:password) WHERE `id` = :id');
+			$query->bindValue(':id', $uid);
+			$query->bindValue(':password', $_POST['password']);
+			$query->execute() or error(db_error($query));
+			
+			login($_POST['username'], $_POST['password']);
+			setCookies();
+		}
+		
+		header('Location: ?/users', true, $config['redirect_http']);
+		return;
+	}
+	
+	if (hasPermission($config['mod']['modlog'])) {
+		$query = prepare('SELECT * FROM `modlogs` WHERE `mod` = :id ORDER BY `time` DESC LIMIT 5');
+		$query->bindValue(':id', $uid);
+		$query->execute() or error(db_error($query));
+		$log = $query->fetchAll(PDO::FETCH_ASSOC);
+	} else {
+		$log = array();
+	}
+	
+	$user['boards'] = explode(',', $user['boards']);
+	
+	mod_page('Edit user', 'mod/user.html', array('user' => $user, 'logs' => $log, 'boards' => listBoards()));
+}
+
 function mod_users() {
 	global $config;
 	
diff --git a/mod.php b/mod.php
index 8af74a7b..85d10c6c 100644
--- a/mod.php
+++ b/mod.php
@@ -28,6 +28,7 @@ $pages = array(
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
 	
 	'!^/users$!'				=> 'users',		// manage users
+	'!^/users/(\d+)$!'			=> 'user',		// edit user
 	'!^/users/(\d+)/(promote|demote)$!'	=> 'user_promote',	// prmote/demote user
 	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
 	'!^/PM/(\d+)(/reply)?$!'		=> 'pm',		// read a pm
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 61243202..19924b1d 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -2,7 +2,7 @@
 	<tr>
 		<th>Staff</th>
 		<th>IP address</th>
-		<th>Ago</th>
+		<th>Time</th>
 		<th>Board</th>
 		<th>Action</th>
 	</tr>
diff --git a/templates/mod/user.html b/templates/mod/user.html
new file mode 100644
index 00000000..87a57d92
--- /dev/null
+++ b/templates/mod/user.html
@@ -0,0 +1,93 @@
+<form action="?/users/{{ mod.id }}" method="post">
+	<table>
+		<tr>
+			<th>Username</th>
+			<td>
+				{% if mod|hasPermission(config.mod.editusers) %}
+					<input size="20" maxlength="30" type="text" name="username" value="{{ user.username|e }}" autocomplete="off">
+				{% else %}
+					{{ user.username|e }}
+				{% endif %}
+			</td>
+		</tr>
+		<tr>
+			<th>Password <small style="font-weight:normal">(new; optional)</small></th>
+			<td>
+				{% if mod|hasPermission(config.mod.editusers) or (mod|hasPermission(config.mod.change_password) and user.id == mod.id) %}
+					<input size="20" maxlength="30" type="password" name="password" value="" autocomplete="off">
+				{% else %}
+					-
+				{% endif %}
+			</td>
+		</tr>
+		<tr>
+			<th>Boards</th>
+			<td>
+				<ul style="padding:0 5px;list-style:none">
+					<li>
+						<input type="checkbox" id="allboards" name="allboards"
+						{% if '*' in user.boards %} checked{% endif %}
+						{% if not mod|hasPermission(config.mod.editusers) %}
+						 disabled
+						{% endif %}
+						> 
+						<label for="allboards">"*" - All boards</label>
+					</li>
+					{% for board in boards %}
+						<li>
+							<input type="checkbox" id="board_{{ board.uri }}" name="board_{{ board.uri }}"
+								{% if board.uri in user.boards %} checked{% endif %}
+								{% if not mod|hasPermission(config.mod.editusers) %}
+								 disabled
+								{% endif %}
+								> 
+							<label for="board_{{ board.uri }}">
+								{{ config.board_abbreviation|sprintf(board.uri) }}
+								 - 
+								{{ board.title }}
+							</label>
+						</li>
+					{% endfor %}
+				</ul>
+			</td>
+		</tr>
+	</table>
+	
+	<ul style="padding:0;text-align:center">
+		<li><input type="submit" value="Save changes"></li>
+		{% if mod|hasPermission(config.mod.deleteusers) %}
+		<li><input type="submit" value="Delete user"></li>
+		{% endif %}
+	</ul>
+</form>
+
+{% if logs|count > 0  %}
+	<table class="modlog" style="width:600px">
+		<tr>
+			<th>IP address</th>			
+			<th>Time</th>
+			<th>Board</th>
+			<th>Action</th>
+		</tr>
+		{% for log in logs %}
+			<tr>
+				<td class="minimal">
+					<a href="?/IP/{{ log.ip }}">{{ log.ip }}</a>
+				</td>
+				<td class="minimal">
+					<span title="{{ log.time|date(config.post_date) }}">{{ log.time|ago }}</span>
+				</td>
+				<td class="minimal">
+					{% if log.board %}
+						<a href="?/{{ config.board_path|sprintf(log.board) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(log.board) }}</a>
+					{% else %}
+						-
+					{% endif %}
+				</td>
+				<td>
+					{{ log.text }}
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+{% endif %}
-- 
cgit v1.3


From 2c47c2d994adfb71b0f938640e95592d7d1567ac Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Thu, 19 Apr 2012 01:37:31 +1000
Subject: CRC32 -> SHA1

---
 templates/mod/debug/antispam.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html
index af5354ed..c3e70859 100644
--- a/templates/mod/debug/antispam.html
+++ b/templates/mod/debug/antispam.html
@@ -1,11 +1,11 @@
 <p style="text-align:center">
 	Most used (in active):
 </p>
-<table class="modlog" style="width:600px;margin:auto">
+<table class="modlog" style="width:700px;margin:auto">
 	<tr>
 		<th>Board</th>
 		<th>Thread</th>
-		<th>Hash (CRC32)</th>
+		<th>Hash (SHA1)</th>
 		<th>Created</th>
 		<th>Expires</th>
 		<th>Passed</th>
-- 
cgit v1.3


From 4891eae24eac73328ecdc9eb9c5c8a4ab1e9c346 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Thu, 19 Apr 2012 22:40:11 +1000
Subject: added filter/purge controls to ?/debug/antispam

---
 inc/mod/pages.php                 | 27 +++++++++++++++++++++++----
 templates/mod/debug/antispam.html | 25 ++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index e388c509..541a7c23 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -435,7 +435,7 @@ function mod_user($uid) {
 		return;
 	}
 	
-	if (hasPermission($config['mod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
+	if (hasPermission($config['dmod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
 		if ($_POST['password'] != '') {
 			$query = prepare('UPDATE `mods` SET `password` = SHA1(:password) WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
@@ -749,15 +749,34 @@ function mod_report_dismiss($id, $all = false) {
 }
 
 function mod_debug_antispam() {
+	global $pdo, $config;
+	
 	$args = array();
 	
-	$query = query('SELECT COUNT(*) FROM `antispam`') or error(db_error());
+	if (isset($_POST['board'], $_POST['thread'])) {
+		$where = '`board` = ' . $pdo->quote($_POST['board']);
+		if($_POST['thread'] != '')
+			$where .= ' AND `thread` = ' . $pdo->quote($_POST['thread']);
+		
+		if (isset($_POST['purge'])) {
+			$query = prepare('UPDATE `antispam` SET `expires` = UNIX_TIMESTAMP() + :expires WHERE' . $where);
+			$query->bindValue(':expires', $config['spam']['hidden_inputs_expire']);
+			$query->execute() or error(db_error());
+		}
+		
+		$args['board'] = $_POST['board'];
+		$args['thread'] = $_POST['thread'];
+	} else {
+		$where = '';
+	}
+	
+	$query = query('SELECT COUNT(*) FROM `antispam`' . ($where ? " WHERE $where" : '')) or error(db_error());
 	$args['total'] = number_format($query->fetchColumn(0));
 	
-	$query = query('SELECT COUNT(*) FROM `antispam` WHERE `expires` IS NOT NULL') or error(db_error());
+	$query = query('SELECT COUNT(*) FROM `antispam` WHERE `expires` IS NOT NULL' . ($where ? " AND $where" : '')) or error(db_error());
 	$args['expiring'] = number_format($query->fetchColumn(0));
 	
-	$query = query('SELECT * FROM `antispam` /* WHERE `passed` > 0 */ ORDER BY `passed` DESC LIMIT 25') or error(db_error());
+	$query = query('SELECT * FROM `antispam` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `passed` DESC LIMIT 40') or error(db_error());
 	$args['top'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
 	mod_page("Debug: Anti-spam", 'mod/debug/antispam.html', $args);
diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html
index c3e70859..99331ed3 100644
--- a/templates/mod/debug/antispam.html
+++ b/templates/mod/debug/antispam.html
@@ -19,7 +19,9 @@
 				{% else %}
 					-
 				{% endif %}</td>
-			<td>{{ hash.hash }}</td>
+			<td>
+				<small>{{ hash.hash|upper }}</small>
+			</td>
 			<td>
 				<span title="{{ hash.created|date(config.post_date) }}">{{ hash.created|ago }} ago</span>
 			</td>
@@ -40,3 +42,24 @@
 	Total: <strong>{{ total }}</strong> (<strong>{{ expiring }}</strong> set to expire)
 </p>
 
+<form method="post" action="?/debug/antispam">
+	<table class="modlog" style="width:1%;white-space:nowrap;margin:auto">
+		<tr>
+			<th>Board</th>
+			<th>Thread</th>
+			<th></th>
+		</tr>
+		<tr>
+			<td>
+				<input type="text" name="board" style="width:90px" value="{{ board }}">
+			</td>
+			<td>
+				<input type="text" name="thread" style="width:90px" value="{{ thread }}">
+			</td>
+			<td>
+				<input type="submit" name="filter" value="Filter"> 
+				<input type="submit" name="purge" value="Purge">
+			</td>
+		</tr>
+	</table>
+</form>
-- 
cgit v1.3


From de84ca6f755347b2c3fcf87165704a2d9e899d77 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 20 Apr 2012 21:37:48 +1000
Subject: Multiple improvements: ?/ban/<post> & ?/ban&delete/<post>

---
 inc/mod/pages.php           | 47 ++++++++++++++++++++++++++++++++++++++++++---
 mod.php                     |  2 +-
 templates/mod/ban_form.html | 36 ++++++++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 7bc970b0..78f560ec 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -374,13 +374,54 @@ function mod_ban_post($board, $delete, $post) {
 	if (!hasPermission($config['mod']['delete'], $board))
 		error($config['error']['noaccess']);
 	
-	$query = prepare(sprintf('SELECT `ip` FROM `posts_%s` WHERE `id` = :id', $board));
+	$query = prepare(sprintf('SELECT `ip`, `thread` FROM `posts_%s` WHERE `id` = :id', $board));
 	$query->bindValue(':id', $post);
 	$query->execute() or error(db_error($query));
-	if(!$ip = $query->fetchColumn(0))
+	if(!$_post = $query->fetch(PDO::FETCH_ASSOC))
 		error($config['error']['404']);
 	
-	mod_page("New ban", 'mod/ban_form.html', array());
+	$thread = $_post['thread'];
+	$ip = $_post['ip'];
+	
+	if (isset($_POST['new_ban'], $_POST['reason'], $_POST['length'], $_POST['board'])) {
+		require_once 'inc/mod/ban.php';
+		
+		if (isset($_POST['ip']))
+			$ip = $_POST['ip'];
+		
+		ban($ip, $_POST['reason'], parse_time($_POST['length']), $_POST['board'] == '*' ? false : $_POST['board']);
+		
+		if (isset($_POST['public_message'], $_POST['message'])) {
+			// public ban message
+			$query = prepare(sprintf('UPDATE `posts_%s` SET `body` = CONCAT(`body`, :body) WHERE `id` = :id', $board));
+			$query->bindValue(':id', $post);
+			$query->bindValue(':body', sprintf($config['mod']['ban_message'], utf8tohtml($_POST['message'])));
+			$query->execute() or error(db_error($query));
+			
+			modLog("Attached a public ban message to post #{$post}: " . utf8tohtml($_POST['message']));
+			buildThread($thread ? $thread : $post);
+			buildIndex();
+		} elseif (isset($_POST['delete'])) {
+			// Delete post
+			deletePost($post);
+			modLog("Deleted post #{$post}");
+			// Rebuild board
+			buildIndex();
+		}
+		
+		header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+	}
+	
+	$args = array(
+		'ip' => $ip,
+		'hide_ip' => !hasPermission($config['mod']['show_ip'], $board),
+		'post' => $post,
+		'board' => $board,
+		'delete' => (bool)$delete,
+		'boards' => listBoards()
+	);
+	
+	mod_page("New ban", 'mod/ban_form.html', $args);
 }
 
 function mod_delete($board, $post) {
diff --git a/mod.php b/mod.php
index 57967da5..b5edd255 100644
--- a/mod.php
+++ b/mod.php
@@ -44,7 +44,7 @@ $pages = array(
 	'!^/bans/(\d+)$!'			=> 'bans',		// ban list
 	
 	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
-	'!^/(\w+)/ban/(&delete/)?(\d+)$!'	=> 'ban_post',		// ban poster
+	'!^/(\w+)/ban(&delete)?/(\d+)$!'	=> 'ban_post',		// ban poster
 	'!^/(\w+)/(un)?lock/(\d+)$!'		=> 'lock',		// lock thread
 	'!^/(\w+)/(un)?sticky/(\d+)$!'		=> 'sticky',		// sticky thread
 	'!^/(\w+)/bump(un)?lock/(\d+)$!'	=> 'bumplock',		// "bumplock" thread
diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
index 1b94e725..9d4d6728 100644
--- a/templates/mod/ban_form.html
+++ b/templates/mod/ban_form.html
@@ -1,15 +1,29 @@
-<form action="?/ban" method="post">
+{% if post and board %}
+	{% set action = '?/' ~ board ~ '/ban/' ~ post %}
+{% else %}
+	{% set action = '?/ban' %}
+{% endif %}
+
+<form action="{{ action }}" method="post">
 	{% if redirect %}
 		<input type="hidden" name="redirect" value="{{ redirect|e }}">
 	{% endif %}
+	{% if post and board %}
+		<input type="hidden" name="delete" value="{% if delete %}1{% else %}0{% endif %}">
+	{% endif %}
 	
 	<table>
+		
 		<tr>
 			<th>
 				<label for="ip">IP <span class="unimportant">(or subnet)</span></label>
 			</th>
 			<td>
-				<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
+				{% if not hide_ip %}
+					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
+				{% else %}
+					<em>hidden</em>
+				{% endif %}
 			</td>
 		</tr>
 		<tr>
@@ -20,6 +34,24 @@
 				<textarea name="reason" id="reason" rows="5" cols="30">{{ reason|e }}</textarea>
 			</td>
 		</tr>
+		{% if post and board and not delete %}
+			<tr>
+				<th>
+					<label for="reason">Message</label>
+				</th>
+				<td>
+					<input type="checkbox" id="public_message" name="public_message"> 
+					<input type="text" name="message" id="message" size="35" maxlength="200" value="{{ config.mod.default_ban_message|e }}"> 
+					<span class="unimportant">(public; attached to post)</span>
+					<script type="text/javascript">
+						document.getElementById('message').disabled = true;
+						document.getElementById('public_message').onchange = function() {
+							document.getElementById('message').disabled = !this.checked;
+						}
+					</script>
+				</td>
+			</tr>
+		{% endif %}
 		<tr>
 			<th>
 				<label for="length">Length</label>
-- 
cgit v1.3


From 07fc56b80b36fcf41e8959844d1d8329a8852a99 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 20 Apr 2012 21:54:30 +1000
Subject: Noticeboard on dashboard

---
 inc/mod/pages.php            | 14 +++++++++
 templates/mod/dashboard.html | 67 +++++++++++++++++++++++++++++++-------------
 2 files changed, 62 insertions(+), 19 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 78f560ec..e40dc241 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -61,10 +61,24 @@ function mod_confirm($request) {
 }
 
 function mod_dashboard() {
+	global $config;
+	
 	$args = array();
 	
 	$args['boards'] = listBoards();
 	
+	if(hasPermission($config['mod']['noticeboard'])) {
+		if(!$config['cache']['enabled'] || !$args['noticeboard'] = cache::get('noticeboard_preview')) {
+			$query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
+			$query->bindValue(':limit', $config['mod']['noticeboard_dashboard'], PDO::PARAM_INT);
+			$query->execute() or error(db_error($query));
+			$args['noticeboard'] = $query->fetchAll(PDO::FETCH_ASSOC);
+			
+			if($config['cache']['enabled'])
+				cache::set('noticeboard_preview', $args['noticeboard']);
+		}
+	}
+	
 	mod_page('Dashboard', 'mod/dashboard.html', $args);
 }
 
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index e9290e12..173c0e94 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -1,5 +1,5 @@
 <fieldset>
-	<legend>Boards</legend>
+	<legend>{% trans 'Boards' %}</legend>
 	
 	<ul>
 		{% for board in boards %}
@@ -12,79 +12,108 @@
 				{% endif %}
 				
 				{% if mod|hasPermission(config.mod.manageboards) %}
-					 <a href="?/manage/{{ board.uri }}"><small>[manage]</small></a>
+					 <a href="?/manage/{{ board.uri }}"><small>[{% trans 'manage' %}]</small></a>
 				{% endif %}
 			</li>
 		{% endfor %}
 		
 		{% if mod|hasPermission(config.mod.newboard) %}
-			<li style="margin-top:15px"><a href="?/new_board"><strong>Create new board</strong></a></li>
+			<li style="margin-top:15px"><a href="?/new_board"><strong>{% trans 'Create new board' %}</strong></a></li>
 		{% endif %}
 	</ul>
 </fieldset>
 
 {% if mod|hasPermission(config.mod.noticeboard) %}
 	<fieldset>
-		<legend>Noticeboard</legend>
-	
-		{# TODO #}
+		<legend>{% trans 'Noticeboard' %}</legend>
+		<ul>
+			{% if noticeboard %}
+				<li>
+					{% trans 'Latest posts:' %}
+					<ul>
+						{% for post in noticeboard %}
+							<li>
+								<a href="?/noticeboard#{{ post.id }}">
+									{% if post.subject %}
+										{{ post.subject|e }}
+									{% else %}
+										<em>{% trans 'no subject' %}</em>
+									{% endif %}
+								</a> 
+								<small class="unimportant">
+									&mdash; by 
+									{% if post.username %}
+										{{ post.username }}
+									{% else %}
+										<em>deleted?</em>
+									{% endif %} 
+									at 
+									{{ notice.time|date(config.post_date) }} 
+								</small>
+							</li>
+						{% endfor %}
+					</ul>
+				</li>
+			{% endif %}
+			<li><a href="?/noticeboard">{% trans 'View all entries' %}</a></li>
+		</ul>
 	</fieldset>
 {% endif %}
 
 <fieldset>
-	<legend>Administration</legend>
+	<legend>{% trans 'Administration' %}</legend>
 	
 	<ul>
 		{% if mod|hasPermission(config.mod.reports) %}
-			<li><a href="?/reports">Report queue</a></li>
+			<li><a href="?/reports">{% trans 'Report queue' %}</a></li>
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.view_banlist) %}
-			<li><a href="?/bans">Ban list</a></li>
+			<li><a href="?/bans">{% trans 'Ban list' %}</a></li>
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.manageusers) %}
-			<li><a href="?/users">Manage users</a></li>
+			<li><a href="?/users">{% trans 'Manage users' %}</a></li>
 		{% elseif mod|hasPermission(config.mod.change_password) %}
-			<li><a href="?/users/{{ mod.id }}">Change password</a></li>
+			<li><a href="?/users/{{ mod.id }}">{% trans 'Change password' %}</a></li>
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.modlog) %}
-			<li><a href="?/log">Moderation log</a></li>
+			<li><a href="?/log">{% trans 'Moderation log' %}</a></li>
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.rebuild) %}
-			<li><a href="?/rebuild">Rebuild</a></li>
+			<li><a href="?/rebuild">{% trans 'Rebuild' %}</a></li>
 			{% if config.cache.enabled %}
-				<li><a href="?/flushcache">Clear cache</a></li>
+				<li><a href="?/flushcache">{% trans 'Clear cache' %}</a></li>
 			{% endif %}
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.show_config) %}
-			<li><a href="?/config">Configuration</a></li>
+			<li><a href="?/config">{% trans 'Configuration' %}</a></li>
 		{% endif %}
 	</ul>
 </fieldset>
 
 {% if mod|hasPermission(config.mod.themes) %}
 	<fieldset>
-		<legend>Themes</legend>
+		<legend>{% trans 'Themes' %}</legend>
 	
 		{# TODO #}
 	</fieldset>
 {% endif %}
 
 <fieldset>
-	<legend>Search</legend>
+	<legend>{% trans 'Search' %}</legend>
 	
 	{# TODO #}
 </fieldset>
 
 {% if config.debug %}
 	<fieldset>
-		<legend>Debug</legend>
+		<legend>{% trans 'Debug' %}</legend>
 		<ul>
-			<li><a href="?/debug/antispam">Anti-spam</a></li>
+			<li><a href="?/debug/antispam">{% trans 'Anti-spam' %}</a></li>
 		</ul>
 	</fieldset>
 {% endif %}
-- 
cgit v1.3


From 2c1f14d24b644e02f59758d04e1a029e2e73ed5a Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 21 Apr 2012 12:42:41 +1000
Subject: Improvements to new mod panel

---
 inc/mod/pages.php            | 2 +-
 templates/mod/dashboard.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index e40dc241..3754268d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -508,7 +508,7 @@ function mod_user($uid) {
 		return;
 	}
 	
-	if (hasPermission($config['dmod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
+	if (hasPermission($config['mod']['change_password']) && $uid == $mod['id'] && isset($_POST['password'])) {
 		if ($_POST['password'] != '') {
 			$query = prepare('UPDATE `mods` SET `password` = SHA1(:password) WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 173c0e94..984aa03e 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -27,7 +27,7 @@
 	<fieldset>
 		<legend>{% trans 'Noticeboard' %}</legend>
 		<ul>
-			{% if noticeboard %}
+			{% if noticeboard|count > 0 %}
 				<li>
 					{% trans 'Latest posts:' %}
 					<ul>
-- 
cgit v1.3


From 2a301de29feb08d40a9740a574dbef8b07bd595c Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 21 Apr 2012 15:15:32 +1000
Subject: Paginate ?/noticeboard

---
 inc/config.php                                  |  4 +-
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |  1 +
 inc/mod/pages.php                               | 55 +++++++++++++++++++--
 mod.php                                         |  6 ++-
 templates/mod/ban_list.html                     |  2 +-
 templates/mod/log.html                          |  2 +-
 templates/mod/noticeboard.html                  | 65 +++++++++++++++++++++++++
 7 files changed, 125 insertions(+), 10 deletions(-)
 create mode 100644 templates/mod/noticeboard.html

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 8d93f266..06e100ea 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -832,8 +832,8 @@
 	// Maximum number of results to display for a search, per board
 	$config['mod']['search_results'] = 75;
 	
-	// Maximum number of notices to display on the moderator noticeboard
-	$config['mod']['noticeboard_display'] = 50;
+	// How many entries to show per page in the moderator noticeboard
+	$config['mod']['noticeboard_page'] = 50;
 	// Number of entries to summarize and display on the dashboard
 	$config['mod']['noticeboard_dashboard'] = 5;
 	
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index df652444..c4810dad 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -37,6 +37,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 	{
 		return Array(
 			'time' => new Twig_Filter_Function('time'),
+			'floor' => new Twig_Filter_Function('floor'),
 			'timezone' => new Twig_Filter_Function('twig_timezone_function'),
 			'hiddenInputs' => new Twig_Filter_Function('hiddenInputs'),
 			'hiddenInputsHash' => new Twig_Filter_Function('hiddenInputsHash'),
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 3754268d..d111a480 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -67,14 +67,14 @@ function mod_dashboard() {
 	
 	$args['boards'] = listBoards();
 	
-	if(hasPermission($config['mod']['noticeboard'])) {
-		if(!$config['cache']['enabled'] || !$args['noticeboard'] = cache::get('noticeboard_preview')) {
+	if (hasPermission($config['mod']['noticeboard'])) {
+		if (!$config['cache']['enabled'] || !$args['noticeboard'] = cache::get('noticeboard_preview')) {
 			$query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :limit");
 			$query->bindValue(':limit', $config['mod']['noticeboard_dashboard'], PDO::PARAM_INT);
 			$query->execute() or error(db_error($query));
 			$args['noticeboard'] = $query->fetchAll(PDO::FETCH_ASSOC);
 			
-			if($config['cache']['enabled'])
+			if ($config['cache']['enabled'])
 				cache::set('noticeboard_preview', $args['noticeboard']);
 		}
 	}
@@ -82,6 +82,47 @@ function mod_dashboard() {
 	mod_page('Dashboard', 'mod/dashboard.html', $args);
 }
 
+function mod_noticeboard($page_no = 1) {
+	global $config, $pdo, $mod;
+	
+	if (!hasPermission($config['mod']['noticeboard']))
+		error($config['error']['noaccess']);
+	
+	if (isset($_POST['subject'], $_POST['body'])) {
+		if (!hasPermission($config['mod']['noticeboard_post']))
+			error($config['error']['noaccess']);
+		
+		markup($_POST['body']);
+		
+		$query = prepare('INSERT INTO `noticeboard` VALUES (NULL, :mod, :time, :subject, :body)');
+		$query->bindValue(':mod', $mod['id']);
+		$query->bindvalue(':time', time());
+		$query->bindValue(':subject', $_POST['subject']);
+		$query->bindValue(':body', $_POST['body']);
+		$query->execute() or error(db_error($query));
+		
+		if($config['cache']['enabled'])
+			cache::delete('noticeboard_preview');
+		
+		header('Location: ?/noticeboard#' . $pdo->lastInsertId(), true, $config['redirect_http']);
+	}
+	
+	$query = prepare("SELECT `noticeboard`.*, `username` FROM `noticeboard` LEFT JOIN `mods` ON `mods`.`id` = `mod` ORDER BY `id` DESC LIMIT :offset, :limit");
+	$query->bindValue(':limit', $config['mod']['noticeboard_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['noticeboard_page'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$noticeboard = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	if (empty($noticeboard))
+		error($config['error']['404']);
+	
+	$query = prepare("SELECT COUNT(*) FROM `noticeboard`");
+	$query->execute() or error(db_error($query));
+	$count = $query->fetchColumn(0);
+	
+	mod_page('Noticeboard', 'mod/noticeboard.html', array('noticeboard' => $noticeboard, 'count' => $count));
+}
+
 function mod_log($page_no = 1) {
 	global $config;
 	
@@ -94,7 +135,10 @@ function mod_log($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$logs = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	$query = prepare("SELECT COUNT(*) AS `count` FROM `modlogs`");
+	if (empty($logs))
+		error($config['error']['404']);
+	
+	$query = prepare("SELECT COUNT(*) FROM `modlogs`");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn(0);
 	
@@ -300,6 +344,9 @@ function mod_bans($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$bans = $query->fetchAll(PDO::FETCH_ASSOC);
 	
+	if (empty($bans))
+		error($config['error']['404']);
+	
 	$query = prepare("SELECT COUNT(*) FROM `bans`");
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn(0);
diff --git a/mod.php b/mod.php
index b5edd255..4495ae52 100644
--- a/mod.php
+++ b/mod.php
@@ -24,8 +24,6 @@ $pages = array(
 	'!^$!'					=> ':?/',		// redirect to dashboard
 	'!^/$!'					=> 'dashboard',		// dashboard
 	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
-	'!^/log$!'				=> 'log',		// modlog
-	'!^/log/(\d+)$!'			=> 'log',		// modlog
 	
 	'!^/users$!'				=> 'users',		// manage users
 	'!^/users/(\d+)$!'			=> 'user',		// edit user
@@ -33,6 +31,10 @@ $pages = array(
 	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
 	'!^/PM/(\d+)(/reply)?$!'		=> 'pm',		// read a pm
 	
+	'!^/noticeboard$!'			=> 'noticeboard',	// view noticeboard
+	'!^/noticeboard/(\d+)$!'		=> 'noticeboard',	// view noticeboard
+	'!^/log$!'				=> 'log',		// modlog
+	'!^/log/(\d+)$!'			=> 'log',		// modlog
 	'!^/rebuild$!'				=> 'rebuild',		// rebuild static files
 	'!^/reports$!'				=> 'reports',		// report queue
 	'!^/reports/(\d+)/dismiss(all)?$!'	=> 'report_dismiss',	// dismiss a report
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 66471d6d..ea8183d6 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -75,7 +75,7 @@
 
 {% if count > bans|count %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
-		{% for i in range(0, count / config.mod.modlog_page) %}
+		{% for i in range(0, (count - 1) / config.mod.modlog_page) %}
 			<a href="?/bans/{{ i + 1 }}">[{{ i + 1 }}]</a> 
 		{% endfor %}
 	</p>
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 19924b1d..9b0979cb 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -33,7 +33,7 @@
 
 {% if count > logs|count %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">
-		{% for i in range(0, count / config.mod.modlog_page) %}
+		{% for i in range(0, (count - 1) / config.mod.modlog_page) %}
 			<a href="?/log/{{ i + 1 }}">[{{ i + 1 }}]</a> 
 		{% endfor %}
 	</p>
diff --git a/templates/mod/noticeboard.html b/templates/mod/noticeboard.html
new file mode 100644
index 00000000..4d764d80
--- /dev/null
+++ b/templates/mod/noticeboard.html
@@ -0,0 +1,65 @@
+{% if mod|hasPermission(config.mod.noticeboard_post) %}
+	<fieldset>
+		<legend>{% trans 'New post' %}</legend>
+		<form style="margin:0" action="" method="post">
+			<table>
+				<tr>
+					<th>{% trans 'Name' %}</th>
+					<td>{{ mod.username|e }}</td>
+				</tr>
+				<tr>
+					<th><label for="subject">{% trans 'Subject' %}</label></th>
+					<td><input type="text" size="55" name="subject" id="subject" /></td>
+				</tr>
+				<tr>
+					<th>{% trans 'Body' %}</th>
+					<td><textarea name="body" style="width:100%;height:100px"></textarea></td>
+				</tr>
+			</table>
+			<p style="text-align:center">
+				<input type="submit" value="{% trans 'Post to noticeboard' %}" />
+			</p>
+		</form>
+	</fieldset>
+{% endif %}
+
+{% for post in noticeboard %}
+	<div class="ban">
+		{% if mod|hasPermission(config.mod.noticeboard_delete) %}
+			<span style="float:right;padding:2px">
+				<a class="unimportant" href="?/noticeboard/delete/{{ post.id }}">[{% trans 'delete' %}]</a>
+			</span>
+		{% endif %}
+		<h2 id="{{ post.id }}">
+			<small class="unimportant">
+				<a href="#{{ post.id }}">#</a>
+			</small> 
+			{% if post.subject %}
+				{{ post.subject|e }}
+			{% else %}
+				<em>{% trans 'no subject' %}</em>
+			{% endif %} 
+			<small class="unimportant">
+				&mdash; by 
+				{% if post.username %}
+					{{ post.username }}
+				{% else %}
+					<em>deleted?</em>
+				{% endif %} 
+				at 
+				{{ notice.time|date(config.post_date) }} 
+			</small>
+		</h2>
+		<p>
+			{{ post.body }}
+		</p>
+	</div>
+{% endfor %}
+
+{% if count > noticeboard|count %}
+	<p class="unimportant" style="text-align:center;word-wrap:break-word">
+		{% for i in range(0, (count - 1) / config.mod.noticeboard_page) %}
+			<a href="?/noticeboard/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+		{% endfor %}
+	</p>
+{% endif %}
-- 
cgit v1.3


From 19ea6e3d44186544c15166aa13e4faa1b8804c99 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 21 Apr 2012 15:29:57 +1000
Subject: ?/deletefile

---
 inc/mod/pages.php            | 40 +++++++++++++++++++++++++++++++++++++---
 mod.php                      |  1 +
 templates/mod/dashboard.html |  3 ---
 3 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index d111a480..5bba5145 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -85,6 +85,9 @@ function mod_dashboard() {
 function mod_noticeboard($page_no = 1) {
 	global $config, $pdo, $mod;
 	
+	if ($page_no < 1)
+		error($config['error']['404']);
+	
 	if (!hasPermission($config['mod']['noticeboard']))
 		error($config['error']['noaccess']);
 	
@@ -113,7 +116,7 @@ function mod_noticeboard($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$noticeboard = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	if (empty($noticeboard))
+	if (empty($noticeboard) && $page_no > 1)
 		error($config['error']['404']);
 	
 	$query = prepare("SELECT COUNT(*) FROM `noticeboard`");
@@ -126,6 +129,9 @@ function mod_noticeboard($page_no = 1) {
 function mod_log($page_no = 1) {
 	global $config;
 	
+	if ($page_no < 1)
+		error($config['error']['404']);
+	
 	if (!hasPermission($config['mod']['modlog']))
 		error($config['error']['noaccess']);
 	
@@ -135,7 +141,7 @@ function mod_log($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$logs = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	if (empty($logs))
+	if (empty($logs) && $page_no > 1)
 		error($config['error']['404']);
 	
 	$query = prepare("SELECT COUNT(*) FROM `modlogs`");
@@ -308,6 +314,9 @@ function mod_ban() {
 function mod_bans($page_no = 1) {
 	global $config;
 	
+	if ($page_no < 1)
+		error($config['error']['404']);
+	
 	if (!hasPermission($config['mod']['view_banlist']))
 		error($config['error']['noaccess']);
 	
@@ -344,7 +353,7 @@ function mod_bans($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$bans = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	if (empty($bans))
+	if (empty($bans) && $page_no > 1)
 		error($config['error']['404']);
 	
 	$query = prepare("SELECT COUNT(*) FROM `bans`");
@@ -505,6 +514,26 @@ function mod_delete($board, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_deletefile($board, $post) {
+	global $config, $mod;
+	
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['deletefile'], $board))
+		error($config['error']['noaccess']);
+	
+	// Delete file
+	deleteFile($post);
+	// Record the action
+	modLog("Deleted file from post #{$post}");
+	// Rebuild board
+	buildIndex();
+	
+	// Redirect
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
 function mod_user($uid) {
 	global $config, $mod;
 	
@@ -699,6 +728,11 @@ function mod_rebuild() {
 		$rebuilt_scripts = array();
 		
 		if (isset($_POST['rebuild_cache'])) {
+			if ($config['cache']['enabled']) {
+				$log[] = 'Flushing cache';
+				Cache::flush();
+			}
+			
 			$log[] = 'Clearing template cache';
 			load_twig();
 			$twig->clearCacheFiles();
diff --git a/mod.php b/mod.php
index 4495ae52..f3726c24 100644
--- a/mod.php
+++ b/mod.php
@@ -47,6 +47,7 @@ $pages = array(
 	
 	'!^/(\w+)/delete/(\d+)$!'		=> 'delete',		// delete post
 	'!^/(\w+)/ban(&delete)?/(\d+)$!'	=> 'ban_post',		// ban poster
+	'!^/(\w+)/deletefile/(\d+)$!'		=> 'deletefile',	// delete file from post
 	'!^/(\w+)/(un)?lock/(\d+)$!'		=> 'lock',		// lock thread
 	'!^/(\w+)/(un)?sticky/(\d+)$!'		=> 'sticky',		// sticky thread
 	'!^/(\w+)/bump(un)?lock/(\d+)$!'	=> 'bumplock',		// "bumplock" thread
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 984aa03e..fc510ac7 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -84,9 +84,6 @@
 		
 		{% if mod|hasPermission(config.mod.rebuild) %}
 			<li><a href="?/rebuild">{% trans 'Rebuild' %}</a></li>
-			{% if config.cache.enabled %}
-				<li><a href="?/flushcache">{% trans 'Clear cache' %}</a></li>
-			{% endif %}
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.show_config) %}
-- 
cgit v1.3


From 54862246cda6e0e3acaa5fefa0da532a3778cb3b Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 22 Apr 2012 16:52:24 +1000
Subject: Stylesheet change.

---
 stylesheets/style.css                 | 2 +-
 templates/themes/basic/index.html     | 6 ++++--
 templates/themes/categories/news.html | 5 ++++-
 templates/themes/frameset/news.html   | 6 ++++--
 templates/themes/recent/recent.html   | 6 ++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index edebf0c1..0c71ff7c 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -44,7 +44,7 @@ h2 {
 header {
 	margin: 1em 0;
 }
-header h1 {
+h1 {
 	font-family: tahoma;
 	letter-spacing: -2px;
 	font-size: 20pt;
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index 8426e736..89022420 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -8,8 +8,10 @@
 </head>
 <body>
 	{{ boardlist.top }}
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 56ddfabb..9c7d8340 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -8,7 +8,10 @@
 </head>
 <body>
 	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html
index 56ddfabb..2af5e10d 100644
--- a/templates/themes/frameset/news.html
+++ b/templates/themes/frameset/news.html
@@ -7,8 +7,10 @@
 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/>
 </head>
 <body>
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="ban">
 		{% if news|count == 0 %}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index a6daa9e7..a42024c0 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -9,8 +9,10 @@
 </head>
 <body>
 	{{ boardlist.top }}
-	<h1>{{ settings.title }}</h1>
-	<div class="title">{{ settings.subtitle }}</div>
+	<header>
+		<h1>{{ settings.title }}</h1>
+		<div class="subtitle">{{ settings.subtitle }}</div>
+	</header>
 	
 	<div class="box-wrap">
 		<div class="box left">
-- 
cgit v1.3


From f5b4bf93b0ca00bee22dec0222299352256e196c Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 22 Apr 2012 16:52:58 +1000
Subject: ?/debug/antispam formatting

---
 templates/mod/debug/antispam.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/mod/debug/antispam.html b/templates/mod/debug/antispam.html
index 99331ed3..a846bc17 100644
--- a/templates/mod/debug/antispam.html
+++ b/templates/mod/debug/antispam.html
@@ -20,7 +20,7 @@
 					-
 				{% endif %}</td>
 			<td>
-				<small>{{ hash.hash|upper }}</small>
+				<small><code>{{ hash.hash }}</code></small>
 			</td>
 			<td>
 				<span title="{{ hash.created|date(config.post_date) }}">{{ hash.created|ago }} ago</span>
-- 
cgit v1.3


From aeff0a69b100d2cfa5896d043aa1891b993a7a5f Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 4 May 2012 00:21:16 +1000
Subject: minor CSS fixes

---
 inc/config.php             |  8 ++++----
 stylesheets/style.css      | 28 +++++++++++++++++++++++-----
 templates/post_thread.html |  8 ++------
 3 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 06e100ea..eb70f932 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -786,22 +786,22 @@
 	$config['mod']['link_move'] = '[Move]';
 	
 	// Moderator capcodes
-	$config['capcode'] = ' <a class="capcode">## %s</a>';
+	$config['capcode'] = ' <span class="capcode">## %s</span>';
 	
 	// Custom capcodes, by example:
 	// "## Custom" becomes lightgreen, italic and bold
-	//$config['custom_capcode']['Custom'] ='<a class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</a>';
+	//$config['custom_capcode']['Custom'] ='<span class="capcode" style="color:lightgreen;font-style:italic;font-weight:bold"> ## %s</span>';
 	
 	// "## Mod" makes everything purple, including the name and tripcode
 	//$config['custom_capcode']['Mod'] = array(
-	//	'<a class="capcode" style="color:purple"> ## %s</a>',
+	//	'<span class="capcode" style="color:purple"> ## %s</span>',
 	//	'color:purple', // Change name style; optional
 	//	'color:purple' // Change tripcode style; optional
 	//);
 	
 	// "## Admin" makes everything red and bold, including the name and tripcode
 	//$config['custom_capcode']['Admin'] = array(
-	//	'<a class="capcode" style="color:red;font-weight:bold"> ## %s</a>',
+	//	'<span class="capcode" style="color:red;font-weight:bold"> ## %s</span>',
 	//	'color:red;font-weight:bold', // Change name style; optional
 	//	'color:red;font-weight:bold' // Change tripcode style; optional
 	//);
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0c71ff7c..a46ca3fb 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -10,19 +10,21 @@ body {
 table * {
 	margin: 0;
 }
-a:link, a:visited {
+a, a:visited {
 	text-decoration: underline;
 	color: #34345C;
 }
-a:link:hover, a:visited:hover {
+a:hover {
 	color: #ff0000;
 }
 a.post_no {
-	color: black;
 	text-decoration: none;
 	margin: 0;
 	padding: 0;
 }
+a.post_no:not(:hover) {
+	color: black;
+}
 p.intro a.post_no, p.intro a.email {
 	margin: 0;
 }
@@ -167,7 +169,7 @@ p.intro span.name {
 	color: #117743;
 	font-weight: bold;
 }
-p.intro a.capcode, p.intro a.nametag {
+p.intro span.capcode, p.intro a.capcode, p.intro a.nametag {
 	color: #F00000;
 	margin-left: 0;
 }
@@ -314,7 +316,7 @@ div.pages a.selected {
 	color: black;
 	font-weight: bolder;
 }
-div.pages a:link {
+div.pages a {
 	text-decoration: none;
 }
 div.pages form {
@@ -386,3 +388,19 @@ div.blotter {
 	font-weight: bold;
 	text-align: center;
 }
+
+/* Uboachan stuff */
+div.styles-sidebar {
+	text-align: center;
+	padding-bottom: 0px;
+}
+div.styles-sidebar a {
+	margin: 0 5px;
+}
+div.styles-sidebar a.selected {
+	text-decoration: none;
+}
+.category {
+	background: #98E;
+	color: black;
+}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 095c53f9..ac5c786b 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -1,9 +1,7 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
 
-{% if index %}
-	<div id="thread_{{ post.id }}">
-{% endif %}
+<div id="thread_{{ post.id }}">
 
 {% if post.embed %}
 	{{ post.embed }}
@@ -136,6 +134,4 @@
 	{% include 'post_reply.html' %}
 {% endfor %}
 <br class="clear"/>{% if hr %}<hr/>{% endif %}
-{% if index %}
-	</div>
-{% endif %}
+</div>
-- 
cgit v1.3


From a6104587203f1b1b448e6977066d6e649de91ae8 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 6 May 2012 01:33:10 +1000
Subject: a lot more improvements

---
 inc/config.php                           |   5 +-
 inc/functions.php                        |  25 +-
 inc/mod/pages.php                        | 396 +++++++++++++++++++++++++++++--
 install.php                              |   4 +-
 js/show-op.js                            |   2 -
 mod.php                                  |  39 ++-
 templates/generic_page.html              |  71 ++++++
 templates/index.html                     |  16 +-
 templates/mod/ban_form.html              |  20 +-
 templates/mod/ban_list.html              |  24 +-
 templates/mod/board.html                 |  44 ++++
 templates/mod/confirm.html               |   4 +-
 templates/mod/dashboard.html             |  56 ++++-
 templates/mod/inbox.html                 |  36 +++
 templates/mod/log.html                   |  18 +-
 templates/mod/login.html                 |   4 +-
 templates/mod/new_pm.html                |   6 +-
 templates/mod/news.html                  |  70 ++++++
 templates/mod/noticeboard.html           |   8 +-
 templates/mod/pm.html                    |  14 +-
 templates/mod/rebuild.html               |  20 +-
 templates/mod/rebuilt.html               |   4 +-
 templates/mod/report.html                |  12 +-
 templates/mod/reports.html               |   3 +-
 templates/mod/user.html                  |  64 +++--
 templates/mod/users.html                 |  57 +++--
 templates/mod/view_ip.html               |  72 +++---
 templates/page.html                      |  10 +-
 templates/themes/basic/info.php          |   4 +-
 templates/themes/basic/theme.php         |   2 +-
 templates/themes/categories/info.php     |   4 +-
 templates/themes/categories/sidebar.html |   2 +-
 templates/themes/categories/theme.php    |  12 +-
 templates/themes/frameset/sidebar.html   |   2 +-
 templates/themes/frameset/theme.php      |   6 +-
 templates/themes/recent/info.php         |   6 +-
 templates/themes/recent/theme.php        |  28 +--
 templates/themes/rrdtool/info.php        |  16 +-
 templates/themes/rrdtool/theme.php       |  54 +++--
 templates/thread.html                    |  17 +-
 40 files changed, 986 insertions(+), 271 deletions(-)
 create mode 100644 templates/generic_page.html
 create mode 100644 templates/mod/board.html
 create mode 100644 templates/mod/inbox.html
 create mode 100644 templates/mod/news.html

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 414d5262..c202d8c9 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -816,8 +816,6 @@
 	
 	// Do a DNS lookup on IP addresses to get their hostname on the IP summary page
 	$config['mod']['dns_lookup'] = true;
-	// Show ban form on the IP summary page
-	$config['mod']['ip_banform'] = true;
 	// How many recent posts, per board, to show in the IP summary page
 	$config['mod']['ip_recentposts'] = 5;
 	
@@ -829,6 +827,9 @@
 	// How many bans to show per page in the ban list
 	$config['mod']['banlist_page'] = 350;
 	
+	// Number of news entries to display per page
+	$config['mod']['news_page'] = 40;
+	
 	// Maximum number of results to display for a search, per board
 	$config['mod']['search_results'] = 75;
 	
diff --git a/inc/functions.php b/inc/functions.php
index 3ca5f599..ac0a1c96 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -32,7 +32,30 @@ function loadConfig() {
 	if (!isset($_SERVER['REMOTE_ADDR']))
 		$_SERVER['REMOTE_ADDR'] = '0.0.0.0';
 	
-	$arrays = array('db', 'cache', 'cookies', 'error', 'dir', 'mod', 'spam', 'flood_filters', 'wordfilters', 'custom_capcode', 'custom_tripcode', 'dnsbl', 'dnsbl_exceptions', 'remote', 'allowed_ext', 'allowed_ext_files', 'file_icons', 'footer', 'stylesheets', 'additional_javascript', 'markup');
+	$arrays = array(
+		'db',
+		'cache',
+		'cookies',
+		'error',
+		'dir',
+		'mod',
+		'spam',
+		'flood_filters',
+		'wordfilters',
+		'custom_capcode',
+		'custom_tripcode',
+		'dnsbl',
+		'dnsbl_exceptions',
+		'remote',
+		'allowed_ext',
+		'allowed_ext_files',
+		'file_icons',
+		'footer',
+		'stylesheets',
+		'additional_javascript',
+		'markup',
+		'custom_pages'
+	);
 	
 	$config = array();
 	foreach ($arrays as $key) {
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 260ad94c..c56570a5 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -9,7 +9,7 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
 	exit;
 }
 
-function mod_page($title, $template, $args) {
+function mod_page($title, $template, $args, $subtitle = false) {
 	global $config, $mod;
 	
 	echo Element('page.html', array(
@@ -17,6 +17,7 @@ function mod_page($title, $template, $args) {
 		'mod' => $mod,
 		'hide_dashboard_link' => $template == 'mod/dashboard.html',
 		'title' => $title,
+		'subtitle' => $subtitle,
 		'body' => Element($template,
 				array_merge(
 					array('config' => $config, 'mod' => $mod), 
@@ -28,6 +29,8 @@ function mod_page($title, $template, $args) {
 }
 
 function mod_login() {
+	global $config;
+	
 	$args = array();
 	
 	if (isset($_POST['login'])) {
@@ -60,8 +63,14 @@ function mod_confirm($request) {
 	mod_page('Confirm action', 'mod/confirm.html', array('request' => $request));
 }
 
+function mod_logout() {
+	destroyCookies();
+	
+	header('Location: ?/', true, $config['redirect_http']);
+}
+
 function mod_dashboard() {
-	global $config;
+	global $config, $mod;
 	
 	$args = array();
 	
@@ -79,9 +88,180 @@ function mod_dashboard() {
 		}
 	}
 	
+	$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :id AND `unread` = 1');
+	$query->bindValue(':id', $mod['id']);
+	$query->execute() or error(db_error($query));
+	$args['unread_pms'] = $query->fetchColumn(0);
+	
+	if ($mod['type'] >= ADMIN && $config['check_updates']) {
+		if (!$config['version'])
+			error(_('Could not find current version! (Check .installed)'));
+		
+		if (isset($_COOKIE['update'])) {
+			$latest = unserialize($_COOKIE['update']);
+		} else {
+			$ctx = stream_context_create(array('http' => array('timeout' => 5)));
+			if ($code = @file_get_contents('http://tinyboard.org/version.txt', 0, $ctx)) {
+				eval($code);
+				if (preg_match('/v(\d+)\.(\d)\.(\d+)(-dev.+)?$/', $config['version'], $matches)) {
+					$current = array(
+						'massive' => (int) $matches[1],
+						'major' => (int) $matches[2],
+						'minor' => (int) $matches[3]
+					);
+					if (isset($m[4])) { 
+						// Development versions are always ahead in the versioning numbers
+						$current['minor'] --;
+					}
+					// Check if it's newer
+					if (!(	$latest['massive'] > $current['massive'] ||
+						$latest['major'] > $current['major'] ||
+							($latest['massive'] == $current['massive'] &&
+								$latest['major'] == $current['major'] &&
+								$latest['minor'] > $current['minor']
+							)))
+						$latest = false;
+				} else {
+					$latest = false;
+				}
+			} else {
+				// Couldn't get latest version
+				$latest = false;
+			}
+	
+			setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, false, true);
+		}
+		
+		if ($latest)
+			$args['newer_release'] = $latest;
+	}
+			
 	mod_page('Dashboard', 'mod/dashboard.html', $args);
 }
 
+function mod_edit_board($boardName) {
+	global $board, $config;
+	
+	if (!openBoard($boardName))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['manageboards'], $board['uri']))
+			error($config['error']['noaccess']);
+	
+	if (isset($_POST['title'], $_POST['subtitle'])) {
+		if (isset($_POST['delete'])) {
+			if (!hasPermission($config['mod']['manageboards'], $board['uri']))
+				error($config['error']['deleteboard']);
+			
+			$query = prepare('DELETE FROM `boards` WHERE `uri` = :uri');
+			$query->bindValue(':uri', $board['uri']);
+			$query->execute() or error(db_error($query));
+			
+			modLog('Deleted board: ' . sprintf($config['board_abbreviation'], $board['uri']), false);
+			
+			// Delete entire board directory
+			rrmdir($board['uri'] . '/');
+			
+			// Delete posting table
+			$query = query(sprintf('DROP TABLE IF EXISTS `posts_%s`', $board['uri'])) or error(db_error());
+			
+			// Clear reports
+			$query = prepare('DELETE FROM `reports` WHERE `board` = :id');
+			$query->bindValue(':id', $board['uri'], PDO::PARAM_INT);
+			$query->execute() or error(db_error($query));
+			
+			// Delete from table
+			$query = prepare('DELETE FROM `boards` WHERE `uri` = :uri');
+			$query->bindValue(':uri', $board['uri'], PDO::PARAM_INT);
+			$query->execute() or error(db_error($query));
+			
+			if ($config['cache']['enabled']) {
+				cache::delete('board_' . $board['uri']);
+				cache::delete('all_boards');
+			}
+			
+			$query = prepare("SELECT `board`, `post` FROM `cites` WHERE `target_board` = :board");
+			$query->bindValue(':board', $board['uri']);
+			$query->execute() or error(db_error($query));
+			while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
+				if ($board['uri'] != $cite['board']) {
+					if (!isset($tmp_board))
+						$tmp_board = $board;
+					openBoard($cite['board']);
+					rebuildPost($cite['post']);
+				}
+			}
+			
+			$query = prepare('DELETE FROM `cites` WHERE `board` = :board OR `target_board` = :board');
+			$query->bindValue(':board', $board['uri']);
+			$query->execute() or error(db_error($query));
+			
+			$query = prepare('DELETE FROM `antispam` WHERE `board` = :board');
+			$query->bindValue(':board', $board['uri']);
+			$query->execute() or error(db_error($query));
+		} else {
+			$query = prepare('UPDATE `boards` SET `title` = :title, `subtitle` = :subtitle WHERE `uri` = :uri');
+			$query->bindValue(':uri', $board['uri']);
+			$query->bindValue(':title', $_POST['title']);
+			$query->bindValue(':subtitle', $_POST['subtitle']);
+			$query->execute() or error(db_error($query));
+		}
+		
+		rebuildThemes('boards');
+		
+		header('Location: ?/', true, $config['redirect_http']);
+	} else {
+		mod_page('Edit board: ' . sprintf($config['board_abbreviation'], $board['uri']), 'mod/board.html', array('board' => $board));
+	}
+}
+
+function mod_new_board() {
+	global $config, $board;
+	
+	if (!hasPermission($config['mod']['newboard']))
+		error($config['error']['noaccess']);
+	
+	if (isset($_POST['uri'], $_POST['title'], $_POST['subtitle'])) {
+		if ($_POST['uri'] == '')
+			error(sprintf($config['error']['required'], 'URI'));
+		
+		if ($_POST['title'] == '')
+			error(sprintf($config['error']['required'], 'title'));
+		
+		if (!preg_match('/^\w+$/', $_POST['uri']))
+			error(sprintf($config['error']['invalidfield'], 'URI'));
+		
+		if (openBoard($_POST['uri'])) {
+			error(sprintf($config['error']['boardexists'], $board['url']));
+		}
+		
+		$query = prepare('INSERT INTO `boards` VALUES (:uri, :title, :subtitle)');
+		$query->bindValue(':uri', $_POST['uri']);
+		$query->bindValue(':title', $_POST['title']);
+		$query->bindValue(':subtitle', $_POST['subtitle']);
+		$query->execute() or error(db_error($query));
+		
+		modLog('Created a new board: ' . sprintf($config['board_abbreviation'], $_POST['uri']));
+		
+		if (!openBoard($_POST['uri']))
+			error(_("Couldn't open board after creation."));
+		
+		query(Element('posts.sql', array('board' => $board['uri']))) or error(db_error());
+		
+		if ($config['cache']['enabled'])
+				cache::delete('all_boards');
+		
+		// Build the board
+		buildIndex();
+		
+		rebuildThemes('boards');
+		
+		header('Location: ?/' . $board['uri'] . '/' . $config['file_index'], true, $config['redirect_http']);
+	}
+	
+	mod_page('New board', 'mod/board.html', array('new' => true));
+}
+
 function mod_noticeboard($page_no = 1) {
 	global $config, $pdo, $mod;
 	
@@ -104,9 +284,11 @@ function mod_noticeboard($page_no = 1) {
 		$query->bindValue(':body', $_POST['body']);
 		$query->execute() or error(db_error($query));
 		
-		if($config['cache']['enabled'])
+		if ($config['cache']['enabled'])
 			cache::delete('noticeboard_preview');
 		
+		modLog('Posted a noticeboard entry');
+		
 		header('Location: ?/noticeboard#' . $pdo->lastInsertId(), true, $config['redirect_http']);
 	}
 	
@@ -126,6 +308,78 @@ function mod_noticeboard($page_no = 1) {
 	mod_page('Noticeboard', 'mod/noticeboard.html', array('noticeboard' => $noticeboard, 'count' => $count));
 }
 
+function mod_noticeboard_delete($id) {
+	global $config;
+	
+	if (!hasPermission($config['mod']['noticeboard_delete']))
+			error($config['error']['noaccess']);
+	
+	$query = prepare('DELETE FROM `noticeboard` WHERE `id` = :id');
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	modLog('Deleted a noticeboard entry');
+	
+	header('Location: ?/noticeboard', true, $config['redirect_http']);
+}
+
+function mod_news($page_no = 1) {
+	global $config, $pdo, $mod;
+	
+	if ($page_no < 1)
+		error($config['error']['404']);
+	
+	if (isset($_POST['subject'], $_POST['body'])) {
+		if (!hasPermission($config['mod']['news']))
+			error($config['error']['noaccess']);
+		
+		markup($_POST['body']);
+		
+		$query = prepare('INSERT INTO `news` VALUES (NULL, :name, :time, :subject, :body)');
+		$query->bindValue(':name', isset($_POST['name']) && hasPermission($config['mod']['news_custom']) ? $_POST['name'] : $mod['username']);
+		$query->bindvalue(':time', time());
+		$query->bindValue(':subject', $_POST['subject']);
+		$query->bindValue(':body', $_POST['body']);
+		$query->execute() or error(db_error($query));
+		
+		modLog('Posted a news entry');
+		
+		rebuildThemes('news');
+		
+		header('Location: ?/news#' . $pdo->lastInsertId(), true, $config['redirect_http']);
+	}
+	
+	$query = prepare("SELECT * FROM `news` ORDER BY `id` DESC LIMIT :offset, :limit");
+	$query->bindValue(':limit', $config['mod']['news_page'], PDO::PARAM_INT);
+	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['news_page'], PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$news = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	if (empty($news) && $page_no > 1)
+		error($config['error']['404']);
+	
+	$query = prepare("SELECT COUNT(*) FROM `news`");
+	$query->execute() or error(db_error($query));
+	$count = $query->fetchColumn(0);
+	
+	mod_page('News', 'mod/news.html', array('news' => $news, 'count' => $count));
+}
+
+function mod_news_delete($id) {
+	global $config;
+	
+	if (!hasPermission($config['mod']['news_delete']))
+			error($config['error']['noaccess']);
+	
+	$query = prepare('DELETE FROM `news` WHERE `id` = :id');
+	$query->bindValue(':id', $id);
+	$query->execute() or error(db_error($query));
+	
+	modLog('Deleted a news entry');
+	
+	header('Location: ?/news', true, $config['redirect_http']);
+}
+
 function mod_log($page_no = 1) {
 	global $config;
 	
@@ -135,7 +389,7 @@ function mod_log($page_no = 1) {
 	if (!hasPermission($config['mod']['modlog']))
 		error($config['error']['noaccess']);
 	
-	$query = prepare("SELECT `username`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY `time` DESC LIMIT :offset, :limit");
+	$query = prepare("SELECT `username`, `mod`, `ip`, `board`, `time`, `text` FROM `modlogs` LEFT JOIN `mods` ON `mod` = `mods`.`id` ORDER BY `time` DESC LIMIT :offset, :limit");
 	$query->bindValue(':limit', $config['mod']['modlog_page'], PDO::PARAM_INT);
 	$query->bindValue(':offset', ($page_no - 1) * $config['mod']['modlog_page'], PDO::PARAM_INT);
 	$query->execute() or error(db_error($query));
@@ -196,7 +450,7 @@ function mod_ip_remove_note($ip, $id) {
 	
 	modLog("Removed a note for <a href=\"?/IP/{$ip}\">{$ip}</a>");
 	
-	header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+	header('Location: ?/IP/' . $ip . '#notes', true, $config['redirect_http']);
 }
 
 function mod_page_ip($ip) {
@@ -212,7 +466,8 @@ function mod_page_ip($ip) {
 		require_once 'inc/mod/ban.php';
 		
 		unban($_POST['ban_id']);
-		header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+		
+		header('Location: ?/IP/' . $ip . '#bans', true, $config['redirect_http']);
 		return;
 	}
 	
@@ -230,7 +485,7 @@ function mod_page_ip($ip) {
 		
 		modLog("Added a note for <a href=\"?/IP/{$ip}\">{$ip}</a>");
 		
-		header('Location: ?/IP/' . $ip, true, $config['redirect_http']);
+		header('Location: ?/IP/' . $ip . '#notes', true, $config['redirect_http']);
 		return;
 	}
 	
@@ -238,6 +493,9 @@ function mod_page_ip($ip) {
 	$args['ip'] = $ip;
 	$args['posts'] = array();
 	
+	if ($config['mod']['dns_lookup'])
+		$args['hostname'] = rDNS($ip);
+	
 	$boards = listBoards();
 	foreach ($boards as $board) {
 		openBoard($board['uri']);
@@ -287,7 +545,7 @@ function mod_page_ip($ip) {
 		$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	}
 	
-	mod_page("IP: $ip", 'mod/view_ip.html', $args);
+	mod_page("IP: $ip", 'mod/view_ip.html', $args, $args['hostname']);
 }
 
 function mod_ban() {
@@ -382,7 +640,7 @@ function mod_lock($board, $unlock, $post) {
 	$query->bindValue(':id', $post);
 	$query->bindValue(':locked', $unlock ? 0 : 1);
 	$query->execute() or error(db_error($query));
-	if($query->rowCount()) {
+	if ($query->rowCount()) {
 		modLog(($unlock ? 'Unlocked' : 'Locked') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
@@ -404,7 +662,7 @@ function mod_sticky($board, $unsticky, $post) {
 	$query->bindValue(':id', $post);
 	$query->bindValue(':sticky', $unsticky ? 0 : 1);
 	$query->execute() or error(db_error($query));
-	if($query->rowCount()) {
+	if ($query->rowCount()) {
 		modLog(($unlock ? 'Unstickied' : 'Stickied') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
@@ -426,7 +684,7 @@ function mod_bumplock($board, $unbumplock, $post) {
 	$query->bindValue(':id', $post);
 	$query->bindValue(':bumplock', $unbumplock ? 0 : 1);
 	$query->execute() or error(db_error($query));
-	if($query->rowCount()) {
+	if ($query->rowCount()) {
 		modLog(($unlock ? 'Unbumplocked' : 'Bumplocked') . " thread #{$post}");
 		buildThread($post);
 		buildIndex();
@@ -447,7 +705,7 @@ function mod_ban_post($board, $delete, $post) {
 	$query = prepare(sprintf('SELECT `ip`, `thread` FROM `posts_%s` WHERE `id` = :id', $board));
 	$query->bindValue(':id', $post);
 	$query->execute() or error(db_error($query));
-	if(!$_post = $query->fetch(PDO::FETCH_ASSOC))
+	if (!$_post = $query->fetch(PDO::FETCH_ASSOC))
 		error($config['error']['404']);
 	
 	$thread = $_post['thread'];
@@ -624,25 +882,54 @@ function mod_user($uid) {
 			}
 		}
 		
+		if (isset($_POST['delete'])) {
+			if (!hasPermission($config['mod']['deleteusers']))
+				error($config['error']['noaccess']);
+			
+			$query = prepare('DELETE FROM `mods` WHERE `id` = :id');
+			$query->bindValue(':id', $uid);
+			$query->execute() or error(db_error($query));
+			
+			modLog('Deleted user ' . utf8tohtml($user['username']) . ' <small>(#' . $user['id'] . ')</small>');
+			
+			header('Location: ?/users', true, $config['redirect_http']);
+			
+			return;
+		}
+		
+		if ($_POST['username'] == '')
+			error(sprintf($config['error']['required'], 'username'));
+		
 		$query = prepare('UPDATE `mods` SET `username` = :username, `boards` = :boards WHERE `id` = :id');
 		$query->bindValue(':id', $uid);
 		$query->bindValue(':username', $_POST['username']);
 		$query->bindValue(':boards', implode(',', $boards));
 		$query->execute() or error(db_error($query));
 		
+		if ($user['username'] !== $_POST['username']) {
+			// account was renamed
+			modLog('Renamed user "' . utf8tohtml($user['username']) . '" <small>(#' . $user['id'] . ')</small> to "' . utf8tohtml($_POST['username']) . '"');
+		}
+		
 		if ($_POST['password'] != '') {
 			$query = prepare('UPDATE `mods` SET `password` = SHA1(:password) WHERE `id` = :id');
 			$query->bindValue(':id', $uid);
 			$query->bindValue(':password', $_POST['password']);
 			$query->execute() or error(db_error($query));
 			
+			modLog('Changed password for ' . utf8tohtml($_POST['username']) . ' <small>(#' . $user['id'] . ')</small>');
+			
 			if ($uid == $mod['id']) {
 				login($_POST['username'], $_POST['password']);
 				setCookies();
 			}
 		}
 		
-		header('Location: ?/users', true, $config['redirect_http']);
+		if (hasPermission($config['mod']['manageusers']))
+			header('Location: ?/users', true, $config['redirect_http']);
+		else
+			header('Location: ?/', true, $config['redirect_http']);
+		
 		return;
 	}
 	
@@ -653,11 +940,17 @@ function mod_user($uid) {
 			$query->bindValue(':password', $_POST['password']);
 			$query->execute() or error(db_error($query));
 			
-			login($_POST['username'], $_POST['password']);
+			modLog('Changed own password');
+			
+			login($user['username'], $_POST['password']);
 			setCookies();
 		}
 		
-		header('Location: ?/users', true, $config['redirect_http']);
+		if (hasPermission($config['mod']['manageusers']))
+			header('Location: ?/users', true, $config['redirect_http']);
+		else
+			header('Location: ?/', true, $config['redirect_http']);
+		
 		return;
 	}
 	
@@ -675,6 +968,47 @@ function mod_user($uid) {
 	mod_page('Edit user', 'mod/user.html', array('user' => $user, 'logs' => $log, 'boards' => listBoards()));
 }
 
+function mod_user_new() {
+	if (isset($_POST['username'], $_POST['password'], $_POST['type'])) {
+		if ($_POST['username'] == '')
+			error(sprintf($config['error']['required'], 'username'));
+		if ($_POST['password'] == '')
+			error(sprintf($config['error']['required'], 'password'));
+		
+		if (isset($_POST['allboards'])) {
+			$boards = array('*');
+		} else {
+			$_boards = listBoards();
+			foreach ($_boards as &$board) {
+				$board = $board['uri'];
+			}
+			
+			$boards = array();
+			foreach ($_POST as $name => $value) {
+				if (preg_match('/^board_(\w+)$/', $name, $matches) && in_array($matches[1], $_boards))
+					$boards[] = $matches[1];
+			}
+		}
+		
+		$_POST['type'] = (int) $_POST['type'];
+		if ($_POST['type'] !== JANITOR && $_POST['type'] !== MOD && $_POST['type'] !== ADMIN)
+			error(sprintf($config['error']['invalidfield'], 'type'));
+		
+		$query = prepare('INSERT INTO `mods` VALUES (NULL, :username, SHA1(:password), :type, :boards)');
+		$query->bindValue(':username', $_POST['username']);
+		$query->bindValue(':password', $_POST['password']);
+		$query->bindValue(':type', $_POST['type']);
+		$query->bindValue(':boards', implode(',', $boards));
+		$query->execute() or error(db_error($query));
+		
+		header('Location: ?/users', true, $config['redirect_http']);
+		return;
+	}
+		
+	mod_page('Edit user', 'mod/user.html', array('new' => true, 'boards' => listBoards()));
+}
+
+
 function mod_users() {
 	global $config;
 	
@@ -734,12 +1068,38 @@ function mod_pm($id, $reply = false) {
 		if (!$pm['to_username'])
 			error($config['error']['404']); // deleted?
 		
-		mod_page("New PM for {$pm['to_username']}", 'mod/new_pm.html', array('username' => $pm['to_username'], 'id' => $pm['to'], 'message' => quote($pm['message'])));
+		mod_page("New PM for {$pm['to_username']}", 'mod/new_pm.html', array(
+			'username' => $pm['username'], 'id' => $pm['sender'], 'message' => quote($pm['message'])
+		));
 	} else {
 		mod_page("Private message &ndash; #$id", 'mod/pm.html', $pm);
 	}
 }
 
+function mod_inbox() {
+	global $config, $mod;
+	
+	$query = prepare('SELECT `unread`,`pms`.`id`, `time`, `sender`, `to`, `message`, `username` FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` WHERE `to` = :mod ORDER BY `unread` DESC, `time` DESC');
+	$query->bindValue(':mod', $mod['id']);
+	$query->execute() or error(db_error($query));
+	$messages = $query->fetchAll(PDO::FETCH_ASSOC);
+	
+	$query = prepare('SELECT COUNT(*) FROM `pms` WHERE `to` = :mod AND `unread` = 1');
+	$query->bindValue(':mod', $mod['id']);
+	$query->execute() or error(db_error($query));
+	$unread = $query->fetchColumn(0);
+	
+	foreach ($messages as &$message) {
+		$message['snippet'] = pm_snippet($message['message']);
+	}
+	
+	mod_page('PM inbox (' . (count($messages) > 0 ? $unread . ' unread' : 'empty') . ')', 'mod/inbox.html', array(
+		'messages' => $messages,
+		'unread' => $unread
+	));
+}
+
+
 function mod_new_pm($username) {
 	global $config, $mod;
 	
@@ -920,7 +1280,7 @@ function mod_reports() {
 		
 		$body .= $po->build(true) . '<hr>';
 		
-		if(isset($__old_body_truncate_char))
+		if (isset($__old_body_truncate_char))
 			$config['body_truncate_char'] = $__old_body_truncate_char;
 	}
 	
@@ -971,7 +1331,7 @@ function mod_debug_antispam() {
 	
 	if (isset($_POST['board'], $_POST['thread'])) {
 		$where = '`board` = ' . $pdo->quote($_POST['board']);
-		if($_POST['thread'] != '')
+		if ($_POST['thread'] != '')
 			$where .= ' AND `thread` = ' . $pdo->quote($_POST['thread']);
 		
 		if (isset($_POST['purge'])) {
diff --git a/install.php b/install.php
index 2e732c4c..1e872911 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 
 // Installation/upgrade file	
-define('VERSION', 'v0.9.6-dev-4');
+define('VERSION', 'v0.9.6-dev-5');
 
 require 'inc/functions.php';
 
@@ -210,6 +210,8 @@ if (file_exists($config['has_installed'])) {
 			}
 		case 'v0.9.6-dev-3':
 			query("ALTER TABLE  `antispam` CHANGE  `hash`  `hash` CHAR( 40 ) NOT NULL") or error(db_error());
+		case 'v0.9.6-dev-4':
+			query("ALTER TABLE  `news` DROP INDEX  `id`, ADD PRIMARY KEY ( `id` )") or error(db_error());
 		case false:
 			// Update version number
 			file_write($config['has_installed'], VERSION);
diff --git a/js/show-op.js b/js/show-op.js
index df9cf31b..d948ca3b 100644
--- a/js/show-op.js
+++ b/js/show-op.js
@@ -23,8 +23,6 @@ $(document).ready(function(){
 			OP = $('div.post.op a.post_no:eq(1)').text();
 		}
 		
-		console.log(OP);
-		
 		$(this).find('p.body a:not([rel="nofollow"])').each(function() {
 			var postID;
 			
diff --git a/mod.php b/mod.php
index 7ebb0da7..f1d47e8d 100644
--- a/mod.php
+++ b/mod.php
@@ -24,17 +24,28 @@ $pages = array(
 	'!^$!'					=> ':?/',		// redirect to dashboard
 	'!^/$!'					=> 'dashboard',		// dashboard
 	'!^/confirm/(.+)$!'			=> 'confirm',		// confirm action (if javascript didn't work)
+	'!^/logout$!'				=> 'logout',		// logout
 	
 	'!^/users$!'				=> 'users',		// manage users
 	'!^/users/(\d+)$!'			=> 'user',		// edit user
 	'!^/users/(\d+)/(promote|demote)$!'	=> 'user_promote',	// prmote/demote user
+	'!^/users/new$!'			=> 'user_new',		// create a new user
 	'!^/new_PM/([^/]+)$!'			=> 'new_pm',		// create a new pm
 	'!^/PM/(\d+)(/reply)?$!'		=> 'pm',		// read a pm
+	'!^/inbox$!'				=> 'inbox',		// pm inbox
 	
 	'!^/noticeboard$!'			=> 'noticeboard',	// view noticeboard
 	'!^/noticeboard/(\d+)$!'		=> 'noticeboard',	// view noticeboard
+	'!^/noticeboard/delete/(\d+)$!'		=> 'noticeboard_delete',// delete from noticeboard
 	'!^/log$!'				=> 'log',		// modlog
 	'!^/log/(\d+)$!'			=> 'log',		// modlog
+	'!^/news$!'				=> 'news',		// view news
+	'!^/news/(\d+)$!'			=> 'news',		// view news
+	'!^/news/delete/(\d+)$!'		=> 'news_delete',	// delete from news
+	
+	'!^/edit/(\w+)$!'			=> 'edit_board',	// edit board details
+	'!^/new-board$!'			=> 'new_board',		// create a new board
+	
 	'!^/rebuild$!'				=> 'rebuild',		// rebuild static files
 	'!^/reports$!'				=> 'reports',		// report queue
 	'!^/reports/(\d+)/dismiss(all)?$!'	=> 'report_dismiss',	// dismiss a report
@@ -64,8 +75,14 @@ $pages = array(
 			str_replace('%d', '(\d+)', preg_quote($config['file_page'], '!')) . '$!'	=> 'view_thread',
 );
 
-if (!$mod)
+
+if (!$mod) {
 	$pages = array('//' => 'login');
+} elseif (isset($_GET['status'], $_GET['r'])) {
+	header('Location: ' . $_GET['r'], true, (int)$_GET['stats']);
+} elseif (isset($config['mod']['custom_pages'])) {
+	$pages = array_merge($pages, $config['mod']['custom_pages']);
+}
 
 foreach ($pages as $uri => $handler) {
 	if (preg_match($uri, $query, $matches)) {
@@ -79,14 +96,20 @@ foreach ($pages as $uri => $handler) {
 			);
 		}
 		
-		if ($handler[0] == ':') {
-			header('Location: ' . substr($handler, 1),  true, $config['redirect_http']);
-		} elseif (is_callable("mod_page_$handler")) {
-			call_user_func_array("mod_page_$handler", $matches);
-		} elseif (is_callable("mod_$handler")) {
-			call_user_func_array("mod_$handler", $matches);
+		if (is_string($handler)) {
+			if ($handler[0] == ':') {
+				header('Location: ' . substr($handler, 1),  true, $config['redirect_http']);
+			} elseif (is_callable("mod_page_$handler")) {
+				call_user_func_array("mod_page_$handler", $matches);
+			} elseif (is_callable("mod_$handler")) {
+				call_user_func_array("mod_$handler", $matches);
+			} else {
+				error("Mod page '$handler' not found!");
+			}
+		} elseif (is_callable($handler)) {
+			call_user_func_array($handler, $matches);
 		} else {
-			error("Mod page '$handler' not found!");
+			error("Mod page '$handler' not a string, and not callable!");
 		}
 		
 		exit;
diff --git a/templates/generic_page.html b/templates/generic_page.html
new file mode 100644
index 00000000..e834aad0
--- /dev/null
+++ b/templates/generic_page.html
@@ -0,0 +1,71 @@
+<!doctype html>
+<html>
+<head>
+	{% block head %}
+		<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+		{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
+		<title>{{ board.url }} - {{ board.name }}</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes">
+		{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
+		{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
+		{% if not nojavascript %}
+			<script type="text/javascript" src="{{ config.url_javascript }}"></script>
+			{% if not config.additional_javascript_compile %}
+			{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+			{% endif %}
+		{% endif %}
+		{% if config.recaptcha %}<style type="text/css">{% raw %}
+			.recaptcha_image_cell {
+				background: none !important;
+			}
+			table.recaptchatable {
+				border: none !important;
+			}
+			#recaptcha_logo, #recaptcha_tagline {
+				display: none;
+				float: right;
+			}
+			.recaptchatable a {
+				display: block;
+			}
+		{% endraw %}</style>{% endif %}
+	{% endblock %}
+</head>
+<body>	
+	{{ boardlist.top }}
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
+	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
+	<header>
+		<h1>{{ board.url }} - {{ board.name }}</h1>
+		<div class="subtitle">
+			{% if board.title %}
+				{{ board.title|e }}
+			{% endif %}
+			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
+		</div>
+	</header>
+	
+	{% include 'post_form.html' %}
+	
+	{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
+	<hr />
+	<form name="postcontrols" action="{{ config.post_url }}" method="post">
+	<input type="hidden" name="board" value="{{ board.uri }}" />
+	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
+	{{ body }}
+	{% include 'report_delete.html' %}
+	</form>
+	<div class="pages">{{ btn.prev }} {% for page in pages %}
+		 [<a {% if page.selected %}class="selected"{% endif %}{% if not page.selected %}href="{{ page.link }}"{% endif %}>{{ page.num }}</a>]{% if loop.last %} {% endif %}
+	{% endfor %} {{ btn.next }}</div>
+	{{ boardlist.bottom }}
+	<footer>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
+		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
+	</footer>
+	<script type="text/javascript">{% raw %}
+		ready();
+	{% endraw %}</script>
+</body>
+</html>
diff --git a/templates/index.html b/templates/index.html
index f12e2517..a28724a1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html>
 <head>
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}" />
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
+	<meta charset="utf-8">
+	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
 	<title>{{ board.url }} - {{ board.name }}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}" />{% endif %}
-	<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
+	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
+	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if not nojavascript %}
 		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
 		{% if not config.additional_javascript_compile %}
@@ -35,10 +35,10 @@
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
-		<h1>{{ board.url }} - {{ board.title }}</h1>
+		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle }}
+				{{ board.subtitle|e }}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
index 9d4d6728..5d5f2b81 100644
--- a/templates/mod/ban_form.html
+++ b/templates/mod/ban_form.html
@@ -16,19 +16,19 @@
 		
 		<tr>
 			<th>
-				<label for="ip">IP <span class="unimportant">(or subnet)</span></label>
+				<label for="ip">{% trans 'IP' %} <span class="unimportant">{% trans '(or subnet)' %}</span></label>
 			</th>
 			<td>
 				{% if not hide_ip %}
 					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
 				{% else %}
-					<em>hidden</em>
+					<em>{% trans 'hidden' %}</em>
 				{% endif %}
 			</td>
 		</tr>
 		<tr>
 			<th>
-				<label for="reason">Reason</label>
+				<label for="reason">{% trans 'Reason' %}</label>
 			</th>
 			<td>
 				<textarea name="reason" id="reason" rows="5" cols="30">{{ reason|e }}</textarea>
@@ -37,12 +37,12 @@
 		{% if post and board and not delete %}
 			<tr>
 				<th>
-					<label for="reason">Message</label>
+					<label for="reason">{% trans 'Message' %}</label>
 				</th>
 				<td>
 					<input type="checkbox" id="public_message" name="public_message"> 
 					<input type="text" name="message" id="message" size="35" maxlength="200" value="{{ config.mod.default_ban_message|e }}"> 
-					<span class="unimportant">(public; attached to post)</span>
+					<span class="unimportant">({% trans 'public; attached to post' %})</span>
 					<script type="text/javascript">
 						document.getElementById('message').disabled = true;
 						document.getElementById('public_message').onchange = function() {
@@ -54,20 +54,20 @@
 		{% endif %}
 		<tr>
 			<th>
-				<label for="length">Length</label>
+				<label for="length">{% trans 'Length' %}</label>
 			</th>
 			<td>
 				<input type="text" name="length" id="length" size="20" maxlength="40"> 
 					<span class="unimportant">(eg. "2d1h30m" or "2 days")</span></td>
 			</tr>
 		<tr>
-			<th>Board</th>
+			<th>{% trans 'Board' %}</th>
 			<td>
 				<ul style="list-style:none;padding:2px 5px">
 					<li>
 						<input type="radio" name="board" value="*" id="ban-allboards" checked> 
 						<label style="display:inline" for="ban-allboards">
-							<em>all boards</em>
+							<em>{% trans 'all boards' %}</em>
 						</label>
 					</li>
 					
@@ -75,7 +75,7 @@
 						<li>
 							<input type="radio" name="board" value="{{ board.uri }}" id="ban-board-{{ board.uri }}"> 
 							<label style="display:inline" for="ban-board-{{ board.uri }}">
-								{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title }}
+								{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title|e }}
 							</label>
 						</li>
 					{% endfor %}
@@ -84,7 +84,7 @@
 		</tr>
 		<tr>
 			<td></td>
-			<td><input name="new_ban" type="submit" value="New Ban"></td>
+			<td><input name="new_ban" type="submit" value="{% trans 'New Ban' %}"></td>
 		</tr>
 	</table>
 </form>
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index ea8183d6..4a27b8f7 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -1,15 +1,15 @@
 {% if bans|count == 0 %}
-	<p style="text-align:center" class="unimportant">(There are no active bans.)</p>
+	<p style="text-align:center" class="unimportant">({% trans 'There are no active bans.' %})</p>
 {% else %}
 	<form action="" method="post">
 		<table class="mod">
 			<tr>
-				<th>{% trans %}IP address{% endtrans %}</th>
-				<th>{% trans %}Reason{% endtrans %}</th>
-				<th>{% trans %}Board{% endtrans %}</th>
-				<th>{% trans %}Set{% endtrans %}</th>
-				<th>{% trans %}Expires{% endtrans %}</th>
-				<th>{% trans %}Staff{% endtrans %}</th>
+				<th>{% trans 'IP address' %}</th>
+				<th>{% trans 'Reason' %}</th>
+				<th>{% trans 'Board' %}</th>
+				<th>{% trans 'Set' %}</th>
+				<th>{% trans 'Expires' %}</th>
+				<th>{% trans 'Staff' %}</th>
 			</tr>
 			{% for ban in bans %}
 				<tr{% if ban.expires != 0 and ban.expires < time() %} style="text-decoration:line-through"{% endif %}>
@@ -32,7 +32,7 @@
 						{% if ban.board %}
 							{{ config.board_abbreviation|sprintf(ban.board) }}
 						{% else %}
-							<em>{% trans %}all boards{% endtrans %}
+							<em>{% trans 'all boards' %}</em>
 						{% endif %}					
 					</td>
 					<td style="white-space: nowrap">
@@ -40,7 +40,7 @@
 					</td>
 					<td style="white-space: nowrap">
 						{% if ban.expires == 0 %}
-							<em>never</em>
+							<em>{% trans 'never' %}</em>
 						{% else %}
 							{{ ban.expires|date(config.post_date) }} 
 							{% if ban.expires > time() %}
@@ -59,8 +59,10 @@
 							
 								{% endif %}
 							{% endif %}
+						{% elseif ban.mod == -1 %}
+							<em>system</em>
 						{% else %}
-							<em>deleted?</em>
+							<em>{% trans 'deleted?' %}</em>
 						{% endif %}
 					</td>
 				</tr>
@@ -68,7 +70,7 @@
 		</table>
 		
 		<p style="text-align:center">
-			<input type="submit" name="unban" value="Unban selected">
+			<input type="submit" name="unban" value="{% trans 'Unban selected' %}">
 		</p>
 	</form>
 {% endif %}
diff --git a/templates/mod/board.html b/templates/mod/board.html
new file mode 100644
index 00000000..0775e421
--- /dev/null
+++ b/templates/mod/board.html
@@ -0,0 +1,44 @@
+{% if new %}
+	{% set action = '?/new-board' %}
+{% else %}
+	{% set action = '?/edit/' ~ board.uri %}
+{% endif %}
+
+<form action="{{ action }}" method="post">
+	<table>
+		<tr>
+			<th>{% trans 'URI' %}</th>
+			<td>
+				{% if not new %}
+					{{ config.board_abbreviation|sprintf(board.uri) }}
+				{% else %}
+					/<input size="10" maxlength="255" type="text" name="uri" autocomplete="off">/
+				{% endif %}
+			</td>
+		</tr>
+		<tr>
+			<th>{% trans 'Title' %}</th>
+			<td>
+				<input size="25" type="text" name="title" value="{{ board.title|e }}" autocomplete="off">
+			</td>
+		</tr>
+		<tr>
+			<th>{% trans 'Subtitle' %}</th>
+			<td>
+				<input size="25" type="text" name="subtitle" value="{{ board.subtitle|e }}" autocomplete="off">
+			</td>
+		</tr>
+	</table>
+	
+	<ul style="padding:0;text-align:center;list-style:none">
+		{% if new %}
+			<li><input type="submit" value="{% trans 'Create board' %}"></li>
+		{% else %}
+			<li><input type="submit" value="{% trans 'Save changes' %}"></li>
+			{% if mod|hasPermission(config.mod.deleteboard) %}
+				<li><input name="delete" onclick="return confirm('Are you sure you want to permanently delete this board?');" type="submit" value="{% trans 'Delete board' %}"></li>
+			{% endif %}
+		{% endif %}
+	</ul>
+</form>
+
diff --git a/templates/mod/confirm.html b/templates/mod/confirm.html
index 7509ce3c..6dc4d66a 100644
--- a/templates/mod/confirm.html
+++ b/templates/mod/confirm.html
@@ -1,7 +1,7 @@
 <p style="text-align:center;font-size:1.1em">
-	Are you sure you want to do that? <a href="?/{{ request }}">Click to proceed to ?/{{ request }}</a>.
+	{% trans 'Are you sure you want to do that?' %} <a href="?/{{ request }}">{% trans 'Click to proceed to' %} ?/{{ request }}</a>.
 </p>
 <p class="unimportant" style="text-align:center">
-	You are seeing this message because we were unable to serve a confirmation dialog, probably due to Javascript being disabled.
+	{% trans 'You are seeing this message because we were unable to serve a confirmation dialog, probably due to Javascript being disabled.' %}
 </p>
 
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index fc510ac7..9e50e6ed 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -6,30 +6,30 @@
 			<li>
 				<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board.uri) }}</a>
 					 - 
-				{{ board.title }}
+				{{ board.title|e }}
 				{% if board.subtitle %}
-					 <small>&mdash; {{ board.subtitle }}</small>
+					 <small>&mdash; {{ board.subtitle|e }}</small>
 				{% endif %}
 				
 				{% if mod|hasPermission(config.mod.manageboards) %}
-					 <a href="?/manage/{{ board.uri }}"><small>[{% trans 'manage' %}]</small></a>
+					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
 				{% endif %}
 			</li>
 		{% endfor %}
 		
 		{% if mod|hasPermission(config.mod.newboard) %}
-			<li style="margin-top:15px"><a href="?/new_board"><strong>{% trans 'Create new board' %}</strong></a></li>
+			<li style="margin-top:15px"><a href="?/new-board"><strong>{% trans 'Create new board' %}</strong></a></li>
 		{% endif %}
 	</ul>
 </fieldset>
 
-{% if mod|hasPermission(config.mod.noticeboard) %}
-	<fieldset>
-		<legend>{% trans 'Noticeboard' %}</legend>
-		<ul>
+<fieldset>
+	<legend>{% trans 'Messages' %}</legend>
+	<ul>
+		{% if mod|hasPermission(config.mod.noticeboard) %}
 			{% if noticeboard|count > 0 %}
 				<li>
-					{% trans 'Latest posts:' %}
+					{% trans 'Noticeboard' %}:
 					<ul>
 						{% for post in noticeboard %}
 							<li>
@@ -43,7 +43,7 @@
 								<small class="unimportant">
 									&mdash; by 
 									{% if post.username %}
-										{{ post.username }}
+										{{ post.username|e }}
 									{% else %}
 										<em>deleted?</em>
 									{% endif %} 
@@ -56,9 +56,18 @@
 				</li>
 			{% endif %}
 			<li><a href="?/noticeboard">{% trans 'View all entries' %}</a></li>
-		</ul>
-	</fieldset>
-{% endif %}
+		{% endif %}
+		<li><a href="?/news">{% trans 'News' %}</a></li>
+		<li>
+			<a href="?/inbox">
+				{% trans 'PM inbox' %}
+				{% if unread_pms > 0 %}
+					 <strong>({{ unread_pms }} unread)</strong>
+				{% endif %}
+			</a>
+		</li>
+	</ul>
+</fieldset>
 
 <fieldset>
 	<legend>{% trans 'Administration' %}</legend>
@@ -115,3 +124,24 @@
 	</fieldset>
 {% endif %}
 
+{% if newer_release %}
+	<fieldset>
+		<legend>Update</legend>
+		<ul>
+			<li>
+				A newer version of Tinyboard 
+				(<strong>v{{ newer_release.massive }}.{{ newer_release.major }}.{{ newer_release.minor }}</strong>) is available! 
+				See <a href="http://tinyboard.org">http://tinyboard.org/</a> for upgrade instructions.
+			</li>
+		</ul>
+	</fieldset>
+{% endif %}
+
+<fieldset>
+	<legend>{% trans 'User account' %}</legend>
+	
+	<ul>
+		<li><a href="?/logout">{% trans 'Logout' %}</a></li>
+	</ul>
+</fieldset>
+
diff --git a/templates/mod/inbox.html b/templates/mod/inbox.html
new file mode 100644
index 00000000..97afe446
--- /dev/null
+++ b/templates/mod/inbox.html
@@ -0,0 +1,36 @@
+{% if messages|count == 0 %}
+	<p style="text-align:center" class="unimportant">({% trans 'No private messages for you.' %})</p>
+{% else %}
+	<table class="modlog">
+		<tr>
+			<th>{% trans 'ID' %}</th>
+			<th>{% trans 'From' %}</th>
+			<th>{% trans 'Date' %}</th>
+			<th>{% trans 'Message snippet' %}</th>
+		</tr>
+		{% for message in messages %}
+			<tr{% if message.unread %} style="font-weight:bold"{% endif %}>
+				<td class="minimal">
+					<a href="?/PM/{{ message.id }}">
+						{{ message.id }}
+					</a>
+				</td>
+				<td class="minimal">
+					{% if message.username %}
+						<a href="?/new_PM/{{ message.username|e }}">{{ message.username|e }}</a>
+					{% else %}
+						<em>{% trans 'deleted?' %}</em>
+					{% endif %}
+				</td>
+				<td class="minimal">
+					{{ message.time|date(config.post_date) }}
+				</td>
+				<td>
+					<a href="?/PM/{{ message.id }}">
+						{{ message.snippet }}
+					</a>
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+{% endif %}
diff --git a/templates/mod/log.html b/templates/mod/log.html
index 9b0979cb..dca1b2d0 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -1,15 +1,21 @@
 <table class="modlog">
 	<tr>
-		<th>Staff</th>
-		<th>IP address</th>
-		<th>Time</th>
-		<th>Board</th>
-		<th>Action</th>
+		<th>{% trans 'Staff' %}</th>
+		<th>{% trans 'IP address' %}</th>
+		<th>{% trans 'Time' %}</th>
+		<th>{% trans 'Board' %}</th>
+		<th>{% trans 'Action' %}</th>
 	</tr>
 	{% for log in logs %}
 		<tr>
 			<td class="minimal">
-				<a href="?/new_PM/{{ log.username }}">{{ log.username }}</a>
+				{% if log.username %}
+					<a href="?/new_PM/{{ log.username|e }}">{{ log.username|e }}</a>
+				{% elseif log.mod == -1 %}
+					<em>system</em>
+				{% else %}
+					<em>{% trans 'deleted?' %}</em>
+				{% endif %}
 			</td>
 			<td class="minimal">
 				<a href="?/IP/{{ log.ip }}">{{ log.ip }}</a>
diff --git a/templates/mod/login.html b/templates/mod/login.html
index 5ac308a3..43a28d56 100644
--- a/templates/mod/login.html
+++ b/templates/mod/login.html
@@ -3,7 +3,7 @@
 <table style="margin-top:25px;">
 	<tr>
 		<th>
-			{% trans %}Username{% endtrans %}
+			{% trans 'Username' %}
 		</th>
 		<td>
 			<input type="text" name="username" size="20" maxlength="30" value="{{ username|e }}">
@@ -11,7 +11,7 @@
 	</tr>
 	<tr>
 		<th>
-			{% trans %}Password{% endtrans %}
+			{% trans 'Password' %}
 		</th>
 		<td>
 			<input type="password" name="password" size="20" maxlength="30" value="">
diff --git a/templates/mod/new_pm.html b/templates/mod/new_pm.html
index ece1325c..3fd78ac6 100644
--- a/templates/mod/new_pm.html
+++ b/templates/mod/new_pm.html
@@ -1,7 +1,3 @@
-{#{% if id == mod.id %}
-	{% set username = 'me' %}
-{% endif %}#}
-
 <form action="?/new_PM/{{ username|e }}" method="post">
 	<table>
 		<tr>
@@ -18,5 +14,5 @@
 		</tr>
 	</table>
 
-	<p style="text-align:center"><input type="submit" value="Send message"></p>
+	<p style="text-align:center"><input type="submit" value="{% trans 'Send message' %}"></p>
 </form>
diff --git a/templates/mod/news.html b/templates/mod/news.html
new file mode 100644
index 00000000..b6c35798
--- /dev/null
+++ b/templates/mod/news.html
@@ -0,0 +1,70 @@
+{% if mod|hasPermission(config.mod.news) %}
+	<fieldset>
+		<legend>{% trans 'New post' %}</legend>
+		<form style="margin:0" action="" method="post">
+			<table>
+				<tr>
+					<th>
+						{% if mod|hasPermission(config.mod.news_custom) %}
+							<label for="name">{% trans 'Name' %}</label>
+						{% else %}
+							{% trans 'Name' %}
+						{% endif %}
+					</th>
+					<td>
+						{% if mod|hasPermission(config.mod.news_custom) %}
+							<input type="text" size="55" name="name" id="name" value="{{ mod.username|e }}">
+						{% else %}
+							{{ mod.username|e }}
+						{% endif %}
+					</td>
+				</tr>
+				<tr>
+					<th><label for="subject">{% trans 'Subject' %}</label></th>
+					<td><input type="text" size="55" name="subject" id="subject"></td>
+				</tr>
+				<tr>
+					<th><label for="body">{% trans 'Body' %}</label></th>
+					<td><textarea name="body" id="body" style="width:100%;height:100px"></textarea></td>
+				</tr>
+			</table>
+			<p style="text-align:center">
+				<input type="submit" value="{% trans 'Post news entry' %}">
+			</p>
+		</form>
+	</fieldset>
+{% endif %}
+
+{% for post in news %}
+	<div class="ban">
+		{% if mod|hasPermission(config.mod.news_delete) %}
+			<span style="float:right;padding:2px">
+				<a class="unimportant" href="?/news/delete/{{ post.id }}">[{% trans 'delete' %}]</a>
+			</span>
+		{% endif %}
+		<h2 id="{{ post.id }}">
+			<small class="unimportant">
+				<a href="#{{ post.id }}">#</a>
+			</small> 
+			{% if post.subject %}
+				{{ post.subject|e }}
+			{% else %}
+				<em>{% trans 'no subject' %}</em>
+			{% endif %} 
+			<small class="unimportant">
+				&mdash; {% trans 'by' %} {{ post.name }} {% trans 'at' %} {{ notice.time|date(config.post_date) }} 
+			</small>
+		</h2>
+		<p>
+			{{ post.body }}
+		</p>
+	</div>
+{% endfor %}
+
+{% if count > news|count %}
+	<p class="unimportant" style="text-align:center;word-wrap:break-word">
+		{% for i in range(0, (count - 1) / config.mod.news_page) %}
+			<a href="?/news/{{ i + 1 }}">[{{ i + 1 }}]</a> 
+		{% endfor %}
+	</p>
+{% endif %}
diff --git a/templates/mod/noticeboard.html b/templates/mod/noticeboard.html
index 4d764d80..4a0a068f 100644
--- a/templates/mod/noticeboard.html
+++ b/templates/mod/noticeboard.html
@@ -40,13 +40,13 @@
 				<em>{% trans 'no subject' %}</em>
 			{% endif %} 
 			<small class="unimportant">
-				&mdash; by 
+				&mdash; {% trans 'by' %} 
 				{% if post.username %}
-					{{ post.username }}
+					{{ post.username|e }}
 				{% else %}
-					<em>deleted?</em>
+					<em>{% trans 'deleted?' %}</em>
 				{% endif %} 
-				at 
+				{% trans 'at' %} 
 				{{ notice.time|date(config.post_date) }} 
 			</small>
 		</h2>
diff --git a/templates/mod/pm.html b/templates/mod/pm.html
index 511bcfef..c66dc883 100644
--- a/templates/mod/pm.html
+++ b/templates/mod/pm.html
@@ -1,11 +1,11 @@
 <form action="" method="post">
 	<table>
 		<tr>
-			<th>From</th>
+			<th>{% trans 'From' %}</th>
 			{% if username %}
 				<td><a href="?/new_PM/{{ username|e }}">{{ username|e }}</a></td>
 			{% else %}
-				<td><em>deleted?</em></td>
+				<td><em>{% trans 'deleted?' %}</em></td>
 			{% endif %}
 		</tr>
 		{% if to != mod.id %}
@@ -14,27 +14,27 @@
 				{% if to_username %}
 					<td><a href="?/new_PM/{{ to_username|e }}">{{ to_username|e }}</a></td>
 				{% else %}
-					<td><em>deleted?</em></td>
+					<td><em>{% trans 'deleted?' %}</em></td>
 				{% endif %}
 			</tr>
 		{% endif %}
 		<tr>
-			<th>Date</th>
+			<th>{% trans 'Date' %}</th>
 			<td>{{ time|date(config.post_date) }}</td>
 		</tr>
 		<tr>
-			<th>Message</th>
+			<th>{% trans 'Message' %}</th>
 			<td>{{ message }}</td>
 		</tr>
 	</table>
 	
 	<ul style="list-style:none;text-align:center;padding:0">
 		<li style="padding:5px 0">
-			<input type="submit" name="delete" value="Delete forever">
+			<input type="submit" name="delete" value="{% trans 'Delete forever' %}">
 		</li>
 		<li style="padding:5px 0">
 			<a href="?/PM/{{ id }}/reply">
-				Reply with quote
+				{% trans 'Reply with quote' %}
 			</a>
 		</li>
 	</ul>
diff --git a/templates/mod/rebuild.html b/templates/mod/rebuild.html
index 856855d7..7c6b28ba 100644
--- a/templates/mod/rebuild.html
+++ b/templates/mod/rebuild.html
@@ -2,7 +2,7 @@
 	<ul id="rebuild">
 		<li style="margin-bottom:8px">
 			<input type="checkbox" name="rebuild_all" id="rebuild_all" onchange="toggleall(this.checked)"> 
-			<label for="rebuild_all"><strong>Toggle all</strong></label>
+			<label for="rebuild_all"><strong>{% trans 'Toggle all' %}</strong></label>
 			<script>
 				function toggleall(val) {
 					/* TODO: something more suitable for all browsers? */
@@ -15,27 +15,27 @@
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_cache" id="rebuild_cache" checked> 
-			<label for="rebuild_cache">Flush cache</label>
+			<label for="rebuild_cache">{% trans 'Flush cache' %}</label>
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_javascript" id="rebuild_javascript" checked> 
-			<label for="rebuild_javascript">Rebuild Javascript</label>
+			<label for="rebuild_javascript">{% trans 'Rebuild Javascript' %}</label>
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_index" id="rebuild_index" checked> 
-			<label for="rebuild_index">Rebuild index pages</label>
+			<label for="rebuild_index">{% trans 'Rebuild index pages' %}</label>
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_thread" id="rebuild_thread" checked> 
-			<label for="rebuild_thread">Rebuild thread pages</label>
+			<label for="rebuild_thread">{% trans 'Rebuild thread pages' %}</label>
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_themes" id="rebuild_themes" checked> 
-			<label for="rebuild_themes">Rebuild themes</label>
+			<label for="rebuild_themes">{% trans 'Rebuild themes' %}</label>
 		</li>
 		<li>
 			<input type="checkbox" name="rebuild_posts" id="rebuild_posts"> 
-			<label for="rebuild_posts">Rebuild replies</label>
+			<label for="rebuild_posts">{% trans 'Rebuild replies' %}</label>
 		</li>
 	</ul>
 	
@@ -44,7 +44,7 @@
 	<ul id="boards">
 		<li style="margin-bottom:8px">
 			<input type="checkbox" name="boards_all" id="boards_all" onchange="toggleallboards(this.checked)" checked> 
-			<label for="boards_all"><strong>All boards</strong></label>
+			<label for="boards_all"><strong>{% trans 'All boards' %}</strong></label>
 			<script>
 				function toggleallboards(val) {
 					/* TODO: something more suitable for all browsers? */
@@ -59,13 +59,13 @@
 			<li>
 				<input type="checkbox" name="board_{{ board.uri }}" id="board-{{ board.uri }}" checked> 
 				<label for="board-{{ board.uri }}">
-					{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title }}
+					{{ config.board_abbreviation|sprintf(board.uri) }} - {{ board.title|e }}
 				</label>
 			</li>
 		{% endfor %}
 	</ul>
 	
 	<p style="text-align:center">
-		<input type="submit" value="Rebuild" name="rebuild">
+		<input type="submit" value="{% trans 'Rebuild' %}" name="rebuild">
 	</p>
 </form>
diff --git a/templates/mod/rebuilt.html b/templates/mod/rebuilt.html
index 8cc10bf9..57d16fff 100644
--- a/templates/mod/rebuilt.html
+++ b/templates/mod/rebuilt.html
@@ -1,12 +1,12 @@
 <div class="ban">
-	<h2>Rebuilt</h2>
+	<h2>{% trans 'Rebuilt' %}</h2>
 	<ul>
 		{% for log in logs %}
 			<li>{{ log }}</li>
 		{% endfor %}
 	</ul>
 	<p>
-		<a href="?/rebuild">Go back and rebuild again</a>.
+		<a href="?/rebuild">{% trans 'Go back and rebuild again' %}</a>.
 	</p>
 </div>
 
diff --git a/templates/mod/report.html b/templates/mod/report.html
index c84e3c89..9c8463ed 100644
--- a/templates/mod/report.html
+++ b/templates/mod/report.html
@@ -1,25 +1,25 @@
 <div class="report">
 	<hr>
-	Board: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
+	{% trans 'Board' %}: <a href="?/{{ report.board }}/{{ config.file_index }}">{{ config.board_abbreviation|sprintf(report.board) }}</a>
 	<br>
-	Reason: {{ report.reason }}
+	{% trans 'Reason' %}: {{ report.reason }}
 	<br>
-	Report date: {{ report.time|date(config.post_date) }}
+	{% trans 'Report date' %}: {{ report.time|date(config.post_date) }}
 	<br>
 	{% if mod|hasPermission(config.mod.show_ip, report.board) %}
-		Reported by: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
+		{% trans 'Reported by' %}: <a href="?/IP/{{ report.ip }}">{{ report.ip }}</a>
 		<br>
 	{% endif %}
 	{% if mod|hasPermission(config.mod.report_dismiss, report.board) or mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
 		<hr>
 		{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
-			<a title="Discard abuse report" href="?/reports/{{ report.id }}/dismiss">Dismiss</a>
+			<a title="{% trans 'Discard abuse report' %}" href="?/reports/{{ report.id }}/dismiss">Dismiss</a>
 		{% endif %}
 		{% if mod|hasPermission(config.mod.report_dismiss_ip, report.board) %}
 			{% if mod|hasPermission(config.mod.report_dismiss, report.board) %}
 			 | 
 			{% endif %}
-			<a title="Discard all abuse reports by this IP address" href="?/reports/{{ report.id }}/dismissall">Dismiss+</a>
+			<a title="{% trans 'Discard all abuse reports by this IP address' %}" href="?/reports/{{ report.id }}/dismissall">Dismiss+</a>
 		{% endif %}
 	{% endif %}
 </div>
diff --git a/templates/mod/reports.html b/templates/mod/reports.html
index 37322e35..26bceacc 100644
--- a/templates/mod/reports.html
+++ b/templates/mod/reports.html
@@ -1,5 +1,6 @@
 {% if reports %}
 	{{ reports }}
 {% else %}
-	<p style="text-align:center" class="unimportant">(There are no reports.)</p>
+	<p style="text-align:center" class="unimportant">({% trans 'There are no reports.' %})</p>
 {% endif %}
+
diff --git a/templates/mod/user.html b/templates/mod/user.html
index 87a57d92..3c4b89cf 100644
--- a/templates/mod/user.html
+++ b/templates/mod/user.html
@@ -1,9 +1,15 @@
-<form action="?/users/{{ mod.id }}" method="post">
+{% if new %}
+	{% set action = '?/users/new' %}
+{% else %}
+	{% set action = '?/users/' ~ user.id %}
+{% endif %}
+
+<form action="{{ action }}" method="post">
 	<table>
 		<tr>
-			<th>Username</th>
+			<th>{% trans 'Username' %}</th>
 			<td>
-				{% if mod|hasPermission(config.mod.editusers) %}
+				{% if new or mod|hasPermission(config.mod.editusers) %}
 					<input size="20" maxlength="30" type="text" name="username" value="{{ user.username|e }}" autocomplete="off">
 				{% else %}
 					{{ user.username|e }}
@@ -11,17 +17,38 @@
 			</td>
 		</tr>
 		<tr>
-			<th>Password <small style="font-weight:normal">(new; optional)</small></th>
+			<th>{% trans 'Password' %}{% if not new %} <small style="font-weight:normal">({% trans 'new; optional' %})</small>{% endif %}</th>
 			<td>
-				{% if mod|hasPermission(config.mod.editusers) or (mod|hasPermission(config.mod.change_password) and user.id == mod.id) %}
+				{% if new or (mod|hasPermission(config.mod.editusers) or (mod|hasPermission(config.mod.change_password) and user.id == mod.id)) %}
 					<input size="20" maxlength="30" type="password" name="password" value="" autocomplete="off">
 				{% else %}
 					-
 				{% endif %}
 			</td>
 		</tr>
+		{% if new %}
+			<tr>
+				<th>{% trans 'Class' %}</th>
+				<td>
+					<ul style="padding:5px 8px;list-style:none">
+						<li>
+							<input type="radio" name="type" id="janitor" value="{{ constant('JANITOR') }}"> 
+							<label for="janitor">{% trans 'Janitor' %}</label>
+						</li>
+						<li>
+							<input type="radio" name="type" id="mod" value="{{ constant('MOD') }}" checked> 
+							<label for="mod">{% trans 'Mod' %}</label>
+						</li>
+						<li>
+							<input type="radio" name="type" id="admin" value="{{ constant('Admin') }}"> 
+							<label for="admin">{% trans 'Admin' %}</label>
+						</li>
+					</ul>
+				</td>
+			</tr>
+		{% endif %}
 		<tr>
-			<th>Boards</th>
+			<th>{% trans 'Boards' %}</th>
 			<td>
 				<ul style="padding:0 5px;list-style:none">
 					<li>
@@ -31,7 +58,7 @@
 						 disabled
 						{% endif %}
 						> 
-						<label for="allboards">"*" - All boards</label>
+						<label for="allboards">"*" - {% trans 'All boards' %}</label>
 					</li>
 					{% for board in boards %}
 						<li>
@@ -44,7 +71,7 @@
 							<label for="board_{{ board.uri }}">
 								{{ config.board_abbreviation|sprintf(board.uri) }}
 								 - 
-								{{ board.title }}
+								{{ board.title|e }}
 							</label>
 						</li>
 					{% endfor %}
@@ -53,10 +80,14 @@
 		</tr>
 	</table>
 	
-	<ul style="padding:0;text-align:center">
-		<li><input type="submit" value="Save changes"></li>
-		{% if mod|hasPermission(config.mod.deleteusers) %}
-		<li><input type="submit" value="Delete user"></li>
+	<ul style="padding:0;text-align:center;list-style:none">
+		{% if new %}
+			<li><input type="submit" value="{% trans 'Create user' %}"></li>
+		{% else %}
+			<li><input type="submit" value="{% trans 'Save changes' %}"></li>
+			{% if mod|hasPermission(config.mod.deleteusers) %}
+				<li><input name="delete" onclick="return confirm('Are you sure you want to permanently delete this user?');" type="submit" value="{% trans 'Delete user' %}"></li>
+			{% endif %}
 		{% endif %}
 	</ul>
 </form>
@@ -64,10 +95,10 @@
 {% if logs|count > 0  %}
 	<table class="modlog" style="width:600px">
 		<tr>
-			<th>IP address</th>			
-			<th>Time</th>
-			<th>Board</th>
-			<th>Action</th>
+			<th>{% trans 'IP address' %}</th>			
+			<th>{% trans 'Time' %}</th>
+			<th>{% trans 'Board' %}</th>
+			<th>{% trans 'Action' %}</th>
 		</tr>
 		{% for log in logs %}
 			<tr>
@@ -91,3 +122,4 @@
 		{% endfor %}
 	</table>
 {% endif %}
+
diff --git a/templates/mod/users.html b/templates/mod/users.html
index 63d799d5..a0d216d3 100644
--- a/templates/mod/users.html
+++ b/templates/mod/users.html
@@ -1,39 +1,45 @@
 <table class="modlog" style="width:auto">
 	<tr>
-		<th>ID</th>
-		<th>Username</th>
-		<th>Type</th>
-		<th>Boards</th>
-		<th>Last action</th>
+		<th>{% trans 'ID' %}</th>
+		<th>{% trans 'Username' %}</th>
+		<th>{% trans 'Type' %}</th>
+		<th>{% trans 'Boards' %}</th>
+		<th>{% trans 'Last action' %}</th>
 		<th>&hellip;</th>
 	</tr>
 	
 	{% for user in users %}
 		<tr>
 			<td><small>{{ user.id }}</small></td>
-			<td>{{ user.username }}</td>
+			<td>{{ user.username|e }}</td>
 			<td>
-				{% if user.type == constant('JANITOR') %}Janitor
-				{% elseif user.type == constant('MOD') %}Mod
-				{% elseif user.type == constant('ADMIN') %}Admin
+				{% if user.type == constant('JANITOR') %}{% trans 'Janitor' %}
+				{% elseif user.type == constant('MOD') %}{% trans 'Mod' %}
+				{% elseif user.type == constant('ADMIN') %}{% trans 'Admin' %}
 				{% endif %}
 			</td>
 			<td>
-				{# This is really messy, but IMO it beats doing it in PHP. #}
-				{% set boards = user.boards|split(',') %}
-				{% set _boards = [] %}
-				{% for board in boards %}
-					{% set _boards = _boards|push(board == '*' ? '*' : config.board_abbreviation|sprintf(board)) %}
-				{% endfor %}
-				{% set _boards = _boards|sort %}
-				{{ _boards|join(', ') }}
+				{% if user.boards == '' %}
+					<em>{% trans 'none' %}</em>
+				{% elseif user.boards == '*' %}
+					<em>{% trans 'all boards' %}</em>
+				{% else %}
+					{# This is really messy, but IMO it beats doing it in PHP. #}
+					{% set boards = user.boards|split(',') %}
+					{% set _boards = [] %}
+					{% for board in boards %}
+						{% set _boards = _boards|push(board == '*' ? '*' : config.board_abbreviation|sprintf(board)) %}
+					{% endfor %}
+					{% set _boards = _boards|sort %}
+					{{ _boards|join(', ') }}
+				{% endif %}
 			</td>
 			<td>
 				{% if mod|hasPermission(config.mod.modlog) %}
 					{% if user.last %}
 						<span title="{{ user.action|e }}">{{ user.last|ago }}</span>
 					{% else %}
-						<em>never</em>
+						<em>{% trans 'never' %}</em>
 					{% endif %}
 				{% else %}
 					&ndash;
@@ -41,18 +47,25 @@
 			</td>
 			<td>
 				{% if mod|hasPermission(config.mod.promoteusers) and user.type < constant('ADMIN') %}
-					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote" title="Promote">&#9650;</a> 
+					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote" title="{% trans 'Promote' %}">&#9650;</a> 
 				{% endif %}
 				{% if mod|hasPermission(config.mod.promoteusers) and user.type > constant('JANITOR') %}
-					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/demote" title="Demote">&#9660;</a> 
+					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/demote" title="{% trans 'Demote' %}">&#9660;</a> 
 				{% endif %}
 				{% if mod|hasPermission(config.editusers) or (mod|hasPermission(config.change_password) and mod.id == user.id) %}
-					<a class="unimportant" style="margin-left:5px;float:right" href="?/users/{{ user.id }}">[edit]</a> 
+					<a class="unimportant" style="margin-left:5px;float:right" href="?/users/{{ user.id }}">[{% trans 'edit' %}]</a> 
 				{% endif %}
 				{% if mod|hasPermission(config.mod.create_pm) %}
-					<a class="unimportant" style="margin-left:5px;float:right" href="?/new_PM/{{ user.username }}">[PM]</a>
+					<a class="unimportant" style="margin-left:5px;float:right" href="?/new_PM/{{ user.username|e }}">[{% trans 'PM' %}]</a>
 				{% endif %}
 			</td>
 		</tr>
 	{% endfor %}
 </table>
+
+{% if mod|hasPermission(config.mod.createusers) %}
+	<p style="text-align:center">
+		<a href="?/users/new">Create a new user</a>
+	</p>
+{% endif %}
+
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 3bc9654c..e69301fd 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -1,37 +1,38 @@
 {% for board_posts in posts %}
 	<fieldset>
 		<legend>
-			<a href="?/{{ config.board_path|sprintf(board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}</a>
+			<a href="?/{{ config.board_path|sprintf(board_posts.board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}</a>
 			 - 
-			 {{ board_posts.board.title }}
+			 {{ board_posts.board.title|e }}
 		</legend>
 		{{ board_posts.posts|join('<hr>') }}
 	</fieldset>
 {% endfor %}
 
 {% if mod|hasPermission(config.mod.view_notes) %}
-	<fieldset>
+	<fieldset id="notes">
 		<legend>
-			{{ notes|count }} note{% if notes|count != 1 %}s{% endif %} on record
+			{% set notes_on_record = 'note' ~ (notes|count != 1 ? 's' : '') ~ ' on record' %}
+			<legend>{{ notes|count }} {% trans notes_on_record %}</legend>
 		</legend>
 		
 		{% if notes|count > 0 %}
 			<table class="modlog">
 				<tr>
-					<th>Staff</th>
-					<th>Note</th>
-					<th>Date</th>
+					<th>{% trans 'Staff' %}</th>
+					<th>{% trans 'Note' %}</th>
+					<th>{% trans 'Date' %}</th>
 					{% if mod|hasPermission(config.mod.remove_notes) %}
-						<th>Actions</th>
+						<th>{% trans 'Actions' %}</th>
 					{% endif %}
 				</tr>
 				{% for note in notes %}
 					<tr>
 						<td class="minimal">
 							{% if note.username %}
-								<a href="?/new_PM/{{ note.username }}">{{ note.username }}</a>
+								<a href="?/new_PM/{{ note.username|e }}">{{ note.username|e }}</a>
 							{% else %}
-								<em>deleted?</em>
+								<em>{% trans 'deleted?' %}</em>
 							{% endif %}
 						</td>
 						<td>
@@ -42,7 +43,9 @@
 						</td>
 						{% if mod|hasPermission(config.mod.remove_notes) %}
 							<td class="minimal">
-								<a href="?/IP/{{ ip }}/remove_note/{{ note.id }}"><small>[remove]</small></a>
+								<a href="?/IP/{{ ip }}/remove_note/{{ note.id }}">
+									<small>[{% trans 'remove' %}]</small>
+								</a>
 							</td>
 						{% endif %}
 					</tr>
@@ -54,12 +57,12 @@
 			<form action="" method="post" style="margin:0">
 				<table>
 					<tr>
-						<th>Staff</th>
-						<td>{{ mod.username }}</td>
+						<th>{% trans 'Staff' %}</th>
+						<td>{{ mod.username|e }}</td>
 					</tr>
 					<tr>
 						<th>
-							<label for="note">Note</label>
+							<label for="note">{% trans 'Note' %}</label>
 						</th>
 						<td>
 							<textarea id="note" name="note" rows="5" cols="30"></textarea>
@@ -67,7 +70,7 @@
 					</tr>
 					<tr>
 						<td></td>
-						<td><input type="submit" value="New note"></td>
+						<td><input type="submit" value="{% trans 'New note' %}"></td>
 					</tr>
 				</table>
 			</form>
@@ -76,73 +79,74 @@
 {% endif %}
 
 {% if bans|count > 0 and mod|hasPermission(config.mod.view_ban) %}
-	<fieldset>
-		<legend>Ban{% if bans|count != 1 %}s{% endif %} on record</legend>
+	<fieldset id="bans">
+		{% set bans_on_record = 'ban' ~ (bans|count != 1 ? 's' : '') ~ ' on record' %}
+		<legend>{{ bans|count }} {% trans bans_on_record %}</legend>
 		
 		{% for ban in bans %}
 			<form action="" method="post" style="text-align:center">
 				<table style="width:400px;margin-bottom:10px;border-bottom:1px solid #ddd;padding:5px">
 					<tr>
-						<th>Status</th>
+						<th>{% trans 'Status' %}</th>
 						<td>
 							{% if config.mod.view_banexpired and ban.expires != 0 and ban.expires < time() %}
-								Expired
+								{% trans 'Expired' %}
 							{% else %}
-								Active
+								{% trans 'Active' %}
 							{% endif %}
 						</td>
 					</tr>
 					<tr>
-						<th>IP</th>
+						<th>{% trans 'IP' %}</th>
 						<td>{{ ban.ip }}</td>
 					</tr>
 					<tr>
-						<th>Reason</th>
+						<th>{% trans 'Reason' %}</th>
 						<td>
 							{% if ban.reason %}
 								{{ ban.reason }}
 							{% else %}
-								<em>no reason</em>
+								<em>{% trans 'no reason' %}</em>
 							{% endif %}
 						</td>
 					</tr>
 					<tr>
-						<th>Board</th>
+						<th>{% trans 'Board' %}</th>
 						<td>
 							{% if ban.board %}
 								{{ config.board_abbreviation|sprintf(ban.board) }}
 							{% else %}
-								<em>all boards</em>
+								<em>{% trans 'all boards' %}</em>
 							{% endif %}
 						</td>
 					</tr>
 					<tr>
-						<th>Set</th>
+						<th>{% trans 'Set' %}</th>
 						<td>{{ ban.set|date(config.post_date) }}</td>
 					</tr>
 					<tr>
-						<th>Expires</th>
+						<th>{% trans 'Expires' %}</th>
 						<td>
 							{% if ban.expires %}
 								{{ ban.expires|date(config.post_date) }}
 							{% else %}
-								<em>never</em>
+								<em>{% trans 'never' %}</em>
 							{% endif %}
 						</td>
 					</tr>
 					<tr>
-						<th>Staff</th>
+						<th>{% trans 'Staff' %}</th>
 						<td>
 							{% if ban.username %}
-								{{ ban.username }}
+								{{ ban.username|e }}
 							{% else %}
-								<em>deleted?</em>
+								<em>{% trans 'deleted?' %}</em>
 							{% endif %}
 						</td>
 					</tr>
 				</table>
 				<input type="hidden" name="ban_id" value="{{ ban.id }}">
-				<input type="submit" name="unban" value="Remove ban">
+				<input type="submit" name="unban" value="{% trans 'Remove ban' %}">
 			</form>
 		{% endfor %}
 	</fieldset>
@@ -150,8 +154,8 @@
 
 {% if mod|hasPermission(config.mod.ban) %}
 	<fieldset>
-		<legend>New ban</legend>
-		{% set redirect = '?/IP/' ~ ip %}
+		<legend>{% trans 'New ban' %}</legend>
+		{% set redirect = '?/IP/' ~ ip ~ '#bans' %}
 		{% include 'mod/ban_form.html' %}
 	</fieldset>
 {% endif %}
diff --git a/templates/page.html b/templates/page.html
index 0c0264d1..a5dc3dc0 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,12 +1,12 @@
 <!doctype html>
 <html>
 <head>
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}" />
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
+	<meta charset="utf-8">
+	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
 	<title>{{ title }}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-	<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
+	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
 </head>
 <body>
diff --git a/templates/themes/basic/info.php b/templates/themes/basic/info.php
index b782a6d4..0b8ba98b 100644
--- a/templates/themes/basic/info.php
+++ b/templates/themes/basic/info.php
@@ -44,9 +44,9 @@
 	$theme['build_function'] = 'basic_build';
 	$theme['install_callback'] = 'build_install';
 
-	if(!function_exists('build_install')) {
+	if (!function_exists('build_install')) {
 		function build_install($settings) {
-			if(!is_numeric($settings['no_recent']) || $settings['no_recent'] < 0)
+			if (!is_numeric($settings['no_recent']) || $settings['no_recent'] < 0)
 				return Array(false, '<strong>' . utf8tohtml($settings['no_recent']) . '</strong> is not a non-negative integer.');
 		}
 	}
diff --git a/templates/themes/basic/theme.php b/templates/themes/basic/theme.php
index a07dc7ec..806a331a 100644
--- a/templates/themes/basic/theme.php
+++ b/templates/themes/basic/theme.php
@@ -15,7 +15,7 @@
 		public static function build($action, $settings) {
 			global $config;
 			
-			if($action == 'all' || $action == 'news')
+			if ($action == 'all' || $action == 'news')
 				file_write($config['dir']['home'] . $settings['file'], Basic::homepage($settings));
 		}
 		
diff --git a/templates/themes/categories/info.php b/templates/themes/categories/info.php
index 5ae3d296..62d8f6bb 100644
--- a/templates/themes/categories/info.php
+++ b/templates/themes/categories/info.php
@@ -54,11 +54,11 @@ Requires $config[\'categories\'].';
 	$theme['build_function'] = 'categories_build';
 	$theme['install_callback'] = 'categories_install';
 	
-	if(!function_exists('categories_install')) {
+	if (!function_exists('categories_install')) {
 		function categories_install($settings) {
 			global $config;
 			
-			if(!isset($config['categories'])) {
+			if (!isset($config['categories'])) {
 				return Array(false, '<h2>Prerequisites not met!</h2>' . 
 					'This theme requires $config[\'boards\'] and $config[\'categories\'] to be set.');
 			}
diff --git a/templates/themes/categories/sidebar.html b/templates/themes/categories/sidebar.html
index a4bc28ae..856930ab 100644
--- a/templates/themes/categories/sidebar.html
+++ b/templates/themes/categories/sidebar.html
@@ -31,7 +31,7 @@
 			</legend>
 			{% for board in boards %}
 				<li>
-					<a href="{{ board.uri }}">{{ board.title }}</a>
+					<a href="{{ board.uri }}">{{ board.title|e }}</a>
 				</li>
 			{% endfor %}
 		</fieldset>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 648034e7..11fcbbaf 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -15,13 +15,13 @@
 		public static function build($action, $settings) {
 			global $config;
 			
-			if($action == 'all')
+			if ($action == 'all')
 				file_write($config['dir']['home'] . $settings['file_main'], Categories::homepage($settings));
 			
-			if($action == 'all' || $action == 'boards')
+			if ($action == 'all' || $action == 'boards')
 				file_write($config['dir']['home'] . $settings['file_sidebar'], Categories::sidebar($settings));
 			
-			if($action == 'all' || $action == 'news')
+			if ($action == 'all' || $action == 'news')
 				file_write($config['dir']['home'] . $settings['file_news'], Categories::news($settings));
 		}
 		
@@ -52,10 +52,10 @@
 			
 			$categories = $config['categories'];
 			
-			foreach($categories as &$boards) {
-				foreach($boards as &$board) {
+			foreach ($categories as &$boards) {
+				foreach ($boards as &$board) {
 					$title = boardTitle($board);
-					if(!$title)
+					if (!$title)
 						$title = $board; // board doesn't exist, but for some reason you want to display it anyway
 					$board = Array('title' => $title, 'uri' => sprintf($config['board_path'], $board));
 				}
diff --git a/templates/themes/frameset/sidebar.html b/templates/themes/frameset/sidebar.html
index 457ecec8..40e2d719 100644
--- a/templates/themes/frameset/sidebar.html
+++ b/templates/themes/frameset/sidebar.html
@@ -30,7 +30,7 @@
 			{% for board in boards %}
 				<li>
 					<a href="{{ config.board_path|sprintf(board.uri) }}">
-						{{ board.title }}
+						{{ board.title|e }}
 					</a>
 				</li>
 			{% endfor %}
diff --git a/templates/themes/frameset/theme.php b/templates/themes/frameset/theme.php
index f3e1b139..015eebaf 100644
--- a/templates/themes/frameset/theme.php
+++ b/templates/themes/frameset/theme.php
@@ -15,13 +15,13 @@
 		public static function build($action, $settings) {
 			global $config;
 			
-			if($action == 'all')
+			if ($action == 'all')
 				file_write($config['dir']['home'] . $settings['file_main'], Frameset::homepage($settings));
 			
-			if($action == 'all' || $action == 'boards')
+			if ($action == 'all' || $action == 'boards')
 				file_write($config['dir']['home'] . $settings['file_sidebar'], Frameset::sidebar($settings));
 			
-			if($action == 'all' || $action == 'news')
+			if ($action == 'all' || $action == 'news')
 				file_write($config['dir']['home'] . $settings['file_news'], Frameset::news($settings));
 		}
 		
diff --git a/templates/themes/recent/info.php b/templates/themes/recent/info.php
index 83d7477a..d4cf1029 100644
--- a/templates/themes/recent/info.php
+++ b/templates/themes/recent/info.php
@@ -60,11 +60,11 @@
 	$theme['build_function'] = 'recentposts_build';
 	$theme['install_callback'] = 'recentposts_install';
 
-	if(!function_exists('recentposts_install')) {
+	if (!function_exists('recentposts_install')) {
 		function recentposts_install($settings) {
-			if(!is_numeric($settings['limit_images']) || $settings['limit_images'] < 0)
+			if (!is_numeric($settings['limit_images']) || $settings['limit_images'] < 0)
 				return Array(false, '<strong>' . utf8tohtml($settings['limit_images']) . '</strong> is not a non-negative integer.');
-			if(!is_numeric($settings['limit_posts']) || $settings['limit_posts'] < 0)
+			if (!is_numeric($settings['limit_posts']) || $settings['limit_posts'] < 0)
 				return Array(false, '<strong>' . utf8tohtml($settings['limit_posts']) . '</strong> is not a non-negative integer.');
 		}
 	}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 13a5546f..986fac6a 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -17,13 +17,13 @@
 		public function build($action, $settings) {
 			global $config, $_theme;
 			
-			if($action == 'all') {
+			if ($action == 'all') {
 				copy('templates/themes/recent/recent.css', $config['dir']['home'] . $settings['css']);
 			}
 			
 			$this->excluded = explode(' ', $settings['exclude']);
 			
-			if($action == 'all' || $action == 'post')
+			if ($action == 'all' || $action == 'post')
 				file_write($config['dir']['home'] . $settings['html'], $this->homepage($settings));
 		}
 		
@@ -38,15 +38,15 @@
 			$boards = listBoards();
 			
 			$query = '';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], $this->excluded))
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
 					continue;
 				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
 			$query = query($query) or error(db_error());
 			
-			while($post = $query->fetch()) {
+			while ($post = $query->fetch()) {
 				openBoard($post['board']);
 				
 				// board settings won't be available in the template file, so generate links now
@@ -58,15 +58,15 @@
 			
 			
 			$query = '';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], $this->excluded))
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
 					continue;
 				$query .= sprintf("SELECT *, '%s' AS `board` FROM `posts_%s` UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_posts'], $query);
 			$query = query($query) or error(db_error());
 			
-			while($post = $query->fetch()) {
+			while ($post = $query->fetch()) {
 				openBoard($post['board']);
 				
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
@@ -78,8 +78,8 @@
 			
 			// Total posts
 			$query = 'SELECT SUM(`top`) AS `count` FROM (';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], $this->excluded))
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
 					continue;
 				$query .= sprintf("SELECT MAX(`id`) AS `top` FROM `posts_%s` UNION ALL ", $_board['uri']);
 			}
@@ -90,8 +90,8 @@
 			
 			// Unique IPs
 			$query = 'SELECT COUNT(DISTINCT(`ip`)) AS `count` FROM (';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], $this->excluded))
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
 					continue;
 				$query .= sprintf("SELECT `ip` FROM `posts_%s` UNION ALL ", $_board['uri']);
 			}
@@ -102,8 +102,8 @@
 			
 			// Active content
 			$query = 'SELECT SUM(`filesize`) AS `count` FROM (';
-			foreach($boards as &$_board) {
-				if(in_array($_board['uri'], $this->excluded))
+			foreach ($boards as &$_board) {
+				if (in_array($_board['uri'], $this->excluded))
 					continue;
 				$query .= sprintf("SELECT `filesize` FROM `posts_%s` UNION ALL ", $_board['uri']);
 			}
diff --git a/templates/themes/rrdtool/info.php b/templates/themes/rrdtool/info.php
index 73658a22..46a20587 100644
--- a/templates/themes/rrdtool/info.php
+++ b/templates/themes/rrdtool/info.php
@@ -28,7 +28,7 @@
 	
 	$__boards = listBoards();
 	$__default_boards = Array();
-	foreach($__boards as $__board)
+	foreach ($__boards as $__board)
 		$__default_boards[] = $__board['uri'];
 	
 	$theme['config'][] = Array(
@@ -83,31 +83,31 @@
 	);
 	
 	$theme['install_callback'] = 'rrdtool_install';
-	if(!function_exists('rrdtool_install')) {
+	if (!function_exists('rrdtool_install')) {
 		function rrdtool_install($settings) {
 			global $config;
 			
-			if(!is_numeric($settings['interval']) || $settings['interval'] < 1 || $settings['interval'] > 86400)
+			if (!is_numeric($settings['interval']) || $settings['interval'] < 1 || $settings['interval'] > 86400)
 				return Array(false, 'Invalid interval: <strong>' . $settings['interval'] . '</strong>. Must be an integer greater than 1 and less than 86400.');
 			
-			if(!is_numeric($settings['width']) || $settings['width'] < 1)
+			if (!is_numeric($settings['width']) || $settings['width'] < 1)
 				return Array(false, 'Invalid width: <strong>' . $settings['width'] . '</strong>!');
 			
-			if(!is_numeric($settings['height']) || $settings['height'] < 1)
+			if (!is_numeric($settings['height']) || $settings['height'] < 1)
 				return Array(false, 'Invalid height: <strong>' . $settings['height'] . '</strong>!');
 			
-			if(!in_array($settings['rate'], Array('second', 'minute', 'day', 'hour', 'week', 'month', 'year')))
+			if (!in_array($settings['rate'], Array('second', 'minute', 'day', 'hour', 'week', 'month', 'year')))
 				return Array(false, 'Invalid rate: <strong>' . $settings['rate'] . '</strong>!');
 			
 			$job = '*/' . $settings['interval'] . ' * * * * php -q ' . str_replace('\\', '/', dirname(__FILE__)) . '/cron.php' . PHP_EOL;
 			
-			if(function_exists('system')) {
+			if (function_exists('system')) {
 				$crontab = tempnam($config['tmp'], 'tinyboard-rrdtool');
 				file_write($crontab, $job);
 				@system('crontab ' . escapeshellarg($crontab), $ret);
 				unlink($crontab);
 				
-				if($ret === 0)
+				if ($ret === 0)
 					return ''; // it seems to install okay?
 			}
 			
diff --git a/templates/themes/rrdtool/theme.php b/templates/themes/rrdtool/theme.php
index 20a00e76..eed2ac9a 100644
--- a/templates/themes/rrdtool/theme.php
+++ b/templates/themes/rrdtool/theme.php
@@ -17,7 +17,7 @@
 		public function build($action, $settings) {
 			global $config, $_theme, $argv;
 			
-			if(!$settings) {
+			if (!$settings) {
 				error('This theme is not currently installed.');
 			}
 			
@@ -26,18 +26,18 @@
 			// exclude boards from the "combined" graph
 			$this->combined_exclude = Array();
 			
-			if($action == 'cron') {
-				if(!file_exists($settings['path']))
+			if ($action == 'cron') {
+				if (!file_exists($settings['path']))
 					mkdir($settings['path']);
-				if(!file_exists($settings['images']))
+				if (!file_exists($settings['images']))
 					mkdir($settings['images']);
 				
-				foreach($this->boards as &$board) {
+				foreach ($this->boards as &$board) {
 					$file = $settings['path'] . '/' . $board . '.rrd';
 					
-					if(!file_exists($file)) {
+					if (!file_exists($file)) {
 						// Create graph
-						if(!rrd_create($file, Array(
+						if (!rrd_create($file, Array(
 							'-s 60',
 							'DS:posts:COUNTER:86400:0:10000',
 							
@@ -59,22 +59,22 @@
 					}
 					
 					// debug just the graphing (not updating) with the --debug switch
-					if(!isset($argv[1]) || $argv[1] != '--debug') {
+					if (!isset($argv[1]) || $argv[1] != '--debug') {
 						// Update graph
 						$query = query(sprintf("SELECT MAX(`id`) AS `count` FROM `posts_%s`", $board));
 						$count = $query->fetch();
 						$count = $count['count'];
 					
-						if(!rrd_update($file, Array(
+						if (!rrd_update($file, Array(
 							'-t',
 							'posts',
 							'N:' . $count)))
 								error('RRDtool failed: ' . htmlentities(rrd_error()));
 					}
 					
-					foreach($this->spans as &$span) {
+					foreach ($this->spans as &$span) {
 						// Graph graph
-						if(!rrd_graph($settings['images'] . '/' . $board . '-' . $span . '.png', Array(
+						if (!rrd_graph($settings['images'] . '/' . $board . '-' . $span . '.png', Array(
 							'-s -1' . $span,
 							'-t Posts on ' . sprintf($config['board_abbreviation'], $board) .' this ' . $span,
 							'--lazy',
@@ -105,7 +105,7 @@
 				}
 				
 				// combined graph
-				foreach($this->spans as &$span) {
+				foreach ($this->spans as &$span) {
 					$options = Array(
 						'-s -1' . $span,
 						'-t Posts this ' . $span,
@@ -129,8 +129,8 @@
 					$c = 1;
 					$cc = 0;
 					$red = 2;
-					foreach($this->boards as &$board) {
-						if(in_array($board, $this->combined_exclude))
+					foreach ($this->boards as &$board) {
+						if (in_array($board, $this->combined_exclude))
 							continue;
 						$color =	str_pad(dechex($red*85), 2, '0', STR_PAD_LEFT) .
 									str_pad(dechex($green*85), 2, '0', STR_PAD_LEFT) .
@@ -147,31 +147,35 @@
 							sprintf($config['board_abbreviation'], $board);
 						
 						// Randomize colors using this horrible undocumented algorithm I threw together while debugging
-						if($c == 0)
+						if ($c == 0)
 							$red++;
-						elseif($c == 1)
+						elseif ($c == 1)
 							$green++;
-						elseif($c == 2)
+						elseif ($c == 2)
 							$blue++;
-						elseif($c == 3)
+						elseif ($c == 3)
 							$green--;
-						elseif($c == 4)
+						elseif ($c == 4)
 							$red--;
 						
 						$cc++;
-						if($cc > 2) {
+						if ($cc > 2) {
 							$c++;
 							$cc = 0;
 						}
-						if($c>4) $c = 0;
+						if ($c > 4)
+							$c = 0;
 						
-						if($red>3) $red = 0;
-						if($green>3) $green = 0;
-						if($blue>3) $blue = 0;
+						if ($red > 3)
+							$red = 0;
+						if ($green > 3)
+							$green = 0;
+						if ($blue > 3)
+							$blue = 0;
 					}
 					$options[] = 'HRULE:0#000000';
 					
-					if(!rrd_graph($settings['images'] . '/combined-' . $span . '.png', $options))
+					if (!rrd_graph($settings['images'] . '/combined-' . $span . '.png', $options))
 							error('RRDtool failed: ' . htmlentities(rrd_error()));
 				}
 			}
diff --git a/templates/thread.html b/templates/thread.html
index 9a56a50f..e7c65f9b 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -1,13 +1,13 @@
 <!doctype html>
 <html>
 <head>
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}" />
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}" />{% endif %}
+	<meta charset="utf-8">
+	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
+	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
 	<title>{{ board.url }} - {{ board.name }}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}" />{% endif %}
-	<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
+	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
+	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
 	{% if not nojavascript %}
 		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
 		{% if not config.additional_javascript_compile %}
@@ -29,17 +29,16 @@
 			display: block;
 		}
 	{% endraw %}</style>{% endif %}
-
 </head>
 <body>
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
 	<header>
-		<h1>{{ board.url }} - {{ board.title }}</h1>
+		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle }}
+				{{ board.subtitle|e }}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
-- 
cgit v1.3


From af61bcaf77204f7bd84ef482c489faa17b13a0b1 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 22 Apr 2012 17:50:53 +1000
Subject: Slightly less crappy stylesheet chooser

---
 inc/config.php                                  |   2 +-
 inc/lib/Twig/Extensions/Extension/Tinyboard.php |   1 +
 stylesheets/default.css                         |   0
 templates/main.js                               | 110 ++++++++++++++++--------
 templates/page.html                             |   4 +-
 5 files changed, 76 insertions(+), 41 deletions(-)
 delete mode 100644 stylesheets/default.css

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index c202d8c9..baa1d022 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -525,7 +525,7 @@
 	// $config['banner_height'] = 100;
 	
 	// Custom stylesheets available. The prefix for each stylesheet URI is defined below.
-	$config['stylesheets']['Yotsuba B'] = 'default.css';
+	$config['stylesheets']['Yotsuba B'] = ''; // default
 	$config['stylesheets']['Yotsuba'] = 'yotsuba.css';
 	// $config['stylesheets']['Futaba'] = 'futaba.css';
 	
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index c4810dad..0a128e7b 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
@@ -25,6 +25,7 @@ class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
 			'until' => new Twig_Filter_Function('until'),
 			'split' => new Twig_Filter_Function('twig_split_filter'),
 			'push' => new Twig_Filter_Function('twig_push_filter'),
+			'addslashes' => new Twig_Filter_Function('addslashes')
 		);
 	}
 	
diff --git a/stylesheets/default.css b/stylesheets/default.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/templates/main.js b/templates/main.js
index de62bd8b..b0a96393 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -1,12 +1,71 @@
 {% raw %}
 
-var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0 }}{% raw %}';
-var styles = [
-	{% endraw %}{% for stylesheet in stylesheets %}{% raw %}['{% endraw %}{{ stylesheet.name }}{% raw %}', '{% endraw %}{{ stylesheet.uri }}{% raw %}']{% endraw %}{% if not loop.last %}{% raw %},
-	{% endraw %}{% endif %}{% endfor %}{% raw %}
-];
 var saved = {};
 
+
+var selectedstyle = '{% endraw %}{{ config.default_stylesheet.0|addslashes }}{% raw %}';
+var styles = {
+	{% endraw %}
+	{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
+	{% endraw %}{% endfor %}{% raw %}
+};
+
+function changeStyle(styleName, link) {
+	localStorage.stylesheet = styleName;
+	
+	if (!document.getElementById('stylesheet')) {
+		var s = document.createElement('link');
+		s.rel = 'stylesheet';
+		s.type = 'text/css';
+		s.id = 'stylesheet';
+		var x = document.getElementsByTagName('head')[0];
+		x.appendChild(s);
+	}
+	
+	document.getElementById('stylesheet').href = styles[styleName];
+	selectedstyle = styleName;
+	
+	if (document.getElementsByClassName('styles').length != 0) {
+		var styleLinks = document.getElementsByClassName('styles')[0].childNodes;
+		for (i = 0; i < styleLinks.length; i++) {
+			styleLinks[i].className = '';
+		}
+	}
+	
+	if (link) {
+		link.className = 'selected';
+	}
+}
+
+if (localStorage.stylesheet) {
+	for (styleName in styles) {
+		if (styleName == localStorage.stylesheet) {
+			changeStyle(styleName);
+			break;
+		}
+	}
+}
+
+function init_stylechooser() {
+	var newElement = document.createElement('div');
+	newElement.className = 'styles';
+	
+	for (styleName in styles) {
+		var style = document.createElement('a');
+		style.innerHTML = '[' + styleName + ']';
+		style.onclick = function() {
+			changeStyle(this.innerHTML.substring(1, this.innerHTML.length - 1), this);
+		};
+		if (styleName == selectedstyle) {
+			style.className = 'selected';
+		}
+		style.href = 'javascript:void(0);';
+		newElement.appendChild(style);
+	}	
+	
+	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling);
+}
+
 function get_cookie(cookie_name) {
 	var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
 	if (results)
@@ -16,7 +75,7 @@ function get_cookie(cookie_name) {
 }
 
 function highlightReply(id) {
-	if(typeof window.event != "undefined" && event.which == 2) {
+	if (typeof window.event != "undefined" && event.which == 2) {
 		// don't highlight on middle click
 		return true;
 	}
@@ -57,6 +116,7 @@ function dopost(form) {
 	
 	return form.elements['body'].value != "" || form.elements['file'].value != "";
 }
+
 function citeReply(id) {
 	var body = document.getElementById('body');
 	
@@ -76,21 +136,6 @@ function citeReply(id) {
 	}
 }
 
-function changeStyle(x) {
-	localStorage.stylesheet = styles[x][1];
-	document.getElementById('stylesheet').href = styles[x][1];
-	selectedstyle = styles[x][0];
-}
-
-if(localStorage.stylesheet) {
-	for(var x = 0; x < styles.length ; x++) {
-		if(styles[x][1] == localStorage.stylesheet) {
-			changeStyle(x);
-			break;
-		}
-	}
-}
-
 function rememberStuff() {
 	if (document.forms.post) {
 		if (document.forms.post.password) {
@@ -112,7 +157,7 @@ function rememberStuff() {
 			if (get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}')) {
 				// Remove successful posts
 				var successful = JSON.parse(get_cookie('{% endraw %}{{ config.cookies.js }}{% raw %}'));
-				for(var url in successful) {
+				for (var url in successful) {
 					saved[url] = null;
 				}
 				sessionStorage.body = JSON.stringify(saved);
@@ -132,25 +177,13 @@ function rememberStuff() {
 }
 
 function init() {
-	var newElement = document.createElement('div');
-	newElement.className = 'styles';
+	init_stylechooser();
 	
-	for(x = 0; x < styles.length; x++) {
-		var style = document.createElement('a');
-		style.innerHTML = '[' + styles[x][0] + ']';
-		style.href = 'javascript:changeStyle(' + x + ');';
-		if(selectedstyle == styles[x][0])
-			style.className = 'selected';
-		newElement.appendChild(style);
-	}	
-	
-	document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling)
-	
-	if(document.forms.postcontrols) {
+	if (document.forms.postcontrols) {
 		document.forms.postcontrols.password.value = localStorage.password;
 	}
 	
-	if(window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
+	if (window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
 		highlightReply(window.location.hash.substring(1));
 }
 
@@ -164,7 +197,7 @@ function onready(fnc) {
 }
 
 function ready() {
-	for(var i = 0; i < onready_callbacks.length; i++) {
+	for (var i = 0; i < onready_callbacks.length; i++) {
 		onready_callbacks[i]();
 	}
 }
@@ -174,3 +207,4 @@ onready(init);
 {% endraw %}{% if config.google_analytics %}{% raw %}
 
 var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endraw %}{{ config.google_analytics }}{% raw %}']);{% endraw %}{% if config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', '{% endraw %}{{ config.google_analytics_domain }}{% raw %}']){% endraw %}{% endif %}{% if not config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', 'none']){% endraw %}{% endif %}{% raw %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %}
+
diff --git a/templates/page.html b/templates/page.html
index a5dc3dc0..0f59e6b1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -10,7 +10,7 @@
 	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
 </head>
 <body>
-	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
 	<header>
 		<h1>{{ title }}</h1>
 		<div class="subtitle">
@@ -21,7 +21,7 @@
 		</div>
 	</header>
 	{{ body }}
-	<hr />
+	<hr>
 	<footer>
 		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
 	</footer>
-- 
cgit v1.3


From bdb2f57ce860234ff6c7572654d2774a2e102cf6 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 6 May 2012 12:29:54 +1000
Subject: small bug fixes

---
 mod.php                  | 2 +-
 templates/mod/users.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/mod.php b/mod.php
index f1d47e8d..96fd64e8 100644
--- a/mod.php
+++ b/mod.php
@@ -79,7 +79,7 @@ $pages = array(
 if (!$mod) {
 	$pages = array('//' => 'login');
 } elseif (isset($_GET['status'], $_GET['r'])) {
-	header('Location: ' . $_GET['r'], true, (int)$_GET['stats']);
+	header('Location: ' . $_GET['r'], true, (int)$_GET['status']);
 } elseif (isset($config['mod']['custom_pages'])) {
 	$pages = array_merge($pages, $config['mod']['custom_pages']);
 }
diff --git a/templates/mod/users.html b/templates/mod/users.html
index a0d216d3..761d3ddd 100644
--- a/templates/mod/users.html
+++ b/templates/mod/users.html
@@ -52,7 +52,7 @@
 				{% if mod|hasPermission(config.mod.promoteusers) and user.type > constant('JANITOR') %}
 					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/demote" title="{% trans 'Demote' %}">&#9660;</a> 
 				{% endif %}
-				{% if mod|hasPermission(config.editusers) or (mod|hasPermission(config.change_password) and mod.id == user.id) %}
+				{% if mod|hasPermission(config.mod.editusers) or (mod|hasPermission(config.mod.change_password) and mod.id == user.id) %}
 					<a class="unimportant" style="margin-left:5px;float:right" href="?/users/{{ user.id }}">[{% trans 'edit' %}]</a> 
 				{% endif %}
 				{% if mod|hasPermission(config.mod.create_pm) %}
-- 
cgit v1.3


From c2f790ee860eb88f8a3a5f19e9f7412a95e6aa1c Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 6 May 2012 12:31:15 +1000
Subject: Don't show "Last action" in ?/users if you don't have permission

---
 templates/mod/users.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/users.html b/templates/mod/users.html
index 761d3ddd..6ea6248f 100644
--- a/templates/mod/users.html
+++ b/templates/mod/users.html
@@ -4,7 +4,9 @@
 		<th>{% trans 'Username' %}</th>
 		<th>{% trans 'Type' %}</th>
 		<th>{% trans 'Boards' %}</th>
-		<th>{% trans 'Last action' %}</th>
+		{% if mod|hasPermission(config.mod.modlog) %}
+			<th>{% trans 'Last action' %}</th>
+		{% endif %}
 		<th>&hellip;</th>
 	</tr>
 	
@@ -34,17 +36,15 @@
 					{{ _boards|join(', ') }}
 				{% endif %}
 			</td>
-			<td>
-				{% if mod|hasPermission(config.mod.modlog) %}
+			{% if mod|hasPermission(config.mod.modlog) %}
+				<td>
 					{% if user.last %}
 						<span title="{{ user.action|e }}">{{ user.last|ago }}</span>
 					{% else %}
 						<em>{% trans 'never' %}</em>
 					{% endif %}
-				{% else %}
-					&ndash;
-				{% endif %}
-			</td>
+				</td>
+			{% endif %}
 			<td>
 				{% if mod|hasPermission(config.mod.promoteusers) and user.type < constant('ADMIN') %}
 					<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote" title="{% trans 'Promote' %}">&#9650;</a> 
-- 
cgit v1.3


From e132e4c2b3dc62c2ddb6bdbcc562e67fa61c9fa8 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 7 May 2012 14:08:40 +1000
Subject: a few permissions-related bugs

---
 inc/mod/pages.php     | 12 ++++++++++++
 templates/mod/pm.html | 15 +++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index c56570a5..11e89b9a 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -969,6 +969,11 @@ function mod_user($uid) {
 }
 
 function mod_user_new() {
+	global $pdo;
+	
+	if (!hasPermission($config['mod']['createusers']))
+		error($config['error']['noaccess']);
+	
 	if (isset($_POST['username'], $_POST['password'], $_POST['type'])) {
 		if ($_POST['username'] == '')
 			error(sprintf($config['error']['required'], 'username'));
@@ -1001,6 +1006,10 @@ function mod_user_new() {
 		$query->bindValue(':boards', implode(',', $boards));
 		$query->execute() or error(db_error($query));
 		
+		$uid = $pdo->lastInsertId();
+		
+		modLog('Created a new user: ' . utf8tohtml($_POST['username']) . ' <small>(#' . $userID . ')</small>');
+		
 		header('Location: ?/users', true, $config['redirect_http']);
 		return;
 	}
@@ -1040,6 +1049,9 @@ function mod_user_promote($uid, $action) {
 function mod_pm($id, $reply = false) {
 	global $mod, $config;
 	
+	if ($reply && !hasPermission($config['mod']['create_pm']))
+		error($config['error']['noaccess']);
+	
 	$query = prepare("SELECT `mods`.`username`, `mods_to`.`username` AS `to_username`, `pms`.* FROM `pms` LEFT JOIN `mods` ON `mods`.`id` = `sender` LEFT JOIN `mods` AS `mods_to` ON `mods_to`.`id` = `to` WHERE `pms`.`id` = :id");
 	$query->bindValue(':id', $id);
 	$query->execute() or error(db_error($query));
diff --git a/templates/mod/pm.html b/templates/mod/pm.html
index c66dc883..c62cae58 100644
--- a/templates/mod/pm.html
+++ b/templates/mod/pm.html
@@ -20,7 +20,8 @@
 		{% endif %}
 		<tr>
 			<th>{% trans 'Date' %}</th>
-			<td>{{ time|date(config.post_date) }}</td>
+			<td>{{ time|date(config.post_date) }} <small>({{ time|ago }} ago)</small></td>
+			
 		</tr>
 		<tr>
 			<th>{% trans 'Message' %}</th>
@@ -32,10 +33,12 @@
 		<li style="padding:5px 0">
 			<input type="submit" name="delete" value="{% trans 'Delete forever' %}">
 		</li>
-		<li style="padding:5px 0">
-			<a href="?/PM/{{ id }}/reply">
-				{% trans 'Reply with quote' %}
-			</a>
-		</li>
+		{% if mod|hasPermission(config.mod.create_pm) %}
+			<li style="padding:5px 0">
+				<a href="?/PM/{{ id }}/reply">
+					{% trans 'Reply with quote' %}
+				</a>
+			</li>
+		{% endif %}
 	</ul>
 </form>
-- 
cgit v1.3


From 970c6cd95bfbb39454531f3990863d19cfbfe0ba Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 18:27:45 +1000
Subject: [move]

---
 inc/functions.php       |   4 +-
 inc/mod/pages.php       | 183 ++++++++++++++++++++++++++++++++++++++++++++++++
 mod.php                 |   1 +
 templates/mod/move.html |  41 +++++++++++
 4 files changed, 227 insertions(+), 2 deletions(-)
 create mode 100644 templates/mod/move.html

(limited to 'templates')

diff --git a/inc/functions.php b/inc/functions.php
index f21df417..ff255614 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -716,13 +716,13 @@ function post(array $post) {
 	$query->bindValue(':password', $post['password']);		
 	$query->bindValue(':ip', isset($post['ip']) ? $post['ip'] : $_SERVER['REMOTE_ADDR']);
 	
-	if ($post['mod'] && $post['sticky']) {
+	if ($post['op'] && $post['mod'] && $post['sticky']) {
 		$query->bindValue(':sticky', 1, PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':sticky', 0, PDO::PARAM_INT);
 	}
 	
-	if ($post['mod'] && $post['locked']) {
+	if ($post['op'] && $post['mod'] && $post['locked']) {
 		$query->bindValue(':locked', 1, PDO::PARAM_INT);
 	} else {
 		$query->bindValue(':locked', 0, PDO::PARAM_INT);
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index d532d9ba..7f78cd0b 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -693,6 +693,189 @@ function mod_bumplock($board, $unbumplock, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_move($originBoard, $postID) {
+	global $board, $config, $mod;
+	
+	if (!openBoard($originBoard))
+		error($config['error']['noboard']);
+	
+	if (!hasPermission($config['mod']['move'], $originBoard))
+		error($config['error']['noaccess']);
+	
+	$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `id` = :id AND `thread` IS NULL', $originBoard));
+	$query->bindValue(':id', $postID);
+	$query->execute() or error(db_error($query));
+	if (!$post = $query->fetch(PDO::FETCH_ASSOC))
+		error($config['error']['404']);
+	
+	if (isset($_POST['board'])) {
+		$targetBoard = $_POST['board'];
+		$shadow = isset($_POST['shadow']);
+		
+		if ($targetBoard === $originBoard)
+			error(_('Target and source board are the same.'));
+		
+		// copy() if leaving a shadow thread behind; else, rename().
+		$clone = $shadow ? 'copy' : 'rename';
+		
+		// indicate that the post is a thread
+		$post['op'] = true;
+		
+		if ($post['file']) {
+			$post['has_file'] = true;
+			$post['width'] = &$post['filewidth'];
+			$post['height'] = &$post['fileheight'];
+			
+			$file_src = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file'];
+			$file_thumb = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb'];
+		} else {
+			$post['has_file'] = false;
+		}
+		
+		// allow thread to keep its same traits (stickied, locked, etc.)
+		$post['mod'] = true;
+		
+		if (!openBoard($targetBoard))
+			error($config['error']['noboard']);
+		
+		// create the new thread
+		$newID = post($post);
+		
+		if($post['has_file']) {
+			// copy image
+			$clone($file_src, sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']);
+			$clone($file_thumb, sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']);
+		}
+		
+		// go back to the original board to fetch replies
+		openBoard($originBoard);
+		
+		$query = prepare(sprintf('SELECT * FROM `posts_%s` WHERE `thread` = :id ORDER BY `id`', $originBoard));
+		$query->bindValue(':id', $postID, PDO::PARAM_INT);
+		$query->execute() or error(db_error($query));
+		
+		$replies = array();
+		
+		while($post = $query->fetch()) {
+			$post['mod'] = true;
+			$post['thread'] = $newID;
+			
+			if($post['file']) {
+				$post['has_file'] = true;
+				$post['width'] = &$post['filewidth'];
+				$post['height'] = &$post['fileheight'];
+				
+				$post['file_src'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file'];
+				$post['file_thumb'] = sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb'];
+			} else {
+				$post['has_file'] = false;
+			}
+			
+			$replies[] = $post;
+		}
+		
+		$newIDs = array($postID => $newID);
+		
+		openBoard($targetBoard);
+		
+		foreach($replies as &$post) {
+			$query = prepare('SELECT `target` FROM `cites` WHERE `target_board` = :board AND `board` = :board AND `post` = :post');
+			$query->bindValue(':board', $originBoard);
+			$query->bindValue(':post', $post['id'], PDO::PARAM_INT);
+			$query->execute() or error(db_error($qurey));
+			
+			// correct >>X links
+			while($cite = $query->fetch(PDO::FETCH_ASSOC)) {
+				if(isset($newIDs[$cite['target']])) {
+					$post['body_nomarkup'] = preg_replace(
+							'/(>>(>\/' . preg_quote($originBoard, '/') . '\/)?)' . preg_quote($cite['target'], '/') . '/',
+							'>>' . $newIDs[$cite['target']],
+							$post['body_nomarkup']);
+					
+					$post['body'] = $post['body_nomarkup'];
+				}
+			}
+			
+			$post['body'] = $post['body_nomarkup'];
+			
+			$post['op'] = false;
+			$post['tracked_cites'] = markup($post['body'], true);
+			
+			// insert reply
+			$newIDs[$post['id']] = $newPostID = post($post);
+			
+			if($post['has_file']) {
+				// copy image
+				$clone($post['file_src'], sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']);
+				$clone($post['file_thumb'], sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']);
+			}
+			
+			foreach($post['tracked_cites'] as $cite) {
+				$query = prepare('INSERT INTO `cites` VALUES (:board, :post, :target_board, :target)');
+				$query->bindValue(':board', $board['uri']);
+				$query->bindValue(':post', $newPostID, PDO::PARAM_INT);
+				$query->bindValue(':target_board',$cite[0]);
+				$query->bindValue(':target', $cite[1], PDO::PARAM_INT);
+				$query->execute() or error(db_error($query));
+			}
+		}
+		
+		// build new hread
+		buildThread($newID);
+		buildIndex();
+		
+		// trigger themes
+		rebuildThemes('post');
+		
+		// return to original board
+		openBoard($originBoard);
+		
+		if($shadow) {
+			// lock old thread
+			$query = prepare(sprintf('UPDATE `posts_%s` SET `locked` = 1 WHERE `id` = :id', $originBoard));
+			$query->bindValue(':id', $postID, PDO::PARAM_INT);
+			$query->execute() or error(db_error($query));
+			
+			// leave a reply, linking to the new thread
+			$post = array(
+				'mod' => true,
+				'subject' => '',
+				'email' => '',
+				'name' => $config['mod']['shadow_name'],
+				'capcode' => $config['mod']['shadow_capcode'],
+				'trip' => '',
+				'password' => '',
+				'has_file' => false,
+				// attach to original thread
+				'thread' => $postID,
+				'op' => false
+			);
+			
+			$post['body'] = $post['body_nomarkup'] =  sprintf($config['mod']['shadow_mesage'], '>>>/' . $targetBoard . '/' . $newID);
+			
+			markup($post['body']);
+			
+			$botID = post($post);
+			buildThread($postID);
+			
+			header('Location: ?/' . sprintf($config['board_path'], $originBoard) . $config['dir']['res'] .sprintf($config['file_page'], $postID) .
+				'#' . $botID, true, $config['redirect_http']);
+		} else {
+			deletePost($postID);
+			buildIndex();
+			
+			openBoard($targetBoard);
+			header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . sprintf($config['file_page'], $newID), true, $config['redirect_http']);
+		}
+	}
+	
+	$boards = listBoards();
+	if (count($boards) <= 1)
+		error(_('Impossible to move thread; there is only one board.'));
+	
+	mod_page("Move thread", 'mod/move.html', array('post' => $postID, 'board' => $originBoard, 'boards' => $boards));
+}
+
 function mod_ban_post($board, $delete, $post) {
 	global $config, $mod;
 	
diff --git a/mod.php b/mod.php
index b1422b6a..23cacc11 100644
--- a/mod.php
+++ b/mod.php
@@ -63,6 +63,7 @@ $pages = array(
 	'/(\w+)/(un)?lock/(\d+)'		=> 'lock',		// lock thread
 	'/(\w+)/(un)?sticky/(\d+)'		=> 'sticky',		// sticky thread
 	'/(\w+)/bump(un)?lock/(\d+)'		=> 'bumplock',		// "bumplock" thread
+	'/(\w+)/move/(\d+)'			=> 'move',		// move thread
 	
 	// these pages aren't listed in the dashboard without $config['debug']
 	'/debug/antispam'			=> 'debug_antispam',
diff --git a/templates/mod/move.html b/templates/mod/move.html
new file mode 100644
index 00000000..802903b2
--- /dev/null
+++ b/templates/mod/move.html
@@ -0,0 +1,41 @@
+<form action="?/{{ board }}/move/{{ post }}" method="post">	
+	<table>
+		<tr>
+			<th>
+				{% trans 'Thread ID' %}
+			</th>
+			<td>
+				&gt;&gt;&gt;{{ config.board_abbreviation|sprintf(board) }}{{ post }}
+			</td>
+		</tr>
+		<tr>
+			<th>
+				{% trans 'Leave shadow thread' %}
+			</th>
+			<td>
+				<input type="checkbox" name="shadow" checked> 
+				<span class="unimportant">({% trans 'locks thread; replies to it with a link.' %})</span>
+				</td>
+		</tr>
+		<tr>
+			<th>{% trans 'Target board' %}</th>
+			<td>
+				<ul style="list-style:none;padding:0">
+					{% for targetboard in boards if targetboard.uri != board %}
+						<li>
+							<input type="radio" name="board" value="{{ targetboard.uri }}" id="ban-board-{{ targetboard.uri }}"> 
+							<label style="display:inline" for="ban-board-{{ targetboard.uri }}">
+								{{ config.board_abbreviation|sprintf(targetboard.uri) }} - {{ targetboard.title|e }}
+							</label>
+						</li>
+					{% endfor %}
+				</ul>
+			</td>
+		</tr>
+	</table>
+	
+	<ul style="padding:0;text-align:center;list-style:none">
+		<li><input type="submit" value="{% trans 'Move thread' %}"></li>
+	</ul>
+</form>
+
-- 
cgit v1.3


From 1dedf5deaed5099affbc3785536ddd4efa534fcb Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 21:00:15 +1000
Subject: ban list formatting changes

---
 templates/mod/ban_list.html | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 4a27b8f7..e46d816d 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -4,10 +4,11 @@
 	<form action="" method="post">
 		<table class="mod">
 			<tr>
-				<th>{% trans 'IP address' %}</th>
+				<th>{% trans 'IP address/mask' %}</th>
 				<th>{% trans 'Reason' %}</th>
 				<th>{% trans 'Board' %}</th>
 				<th>{% trans 'Set' %}</th>
+				<th>{% trans 'Duration' %}</th>
 				<th>{% trans 'Expires' %}</th>
 				<th>{% trans 'Staff' %}</th>
 			</tr>
@@ -37,14 +38,22 @@
 					</td>
 					<td style="white-space: nowrap">
 						{{ ban.set|date(config.post_date) }}
+						 <small>({{ ban.set|ago }} ago)</small>
+					</td>
+					<td style="white-space: nowrap">
+						{% if ban.expires == 0 %}
+							-
+						{% else %}
+							{{ (ban.expires - ban.set + time()) | until }}
+						{% endif %}
 					</td>
 					<td style="white-space: nowrap">
 						{% if ban.expires == 0 %}
 							<em>{% trans 'never' %}</em>
 						{% else %}
-							{{ ban.expires|date(config.post_date) }} 
+							{{ ban.expires|date(config.post_date) }}
 							{% if ban.expires > time() %}
-								<small>({{ ban.expires|until }})</small>
+								 <small>({{ ban.expires|until }})</small>
 							{% endif %}
 						{% endif %}
 					</td>
-- 
cgit v1.3


From f0abd961a4221bebfa4f71a2ad44c77d239e5581 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 21:02:51 +1000
Subject: slightly more compact ban list

---
 templates/mod/ban_list.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index e46d816d..88b8b7ee 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -37,8 +37,9 @@
 						{% endif %}					
 					</td>
 					<td style="white-space: nowrap">
-						{{ ban.set|date(config.post_date) }}
-						 <small>({{ ban.set|ago }} ago)</small>
+						<span title="{{ ban.set|date(config.post_date) }}">
+							{{ ban.set|ago }} ago
+						</span>
 					</td>
 					<td style="white-space: nowrap">
 						{% if ban.expires == 0 %}
-- 
cgit v1.3


From 4d3184b762efdb78c4a51f93ae68914aaf453e22 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 21:08:46 +1000
Subject: width: 100% for ban list

---
 templates/mod/ban_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 88b8b7ee..2edb9cdf 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -2,7 +2,7 @@
 	<p style="text-align:center" class="unimportant">({% trans 'There are no active bans.' %})</p>
 {% else %}
 	<form action="" method="post">
-		<table class="mod">
+		<table class="mod" style="width:100%">
 			<tr>
 				<th>{% trans 'IP address/mask' %}</th>
 				<th>{% trans 'Reason' %}</th>
@@ -54,7 +54,7 @@
 						{% else %}
 							{{ ban.expires|date(config.post_date) }}
 							{% if ban.expires > time() %}
-								 <small>({{ ban.expires|until }})</small>
+								 <small>(in {{ ban.expires|until }})</small>
 							{% endif %}
 						{% endif %}
 					</td>
-- 
cgit v1.3


From d6a1f16555376fc4b57a572e21758a400db8852a Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 21:12:40 +1000
Subject: bugfix: noticeboard timestamps

---
 templates/mod/dashboard.html   | 2 +-
 templates/mod/noticeboard.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 9e50e6ed..a10b0cf2 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -48,7 +48,7 @@
 										<em>deleted?</em>
 									{% endif %} 
 									at 
-									{{ notice.time|date(config.post_date) }} 
+									{{ post.time|date(config.post_date) }} 
 								</small>
 							</li>
 						{% endfor %}
diff --git a/templates/mod/noticeboard.html b/templates/mod/noticeboard.html
index 4a0a068f..463b8430 100644
--- a/templates/mod/noticeboard.html
+++ b/templates/mod/noticeboard.html
@@ -47,7 +47,7 @@
 					<em>{% trans 'deleted?' %}</em>
 				{% endif %} 
 				{% trans 'at' %} 
-				{{ notice.time|date(config.post_date) }} 
+				{{ post.time|date(config.post_date) }} 
 			</small>
 		</h2>
 		<p>
-- 
cgit v1.3


From d3739c48c2c2deec83e6abf74ed8e03470581750 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sun, 20 May 2012 20:20:50 +1000
Subject: Config editort

---
 inc/mod/pages.php                | 85 ++++++++++++++++++++++++++++++++++++++++
 inc/template.php                 |  2 +-
 mod.php                          |  2 +
 stylesheets/style.css            | 22 +++++------
 templates/mod/config-editor.html | 56 ++++++++++++++++++++++++++
 templates/mod/view_ip.html       |  8 ++--
 6 files changed, 158 insertions(+), 17 deletions(-)
 create mode 100644 templates/mod/config-editor.html

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 6b644867..a4e2eae1 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1539,6 +1539,91 @@ function mod_report_dismiss($id, $all = false) {
 	header('Location: ?/reports', true, $config['redirect_http']);
 }
 
+
+function mod_config() {
+	global $config, $mod;
+	
+	if (!hasPermission($config['mod']['edit_config']))
+		error($config['error']['noaccess']);
+	
+	require_once 'inc/mod/config-editor.php';
+	
+	$conf = config_vars();
+	
+	foreach ($conf as &$var) {
+		if (is_array($var['name'])) {
+			$c = &$config;
+			foreach ($var['name'] as $n)
+				$c = &$c[$n];
+		} else {
+			$c = $config[$var['name']];
+		}
+		
+		$var['value'] = $c;
+	}
+	unset($var);
+	
+	if (isset($_POST['save'])) {
+		$config_append = '';
+		
+		foreach ($conf as $var) {
+			$field_name = 'cf_' . (is_array($var['name']) ? implode('/', $var['name']) : $var['name']);
+			
+			if ($var['type'] == 'boolean')
+				$value = isset($_POST[$field_name]);
+			elseif (isset($_POST[$field_name]))
+				$value = $_POST[$field_name];
+			else
+				continue; // ???
+			
+			if (!settype($value, $var['type']))
+				continue; // invalid
+			
+			if ($value != $var['value']) {
+				// This value has been changed.
+				
+				$config_append .= '$config';
+				
+				if (is_array($var['name'])) {
+					foreach ($var['name'] as $name)
+						$config_append .= '[' . var_export($name, true) . ']';
+				} else {
+					$config_append .= '[' . var_export($var['name'], true) . ']';
+				}
+				
+				$config_append .= ' = ' . var_export($value, true) . ";\n";
+			}
+		}
+		
+		if(!empty($config_append)) {
+			$config_append = "\n// Changes made via web editor by \"" . $mod['username'] . "\" @ " . date('r') . ":\n" . $config_append . "\n";
+		
+			if(!@file_put_contents('inc/instance-config.php', $config_append, FILE_APPEND)) {
+				$config_append = htmlentities($config_append);
+				
+				if($config['minify_html'])
+					$config_append = str_replace("\n", '&#010;', $config_append);
+				$page = array();
+				$page['title'] = 'Cannot write to file!';
+				$page['config'] = $config;
+				$page['body'] = '
+					<p style="text-align:center">Tinyboard could not write to <strong>inc/instance-config.php</strong> with the ammended configuration, probably due to a permissions error.</p>
+					<p style="text-align:center">You may proceed with these changes manually by copying and pasting the following code to the end of <strong>inc/instance-config.php</strong>:</p>
+					<textarea style="width:700px;height:370px;margin:auto;display:block;background:white;color:black" readonly>' . $config_append . '</textarea>
+				';
+				echo Element('page.html', $page);
+				exit;
+			}
+		}
+		
+		header('Location: ?/', true, $config['redirect_http']);
+		
+		exit;
+	}
+	
+	mod_page('Config editor', 'mod/config-editor.html', array('conf' => $conf));
+}
+
 function mod_debug_antispam() {
 	global $pdo, $config;
 	
diff --git a/inc/template.php b/inc/template.php
index 5355e18c..351bde62 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -27,7 +27,7 @@ function load_twig() {
 	$twig = new Twig_Environment($loader, array(
 		'autoescape' => false,
 		'cache' => "{$config['dir']['template']}/cache",
-		'debug' => ($config['debug'] ? true : false),
+		'debug' => $config['debug']
 	));
 	$twig->addExtension(new Twig_Extensions_Extension_Tinyboard());
 	$twig->addExtension(new Twig_Extensions_Extension_I18n());
diff --git a/mod.php b/mod.php
index 23cacc11..5fa040ee 100644
--- a/mod.php
+++ b/mod.php
@@ -65,6 +65,8 @@ $pages = array(
 	'/(\w+)/bump(un)?lock/(\d+)'		=> 'bumplock',		// "bumplock" thread
 	'/(\w+)/move/(\d+)'			=> 'move',		// move thread
 	
+	'/config'				=> 'config',		// config editor
+	
 	// these pages aren't listed in the dashboard without $config['debug']
 	'/debug/antispam'			=> 'debug_antispam',
 	
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 16da419c..1913f60a 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -388,19 +388,15 @@ div.blotter {
 	font-weight: bold;
 	text-align: center;
 }
-
-/* Uboachan stuff */
-div.styles-sidebar {
-	text-align: center;
-	padding-bottom: 0px;
-}
-div.styles-sidebar a {
-	margin: 0 5px;
+table.mod.config-editor {
+	font-size: 9pt;
+	width: 100%;
 }
-div.styles-sidebar a.selected {
-	text-decoration: none;
+table.mod.config-editor td {
+	text-align: left;
+	padding: 5px;
+	border-bottom: 1px solid #98e;
 }
-.category {
-	background: #98E;
-	color: black;
+table.mod.config-editor input[type="text"] {
+	width: 98%;
 }
diff --git a/templates/mod/config-editor.html b/templates/mod/config-editor.html
new file mode 100644
index 00000000..ec7213bb
--- /dev/null
+++ b/templates/mod/config-editor.html
@@ -0,0 +1,56 @@
+<form method="post" action="">
+	<table class="mod config-editor">
+		<tr>
+			<th class="minimal">Name</th>
+			<th>Value</th>
+			<th class="minimal">Type</th>
+			<th>Description</th>
+		</tr>
+		{% for var in conf if var.type != 'array' %}
+			{% if var.name|count == 1 %}
+				{% set name = 'cf_' ~ var.name %}
+			{% else %}
+				{% set name = 'cf_' ~ var.name|join('/') %}
+			{% endif %}
+			
+			<tr>
+				<th class="minimal">
+					{% if var.name|count == 1 %}
+						{{ var.name }}
+					{% else %}
+						{{ var.name|join(' &rarr; ') }}
+					{% endif %}
+				</th>
+				
+				<td>
+					{% if var.type == 'string' %}
+						<input name="{{ name }}" type="text" value="{{ var.value|e }}">
+					{% elseif var.type == 'integer' %}
+						<input name="{{ name }}" type="number" value="{{ var.value|e }}">
+					{% elseif var.type == 'boolean' %}
+						<input name="{{ name }}" type="checkbox" {% if var.value %}checked{% endif %}>
+					{% else %}
+						?
+					{% endif %}
+					
+					{% if var.type == 'integer' or var.type == 'boolean' %}
+					 <small>Default: <code>{{ var.default }}</code></small>
+					{% endif %}
+				</td>
+				
+				<td class="minimal">
+					{{ var.type|e }}
+				</td>
+				
+				<td>
+					{{ var.comment|join('<br>') }}
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+	
+	<ul style="padding:0;text-align:center;list-style:none">
+		<li><input name="save" type="submit" value="{% trans 'Save changes' %}"></li>
+	</ul>
+</form>
+
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index e69301fd..c49880ae 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -1,9 +1,11 @@
 {% for board_posts in posts %}
 	<fieldset>
 		<legend>
-			<a href="?/{{ config.board_path|sprintf(board_posts.board.uri) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}</a>
-			 - 
-			 {{ board_posts.board.title|e }}
+			<a href="?/{{ config.board_path|sprintf(board_posts.board.uri) }}{{ config.file_index }}">
+				{{ config.board_abbreviation|sprintf(board_posts.board.uri) }}
+				 - 
+				 {{ board_posts.board.title|e }}
+			</a>
 		</legend>
 		{{ board_posts.posts|join('<hr>') }}
 	</fieldset>
-- 
cgit v1.3


From e4b6c89375d60424e1e029cb3d10c8ec2be49620 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Fri, 25 May 2012 21:40:01 +1000
Subject: show number of reports from dashboard; translatable mod panel

---
 inc/mod/pages.php            | 57 ++++++++++++++++++++++++--------------------
 templates/mod/dashboard.html |  6 ++++-
 2 files changed, 36 insertions(+), 27 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 7278afa3..878df92d 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -56,11 +56,11 @@ function mod_login() {
 	if (isset($_POST['username']))
 		$args['username'] = $_POST['username'];
 
-	mod_page('Login', 'mod/login.html', $args);
+	mod_page(_('Login'), 'mod/login.html', $args);
 }
 
 function mod_confirm($request) {
-	mod_page('Confirm action', 'mod/confirm.html', array('request' => $request));
+	mod_page(_('Confirm action'), 'mod/confirm.html', array('request' => $request));
 }
 
 function mod_logout() {
@@ -98,6 +98,9 @@ function mod_dashboard() {
 			cache::set('pm_unreadcount_' . $mod['id'], $args['unread_pms']);
 	}
 	
+	$query = query('SELECT COUNT(*) FROM `reports`') or error(db_error($query));
+	$args['reports'] = $query->fetchColumn(0);
+	
 	if ($mod['type'] >= ADMIN && $config['check_updates']) {
 		if (!$config['version'])
 			error(_('Could not find current version! (Check .installed)'));
@@ -141,7 +144,7 @@ function mod_dashboard() {
 			$args['newer_release'] = $latest;
 	}
 			
-	mod_page('Dashboard', 'mod/dashboard.html', $args);
+	mod_page(_('Dashboard'), 'mod/dashboard.html', $args);
 }
 
 function mod_edit_board($boardName) {
@@ -216,7 +219,7 @@ function mod_edit_board($boardName) {
 		
 		header('Location: ?/', true, $config['redirect_http']);
 	} else {
-		mod_page('Edit board: ' . sprintf($config['board_abbreviation'], $board['uri']), 'mod/board.html', array('board' => $board));
+		mod_page(sprintf('%s: ' . $config['board_abbreviation'], _('Edit board'), $board['uri']), 'mod/board.html', array('board' => $board));
 	}
 }
 
@@ -264,7 +267,7 @@ function mod_new_board() {
 		header('Location: ?/' . $board['uri'] . '/' . $config['file_index'], true, $config['redirect_http']);
 	}
 	
-	mod_page('New board', 'mod/board.html', array('new' => true));
+	mod_page(_('New board'), 'mod/board.html', array('new' => true));
 }
 
 function mod_noticeboard($page_no = 1) {
@@ -310,7 +313,7 @@ function mod_noticeboard($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn(0);
 	
-	mod_page('Noticeboard', 'mod/noticeboard.html', array('noticeboard' => $noticeboard, 'count' => $count));
+	mod_page(_('Noticeboard'), 'mod/noticeboard.html', array('noticeboard' => $noticeboard, 'count' => $count));
 }
 
 function mod_noticeboard_delete($id) {
@@ -367,7 +370,7 @@ function mod_news($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn(0);
 	
-	mod_page('News', 'mod/news.html', array('news' => $news, 'count' => $count));
+	mod_page(_('News'), 'mod/news.html', array('news' => $news, 'count' => $count));
 }
 
 function mod_news_delete($id) {
@@ -407,7 +410,7 @@ function mod_log($page_no = 1) {
 	$query->execute() or error(db_error($query));
 	$count = $query->fetchColumn(0);
 	
-	mod_page('Moderation log', 'mod/log.html', array('logs' => $logs, 'count' => $count));
+	mod_page(_('Moderation log'), 'mod/log.html', array('logs' => $logs, 'count' => $count));
 }
 
 function mod_view_board($boardName, $page_no = 1) {
@@ -550,7 +553,7 @@ function mod_page_ip($ip) {
 		$args['notes'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	}
 	
-	mod_page("IP: $ip", 'mod/view_ip.html', $args, $args['hostname']);
+	mod_page(sprintf('%s: %s', _('IP'), $ip), 'mod/view_ip.html', $args, $args['hostname']);
 }
 
 function mod_ban() {
@@ -560,7 +563,7 @@ function mod_ban() {
 		error($config['error']['noaccess']);
 	
 	if (!isset($_POST['ip'], $_POST['reason'], $_POST['length'], $_POST['board'])) {
-		mod_page("New ban", 'mod/ban_form.html', array());
+		mod_page(_('New ban'), 'mod/ban_form.html', array());
 		return;
 	}
 	
@@ -628,7 +631,7 @@ function mod_bans($page_no = 1) {
 			$ban['real_ip'] = true;
 	}
 	
-	mod_page('Ban list', 'mod/ban_list.html', array('bans' => $bans, 'count' => $count));
+	mod_page(_('Ban list'), 'mod/ban_list.html', array('bans' => $bans, 'count' => $count));
 }
 
 
@@ -880,7 +883,7 @@ function mod_move($originBoard, $postID) {
 	if (count($boards) <= 1)
 		error(_('Impossible to move thread; there is only one board.'));
 	
-	mod_page("Move thread", 'mod/move.html', array('post' => $postID, 'board' => $originBoard, 'boards' => $boards));
+	mod_page(_('Move thread'), 'mod/move.html', array('post' => $postID, 'board' => $originBoard, 'boards' => $boards));
 }
 
 function mod_ban_post($board, $delete, $post) {
@@ -939,7 +942,7 @@ function mod_ban_post($board, $delete, $post) {
 		'boards' => listBoards()
 	);
 	
-	mod_page("New ban", 'mod/ban_form.html', $args);
+	mod_page(_('New ban'), 'mod/ban_form.html', $args);
 }
 
 function mod_delete($board, $post) {
@@ -1155,7 +1158,7 @@ function mod_user($uid) {
 	
 	$user['boards'] = explode(',', $user['boards']);
 	
-	mod_page('Edit user', 'mod/user.html', array('user' => $user, 'logs' => $log, 'boards' => listBoards()));
+	mod_page(_('Edit user'), 'mod/user.html', array('user' => $user, 'logs' => $log, 'boards' => listBoards()));
 }
 
 function mod_user_new() {
@@ -1204,7 +1207,7 @@ function mod_user_new() {
 		return;
 	}
 		
-	mod_page('Edit user', 'mod/user.html', array('new' => true, 'boards' => listBoards()));
+	mod_page(_('Edit user'), 'mod/user.html', array('new' => true, 'boards' => listBoards()));
 }
 
 
@@ -1218,7 +1221,7 @@ function mod_users() {
 	$query = query("SELECT *, (SELECT `time` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM `mods` ORDER BY `type` DESC,`id`") or error(db_error());
 	$args['users'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	mod_page('Manage users', 'mod/users.html', $args);
+	mod_page(_('Manage users'), 'mod/users.html', $args);
 }
 
 function mod_user_promote($uid, $action) {
@@ -1280,11 +1283,11 @@ function mod_pm($id, $reply = false) {
 		if (!$pm['to_username'])
 			error($config['error']['404']); // deleted?
 		
-		mod_page("New PM for {$pm['to_username']}", 'mod/new_pm.html', array(
+		mod_page(sprintf('%s %s', _('New PM for'), $pm['to_username']), 'mod/new_pm.html', array(
 			'username' => $pm['username'], 'id' => $pm['sender'], 'message' => quote($pm['message'])
 		));
 	} else {
-		mod_page("Private message &ndash; #$id", 'mod/pm.html', $pm);
+		mod_page(sprintf('%s &ndash; #%d', _('Private message'), $id), 'mod/pm.html', $pm);
 	}
 }
 
@@ -1305,7 +1308,7 @@ function mod_inbox() {
 		$message['snippet'] = pm_snippet($message['message']);
 	}
 	
-	mod_page('PM inbox (' . (count($messages) > 0 ? $unread . ' unread' : 'empty') . ')', 'mod/inbox.html', array(
+	mod_page(sprintf('%s (%s)', _('PM inbox'), count($messages) > 0 ? $unread . ' unread' : 'empty'), 'mod/inbox.html', array(
 		'messages' => $messages,
 		'unread' => $unread
 	));
@@ -1352,7 +1355,7 @@ function mod_new_pm($username) {
 		header('Location: ?/', true, $config['redirect_http']);
 	}
 	
-	mod_page("New PM for {$username}", 'mod/new_pm.html', array('username' => $username, 'id' => $id));
+	mod_page(sprintf('%s %s', _('New PM for'), $username), 'mod/new_pm.html', array('username' => $username, 'id' => $id));
 }
 
 function mod_rebuild() {
@@ -1414,11 +1417,11 @@ function mod_rebuild() {
 			}
 		}
 		
-		mod_page("Rebuild", 'mod/rebuilt.html', array('logs' => $log));
+		mod_page(_('Rebuild'), 'mod/rebuilt.html', array('logs' => $log));
 		return;
 	}
 	
-	mod_page("Rebuild", 'mod/rebuild.html', array('boards' => listBoards()));
+	mod_page(_('Rebuild'), 'mod/rebuild.html', array('boards' => listBoards()));
 }
 
 function mod_reports() {
@@ -1449,6 +1452,7 @@ function mod_reports() {
 		}
 	}
 	
+	$count = 0;
 	$body = '';
 	foreach ($reports as $report) {
 		if (!isset($report_posts[$report['board']][$report['post']])) {
@@ -1499,9 +1503,11 @@ function mod_reports() {
 		
 		if (isset($__old_body_truncate_char))
 			$config['body_truncate_char'] = $__old_body_truncate_char;
+		
+		$count++;
 	}
 	
-	mod_page("Report queue", 'mod/reports.html', array('reports' => $body));
+	mod_page(sprintf('%s (%d)', _('Report queue'), $count), 'mod/reports.html', array('reports' => $body, 'count' => $count));
 }
 
 function mod_report_dismiss($id, $all = false) {
@@ -1623,7 +1629,7 @@ function mod_config() {
 		exit;
 	}
 	
-	mod_page('Config editor', 'mod/config-editor.html', array('conf' => $conf));
+	mod_page(_('Config editor'), 'mod/config-editor.html', array('conf' => $conf));
 }
 
 function mod_debug_antispam() {
@@ -1657,7 +1663,6 @@ function mod_debug_antispam() {
 	$query = query('SELECT * FROM `antispam` ' . ($where ? "WHERE $where" : '') . ' ORDER BY `passed` DESC LIMIT 40') or error(db_error());
 	$args['top'] = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	mod_page("Debug: Anti-spam", 'mod/debug/antispam.html', $args);
+	mod_page(_('Debug: Anti-spam'), 'mod/debug/antispam.html', $args);
 }
 
-
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index a10b0cf2..1c70bf06 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -74,7 +74,11 @@
 	
 	<ul>
 		{% if mod|hasPermission(config.mod.reports) %}
-			<li><a href="?/reports">{% trans 'Report queue' %}</a></li>
+			<li>
+				{% if reports > 0 %}<strong>{% endif %}
+					<a href="?/reports">{% trans 'Report queue' %} ({{ reports }})</a>
+				{% if reports > 0 %}</strong>{% endif %}
+			</li>
 		{% endif %}
 		
 		{% if mod|hasPermission(config.mod.view_banlist) %}
-- 
cgit v1.3


From 8d96bfc3e90dd5293f3b39beac975850822f8a4b Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 28 May 2012 17:08:29 +1000
Subject: minor change

---
 inc/mod/pages.php            | 7 ++++---
 templates/mod/dashboard.html | 6 ++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 878df92d..72c8c195 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -978,6 +978,8 @@ function mod_deletefile($board, $post) {
 	deleteFile($post);
 	// Record the action
 	modLog("Deleted file from post #{$post}");
+	// Rebuild thread
+	buildThread($post);
 	// Rebuild board
 	buildIndex();
 	
@@ -1217,11 +1219,10 @@ function mod_users() {
 	if (!hasPermission($config['mod']['manageusers']))
 		error($config['error']['noaccess']);
 	
-	$args = array();
 	$query = query("SELECT *, (SELECT `time` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `last`, (SELECT `text` FROM `modlogs` WHERE `mod` = `id` ORDER BY `time` DESC LIMIT 1) AS `action` FROM `mods` ORDER BY `type` DESC,`id`") or error(db_error());
-	$args['users'] = $query->fetchAll(PDO::FETCH_ASSOC);
+	$users = $query->fetchAll(PDO::FETCH_ASSOC);
 	
-	mod_page(_('Manage users'), 'mod/users.html', $args);
+	mod_page(sprintf('%s (%d)', _('Manage users'), count($users)), 'mod/users.html', array('users' => $users));
 }
 
 function mod_user_promote($uid, $action) {
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 1c70bf06..47a25390 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -60,10 +60,8 @@
 		<li><a href="?/news">{% trans 'News' %}</a></li>
 		<li>
 			<a href="?/inbox">
-				{% trans 'PM inbox' %}
-				{% if unread_pms > 0 %}
-					 <strong>({{ unread_pms }} unread)</strong>
-				{% endif %}
+				{% trans 'PM inbox' %} 
+				{% if unread_pms > 0 %}<strong>{%endif %}({{ unread_pms }} unread){% if unread_pms > 0 %}</strong>{%endif %}
 			</a>
 		</li>
 	</ul>
-- 
cgit v1.3


From c5ec20684e77456fe9377a8cbf62c78cfb580b64 Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Mon, 13 Aug 2012 00:18:13 +1000
Subject: themes

---
 inc/mod/pages.php                  | 127 +++++++++++++++++++++++++++++++++++++
 mod.php                            |   5 ++
 templates/mod/dashboard.html       |  18 ++----
 templates/mod/theme_config.html    |  27 ++++++++
 templates/mod/theme_installed.html |   9 +++
 templates/mod/theme_rebuilt.html   |   2 +
 templates/mod/themes.html          |  40 ++++++++++++
 7 files changed, 214 insertions(+), 14 deletions(-)
 create mode 100644 templates/mod/theme_config.html
 create mode 100644 templates/mod/theme_installed.html
 create mode 100644 templates/mod/theme_rebuilt.html
 create mode 100644 templates/mod/themes.html

(limited to 'templates')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 72c8c195..ad69ae39 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1667,3 +1667,130 @@ function mod_debug_antispam() {
 	mod_page(_('Debug: Anti-spam'), 'mod/debug/antispam.html', $args);
 }
 
+function mod_themes_list() {
+	global $config;
+
+	if (!hasPermission($config['mod']['themes']))
+		error($config['error']['noaccess']);
+
+	if(!is_dir($config['dir']['themes']))
+		error(_('Themes directory doesn\'t exist!'));
+	if(!$dir = opendir($config['dir']['themes']))
+		error(_('Cannot open themes directory; check permissions.'));
+
+	$query = query('SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL') or error(db_error());
+	$themes_in_use = $query->fetchAll(PDO::FETCH_COLUMN);
+
+	// Scan directory for themes
+	$themes = array();
+	while ($file = readdir($dir)) {
+		if ($file[0] != '.' && is_dir($config['dir']['themes'] . '/' . $file)) {
+			$themes[$file] = loadThemeConfig($file);
+		}
+	}
+	closedir($dir);
+
+	mod_page(_('Manage themes'), 'mod/themes.html', array(
+		'themes' => $themes,
+		'themes_in_use' => $themes_in_use,
+	));
+}
+
+function mod_theme_configure($theme_name) {
+	global $config;
+
+	if (!hasPermission($config['mod']['themes']))
+		error($config['error']['noaccess']);
+
+	if(!$theme = loadThemeConfig($theme_name)) {
+		error($config['error']['invalidtheme']);
+	}
+
+	if(isset($_POST['install'])) {
+		// Check if everything is submitted
+		foreach($theme['config'] as &$conf) {
+			if(!isset($_POST[$conf['name']]) && $conf['type'] != 'checkbox')
+				error(sprintf($config['error']['required'], $c['title']));
+		}
+		
+		// Clear previous settings
+		$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+		$query->bindValue(':theme', $theme_name);
+		$query->execute() or error(db_error($query));
+		
+		foreach($theme['config'] as &$conf) {
+			$query = prepare("INSERT INTO `theme_settings` VALUES(:theme, :name, :value)");
+			$query->bindValue(':theme', $theme_name);
+			$query->bindValue(':name', $conf['name']);
+			$query->bindValue(':value', $_POST[$conf['name']]);
+			$query->execute() or error(db_error($query));
+		}
+		
+		$query = prepare("INSERT INTO `theme_settings` VALUES(:theme, NULL, NULL)");
+		$query->bindValue(':theme', $theme_name);
+		$query->execute() or error(db_error($query));
+		
+		$result = true;
+		$message = false;
+		if(isset($theme['install_callback'])) {
+			$ret = $theme['install_callback'](themeSettings($theme_name));
+			if($ret && !empty($ret)) {
+				if(is_array($ret) && count($ret) == 2) {
+					$result = $ret[0];
+					$message = $ret[1];
+				}
+			}
+		}
+		
+		if(!$result) {
+			// Install failed
+			$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+			$query->bindValue(':theme', $theme_name);
+			$query->execute() or error(db_error($query));
+		}
+		
+		// Build themes
+		rebuildThemes('all');
+		
+		mod_page(sprintf(_($result ? 'Installed theme: %s' : 'Installation failed: %s'), $theme['name']), 'mod/theme_installed.html', array(
+			'theme_name' => $theme_name,
+			'theme' => $theme,
+			'result' => $result,
+			'message' => $message,
+		));
+	}
+
+	$settings = themeSettings($theme_name);
+
+	mod_page(sprintf(_('Configuring theme: %s'), $theme['name']), 'mod/theme_config.html', array(
+		'theme_name' => $theme_name,
+		'theme' => $theme,
+		'settings' => $settings,
+	));
+}
+
+function mod_theme_uninstall($theme_name) {
+	global $config;
+
+	if (!hasPermission($config['mod']['themes']))
+		error($config['error']['noaccess']);
+	
+	$query = prepare("DELETE FROM `theme_settings` WHERE `theme` = :theme");
+	$query->bindValue(':theme', $theme_name);
+	$query->execute() or error(db_error($query));
+
+	header('Location: ?/themes', true, $config['redirect_http']);
+}
+
+function mod_theme_rebuild($theme_name) {
+	global $config;
+
+	if (!hasPermission($config['mod']['themes']))
+		error($config['error']['noaccess']);
+	
+	rebuildTheme($theme_name, 'all');
+
+	mod_page(sprintf(_('Rebuilt theme: %s'), $theme_name), 'mod/theme_rebuilt.html', array(
+		'theme_name' => $theme_name,
+	));
+}
diff --git a/mod.php b/mod.php
index 5fa040ee..52f340d2 100644
--- a/mod.php
+++ b/mod.php
@@ -65,6 +65,11 @@ $pages = array(
 	'/(\w+)/bump(un)?lock/(\d+)'		=> 'bumplock',		// "bumplock" thread
 	'/(\w+)/move/(\d+)'			=> 'move',		// move thread
 	
+	'/themes'				=> 'themes_list',	// manage themes
+	'/themes/(\w+)'				=> 'theme_configure',	// configure/reconfigure theme
+	'/themes/(\w+)/rebuild'			=> 'theme_rebuild',	// rebuild theme
+	'/themes/(\w+)/uninstall'		=> 'theme_uninstall',	// uninstall theme
+	
 	'/config'				=> 'config',		// config editor
 	
 	// these pages aren't listed in the dashboard without $config['debug']
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index 47a25390..30742dc1 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -10,7 +10,6 @@
 				{% if board.subtitle %}
 					 <small>&mdash; {{ board.subtitle|e }}</small>
 				{% endif %}
-				
 				{% if mod|hasPermission(config.mod.manageboards) %}
 					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
 				{% endif %}
@@ -78,39 +77,30 @@
 				{% if reports > 0 %}</strong>{% endif %}
 			</li>
 		{% endif %}
-		
 		{% if mod|hasPermission(config.mod.view_banlist) %}
 			<li><a href="?/bans">{% trans 'Ban list' %}</a></li>
 		{% endif %}
-		
 		{% if mod|hasPermission(config.mod.manageusers) %}
 			<li><a href="?/users">{% trans 'Manage users' %}</a></li>
 		{% elseif mod|hasPermission(config.mod.change_password) %}
 			<li><a href="?/users/{{ mod.id }}">{% trans 'Change password' %}</a></li>
 		{% endif %}
-		
+		{% if mod|hasPermission(config.mod.themes) %}
+			<li><a href="?/themes">{% trans 'Manage themes' %}</a></li>
+		{% endif %}
 		{% if mod|hasPermission(config.mod.modlog) %}
 			<li><a href="?/log">{% trans 'Moderation log' %}</a></li>
 		{% endif %}
-		
 		{% if mod|hasPermission(config.mod.rebuild) %}
 			<li><a href="?/rebuild">{% trans 'Rebuild' %}</a></li>
 		{% endif %}
-		
 		{% if mod|hasPermission(config.mod.show_config) %}
 			<li><a href="?/config">{% trans 'Configuration' %}</a></li>
 		{% endif %}
+		
 	</ul>
 </fieldset>
 
-{% if mod|hasPermission(config.mod.themes) %}
-	<fieldset>
-		<legend>{% trans 'Themes' %}</legend>
-	
-		{# TODO #}
-	</fieldset>
-{% endif %}
-
 <fieldset>
 	<legend>{% trans 'Search' %}</legend>
 	
diff --git a/templates/mod/theme_config.html b/templates/mod/theme_config.html
new file mode 100644
index 00000000..2dbb8397
--- /dev/null
+++ b/templates/mod/theme_config.html
@@ -0,0 +1,27 @@
+<form action="" method="post">
+	{% if not config %}
+		<p style="text-align:center" class="unimportant">(No configuration required.)</p>
+	{% else %}
+		<table>
+			{% for conf in theme.config %}
+				<tr>
+					<th>{{ conf.title }}</th>
+					<td>
+						<input type="text" name="{{ conf.name }}" 
+						{% if settings[conf.name] %}value="{{ settings[conf.name] }}"{% else %}{% if conf.default %}value="{{ conf.default }}"{% endif %}{% endif %}
+						{% if conf.size %}
+							size="{{ conf.size }}"
+						{% endif %}
+						/>
+					{% if conf.comment %}
+						 <span class="unimportant">{{ conf.comment }}</span>
+					{% endif %}
+					</td>
+				</tr>
+			{% endfor %}
+		</table>
+	{% endif %}
+	<p style="text-align:center">
+		<input name="install" type="submit" value="{% trans 'Install theme' %}" />
+	</p>
+</form>
diff --git a/templates/mod/theme_installed.html b/templates/mod/theme_installed.html
new file mode 100644
index 00000000..e6beec10
--- /dev/null
+++ b/templates/mod/theme_installed.html
@@ -0,0 +1,9 @@
+{% if message %}
+	<div style="border:1px dashed maroon;padding:20px;margin:auto;max-width:800px">{{ message }}</div>
+{% endif %}
+
+{% if result %}
+	<p style="text-align:center">{% trans 'Successfully installed and built theme.' %}</p>
+{% endif %}
+
+<p style="text-align:center"><a href="?/themes">{% trans 'Go back to themes' %}</a>.</p>
diff --git a/templates/mod/theme_rebuilt.html b/templates/mod/theme_rebuilt.html
new file mode 100644
index 00000000..b366e7a6
--- /dev/null
+++ b/templates/mod/theme_rebuilt.html
@@ -0,0 +1,2 @@
+<p style="text-align:center">{{ 'Successfully rebuilt the <strong>%s</strong> theme.'|trans|sprintf(theme_name) }}</p>
+<p style="text-align:center"><a href="?/themes">{% trans 'Go back to themes' %}</a>.</p>
diff --git a/templates/mod/themes.html b/templates/mod/themes.html
new file mode 100644
index 00000000..b596826d
--- /dev/null
+++ b/templates/mod/themes.html
@@ -0,0 +1,40 @@
+{% if themes|count == 0 %}
+	<p style="text-align:center" class="unimportant">({% trans 'There are no themes available.' %})</p>
+{% else %}
+	<table class="modlog">
+		{% for theme_name, theme in themes %}
+			<tr>
+				<th class="minimal">{% trans 'Name' %}</th>
+					<td>{{ theme.name }}</td>
+				</tr>
+				<tr>
+					<th class="minimal">{% trans 'Version' %}</th>
+					<td>{{ theme.version }}</td>
+				</tr>
+				<tr>
+					<th class="minimal">{% trans 'Description' %}</th>
+					<td>{{ theme.description }}</td>
+				</tr>
+				<tr>
+					<th class="minimal">{% trans 'Thumbnail' %}</th>
+					<td>
+						<img style="float:none;margin:4px{% if theme_name in themes_in_use %};border:2px solid red;padding:4px{% endif %}" src="{{ config.dir.themes_uri }}/{{ theme_name }}/thumb.png" />
+					</td>
+				</tr>
+				<tr>
+					<th class="minimal">{% trans 'Actions' %}</th>
+					<td><ul style="padding:0 20px">
+						<li><a title=" {% trans 'Use theme' %}" href="?/themes/{{ theme_name }}">
+							{% if theme_name in themes_in_use %}{% trans 'Reconfigure' %}{% else %}{% trans 'Install' %}{% endif %}
+						</a></li>
+						{% if theme_name in themes_in_use %}
+							<li><a href="?/themes/{{ theme_name }}/rebuild">{% trans 'Rebuild' %}</a></li>
+							<li><a href="?/themes/{{ theme_name }}/uninstall" onclick="return confirm('Are you sure you want to uninstall this theme?');">{% trans 'Uninstall' %}</a></li>
+						{% endif %}
+					</ul></td>
+				</tr>
+				<tr style="height:40px"><td colspan="2"><hr/></td></tr>
+			</tr>
+		{% endfor %}
+	</table>
+{% endif %}
-- 
cgit v1.3