'.
'";
+ }, $body);
+ }
+
foreach ($config['markup'] as $markup) {
if (is_string($markup[1])) {
$body = preg_replace($markup[0], $markup[1], $body);
@@ -1810,7 +1943,7 @@ function markup(&$body, $track_cites = false) {
if (isset($cited_posts[$cite])) {
$replacement = '' .
+ link_for(array('id' => $cite, 'thread' => $cited_posts[$cite])) . '#' . $cite . '">' .
'>>' . $cite .
'';
@@ -1876,12 +2009,12 @@ function markup(&$body, $track_cites = false) {
if (!empty($clauses)) {
$cited_posts[$_board] = array();
- $query = query(sprintf('SELECT `thread`, `id` FROM ``posts_%s`` WHERE ' .
+ $query = query(sprintf('SELECT `thread`, `id`, `slug` FROM ``posts_%s`` WHERE ' .
implode(' OR ', $clauses), $board['uri'])) or error(db_error());
while ($cite = $query->fetch(PDO::FETCH_ASSOC)) {
$cited_posts[$_board][$cite['id']] = $config['root'] . $board['dir'] . $config['dir']['res'] .
- ($cite['thread'] ? $cite['thread'] : $cite['id']) . '.html#' . $cite['id'];
+ link_for($cite) . '#' . $cite['id'];
}
}
@@ -1936,7 +2069,19 @@ function markup(&$body, $track_cites = false) {
$body = preg_replace('/\s+$/', '', $body);
$body = preg_replace("/\n/", '
', $body);
-
+
+ // Fix code markup
+ if ($config['markup_code']) {
+ foreach ($code_markup as $id => $val) {
+ $code = isset($val[2]) ? $val[2] : $val[1];
+ $code_lang = isset($val[2]) ? $val[1] : "";
+
+ $code = "".str_replace(array("\n","\t"), array("
"," "), htmlspecialchars($code))."";
+
+ $body = str_replace("", $code, $body);
+ }
+ }
+
if ($config['markup_repair_tidy']) {
$tidy = new tidy();
$body = str_replace("\t", ' ', $body);
@@ -1954,10 +2099,10 @@ function markup(&$body, $track_cites = false) {
), 'utf8');
$body = str_replace("\n", '', $body);
}
-
+
// replace tabs with 8 spaces
$body = str_replace("\t", ' ', $body);
-
+
return $tracked_cites;
}
@@ -2029,51 +2174,62 @@ function buildThread($id, $return = false, $mod = false) {
cache::delete("thread_{$board['uri']}_{$id}");
}
- $query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
- $query->bindValue(':id', $id, PDO::PARAM_INT);
- $query->execute() or error(db_error($query));
+ if ($config['try_smarter'] && !$mod)
+ $build_pages[] = thread_find_page($id);
- while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
- if (!isset($thread)) {
- $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
- } else {
- $thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod));
+ if (!$config['smart_build'] || $return || $mod) {
+ $query = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE (`thread` IS NULL AND `id` = :id) OR `thread` = :id ORDER BY `thread`,`id`", $board['uri']));
+ $query->bindValue(':id', $id, PDO::PARAM_INT);
+ $query->execute() or error(db_error($query));
+
+ while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
+ if (!isset($thread)) {
+ $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
+ } else {
+ $thread->add(new Post($post, $mod ? '?/' : $config['root'], $mod));
+ }
}
- }
- // Check if any posts were found
- if (!isset($thread))
- error($config['error']['nonexistant']);
+ // Check if any posts were found
+ if (!isset($thread))
+ error($config['error']['nonexistant']);
- $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
- $antibot = $mod || $return ? false : create_antibot($board['uri'], $id);
+ $hasnoko50 = $thread->postCount() >= $config['noko50_min'];
+ $antibot = $mod || $return ? false : create_antibot($board['uri'], $id);
- $body = Element('thread.html', array(
- 'board' => $board,
- 'thread' => $thread,
- 'body' => $thread->build(),
- 'config' => $config,
- 'id' => $id,
- 'mod' => $mod,
- 'hasnoko50' => $hasnoko50,
- 'isnoko50' => false,
- 'antibot' => $antibot,
- 'boardlist' => createBoardlist($mod),
- 'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
- ));
-
- if ($config['try_smarter'] && !$mod)
- $build_pages[] = thread_find_page($id);
+ $body = Element('thread.html', array(
+ 'board' => $board,
+ 'thread' => $thread,
+ 'body' => $thread->build(),
+ 'config' => $config,
+ 'id' => $id,
+ 'mod' => $mod,
+ 'hasnoko50' => $hasnoko50,
+ 'isnoko50' => false,
+ 'antibot' => $antibot,
+ 'boardlist' => createBoardlist($mod),
+ 'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
+ ));
- // json api
- if ($config['api']['enabled']) {
- $api = new Api();
- $json = json_encode($api->translateThread($thread));
+ // json api
+ if ($config['api']['enabled']) {
+ $api = new Api();
+ $json = json_encode($api->translateThread($thread));
+ $jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
+ file_write($jsonFilename, $json);
+ }
+ }
+ else {
$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . '.json';
- file_write($jsonFilename, $json);
+ file_unlink($jsonFilename);
}
- if ($return) {
+ if ($config['smart_build'] && !$return && !$mod) {
+ $noko50fn = $board['dir'] . $config['dir']['res'] . link_for(array('id' => $id), true);
+ file_unlink($noko50fn);
+
+ file_unlink($board['dir'] . $config['dir']['res'] . link_for(array('id' => $id)));
+ } else if ($return) {
return $body;
} else {
$noko50fn = $board['dir'] . $config['dir']['res'] . link_for($thread, true);
@@ -2432,6 +2588,8 @@ function diceRoller($post) {
}
function slugify($post) {
+ global $config;
+
$slug = "";
if (isset($post['subject']) && $post['subject'])
@@ -2447,6 +2605,9 @@ function slugify($post) {
// Transliterate local characters like ΓΌ, I wonder how would it work for weird alphabets :^)
$slug = iconv("UTF-8", "ASCII//TRANSLIT//IGNORE", $slug);
+ // Remove Tinyboard custom markup
+ $slug = preg_replace("/]+>.*?<\/tinyboard>/s", '', $slug);
+
// Downcase everything
$slug = strtolower($slug);
@@ -2459,8 +2620,8 @@ function slugify($post) {
// Strip dashes at the beginning and at the end
$slug = preg_replace('/^-|-$/', '', $slug);
- // Slug should be 200 characters long, at max
- $slug = substr($slug, 0, 200);
+ // Slug should be X characters long, at max (80?)
+ $slug = substr($slug, 0, $config['slug_max_size']);
// Slug is now ready
return $slug;
@@ -2478,17 +2639,26 @@ function link_for($post, $page50 = false, $foreignlink = false, $thread = false)
$slug = false;
- if ($config['slugify'] && isset($post['thread']) && $post['thread']) {
+ if ($config['slugify'] && ( (isset($post['thread']) && $post['thread']) || !isset ($post['slug']) ) ) {
+ $cvar = "slug_".$b['uri']."_".$id;
if (!$thread) {
- // Oh fuck, we'd better optimize it ASAP
+ $slug = Cache::get($cvar);
- $query = prepare(sprintf("SELECT `slug` FROM ``posts_%s`` WHERE `id` = :id", $b['uri']));
- $query->bindValue(':id', $id, PDO::PARAM_INT);
- $query->execute() or error(db_error($query));
+ if ($slug === false) {
+ $query = prepare(sprintf("SELECT `slug` FROM ``posts_%s`` WHERE `id` = :id", $b['uri']));
+ $query->bindValue(':id', $id, PDO::PARAM_INT);
+ $query->execute() or error(db_error($query));
- $thread = $query->fetch(PDO::FETCH_ASSOC);
+ $thread = $query->fetch(PDO::FETCH_ASSOC);
+
+ $slug = $thread['slug'];
+
+ Cache::set($cvar, $slug);
+ }
+ }
+ else {
+ $slug = $thread['slug'];
}
- $slug = $thread['slug'];
}
elseif ($config['slugify']) {
$slug = $post['slug'];
diff --git a/inc/image.php b/inc/image.php
index 7a68605d..291f3e2a 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -363,9 +363,10 @@ class ImageConvert extends ImageBase {
$this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
- if (strpos($error, "known incorrect sRGB profile") === false) {
+ if (strpos($error, "known incorrect sRGB profile") === false &&
+ strpos($error, "iCCP: Not recognizing known sRGB profile that has been edited") === false) {
$this->destroy();
- error('Failed to resize image!', null, array('convert_error' => $error));
+ error(_('Failed to resize image!')." "._('Details: ').nl2br(htmlspecialchars($error)), null, array('convert_error' => $error));
}
if (!file_exists($this->temp)) {
$this->destroy();
diff --git a/inc/lib/geoip/GeoIPv6.dat b/inc/lib/geoip/GeoIPv6.dat
index 1c2658c5..c2f3f11b 100644
Binary files a/inc/lib/geoip/GeoIPv6.dat and b/inc/lib/geoip/GeoIPv6.dat differ
diff --git a/inc/lib/webm/README.md b/inc/lib/webm/README.md
index dc3394c9..d1c2a52a 100644
--- a/inc/lib/webm/README.md
+++ b/inc/lib/webm/README.md
@@ -30,6 +30,13 @@ If you have an [FFmpeg](https://www.ffmpeg.org/) binary on your server and you w
$config['webm']['ffmpeg_path'] = '/path/to/ffmeg';
$config['webm']['ffprobe_path'] = '/path/to/ffprobe';
+MP4 support
+-----------
+
+MP4 support is available only if you use FFmpeg thumbnailing (see above).
+
+ $config['allowed_ext_files'][] = 'mp4';
+
License
-------
diff --git a/inc/lib/webm/ffmpeg.php b/inc/lib/webm/ffmpeg.php
index edd2c73a..0747b420 100644
--- a/inc/lib/webm/ffmpeg.php
+++ b/inc/lib/webm/ffmpeg.php
@@ -3,60 +3,63 @@
* ffmpeg.php
* A barebones ffmpeg based webm implementation for vichan.
*/
-
function get_webm_info($filename) {
global $board, $config;
-
$filename = escapeshellarg($filename);
$ffprobe = $config['webm']['ffprobe_path'];
$ffprobe_out = array();
$webminfo = array();
-
exec("$ffprobe -v quiet -print_format json -show_format -show_streams $filename", $ffprobe_out);
$ffprobe_out = json_decode(implode("\n", $ffprobe_out), 1);
$webminfo['error'] = is_valid_webm($ffprobe_out);
-
if(empty($webminfo['error'])) {
$webminfo['width'] = $ffprobe_out['streams'][0]['width'];
$webminfo['height'] = $ffprobe_out['streams'][0]['height'];
+ $webminfo['duration'] = $ffprobe_out['format']['duration'];
}
-
return $webminfo;
}
-
function is_valid_webm($ffprobe_out) {
global $board, $config;
-
if (empty($ffprobe_out))
return array('code' => 1, 'msg' => $config['error']['genwebmerror']);
-
- if ($ffprobe_out['format']['format_name'] != 'matroska,webm')
- return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
-
+ $extension = pathinfo($ffprobe_out['format']['filename'], PATHINFO_EXTENSION);
+ if ($extension === 'webm') {
+ if ($ffprobe_out['format']['format_name'] != 'matroska,webm')
+ return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
+ } elseif ($extension === 'mp4') {
+ if ($ffprobe_out['streams'][0]['codec_name'] != 'h264' && $ffprobe_out['streams'][1]['codec_name'] != 'aac')
+ return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
+ } else {
+ return array('code' => 1, 'msg' => $config['error']['genwebmerror']);
+ }
if ((count($ffprobe_out['streams']) > 1) && (!$config['webm']['allow_audio']))
return array('code' => 3, 'msg' => $config['error']['webmhasaudio']);
-
- if ($ffprobe_out['streams'][0]['codec_name'] != 'vp8')
- return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
-
if (empty($ffprobe_out['streams'][0]['width']) || (empty($ffprobe_out['streams'][0]['height'])))
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
-
if ($ffprobe_out['format']['duration'] > $config['webm']['max_length'])
- return array('code' => 4, 'msg' => $config['error']['webmtoolong']);
+ return array('code' => 4, 'msg' => sprintf($config['error']['webmtoolong'], $config['webm']['max_length']));
}
-
-function make_webm_thumbnail($filename, $thumbnail, $width, $height) {
+function make_webm_thumbnail($filename, $thumbnail, $width, $height, $duration) {
global $board, $config;
-
$filename = escapeshellarg($filename);
- $thumbnail = escapeshellarg($thumbnail); // Should be safe by default but you
+ $thumbnailfc = escapeshellarg($thumbnail); // Should be safe by default but you
// can never be too safe.
-
+ $width = escapeshellarg($width);
+ $height = escapeshellarg($height); // Same as above.
$ffmpeg = $config['webm']['ffmpeg_path'];
+ $ret = 0;
$ffmpeg_out = array();
-
- exec("$ffmpeg -i $filename -v quiet -ss 00:00:00 -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnail 2>&1");
-
- return count($ffmpeg_out);
+ exec("$ffmpeg -strict -2 -ss " . floor($duration / 2) . " -i $filename -v quiet -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnailfc 2>&1", $ffmpeg_out, $ret);
+ // Work around for https://trac.ffmpeg.org/ticket/4362
+ if (filesize($thumbnail) === 0) {
+ // try again with first frame
+ exec("$ffmpeg -y -strict -2 -ss 0 -i $filename -v quiet -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnailfc 2>&1", $ffmpeg_out, $ret);
+ clearstatcache();
+ // failed if no thumbnail size even if ret code 0, ffmpeg is buggy
+ if (filesize($thumbnail) === 0) {
+ $ret = 1;
+ }
+ }
+ return $ret;
}
diff --git a/inc/lib/webm/posthandler.php b/inc/lib/webm/posthandler.php
index a5b7429b..15c6600d 100644
--- a/inc/lib/webm/posthandler.php
+++ b/inc/lib/webm/posthandler.php
@@ -1,27 +1,22 @@
has_file) foreach ($post->files as &$file) if ($file->extension == 'webm') {
+ if ($post->has_file) foreach ($post->files as &$file) if ($file->extension == 'webm' || $file->extension == 'mp4') {
if ($config['webm']['use_ffmpeg']) {
require_once dirname(__FILE__) . '/ffmpeg.php';
$webminfo = get_webm_info($file->file_path);
-
if (empty($webminfo['error'])) {
$file->width = $webminfo['width'];
$file->height = $webminfo['height'];
-
if ($config['spoiler_images'] && isset($_POST['spoiler'])) {
$file = webm_set_spoiler($file);
}
else {
$file = set_thumbnail_dimensions($post, $file);
$tn_path = $board['dir'] . $config['dir']['thumb'] . $file->file_id . '.jpg';
-
- if(false == make_webm_thumbnail($file->file_path, $tn_path, $file->thumbwidth, $file->thumbheight)) {
+ if(0 == make_webm_thumbnail($file->file_path, $tn_path, $file->thumbwidth, $file->thumbheight, $webminfo['duration'])) {
$file->thumb = $file->file_id . '.jpg';
}
else {
@@ -37,7 +32,6 @@ function postHandler($post) {
require_once dirname(__FILE__) . '/videodata.php';
$videoDetails = videoData($file->file_path);
if (!isset($videoDetails['container']) || $videoDetails['container'] != 'webm') return "not a WebM file";
-
// Set thumbnail
$thumbName = $board['dir'] . $config['dir']['thumb'] . $file->file_id . '.webm';
if ($config['spoiler_images'] && isset($_POST['spoiler'])) {
@@ -53,12 +47,10 @@ function postHandler($post) {
$file->thumb = 'file';
}
unset($videoDetails['frame']);
-
// Set width and height
if (isset($videoDetails['width']) && isset($videoDetails['height'])) {
$file->width = $videoDetails['width'];
$file->height = $videoDetails['height'];
-
if ($file->thumb != 'file' && $file->thumb != 'spoiler') {
$file = set_thumbnail_dimensions($post, $file);
}
@@ -66,14 +58,11 @@ function postHandler($post) {
}
}
}
-
function set_thumbnail_dimensions($post,$file) {
global $board, $config;
-
$tn_dimensions = array();
$tn_maxw = $post->op ? $config['thumb_op_width'] : $config['thumb_width'];
$tn_maxh = $post->op ? $config['thumb_op_height'] : $config['thumb_height'];
-
if ($file->width > $tn_maxw || $file->height > $tn_maxh) {
$file->thumbwidth = min($tn_maxw, intval(round($file->width * $tn_maxh / $file->height)));
$file->thumbheight = min($tn_maxh, intval(round($file->height * $tn_maxw / $file->width)));
@@ -81,17 +70,13 @@ function set_thumbnail_dimensions($post,$file) {
$file->thumbwidth = $file->width;
$file->thumbheight = $file->height;
}
-
return $file;
}
-
function webm_set_spoiler($file) {
global $board, $config;
-
$file->thumb = 'spoiler';
$size = @getimagesize($config['spoiler_image']);
$file->thumbwidth = $size[0];
$file->thumbheight = $size[1];
-
return $file;
}
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 79d1bf51..2c679b20 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -111,7 +111,7 @@ function mod_dashboard() {
$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)) {
+ if ($code = @file_get_contents('http://engine.vichan.net/version.txt', 0, $ctx)) {
$ver = strtok($code, "\n");
if (preg_match('@^// v(\d+)\.(\d+)\.(\d+)\s*?$@', $ver, $matches)) {
@@ -120,7 +120,7 @@ function mod_dashboard() {
'major' => $matches[2],
'minor' => $matches[3]
);
- if (preg_match('/v(\d+)\.(\d)\.(\d+)(-dev.+)?$/', $config['version'], $matches)) {
+ if (preg_match('/(\d+)\.(\d)\.(\d+)(-dev.+)?$/', $config['version'], $matches)) {
$current = array(
'massive' => (int) $matches[1],
'major' => (int) $matches[2],
@@ -1224,7 +1224,10 @@ function mod_move($originBoard, $postID) {
// create the new thread
$newID = post($post);
-
+
+ $op = $post;
+ $op['id'] = $newID;
+
if ($post['has_file']) {
// copy image
foreach ($post['files'] as $i => &$file) {
@@ -1357,14 +1360,14 @@ function mod_move($originBoard, $postID) {
buildIndex();
- header('Location: ?/' . sprintf($config['board_path'], $originBoard) . $config['dir']['res'] . link_for($post, false, $newboard) .
+ header('Location: ?/' . sprintf($config['board_path'], $newboard['uri']) . $config['dir']['res'] . link_for($op, false, $newboard) .
'#' . $botID, true, $config['redirect_http']);
} else {
deletePost($postID);
buildIndex();
openBoard($targetBoard);
- header('Location: ?/' . sprintf($config['board_path'], $board['uri']) . $config['dir']['res'] . link_for($post, false, $newboard), true, $config['redirect_http']);
+ header('Location: ?/' . sprintf($config['board_path'], $newboard['uri']) . $config['dir']['res'] . link_for($op, false, $newboard), true, $config['redirect_http']);
}
}
@@ -2498,10 +2501,14 @@ function mod_theme_configure($theme_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));
+
+ // Clean cache
+ Cache::delete("themes");
+ Cache::delete("theme_settings_".$theme_name);
$result = true;
$message = false;
@@ -2549,11 +2556,15 @@ function mod_theme_uninstall($theme_name) {
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));
+ // Clean cache
+ Cache::delete("themes");
+ Cache::delete("theme_settings_".$theme);
+
header('Location: ?/themes', true, $config['redirect_http']);
}
diff --git a/js/ajax.js b/js/ajax.js
index 61d83df2..56f0df5c 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -115,17 +115,10 @@ $(window).ready(function() {
}
},
error: function(xhr, status, er) {
- // An error occured
- do_not_ajax = true;
- $(form).find('input[type="submit"]').each(function() {
- var $replacement = $('');
- $replacement.attr('name', $(this).attr('name'));
- $replacement.val(submit_txt);
- $(this)
- .after($replacement)
- .replaceWith($('').val(submit_txt));
- });
- $(form).submit();
+ console.log(xhr);
+ alert(_('The server took too long to submit your post. Your post was probably still submitted. If it wasn\'t, we might be experiencing issues right now -- please try your post again later. Error information: ') + "");
+ $(form).find('input[type="submit"]').val(submit_txt);
+ $(form).find('input[type="submit"]').removeAttr('disabled');
},
data: formData,
cache: false,
@@ -141,6 +134,7 @@ $(window).ready(function() {
};
setup_form($('form[name="post"]'));
$(window).on('quick-reply', function() {
+ $('form#quick-reply').off('submit');
setup_form($('form#quick-reply'));
});
});
diff --git a/js/catalog-search.js b/js/catalog-search.js
new file mode 100644
index 00000000..17a8edac
--- /dev/null
+++ b/js/catalog-search.js
@@ -0,0 +1,82 @@
+/*
+ * catalog-search.js
+ * - Search and filters threads when on catalog view
+ * - Optional shortcuts 's' and 'esc' to open and close the search.
+ *
+ * Usage:
+ * $config['additional_javascript'][] = 'js/jquery.min.js';
+ * $config['additional_javascript'][] = 'js/comment-toolbar.js';
+ */
+if (active_page == 'catalog') {
+ onready(function () {
+ 'use strict';
+
+ // 'true' = enable shortcuts
+ var useKeybinds = true;
+
+ // trigger the search 400ms after last keystroke
+ var delay = 400;
+ var timeoutHandle;
+
+ //search and hide none matching threads
+ function filter(search_term) {
+ $('.replies').each(function () {
+ var subject = $(this).children('.intro').text().toLowerCase();
+ var comment = $(this).clone().children().remove(':lt(2)').end().text().trim().toLowerCase();
+ search_term = search_term.toLowerCase();
+
+ if (subject.indexOf(search_term) == -1 && comment.indexOf(search_term) == -1) {
+ $(this).parents('div[id="Grid"]>.mix').css('display', 'none');
+ } else {
+ $(this).parents('div[id="Grid"]>.mix').css('display', 'inline-block');
+ }
+ });
+ }
+
+ function searchToggle() {
+ var button = $('#catalog_search_button')[0];
+
+ if (!button.dataset.expanded) {
+ button.dataset.expanded = '1';
+ button.innerText = 'Close';
+ $('.catalog_search').append(' ');
+ $('#search_field').focus();
+ } else {
+ delete button.dataset.expanded;
+ button.innerText = 'Search';
+ $('.catalog_search').children().last().remove();
+ $('div[id="Grid"]>.mix').each(function () { $(this).css('display', 'inline-block'); });
+ }
+ }
+
+ $('.threads').before('[]');
+ $('#catalog_search_button').text('Search');
+
+ $('#catalog_search_button').on('click', searchToggle);
+ $('.catalog_search').on('keyup', 'input#search_field', function (e) {
+ window.clearTimeout(timeoutHandle);
+ timeoutHandle = window.setTimeout(filter, 400, e.target.value);
+ });
+
+ if (useKeybinds) {
+ // 's'
+ $('body').on('keydown', function (e) {
+ if (e.which === 83 && e.target.tagName === 'BODY' && !(e.ctrlKey || e.altKey || e.shiftKey)) {
+ e.preventDefault();
+ if ($('#search_field').length !== 0) {
+ $('#search_field').focus();
+ } else {
+ searchToggle();
+ }
+ }
+ });
+ // 'esc'
+ $('.catalog_search').on('keydown', 'input#search_field', function (e) {
+ if (e.which === 27 && !(e.ctrlKey || e.altKey || e.shiftKey)) {
+ window.clearTimeout(timeoutHandle);
+ searchToggle();
+ }
+ });
+ }
+ });
+}
diff --git a/js/expand-video.js b/js/expand-video.js
index 79872510..08b474c1 100644
--- a/js/expand-video.js
+++ b/js/expand-video.js
@@ -204,13 +204,13 @@ function setupVideo(thumb, url) {
function setupVideosIn(element) {
var thumbs = element.querySelectorAll("a.file");
for (var i = 0; i < thumbs.length; i++) {
- if (/\.webm$/.test(thumbs[i].pathname)) {
+ if (/\.webm$|\.mp4$/.test(thumbs[i].pathname)) {
setupVideo(thumbs[i], thumbs[i].href);
} else {
var m = thumbs[i].search.match(/\bv=([^&]*)/);
if (m != null) {
var url = decodeURIComponent(m[1]);
- if (/\.webm$/.test(url)) setupVideo(thumbs[i], url);
+ if (/\.webm$|\.mp4$/.test(url)) setupVideo(thumbs[i], url);
}
}
}
diff --git a/js/favorites.js b/js/favorites.js
index e325e110..daf7b732 100644
--- a/js/favorites.js
+++ b/js/favorites.js
@@ -54,7 +54,6 @@ if (active_page == 'thread' || active_page == 'index') {
$(document).ready(function(){
var favorites = JSON.parse(localStorage.favorites);
var is_board_favorite = ~$.inArray(board_name, favorites);
- console.log(is_board_favorite);
$('header>h1').append('\u2605');
add_favorites();
diff --git a/js/file-selector.js b/js/file-selector.js
new file mode 100644
index 00000000..207a5ae9
--- /dev/null
+++ b/js/file-selector.js
@@ -0,0 +1,191 @@
+/*
+ * file-selector.js - Add support for drag and drop file selection, and paste from clipbboard on supported browsers.
+ *
+ * Usage:
+ * $config['additional_javascript'][] = 'js/jquery.min.js';
+ * $config['additional_javascript'][] = 'js/file-selector.js';
+ */
+function init_file_selector(max_images) {
+
+$(document).ready(function () {
+ // add options panel item
+ if (window.Options && Options.get_tab('general')) {
+ Options.extend_tab('general', '');
+
+ $('#file-drag-drop>input').on('click', function() {
+ if ($('#file-drag-drop>input').is(':checked')) {
+ localStorage.file_dragdrop = 'true';
+ } else {
+ localStorage.file_dragdrop = 'false';
+ }
+ });
+
+ if (typeof localStorage.file_dragdrop === 'undefined') localStorage.file_dragdrop = 'true';
+ if (localStorage.file_dragdrop === 'true') $('#file-drag-drop>input').prop('checked', true);
+ }
+});
+
+// disabled by user, or incompatible browser.
+if (localStorage.file_dragdrop == 'false' || !(window.URL.createObjectURL && window.File))
+ return;
+
+// multipost not enabled
+if (typeof max_images == 'undefined') {
+ var max_images = 1;
+}
+
+$(''+
+'').prependTo('#upload td');
+
+var files = [];
+$('#upload_file').remove(); // remove the original file selector
+$('.dropzone-wrap').css('user-select', 'none').show(); // let jquery add browser specific prefix
+
+function addFile(file) {
+ if (files.length == max_images)
+ return;
+
+ files.push(file);
+ addThumb(file);
+}
+
+function removeFile(file) {
+ files.splice(files.indexOf(file), 1);
+}
+
+function getThumbElement(file) {
+ return $('.tmb-container').filter(function(){return($(this).data('file-ref')==file);});
+}
+
+function addThumb(file) {
+
+ var fileName = (file.name.length < 24) ? file.name : file.name.substr(0, 22) + 'β¦';
+ var fileType = file.type.split('/')[0];
+ var fileExt = file.type.split('/')[1];
+ var $container = $('')
+ .addClass('tmb-container')
+ .data('file-ref', file)
+ .append(
+ $('').addClass('remove-btn').html('β'),
+ $('').addClass('file-tmb'),
+ $('').addClass('tmb-filename').html(fileName)
+ )
+ .appendTo('.file-thumbs');
+
+ var $fileThumb = $container.find('.file-tmb');
+ if (fileType == 'image') {
+ // if image file, generate thumbnail
+ var objURL = window.URL.createObjectURL(file);
+ $fileThumb.css('background-image', 'url('+ objURL +')');
+ } else {
+ $fileThumb.html('' + fileExt.toUpperCase() + '');
+ }
+}
+
+$(document).on('ajax_before_post', function (e, formData) {
+ for (var i=0; i 0) key += i + 1;
+ if (typeof files[i] === 'undefined') break;
+ formData.append(key, files[i]);
+ }
+});
+
+// clear file queue and UI on success
+$(document).on('ajax_after_post', function () {
+ files = [];
+ $('.file-thumbs').empty();
+});
+
+var dragCounter = 0;
+var dropHandlers = {
+ dragenter: function (e) {
+ e.stopPropagation();
+ e.preventDefault();
+
+ if (dragCounter === 0) $('.dropzone').addClass('dragover');
+ dragCounter++;
+ },
+ dragover: function (e) {
+ // needed for webkit to work
+ e.stopPropagation();
+ e.preventDefault();
+ },
+ dragleave: function (e) {
+ e.stopPropagation();
+ e.preventDefault();
+
+ dragCounter--;
+ if (dragCounter === 0) $('.dropzone').removeClass('dragover');
+ },
+ drop: function (e) {
+ e.stopPropagation();
+ e.preventDefault();
+
+ $('.dropzone').removeClass('dragover');
+ dragCounter = 0;
+
+ var fileList = e.originalEvent.dataTransfer.files;
+ for (var i=0; i');
+
+ $fileSelector.on('change', function (e) {
+ if (this.files.length > 0) {
+ for (var i=0; i "+_('Forced anonymity')+"");
+ Options.extend_tab("general", "");
}
else {
selector = '#forced-anon';
diff --git a/js/gallery-view.js b/js/gallery-view.js
new file mode 100644
index 00000000..2d7d85b4
--- /dev/null
+++ b/js/gallery-view.js
@@ -0,0 +1,165 @@
+if (active_page == 'index' || active_page == 'thread')
+$(function(){
+
+ var gallery_view = false;
+
+ $('hr:first').before('');
+ $('#gallery-view a').html(gallery_view ? _("Disable gallery mode") : _("Enable gallery mode")).click(function() {
+ gallery_view = !gallery_view;
+ $(this).html(gallery_view ? _("Disable gallery mode") : _("Enable gallery mode"));
+ toggle_gview(document);
+ });
+
+ var toggle_gview = function(elem) {
+ if (gallery_view) {
+ $(elem).find('img.post-image').parent().each(function() {
+ this.oldonclick = this.onclick;
+ this.onclick = handle_click;
+ $(this).attr('data-galid', Math.random());
+ });
+ }
+ else {
+ $(elem).find('img.post-image').parent().each(function() {
+ if (this.onclick == handle_click) this.onclick = this.oldonclick;
+ });
+ }
+ };
+
+ $(document).on('new_post', toggle_gview);
+
+ var gallery_opened = false;
+
+ var handle_click = function(e) {
+ e.stopPropagation();
+ e.preventDefault();
+
+ if (!gallery_opened) open_gallery();
+
+ gallery_setimage($(this).attr('data-galid'));
+ };
+
+ var handler, images, active, toolbar;
+
+ var open_gallery = function() {
+ $('body').css('overflow', 'hidden');
+
+ gallery_opened = true;
+
+ handler = $("").hide().appendTo('body').css('text-align', 'left');
+
+ $("").click(close_gallery).appendTo(handler);
+
+ images = $("").appendTo(handler);
+ toolbar = $("").appendTo(handler);
+ active = $("").appendTo(handler);
+
+ active.on('click', function() {
+ close_gallery();
+ });
+
+ $('img.post-image').parent().each(function() {
+ var thumb = $(this).find('img').attr('src');
+
+ var i = $('![]()
').appendTo(images);
+ i.attr('src', thumb);
+ i.attr('data-galid-th', $(this).attr('data-galid'));
+
+ i.on('click', function(e) {
+ gallery_setimage($(this).attr('data-galid-th'));
+ });
+ });
+
+ $(" ")
+ .click(close_gallery).appendTo(toolbar);
+
+ $('body').on('keydown.gview', function(e) {
+ if (e.which == 39 || e.which == 40) { // right or down arrow
+ gallery_setimage(+1);
+ e.preventDefault();
+ }
+ else if (e.which == 37 || e.which == 38) { // left or up arrow
+ gallery_setimage(-1);
+ e.preventDefault();
+ }
+ });
+
+ handler.fadeIn(400);
+ };
+
+ var gallery_setimage = function(a) {
+ if (a == +1 || a == -1) {
+ var meth = (a == -1) ? 'prev' : 'next';
+ a = $('#gallery_images img.active')[meth]().attr('data-galid-th');
+ if (!a) return;
+ }
+
+ $('#gallery_images img.active').removeClass('active');
+
+ var thumb = $('#gallery_images [data-galid-th="'+a+'"]');
+ var elem = $('a[data-galid="'+a+'"]');
+
+ thumb.addClass('active');
+
+ var topscroll = thumb.position().top + images.scrollTop();
+ topscroll -= images.height() / 2;
+ topscroll += thumb.height() / 2;
+ images.animate({'scrollTop': topscroll}, 300);
+
+ var img = elem.attr('href');
+
+ active.find('img, video').fadeOut(200, function() { $(this).remove(); });
+
+ var i;
+ if (img.match(/player\.php/)) {
+ img = img.replace(/.*player\.php\?v=|&t=.*/g, '');
+ }
+ if (img.match(/\.webm$|\.mp4$|\.ogv$/i)) { // We are handling video nao
+ i = $('