From ed045259949aed75db2bc640553c9adfbff35661 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Thu, 8 Aug 2013 19:41:21 +0000
Subject: Spoil files moderator action

---
 inc/mod/pages.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'inc/mod')

diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 10205a11..23b90aba 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1361,6 +1361,33 @@ function mod_deletefile($board, $post) {
 	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
 }
 
+function mod_spoiler_image($board, $post) {
+	global $config, $mod;
+       
+	if (!openBoard($board))
+		error($config['error']['noboard']);
+       
+	if (!hasPermission($config['mod']['spoilerimage'], $board))
+		error($config['error']['noaccess']);
+
+	// Delete file
+	$query = prepare(sprintf("UPDATE `posts_%s` SET `thumb` = :thumb, `thumbwidth` = :thumbwidth, `thumbheight` = :thumbheight WHERE `id` = :id", $board));
+	$query->bindValue(':thumb', "spoiler");
+	$query->bindValue(':thumbwidth', 128, PDO::PARAM_INT);
+	$query->bindValue(':thumbheight', 128, PDO::PARAM_INT);
+	$query->bindValue(':id', $post, PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+
+	// Record the action
+	modLog("Spoilered file from post #{$post}");
+       
+	// Rebuild board
+	buildIndex();
+       
+	// Redirect
+	header('Location: ?/' . sprintf($config['board_path'], $board) . $config['file_index'], true, $config['redirect_http']);
+}
+
 function mod_deletebyip($boardName, $post, $global = false) {
 	global $config, $mod, $board;
 	
-- 
cgit v1.3


From 2018fd206bfcd69789c2f2ff7c034f7287cc3226 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Sun, 11 Aug 2013 13:54:11 +0000
Subject: Improve spoiler action

Conflicts:
	inc/mod/pages.php
---
 inc/config.php    |  2 ++
 inc/mod/pages.php | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'inc/mod')

diff --git a/inc/config.php b/inc/config.php
index ea0300e0..7bde3d6a 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1093,6 +1093,8 @@
 	$config['mod']['bandelete'] = MOD;
 	// Remove bans
 	$config['mod']['unban'] = MOD;
+	// Spoiler file (and keep post)
+	$config['mod']['deletefile'] = JANITOR;
 	// Delete file (and keep post)
 	$config['mod']['deletefile'] = JANITOR;
 	// Delete all posts by IP
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 23b90aba..932b2ed6 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1371,7 +1371,15 @@ function mod_spoiler_image($board, $post) {
 		error($config['error']['noaccess']);
 
 	// Delete file
-	$query = prepare(sprintf("UPDATE `posts_%s` SET `thumb` = :thumb, `thumbwidth` = :thumbwidth, `thumbheight` = :thumbheight WHERE `id` = :id", $board));
+	$query = prepare(sprintf("SELECT `thumb`, `thread` FROM ``posts_%s`` WHERE id = :id", $board));
+	$query->bindValue(':id', $post, PDO::PARAM_INT);
+	$query->execute() or error(db_error($query));
+	$result = $query->fetch(PDO::FETCH_ASSOC);
+
+	file_unlink($board . '/' . $config['dir']['thumb'] . $result['thumb']);
+
+	// Make thumbnail spoiler
+	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `thumb` = :thumb, `thumbwidth` = :thumbwidth, `thumbheight` = :thumbheight WHERE `id` = :id", $board));
 	$query->bindValue(':thumb', "spoiler");
 	$query->bindValue(':thumbwidth', 128, PDO::PARAM_INT);
 	$query->bindValue(':thumbheight', 128, PDO::PARAM_INT);
@@ -1380,7 +1388,10 @@ function mod_spoiler_image($board, $post) {
 
 	// Record the action
 	modLog("Spoilered file from post #{$post}");
-       
+
+	// Rebuild thread
+	buildThread($result['thread'] ? $result['thread'] : $post);
+
 	// Rebuild board
 	buildIndex();
        
-- 
cgit v1.3


From e0a8ffcfb9246dc5fda840dc5386598730245802 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Mon, 12 Aug 2013 21:14:32 +1000
Subject: ?/config: Link URLs in comments

---
 inc/mod/config-editor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'inc/mod')

diff --git a/inc/mod/config-editor.php b/inc/mod/config-editor.php
index 27740378..3f15ebe5 100644
--- a/inc/mod/config-editor.php
+++ b/inc/mod/config-editor.php
@@ -115,8 +115,14 @@ function config_vars() {
 							$already_exists = true;
 							
 					}
-					if (!$already_exists && permission_to_edit_config_var($var['name']))
+					if (!$already_exists && permission_to_edit_config_var($var['name'])) {
+						foreach ($var['comment'] as &$comment) {
+							$comment = preg_replace_callback(
+								'/((?:https?:\/\/|ftp:\/\/|irc:\/\/)[^\s<>()"]+?(?:\([^\s<>()"]*?\)[^\s<>()"]*?)*)((?:\s|<|>|"|\.||\]|!|\?|,|&#44;|&quot;)*(?:[\s<>()"]|$))/',
+								'markup_url', $comment);
+						}
 						$conf[] = $var;
+					}
 				}
 			}
 			
-- 
cgit v1.3