forked from GithubBackups/vichan
functions.php: format and trim
This commit is contained in:
parent
7041cd13df
commit
f6960b8b3a
@ -21,9 +21,7 @@ loadConfig();
|
|||||||
|
|
||||||
function init_locale($locale, $error='error') {
|
function init_locale($locale, $error='error') {
|
||||||
if (extension_loaded('gettext')) {
|
if (extension_loaded('gettext')) {
|
||||||
if (setlocale(LC_ALL, $locale) === false) {
|
setlocale(LC_ALL, $locale);
|
||||||
//$error('The specified locale (' . $locale . ') does not exist on your platform!');
|
|
||||||
}
|
|
||||||
bindtextdomain('tinyboard', './inc/locale');
|
bindtextdomain('tinyboard', './inc/locale');
|
||||||
bind_textdomain_codeset('tinyboard', 'UTF-8');
|
bind_textdomain_codeset('tinyboard', 'UTF-8');
|
||||||
textdomain('tinyboard');
|
textdomain('tinyboard');
|
||||||
@ -55,8 +53,9 @@ function loadConfig() {
|
|||||||
|
|
||||||
|
|
||||||
if (isset($config['cache_config']) &&
|
if (isset($config['cache_config']) &&
|
||||||
$config['cache_config'] &&
|
$config['cache_config'] &&
|
||||||
$config = Cache::get('config_' . $boardsuffix ) ) {
|
$config = Cache::get('config_' . $boardsuffix))
|
||||||
|
{
|
||||||
$events = Cache::get('events_' . $boardsuffix );
|
$events = Cache::get('events_' . $boardsuffix );
|
||||||
|
|
||||||
define_groups();
|
define_groups();
|
||||||
@ -66,11 +65,10 @@ function loadConfig() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($config['locale'] != $current_locale) {
|
if ($config['locale'] != $current_locale) {
|
||||||
$current_locale = $config['locale'];
|
$current_locale = $config['locale'];
|
||||||
init_locale($config['locale'], $error);
|
init_locale($config['locale'], $error);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$config = array();
|
$config = array();
|
||||||
|
|
||||||
reset_events();
|
reset_events();
|
||||||
@ -180,8 +178,8 @@ function loadConfig() {
|
|||||||
'(' .
|
'(' .
|
||||||
str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) . '|' .
|
str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) . '|' .
|
||||||
str_replace('%d', '\d+', preg_quote($config['file_page50'], '/')) . '|' .
|
str_replace('%d', '\d+', preg_quote($config['file_page50'], '/')) . '|' .
|
||||||
str_replace(array('%d', '%s'), array('\d+', '[a-z0-9-]+'), preg_quote($config['file_page_slug'], '/')) . '|' .
|
str_replace(array('%d', '%s'), array('\d+', '[a-z0-9-]+'), preg_quote($config['file_page_slug'], '/')) . '|' .
|
||||||
str_replace(array('%d', '%s'), array('\d+', '[a-z0-9-]+'), preg_quote($config['file_page50_slug'], '/')) .
|
str_replace(array('%d', '%s'), array('\d+', '[a-z0-9-]+'), preg_quote($config['file_page50_slug'], '/')) .
|
||||||
')' .
|
')' .
|
||||||
'|' .
|
'|' .
|
||||||
preg_quote($config['file_mod'], '/') . '\?\/.+' .
|
preg_quote($config['file_mod'], '/') . '\?\/.+' .
|
||||||
@ -242,12 +240,13 @@ function loadConfig() {
|
|||||||
$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
|
$__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false;
|
||||||
$config['version'] = $__version;
|
$config['version'] = $__version;
|
||||||
|
|
||||||
if ($config['allow_roll'])
|
if ($config['allow_roll']) {
|
||||||
event_handler('post', 'diceRoller');
|
event_handler('post', 'diceRoller');
|
||||||
|
}
|
||||||
|
|
||||||
if (in_array('webm', $config['allowed_ext_files']) ||
|
if (in_array('webm', $config['allowed_ext_files']) || in_array('mp4', $config['allowed_ext_files'])) {
|
||||||
in_array('mp4', $config['allowed_ext_files']))
|
|
||||||
event_handler('post', 'postHandler');
|
event_handler('post', 'postHandler');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Effectful config processing below:
|
// Effectful config processing below:
|
||||||
|
|
||||||
@ -280,8 +279,7 @@ function loadConfig() {
|
|||||||
if ($config['cache']['enabled'])
|
if ($config['cache']['enabled'])
|
||||||
require_once 'inc/cache.php';
|
require_once 'inc/cache.php';
|
||||||
|
|
||||||
if (in_array('webm', $config['allowed_ext_files']) ||
|
if (in_array('webm', $config['allowed_ext_files']) || in_array('mp4', $config['allowed_ext_files']))
|
||||||
in_array('mp4', $config['allowed_ext_files']))
|
|
||||||
require_once 'inc/lib/webm/posthandler.php';
|
require_once 'inc/lib/webm/posthandler.php';
|
||||||
|
|
||||||
event('load-config');
|
event('load-config');
|
||||||
@ -517,12 +515,11 @@ function mb_substr_replace($string, $replacement, $start, $length) {
|
|||||||
function setupBoard($array) {
|
function setupBoard($array) {
|
||||||
global $board, $config;
|
global $board, $config;
|
||||||
|
|
||||||
$board = array(
|
$board = [
|
||||||
'uri' => $array['uri'],
|
'uri' => $array['uri'],
|
||||||
'title' => $array['title'],
|
'title' => $array['title'],
|
||||||
'subtitle' => $array['subtitle'],
|
'subtitle' => $array['subtitle'],
|
||||||
#'indexed' => $array['indexed'],
|
];
|
||||||
);
|
|
||||||
|
|
||||||
// older versions
|
// older versions
|
||||||
$board['name'] = &$board['title'];
|
$board['name'] = &$board['title'];
|
||||||
@ -720,8 +717,8 @@ function file_unlink($path) {
|
|||||||
|
|
||||||
$ret = @unlink($path);
|
$ret = @unlink($path);
|
||||||
|
|
||||||
if ($config['gzip_static']) {
|
if ($config['gzip_static']) {
|
||||||
$gzpath = "$path.gz";
|
$gzpath = "$path.gz";
|
||||||
|
|
||||||
@unlink($gzpath);
|
@unlink($gzpath);
|
||||||
}
|
}
|
||||||
@ -1231,25 +1228,25 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
|
|||||||
$query->bindValue(':board', $board['uri']);
|
$query->bindValue(':board', $board['uri']);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
|
|
||||||
// No need to run on OPs
|
// No need to run on OPs
|
||||||
if ($config['anti_bump_flood'] && isset($thread_id)) {
|
if ($config['anti_bump_flood'] && isset($thread_id)) {
|
||||||
$query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :thread", $board['uri']));
|
$query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :thread", $board['uri']));
|
||||||
$query->bindValue(':thread', $thread_id);
|
$query->bindValue(':thread', $thread_id);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
$bumplocked = (bool)$query->fetchColumn();
|
$bumplocked = (bool)$query->fetchColumn();
|
||||||
|
|
||||||
if (!$bumplocked) {
|
if (!$bumplocked) {
|
||||||
$query = prepare(sprintf("SELECT `time` FROM ``posts_%s`` WHERE (`thread` = :thread AND NOT email <=> 'sage') OR `id` = :thread ORDER BY `time` DESC LIMIT 1", $board['uri']));
|
$query = prepare(sprintf("SELECT `time` FROM ``posts_%s`` WHERE (`thread` = :thread AND NOT email <=> 'sage') OR `id` = :thread ORDER BY `time` DESC LIMIT 1", $board['uri']));
|
||||||
$query->bindValue(':thread', $thread_id);
|
$query->bindValue(':thread', $thread_id);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
$bump = $query->fetchColumn();
|
$bump = $query->fetchColumn();
|
||||||
|
|
||||||
$query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri']));
|
$query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri']));
|
||||||
$query->bindValue(':bump', $bump);
|
$query->bindValue(':bump', $bump);
|
||||||
$query->bindValue(':thread', $thread_id);
|
$query->bindValue(':thread', $thread_id);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($rebuild) && $rebuild_after) {
|
if (isset($rebuild) && $rebuild_after) {
|
||||||
buildThread($rebuild);
|
buildThread($rebuild);
|
||||||
@ -2536,35 +2533,6 @@ function generate_tripcode($name) {
|
|||||||
return array($name, $trip);
|
return array($name, $trip);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Highest common factor
|
|
||||||
function hcf($a, $b){
|
|
||||||
$gcd = 1;
|
|
||||||
if ($a>$b) {
|
|
||||||
$a = $a+$b;
|
|
||||||
$b = $a-$b;
|
|
||||||
$a = $a-$b;
|
|
||||||
}
|
|
||||||
if ($b==(round($b/$a))*$a)
|
|
||||||
$gcd=$a;
|
|
||||||
else {
|
|
||||||
for ($i=round($a/2);$i;$i--) {
|
|
||||||
if ($a == round($a/$i)*$i && $b == round($b/$i)*$i) {
|
|
||||||
$gcd = $i;
|
|
||||||
$i = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $gcd;
|
|
||||||
}
|
|
||||||
|
|
||||||
function fraction($numerator, $denominator, $sep) {
|
|
||||||
$gcf = hcf($numerator, $denominator);
|
|
||||||
$numerator = $numerator / $gcf;
|
|
||||||
$denominator = $denominator / $gcf;
|
|
||||||
|
|
||||||
return "{$numerator}{$sep}{$denominator}";
|
|
||||||
}
|
|
||||||
|
|
||||||
function getPostByHash($hash) {
|
function getPostByHash($hash) {
|
||||||
global $board;
|
global $board;
|
||||||
$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `filehash` = :hash", $board['uri']));
|
$query = prepare(sprintf("SELECT `id`,`thread` FROM ``posts_%s`` WHERE `filehash` = :hash", $board['uri']));
|
||||||
@ -2799,10 +2767,10 @@ function link_for($post, $page50 = false, $foreignlink = false, $thread = false)
|
|||||||
|
|
||||||
if ($slug === false) {
|
if ($slug === false) {
|
||||||
$query = prepare(sprintf("SELECT `slug` FROM ``posts_%s`` WHERE `id` = :id", $b['uri']));
|
$query = prepare(sprintf("SELECT `slug` FROM ``posts_%s`` WHERE `id` = :id", $b['uri']));
|
||||||
$query->bindValue(':id', $id, PDO::PARAM_INT);
|
$query->bindValue(':id', $id, PDO::PARAM_INT);
|
||||||
$query->execute() or error(db_error($query));
|
$query->execute() or error(db_error($query));
|
||||||
|
|
||||||
$thread = $query->fetch(PDO::FETCH_ASSOC);
|
$thread = $query->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
$slug = $thread['slug'];
|
$slug = $thread['slug'];
|
||||||
|
|
||||||
@ -2818,7 +2786,7 @@ function link_for($post, $page50 = false, $foreignlink = false, $thread = false)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ( $page50 && $slug) $tpl = $config['file_page50_slug'];
|
if ( $page50 && $slug) $tpl = $config['file_page50_slug'];
|
||||||
else if (!$page50 && $slug) $tpl = $config['file_page_slug'];
|
else if (!$page50 && $slug) $tpl = $config['file_page_slug'];
|
||||||
else if ( $page50 && !$slug) $tpl = $config['file_page50'];
|
else if ( $page50 && !$slug) $tpl = $config['file_page50'];
|
||||||
else if (!$page50 && !$slug) $tpl = $config['file_page'];
|
else if (!$page50 && !$slug) $tpl = $config['file_page'];
|
||||||
@ -2830,24 +2798,6 @@ function prettify_textarea($s){
|
|||||||
return str_replace("\t", '	', str_replace("\n", ' ', htmlentities($s)));
|
return str_replace("\t", '	', str_replace("\n", ' ', htmlentities($s)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*class HTMLPurifier_URIFilter_NoExternalImages extends HTMLPurifier_URIFilter {
|
|
||||||
public $name = 'NoExternalImages';
|
|
||||||
public function filter(&$uri, $c, $context) {
|
|
||||||
global $config;
|
|
||||||
$ct = $context->get('CurrentToken');
|
|
||||||
|
|
||||||
if (!$ct || $ct->name !== 'img') return true;
|
|
||||||
|
|
||||||
if (!isset($uri->host) && !isset($uri->scheme)) return true;
|
|
||||||
|
|
||||||
if (!in_array($uri->scheme . '://' . $uri->host . '/', $config['allowed_offsite_urls'])) {
|
|
||||||
error('No off-site links in board announcement images.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
function purify_html($s) {
|
function purify_html($s) {
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user