Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-25 07:50:23 +01:00
Code Releases Wiki Activity

Merge https://github.com/ctrlcctrlv/8chan

Browse Source 
Conflicts:
	post.php
This commit is contained in:
8chan 2014-10-06 18:12:50 -07:00
commit ed94a1671d
6 changed files with 196 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/config.php
View File

@ -66,7 +66,10 @@
// Use `host` via shell_exec() to lookup hostnames, avoiding query timeouts. May not work on your system.
// Requires safe_mode to be disabled.
$config['dns_system'] = false;
// Check validity of the reverse DNS of IP addresses. Highly recommended.
$config['fcrdns'] = true;
// When executing most command-line tools (such as `convert` for ImageMagick image processing), add this
// to the environment path (seperated by :).
$config['shell_path'] = '/usr/local/bin';

48
inc/functions.php
View File

@ -681,36 +681,38 @@ function listBoards($just_uri = false) {
function until($timestamp) {
$difference = $timestamp - time();
if ($difference < 60) {
switch(TRUE){
case ($difference < 60):
return $difference . ' ' . ngettext('second', 'seconds', $difference);
} elseif ($difference < 60*60) {
case ($difference < 3600): //60*60 = 3600
return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
} elseif ($difference < 60*60*24) {
return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num);
} elseif ($difference < 60*60*24*7) {
return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num);
} elseif ($difference < 60*60*24*365) {
return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num);
case ($difference < 86400): //60*60*24 = 86400
return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
case ($difference < 604800): //60*60*24*7 = 604800
return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
case ($difference < 31536000): //60*60*24*365 = 31536000
return ($num = round($difference/(604800))) . ' ' . ngettext('week', 'weeks', $num);
default:
return ($num = round($difference/(31536000))) . ' ' . ngettext('year', 'years', $num);
}
return ($num = round($difference/(60*60*24*365))) . ' ' . ngettext('year', 'years', $num);
}
function ago($timestamp) {
$difference = time() - $timestamp;
if ($difference < 60) {
switch(TRUE){
case ($difference < 60) :
return $difference . ' ' . ngettext('second', 'seconds', $difference);
} elseif ($difference < 60*60) {
case ($difference < 3600): //60*60 = 3600
return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
} elseif ($difference < 60*60*24) {
return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num);
} elseif ($difference < 60*60*24*7) {
return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num);
} elseif ($difference < 60*60*24*365) {
return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num);
case ($difference < 86400): //60*60*24 = 86400
return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
case ($difference < 604800): //60*60*24*7 = 604800
return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
case ($difference < 31536000): //60*60*24*365 = 31536000
return ($num = round($difference/(604800))) . ' ' . ngettext('week', 'weeks', $num);
default:
return ($num = round($difference/(31536000))) . ' ' . ngettext('year', 'years', $num);
}
return ($num = round($difference/(60*60*24*365))) . ' ' . ngettext('year', 'years', $num);
}
function displayBan($ban) {
@ -2267,6 +2269,12 @@ function rDNS($ip_addr) {
$host = $ip_addr;
}
$isip = filter_var($host, FILTER_VALIDATE_IP);
if ($config['fcrdns'] && !$isip && DNS($host) != $ip_addr) {
$host = $ip_addr;
}
if ($config['cache']['enabled'])
cache::set('rdns_' . $ip_addr, $host);

1
inc/instance-config.php
View File

@ -127,6 +127,7 @@
$config['additional_javascript'][] = 'js/mobile-style.js';
$config['additional_javascript'][] = 'js/id_highlighter.js';
$config['additional_javascript'][] = 'js/id_colors.js';
$config['additional_javascript'][] = 'js/threadscroll.js';
$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';

139
js/inline.js Normal file
View File

@ -0,0 +1,139 @@
;(function() {
var App = {
cache: {},
get: function(url, cb) {
var $page = App.cache[url]
if ($page)
return cb($page)
$.get(url, function(data) {
var $page = $(data)
App.cache[url] = $page
cb($page)
})
},
options: {
add: function(key, description, tab) {
tab || (tab = 'general')
var checked = App.options.get(key)
var $el = $(
'<div>' +
'<label>' +
'<input type="checkbox">' +
description +
'</label>' +
'</div>')
$el
.find('input')
.prop('checked', checked)
.on('change', App.options.check(key))
window.Options.extend_tab(tab, $el)
},
get: function(key) {
if (localStorage[key])
return JSON.parse(localStorage[key])
},
check: function(key) {
return function(e) {
var val = this.checked
localStorage[key] = JSON.stringify(val)
}
}
}
}
var inline = function(e) {
e.preventDefault()
var $root = $(this).closest('.post')
var targetNum = this.textContent.slice(2)
var srcOP = $root.closest('[id^=thread]').attr('id').match(/\d+/)[0]
var node, targetOP
var isBacklink = !!this.className
if (isBacklink) {
node = $root.find('> .intro')
targetOP = srcOP
} else {
node = $(this)
targetOP = this.pathname.match(/(\d+).html/)[1]
}
var link = {
id: 'inline_' + targetNum,
isBacklink: isBacklink,
node: node
}
var selector = targetNum === targetOP
? '#op_' + srcOP
: '#reply_' + targetNum
var $clone = $root.find('#inline_' + targetNum)
if ($clone.length) {
$clone.remove()
$(selector)
.show()
.next()
.show()
return
}
if (srcOP === targetOP) {
if (targetNum === targetOP)
link.node = link.node.next()// bypass `(OP)`
var $target = $(selector)
if ($target.length)
return add(link, $target)
}
var $loading = $('<div class="inline post">loading...</div>')
.attr('id', link.id)
.insertAfter(link.node)
App.get(this.pathname, function($page) {
$loading.remove()
var $target = $page.find(selector)
add(link, $target)
})
}
var add = function(link, $target) {
var $clone = $target.clone(true)
if (link.isBacklink && App.options.get('hidePost'))
$target
.hide()
.next()
.hide()
$clone.find('.inline').remove()
$clone.attr({
"class": 'inline post',
id: link.id,
style: null// XXX remove post hover styling
})
$clone.insertAfter(link.node)
}
App.options.add('hidePost', 'Hide inlined backlinked posts')
$('head').append(
'<style>' +
'.inline {' +
'border: 1px dashed black;' +
'white-space: normal;' +
'overflow: auto;' + // clearfix
'}' +
'</style>')
// don't attach to outbound links
$('.body a:not([rel]), .mentioned a')
.attr('onclick', null)// XXX disable highlightReply
.click(inline)
})()

28
post.php
View File

@ -193,20 +193,6 @@ if (isset($_POST['delete'])) {
if (!openBoard($post['board']))
error($config['error']['noboard']);
if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
(!$post['op'] && $_POST['post'] == $config['button_reply'])))
//error($config['error']['bot']);
// Check the referrer
if ($config['referer_match'] !== false &&
(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
error($config['error']['referer']);
checkDNSBL();
// Check if banned
checkBan($board['uri']);
// Check for CAPTCHA right after opening the board so the "return" link is in there
if ($config['recaptcha']) {
if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field']))
@ -220,7 +206,21 @@ if (isset($_POST['delete'])) {
error($config['error']['captcha']);
}
}
if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
(!$post['op'] && $_POST['post'] == $config['button_reply'])))
error($config['error']['bot']);
// Check the referrer
if ($config['referer_match'] !== false &&
(!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER']))))
error($config['error']['referer']);
checkDNSBL();
// Check if banned
checkBan($board['uri']);
if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
require 'inc/mod/auth.php';
if (!$mod) {

18
stylesheets/style.css
View File

@ -8,10 +8,6 @@ body {
padding-right: 4px;
}
table * {
margin: 1px;
}
a,a:visited {
text-decoration: underline;
color: #34345C;
@ -289,6 +285,7 @@ div.post.reply {
border-style: none solid solid none;
border-color: #B7C5D9;
display: inline-block;
max-width: 94%!important;
}
span.trip {
@ -893,16 +890,21 @@ div.thread:hover {
cursor: pointer;
}
code > pre {
pre {
/* Better code tags */
background:black;
max-width:inherit;
word-wrap:normal;
overflow:auto;
display: block!important;
font-size:9pt;
font-family:monospace;
}
code > pre > span.pln {
color: grey;
span.pln {
color:grey;
}
@media screen and (min-width: 768px) {
p.intro {
clear: none;