Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

Conflicts:
	inc/config.php
	install.php
	post.php
	stylesheets/style.css

1 files changed, 45 insertions, 41 deletions

diff --git a/mod.php b/mod.php
index ab5de9e7..e5b14878 100644
--- a/mod.php
+++ b/mod.php
@@ -24,48 +24,51 @@ if (get_magic_quotes_gpc()) {
 $query = isset($_SERVER['QUERY_STRING']) ? rawurldecode($_SERVER['QUERY_STRING']) : '';
 
 $pages = array(
-	''					=> ':?/',		// redirect to dashboard
-	'/'					=> 'dashboard',		// dashboard
-	'/confirm/(.+)'				=> 'confirm',		// confirm action (if javascript didn't work)
-	'/logout'				=> 'logout',		// logout
+	''					=> ':?/',			// redirect to dashboard
+	'/'					=> 'dashboard',			// dashboard
+	'/confirm/(.+)'				=> 'confirm',			// confirm action (if javascript didn't work)
+	'/logout'				=> 'secure 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
+	'/users'				=> 'users',			// manage users
+	'/users/(\d+)/(promote|demote)'		=> 'secure user_promote',	// prmote/demote user
+	'/users/(\d+)'				=> 'secure_POST user',		// edit user
+	'/users/new'				=> 'secure_POST user_new',	// create a new user
 	
-	'/noticeboard'				=> 'noticeboard',	// view noticeboard
-	'/noticeboard/(\d+)'			=> 'noticeboard',	// view noticeboard
-	'/noticeboard/delete/(\d+)'		=> 'noticeboard_delete',	// delete from noticeboard
-	'/log'					=> 'log',		// modlog
-	'/log/(\d+)'				=> 'log',		// modlog
-	'/log:([^/]+)'				=> 'user_log',		// modlog
-	'/log:([^/]+)/(\d+)'			=> 'user_log',		// modlog
-	'/news'					=> 'news',		// view news
-	'/news/(\d+)'				=> 'news',		// view news
-	'/news/delete/(\d+)'			=> 'news_delete',	// delete from news
+	'/new_PM/([^/]+)'			=> 'secure_POST new_pm',	// create a new pm
+	'/PM/(\d+)(/reply)?'			=> 'pm',			// read a pm
+	'/inbox'				=> 'inbox',			// pm inbox
 	
-	'/edit/(\%b)'				=> 'edit_board',	// edit board details
-	'/new-board'				=> 'new_board',		// create a new board
+	'/log'					=> 'log',			// modlog
+	'/log/(\d+)'				=> 'log',			// modlog
+	'/log:([^/]+)'				=> 'user_log',			// modlog
+	'/log:([^/]+)/(\d+)'			=> 'user_log',			// modlog
+	'/news'					=> 'secure_POST news',		// view news
+	'/news/(\d+)'				=> 'secure_POST news',		// view news
+	'/news/delete/(\d+)'			=> 'secure news_delete',	// delete from news
 	
-	'/rebuild'				=> 'rebuild',		// rebuild static files
-	'/reports'				=> 'reports',		// report queue
-	'/reports/(\d+)/dismiss(all)?'		=> 'report_dismiss',	// dismiss a report
+	'/noticeboard'				=> 'secure_POST noticeboard',	// view noticeboard
+	'/noticeboard/(\d+)'			=> 'secure_POST noticeboard',	// view noticeboard
+	'/noticeboard/delete/(\d+)'		=> 'secure noticeboard_delete',	// delete from noticeboard
 	
-	'/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
+	'/edit/(\%b)'				=> 'secure_POST edit_board',	// edit board details
+	'/new-board'				=> 'secure_POST new_board',	// create a new board
+	
+	'/rebuild'				=> 'secure_POST rebuild',	// rebuild static files
+	'/reports'				=> 'reports',			// report queue
+	'/reports/(\d+)/dismiss(all)?'		=> 'secure report_dismiss',	// dismiss a report
+	
+	'/IP/([\w.:]+)'				=> 'secure_POST ip',		// view ip address
+	'/IP/([\w.:]+)/remove_note/(\d+)'	=> 'secure ip_remove_note',	// remove note from ip address
 	
-	'/search'				=> 'search_redirect',	// search
-	'/search/(posts|IP_notes|bans|log)/(.+)/(\d+)'	=> 'search',	// search
-	'/search/(posts|IP_notes|bans|log)/(.+)'	=> 'search',	// search
-
-	// CSRF-protected moderator actions
 	'/ban'					=> 'secure_POST ban',		// new ban
+	'/bans'					=> 'secure_POST bans',		// ban list
+	'/bans/(\d+)'				=> 'secure_POST bans',		// ban list
+	'/ban-appeals'				=> 'secure_POST ban_appeals',	// view ban appeals
+	
+	'/search'				=> 'search_redirect',		// search
+	'/search/(posts|IP_notes|bans|log)/(.+)/(\d+)'	=> 'search',		// search
+	'/search/(posts|IP_notes|bans|log)/(.+)'	=> 'search',		// search
+
 	'/(\%b)/ban(&delete)?/(\d+)'		=> 'secure_POST ban_post', 	// ban poster
 	'/(\%b)/move/(\d+)'			=> 'secure_POST move',		// move thread
 	'/(\%b)/move_reply/(\d+)'			=> 'secure_POST move_reply',		// move reply
@@ -78,17 +81,18 @@ $pages = array(
 	'/(\%b)/(un)?sticky/(\d+)'		=> 'secure sticky',		// sticky thread
 	'/(\%b)/bump(un)?lock/(\d+)'		=> 'secure bumplock',		// "bumplock" 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
+	'/themes'				=> 'themes_list',		// manage themes
+	'/themes/(\w+)'				=> 'secure_POST theme_configure',		// configure/reconfigure theme
+	'/themes/(\w+)/rebuild'			=> 'secure theme_rebuild',		// rebuild theme
+	'/themes/(\w+)/uninstall'		=> 'secure theme_uninstall',		// uninstall theme
 	
-	'/config'				=> 'config',		// config editor
-	'/config/(\%b)'				=> 'config',		// config editor
+	'/config'				=> 'secure_POST config',	// config editor
+	'/config/(\%b)'				=> 'secure_POST config',	// config editor
 	
 	// these pages aren't listed in the dashboard without $config['debug']
 	'/debug/antispam'			=> 'debug_antispam',
 	'/debug/recent'				=> 'debug_recent_posts',
+	'/debug/apc'				=> 'debug_apc',
 	'/debug/sql'				=> 'secure_POST debug_sql',
 	
 	// This should always be at the end: