harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
czaks 2014-10-07 00:17:29 +02:00
commit cc44a64097
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
inc/functions.php
View File

@ -681,36 +681,38 @@ function listBoards($just_uri = false) {
function until($timestamp) { function until($timestamp) {
$difference = $timestamp - time(); $difference = $timestamp - time();
if ($difference < 60) { switch(TRUE){
case ($difference < 60):
return $difference . ' ' . ngettext('second', 'seconds', $difference); 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); return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
} elseif ($difference < 60*60*24) { case ($difference < 86400): //60*60*24 = 86400
return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num); return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
} elseif ($difference < 60*60*24*7) { case ($difference < 604800): //60*60*24*7 = 604800
return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num); return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
} elseif ($difference < 60*60*24*365) { case ($difference < 31536000): //60*60*24*365 = 31536000
return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num); 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) { function ago($timestamp) {
$difference = time() - $timestamp; $difference = time() - $timestamp;
if ($difference < 60) { switch(TRUE){
case ($difference < 60) :
return $difference . ' ' . ngettext('second', 'seconds', $difference); 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); return ($num = round($difference/(60))) . ' ' . ngettext('minute', 'minutes', $num);
} elseif ($difference < 60*60*24) { case ($difference < 86400): //60*60*24 = 86400
return ($num = round($difference/(60*60))) . ' ' . ngettext('hour', 'hours', $num); return ($num = round($difference/(3600))) . ' ' . ngettext('hour', 'hours', $num);
} elseif ($difference < 60*60*24*7) { case ($difference < 604800): //60*60*24*7 = 604800
return ($num = round($difference/(60*60*24))) . ' ' . ngettext('day', 'days', $num); return ($num = round($difference/(86400))) . ' ' . ngettext('day', 'days', $num);
} elseif ($difference < 60*60*24*365) { case ($difference < 31536000): //60*60*24*365 = 31536000
return ($num = round($difference/(60*60*24*7))) . ' ' . ngettext('week', 'weeks', $num); 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) { function displayBan($ban) {

28
post.php
View File

@ -192,20 +192,6 @@ if (isset($_POST['delete'])) {
if (!openBoard($post['board'])) if (!openBoard($post['board']))
error($config['error']['noboard']); 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 // Check for CAPTCHA right after opening the board so the "return" link is in there
if ($config['recaptcha']) { if ($config['recaptcha']) {
if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field'])) if (!isset($_POST['recaptcha_challenge_field']) || !isset($_POST['recaptcha_response_field']))
@ -220,6 +206,20 @@ if (isset($_POST['delete'])) {
} }
} }
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']) { if ($post['mod'] = isset($_POST['mod']) && $_POST['mod']) {
require 'inc/mod/auth.php'; require 'inc/mod/auth.php';
if (!$mod) { if (!$mod) {