Merge https://github.com/vichan-devel/vichan

Conflicts:
	inc/mod/pages.php
	js/auto-reload.js
	js/id_colors.js
	js/id_highlighter.js
	stylesheets/style.css
	templates/index.html

inc/config.php

@@ -543,6 +543,9 @@
 	// When true, users are instead presented a selectbox for email. Contains, blank, noko and sage.
 	$config['field_email_selectbox'] = false;
 
+	// When true, the sage won't be displayed
+	$config['hide_sage'] = false;
+
 	// Attach country flags to posts.
 	$config['country_flags'] = false;
 
@@ -1060,7 +1063,8 @@
 	$config['error']['unknownext']		= _('Unknown file extension.');
 	$config['error']['filesize']		= _('Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes');
 	$config['error']['maxsize']		= _('The file was too big.');
-	$config['error']['webmerror'] = _('There was a problem processing your webm.');
+	$config['error']['genwebmerror']	= _('There was a problem processing your webm.');
+	$config['error']['webmerror'] 		= _('There was a problem processing your webm.');//Is this error used anywhere ?
 	$config['error']['invalidwebm'] 	= _('Invalid webm uploaded.');
 	$config['error']['webmhasaudio'] 	= _('The uploaded webm contains an audio or another type of additional stream.');
 	$config['error']['webmtoolong'] 	= _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.');

inc/functions.php

@@ -741,7 +741,7 @@ function displayBan($ban) {
 	$pending_appeal = false;
 	
 	if ($config['ban_appeals']) {
-		$query = query("SELECT `time`, `denied` FROM `ban_appeals` WHERE `ban_id` = " . (int)$ban['id']) or error(db_error());
+		$query = query("SELECT `time`, `denied` FROM ``ban_appeals`` WHERE `ban_id` = " . (int)$ban['id']) or error(db_error());
 		while ($ban_appeal = $query->fetch(PDO::FETCH_ASSOC)) {
 			if ($ban_appeal['denied']) {
 				$denied_appeals[] = $ban_appeal['time'];

inc/mod/pages.php

@@ -1585,10 +1585,11 @@ function mod_spoiler_image($board, $post, $file) {
 	$result = $query->fetch(PDO::FETCH_ASSOC);
 	$files = json_decode($result['files']);
 
-	file_unlink($config['dir']['img_root'] . $board . '/' . $config['dir']['thumb'] . $files[$file]->thumb);
+	$size_spoiler_image = @getimagesize($config['spoiler_image']);
+	file_unlink($board . '/' . $config['dir']['thumb'] . $files[$file]->thumb);
 	$files[$file]->thumb = 'spoiler';
-	$files[$file]->thumbheight = 128;
+	$files[$file]->thumbwidth = $size_spoiler[0];
-	$files[$file]->thumbwidth = 128;
+	$files[$file]->thumbheight = $size_spoiler_image[1];
 	
 	// Make thumbnail spoiler
 	$query = prepare(sprintf("UPDATE ``posts_%s`` SET `files` = :files WHERE `id` = :id", $board));

js/id_colors.js

@@ -67,6 +67,5 @@ if (active_page == 'thread' || active_page == 'index') {
 				colorPostId(v);
 			});
 		});
-
 	});
 }

stylesheets/style.css

@@ -31,9 +31,7 @@ p.intro a.post_no {
   color: inherit;
 }
 
