From 8efab06616bfcdab49fb9e996cdc7ddfe79426bb Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 30 Jul 2013 22:08:56 -0400
Subject: Upgrade to utf8mb4 charset for MySQL server versions above 5.5.3.
 Keep support for older versions. Fix charsets for multiple columns and
 tables.

---
 templates/posts.sql | 63 +++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

(limited to 'templates')

diff --git a/templates/posts.sql b/templates/posts.sql
index c766d38e..0a1dc92a 100644
--- a/templates/posts.sql
+++ b/templates/posts.sql
@@ -1,32 +1,33 @@
 CREATE TABLE IF NOT EXISTS `posts_{{ board }}` (
-  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `thread` int(11) DEFAULT NULL,
-  `subject` varchar(100) DEFAULT NULL,
-  `email` varchar(30) DEFAULT NULL,
-  `name` varchar(35) DEFAULT NULL,
-  `trip` varchar(15) DEFAULT NULL,
-  `capcode` varchar(50) DEFAULT NULL,
-  `body` text NOT NULL,
-  `body_nomarkup` text DEFAULT NULL,
-  `time` int(11) NOT NULL,
-  `bump` int(11) DEFAULT NULL,
-  `thumb` varchar(50) DEFAULT NULL,
-  `thumbwidth` int(11) DEFAULT NULL,
-  `thumbheight` int(11) DEFAULT NULL,
-  `file` varchar(50) DEFAULT NULL,
-  `filewidth` int(11) DEFAULT NULL,
-  `fileheight` int(11) DEFAULT NULL,
-  `filesize` int(11) DEFAULT NULL,
-  `filename` text DEFAULT NULL,
-  `filehash` text DEFAULT NULL,
-  `password` varchar(20) DEFAULT NULL,
-  `ip` varchar(45) NOT NULL,
-  `sticky` int(1) NOT NULL,
-  `locked` int(1) NOT NULL,
-  `sage` int(1) NOT NULL,
-  `embed` text,
-  UNIQUE KEY `id` (`id`),
-  KEY `thread_id` (`thread`, `id`),
-  KEY `time` (`time`),
-  FULLTEXT KEY `body` (`body`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+   `thread` int(11) DEFAULT NULL,
+   `subject` varchar(100) DEFAULT NULL,
+   `email` varchar(30) DEFAULT NULL,
+   `name` varchar(35) DEFAULT NULL,
+   `trip` varchar(15) DEFAULT NULL,
+   `capcode` varchar(50) DEFAULT NULL,
+   `body` text NOT NULL,
+   `body_nomarkup` text,
+   `time` int(11) NOT NULL,
+   `bump` int(11) DEFAULT NULL,
+   `thumb` varchar(50) DEFAULT NULL,
+   `thumbwidth` int(11) DEFAULT NULL,
+   `thumbheight` int(11) DEFAULT NULL,
+   `file` varchar(50) DEFAULT NULL,
+   `filewidth` int(11) DEFAULT NULL,
+   `fileheight` int(11) DEFAULT NULL,
+   `filesize` int(11) DEFAULT NULL,
+   `filename` text,
+   `filehash` text CHARACTER SET ascii,
+   `password` varchar(20) DEFAULT NULL,
+   `ip` varchar(39) CHARACTER SET ascii NOT NULL,
+   `sticky` int(1) NOT NULL,
+   `locked` int(1) NOT NULL,
+   `sage` int(1) NOT NULL,
+   `embed` text,
+   UNIQUE KEY `id` (`id`),
+   KEY `thread_id` (`thread`,`id`),
+   KEY `time` (`time`),
+   FULLTEXT KEY `body` (`body`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1 ;
+ 
\ No newline at end of file
-- 
cgit v1.3


From 889945f50cd0c2cd1b8f39d7b380133196a93a74 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 30 Jul 2013 23:36:46 -0400
Subject: Hide "flags" section in posting form if user doesn't have permission
 to do anything special

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

(limited to 'templates')

diff --git a/templates/post_form.html b/templates/post_form.html
index aa051f5f..a112e2ab 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -85,7 +85,7 @@
 			</td>
 		</tr>
 		{% endif %}
-		{% if mod %}
+		{% if mod and ((not id and post.mod|hasPermission(config.mod.sticky, board.uri)) or (not id and post.mod|hasPermission(config.mod.lock, board.uri)) or post.mod|hasPermission(config.mod.rawhtml, board.uri)) %}
 		<tr>
 			<th>
 				{% trans %}Flags{% endtrans %}
-- 
cgit v1.3


From bb2868896c2f383a913e8e5929627660cc754b14 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 00:04:57 -0400
Subject: Ability to hide IP addresses from mod log

---
 inc/config.php         | 2 ++
 templates/mod/log.html | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/inc/config.php b/inc/config.php
index 582c3145..28a7a4db 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1024,6 +1024,8 @@
 	$config['mod']['createusers'] = ADMIN;
 	// View the moderation log
 	$config['mod']['modlog'] = ADMIN;
+	// View IP addresses of other mods in ?/log
+	$config['mod']['show_ip_modlog'] = ADMIN;
 	// View relevant moderation log entries on IP address pages (ie. ban history, etc.)
 	// Warning: Can be pretty resource exhaustive if your mod logs are huge.
 	$config['mod']['modlog_ip'] = MOD;
diff --git a/templates/mod/log.html b/templates/mod/log.html
index e75330b5..0aa3f110 100644
--- a/templates/mod/log.html
+++ b/templates/mod/log.html
@@ -18,7 +18,11 @@
 				{% endif %}
 			</td>
 			<td class="minimal">
-				<a href="?/IP/{{ log.ip }}">{{ log.ip }}</a>
+				{% if mod|hasPermission(config.mod.show_ip_modlog) %}
+					<a href="?/IP/{{ log.ip }}">{{ log.ip }}</a>
+				{% else %}
+					<em>hidden</em>
+				{% endif %}
 			</td>
 			<td class="minimal">
 				<span title="{{ log.time|date(config.post_date) }}">{{ log.time|ago }}</span>
-- 
cgit v1.3