From f6960b8b3a920ae3260981301e51ef47f6eec60a Mon Sep 17 00:00:00 2001 From: Zankaria Date: Tue, 30 Apr 2024 12:46:44 +0200 Subject: [PATCH] functions.php: format and trim --- inc/functions.php | 130 ++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 90 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index c18ca57e..1d98f9cf 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -21,9 +21,7 @@ loadConfig(); function init_locale($locale, $error='error') { if (extension_loaded('gettext')) { - if (setlocale(LC_ALL, $locale) === false) { - //$error('The specified locale (' . $locale . ') does not exist on your platform!'); - } + setlocale(LC_ALL, $locale); bindtextdomain('tinyboard', './inc/locale'); bind_textdomain_codeset('tinyboard', 'UTF-8'); textdomain('tinyboard'); @@ -55,8 +53,9 @@ function loadConfig() { if (isset($config['cache_config']) && - $config['cache_config'] && - $config = Cache::get('config_' . $boardsuffix ) ) { + $config['cache_config'] && + $config = Cache::get('config_' . $boardsuffix)) + { $events = Cache::get('events_' . $boardsuffix ); define_groups(); @@ -66,11 +65,10 @@ function loadConfig() { } if ($config['locale'] != $current_locale) { - $current_locale = $config['locale']; - init_locale($config['locale'], $error); - } - } - else { + $current_locale = $config['locale']; + init_locale($config['locale'], $error); + } + } else { $config = array(); 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_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_page50_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'], '/')) . ')' . '|' . preg_quote($config['file_mod'], '/') . '\?\/.+' . @@ -242,12 +240,13 @@ function loadConfig() { $__version = file_exists('.installed') ? trim(file_get_contents('.installed')) : false; $config['version'] = $__version; - if ($config['allow_roll']) + if ($config['allow_roll']) { event_handler('post', 'diceRoller'); + } - if (in_array('webm', $config['allowed_ext_files']) || - in_array('mp4', $config['allowed_ext_files'])) + if (in_array('webm', $config['allowed_ext_files']) || in_array('mp4', $config['allowed_ext_files'])) { event_handler('post', 'postHandler'); + } } // Effectful config processing below: @@ -280,8 +279,7 @@ function loadConfig() { if ($config['cache']['enabled']) require_once 'inc/cache.php'; - if (in_array('webm', $config['allowed_ext_files']) || - in_array('mp4', $config['allowed_ext_files'])) + if (in_array('webm', $config['allowed_ext_files']) || in_array('mp4', $config['allowed_ext_files'])) require_once 'inc/lib/webm/posthandler.php'; event('load-config'); @@ -517,12 +515,11 @@ function mb_substr_replace($string, $replacement, $start, $length) { function setupBoard($array) { global $board, $config; - $board = array( + $board = [ 'uri' => $array['uri'], 'title' => $array['title'], 'subtitle' => $array['subtitle'], - #'indexed' => $array['indexed'], - ); + ]; // older versions $board['name'] = &$board['title']; @@ -720,8 +717,8 @@ function file_unlink($path) { $ret = @unlink($path); - if ($config['gzip_static']) { - $gzpath = "$path.gz"; + if ($config['gzip_static']) { + $gzpath = "$path.gz"; @unlink($gzpath); } @@ -1231,25 +1228,25 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) { $query->bindValue(':board', $board['uri']); $query->execute() or error(db_error($query)); - // No need to run on OPs - if ($config['anti_bump_flood'] && isset($thread_id)) { - $query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :thread", $board['uri'])); - $query->bindValue(':thread', $thread_id); - $query->execute() or error(db_error($query)); - $bumplocked = (bool)$query->fetchColumn(); + // No need to run on OPs + if ($config['anti_bump_flood'] && isset($thread_id)) { + $query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :thread", $board['uri'])); + $query->bindValue(':thread', $thread_id); + $query->execute() or error(db_error($query)); + $bumplocked = (bool)$query->fetchColumn(); - 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->bindValue(':thread', $thread_id); - $query->execute() or error(db_error($query)); - $bump = $query->fetchColumn(); + 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->bindValue(':thread', $thread_id); + $query->execute() or error(db_error($query)); + $bump = $query->fetchColumn(); - $query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri'])); - $query->bindValue(':bump', $bump); - $query->bindValue(':thread', $thread_id); - $query->execute() or error(db_error($query)); - } - } + $query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri'])); + $query->bindValue(':bump', $bump); + $query->bindValue(':thread', $thread_id); + $query->execute() or error(db_error($query)); + } + } if (isset($rebuild) && $rebuild_after) { buildThread($rebuild); @@ -2536,35 +2533,6 @@ function generate_tripcode($name) { 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) { global $board; $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) { $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)); + $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']; @@ -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_page50']; 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))); } -/*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) { global $config;