-p.intro a.post_no,
+p.intro a.post_no,p.intro a.email,p.intro a.post_anchor {
-p.intro a.email,
-p.intro a.post_anchor {
   margin: 0;
 }
 
@@ -225,7 +223,6 @@ p.intro {
   margin: 0.5em 0;
   padding: 0;
   padding-bottom: 0.2em;
-  clear: both;
 }
 
 input.delete {
@@ -276,7 +273,6 @@ div.post.reply div.body a {
 }
 
 div.post {
-  max-width: 95%;
   padding-left: 20px;
 }
 
@@ -293,7 +289,6 @@ div.post.reply {
   border-style: none solid solid none;
   border-color: #B7C5D9;
   display: inline-block;
-  max-width: 95%;
 }
 
 span.trip {
@@ -554,7 +549,6 @@ table.mod.config-editor input[type="text"] {
   top: 0;
   left: 0;
   right: 0;
-  /*text-shadow: white 1px 0 6px, white 1px 0 6px, black 1px 0 3px;*/
   margin-top: 0;
   z-index: 30;
   box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
@@ -562,11 +556,6 @@ table.mod.config-editor input[type="text"] {
   background-color: #D6DAF0;
 }
 
-/*.desktop-style div.boardlist:nth-child(1):hover, .desktop-style div.boardlist:nth-child(1).cb-menu {
->>>>>>> f3d7ef5801ae050ed2338156d888c6ed858789a9
-  background-color: rgba(90%, 90%, 90%, 0.6);
-}*/
-
 .desktop-style body {
   padding-top: 20px;
 }
@@ -628,10 +617,11 @@ form.ban-appeal textarea {
 }
 
 .MathJax_Display {
-	display:inline!important
+  display:inline!important;
 }
 pre {
   margin:0
+  display: inline!important;
 }
 
 .theme-catalog div.thread img {
@@ -660,10 +650,6 @@ pre {
   background: rgba(182, 182, 182, 0.12);
   border: 2px solid rgba(111, 111, 111, 0.34);
   max-height:300px;
-  background: rgba(182, 182, 182, 0.12);
-  border: 2px solid rgba(111, 111, 111, 0.34);
-  background: rgba(182, 182, 182, 0.12);
-  border: 2px solid rgba(111, 111, 111, 0.34);
 }
 
 .theme-catalog div.thread strong {
@@ -681,36 +667,33 @@ div.thread:hover {
 }
 
 .theme-catalog div.grid-size-vsmall img {
-  max-height: 64px;
+  max-height: 33%;
-  max-width: 100px;
+  max-width: 95%
 }
 
 .theme-catalog div.grid-size-vsmall {
-  width: 100px;
+  min-width:90px; max-width: 90px;
-  max-width: 100px;
+  max-height: 148px;
-  max-height: 150px;
 }
 
 .theme-catalog div.grid-size-small img {
-  max-height: 128px;
+  max-height: 33%;
-  max-width: 225px;
+  max-width: 95%
 }
 
 .theme-catalog div.grid-size-small {
-  width: 200px;
+  min-width:140px; max-width: 140px;
-  max-width: 225px;
+  max-height: 192px;
-  max-height: 300px;
 }
 
 .theme-catalog div.grid-size-large img {
-  max-height: 148px;
+  max-height: 40%;
-  max-width: 300px;
+  max-width: 95%
 }
 
 .theme-catalog div.grid-size-large {
-  width: 300px;
+  min-width: 256px; max-width: 256px;
-  max-width: 300px;
+  max-height: 384px;
-  max-height: 450px;
 }
 
 .theme-catalog img.thread-image {
@@ -758,7 +741,6 @@ div.thread:hover {
   padding: 5px 6px 8px 6px;
 }
 
-/* styles also used by watch.js */
 .cb-menuitem {
   display: table-row;
 }
@@ -799,7 +781,6 @@ div.thread:hover {
   vertical-align: middle;
 }
 
-/* live-index.js */
 .new-posts {
   opacity: 0.6;
   margin-top: 1em;
@@ -809,7 +790,6 @@ div.thread:hover {
   text-align: center;
 }
 
-/* options.js */
 #options_handler {
   position: fixed;
   top: 0px;
@@ -923,7 +903,6 @@ code > pre > span.pln {
   color: grey;
 }
 
-
 @media screen and (min-width: 768px) {
   p.intro {
     clear: none;

templates/post/name.html

@@ -1,5 +1,5 @@
 {% set capcode = post.capcode|capcode %}
-{% if post.email|length > 0 %}
+{% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %}
 	{# start email #}
 	<a class="email" href="mailto:{{ post.email }}">
 {% endif %}