kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Improved.

Browse Source
This commit is contained in:
Yousha 2012-08-30 20:05:27 +04:30
parent fb4e28c7b8
commit 55470a7ac8
3 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/anti-bot.php
View File

@ -246,14 +246,11 @@ function checkSpam(array $extra_salt = array()) {
$query = prepare('SELECT `passed` FROM `antispam` WHERE `hash` = :hash');
$query->bindValue(':hash', $hash);
$query->execute() or error(db_error($query));
if (($passed = $query->fetchColumn(0)) === false) {
if ((($passed = $query->fetchColumn(0)) === false) || ($passed > $config['spam']['hidden_inputs_max_pass'])) {
// there was no database entry for this hash. most likely expired.
return true;
}
if ($passed > $config['spam']['hidden_inputs_max_pass'])
return true;
return $hash;
}
@ -262,5 +259,3 @@ function incrementSpamHash($hash) {
$query->bindValue(':hash', $hash);
$query->execute() or error(db_error($query));
}

11
inc/database.php
View File

@ -73,6 +73,7 @@ function prepare($query) {
if ($config['debug'])
return new PreparedQueryDebug($query);
return $pdo->prepare($query);
}
@ -93,19 +94,19 @@ function query($query) {
'time' => '~' . $time
);
return $query;
} else {
return $pdo->query($query);
}
return $pdo->query($query);
}
function db_error($PDOStatement=null) {
global $pdo;
if (isset($PDOStatement)) {
$err = $PDOStatement->errorInfo();
return $err[2];
} else {
}
$err = $pdo->errorInfo();
return $err[2];
}
}

43
inc/functions.php
View File

@ -218,6 +218,7 @@ function create_antibot($board, $thread = null) {
function rebuildThemes($action) {
// List themes
$query = query("SELECT `theme` FROM `theme_settings` WHERE `name` IS NULL AND `value` IS NULL") or error(db_error());
while ($theme = $query->fetch()) {
rebuildTheme($theme['theme'], $action);
}
@ -301,6 +302,7 @@ function setupBoard($array) {
function openBoard($uri) {
global $config;
if ($config['cache']['enabled'] && ($board = cache::get('board_' . $uri))) {
setupBoard($board);
return true;
@ -315,7 +317,9 @@ function openBoard($uri) {
cache::set('board_' . $uri, $board);
setupBoard($board);
return true;
} else return false;
}
return false;
}
function boardTitle($uri) {
@ -330,7 +334,9 @@ function boardTitle($uri) {
if ($title = $query->fetch()) {
return $title['title'];
} else return false;
}
return false;
}
function purge($uri) {
@ -520,9 +526,9 @@ function until($timestamp) {
return ($num = round($difference/(60*60*24))) . ' day' . ($num != 1 ? 's' : '');
} elseif ($difference < 60*60*24*365) {
return ($num = round($difference/(60*60*24*7))) . ' week' . ($num != 1 ? 's' : '');
} else {
return ($num = round($difference/(60*60*24*365))) . ' year' . ($num != 1 ? 's' : '');
}
return ($num = round($difference/(60*60*24*365))) . ' year' . ($num != 1 ? 's' : '');
}
function ago($timestamp) {
@ -537,9 +543,9 @@ function ago($timestamp) {
return ($num = round($difference/(60*60*24))) . ' day' . ($num != 1 ? 's' : '');
} elseif ($difference < 60*60*24*365) {
return ($num = round($difference/(60*60*24*7))) . ' week' . ($num != 1 ? 's' : '');
} else {
return ($num = round($difference/(60*60*24*365))) . ' year' . ($num != 1 ? 's' : '');
}
return ($num = round($difference/(60*60*24*365))) . ' year' . ($num != 1 ? 's' : '');
}
function displayBan($ban) {
@ -657,7 +663,9 @@ function threadExists($id) {
if ($query->rowCount()) {
return true;
} else return false;
}
return false;
}
function post(array $post) {
@ -818,10 +826,7 @@ function rebuildPost($id) {
$query->bindValue(':id', $id, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
if (!$post = $query->fetch())
return false;
if (!$post['body_nomarkup'])
if ((!$post = $query->fetch()) || !$post['body_nomarkup'])
return false;
markup($body = &$post['body_nomarkup']);
@ -1078,10 +1083,7 @@ function makerobot($body) {
}
function checkRobot($body) {
if (empty($body))
return true;
if (event('check-robot', $body))
if (empty($body) || event('check-robot', $body))
return true;
$body = makerobot($body);
@ -1091,14 +1093,13 @@ function checkRobot($body) {
if ($query->fetch()) {
return true;
} else {
// Insert new hash
}
// Insert new hash
$query = prepare("INSERT INTO `robot` VALUES (:hash)");
$query->bindValue(':hash', $body);
$query->execute() or error(db_error($query));
return false;
}
}
function numPosts($id) {
@ -1174,7 +1175,6 @@ function checkMute() {
}
}
function buildIndex() {
global $board, $config;
@ -1513,7 +1513,7 @@ function buildThread($id, $return=false, $mod=false) {
if ($return)
return $body;
else
file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $id), $body);
}
@ -1608,8 +1608,6 @@ function fraction($numerator, $denominator, $sep) {
return "{$numerator}{$sep}{$denominator}";
}
function getPostByHash($hash) {
global $board;
$query = prepare(sprintf("SELECT `id`,`thread` FROM `posts_%s` WHERE `filehash` = :hash", $board['uri']));
@ -1680,4 +1678,3 @@ function DNS($host) {
return $ip_addr;
}