From 582a08eee4033da52fde44922532ab5ac2d67af8 Mon Sep 17 00:00:00 2001
From: Zankaria <zankaria.auxa@mailu.io>
Date: Sat, 13 Jul 2024 11:30:31 +0200
Subject: [PATCH] display.php: trim

---
 inc/display.php | 137 ++++++++++++++++++++++++------------------------
 1 file changed, 68 insertions(+), 69 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 0666056c..0d4ad445 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -9,7 +9,7 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
     exit;
 }
 
-/* 
+/*
     joaoptm78@gmail.com
     http://www.php.net/manual/en/function.filesize.php#100097
 */
@@ -57,9 +57,9 @@ function doBoardListPart($list, $root, &$boards) {
 
 function createBoardlist($mod=false) {
     global $config;
-    
+
     if (!isset($config['boards'])) return array('top'=>'','bottom'=>'');
-    
+
     $xboards = listBoards();
     $boards = array();
     foreach ($xboards as $val) {
@@ -70,12 +70,12 @@ function createBoardlist($mod=false) {
 
     if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body))
         $body = '[' . $body . ']';
-    
+
     $body = trim($body);
 
     // Message compact-boardlist.js faster, so that page looks less ugly during loading
     $top = "<script type='text/javascript'>if (typeof do_boardlist != 'undefined') do_boardlist();</script>";
-    
+
     return array(
         'top' => '<div class="boardlist">' . $body . '</div>' . $top,
         'bottom' => '<div class="boardlist bottom">' . $body . '</div>'
@@ -84,7 +84,7 @@ function createBoardlist($mod=false) {
 
 function loginForm($error=false, $username=false, $redirect=false) {
     global $config;
-    
+
     die(Element('page.html', array(
         'index' => $config['root'],
         'title' => _('Login'),
@@ -101,47 +101,47 @@ function loginForm($error=false, $username=false, $redirect=false) {
 
 function pm_snippet($body, $len=null) {
     global $config;
-    
+
     if (!isset($len))
         $len = &$config['mod']['snippet_length'];
-    
+
     // Replace line breaks with some whitespace
     $body = preg_replace('@<br/?>@i', '  ', $body);
-    
+
     // Strip tags but leave span tags which contain spoiler
         $body_with_spoiler_tags = strip_tags($body,'<span>');
 
-    // Check for spoiler tags 
+    // Check for spoiler tags
     $spoiler = preg_match("/spoiler/", $body_with_spoiler_tags);
-    
+
     // Strip tags
     $body = strip_tags($body);
-    
+
     // Unescape HTML characters, to avoid splitting them in half
     $body = html_entity_decode($body, ENT_COMPAT, 'UTF-8');
-    
+
     // calculate strlen() so we can add "..." after if needed
     $strlen = mb_strlen($body);
-    
+
     $body = mb_substr($body, 0, $len);
-    
+
     if ($spoiler){
             $value = "<span class=\"spoiler\">" . utf8tohtml($body) . "</span>";
-    } 
+    }
         else {
             $value = utf8tohtml($body);
         }
-    
+
     // Re-escape the characters.
     return '<em>' . utf8tohtml($body) . ($strlen > $len ? '&hellip;' : '') . '</em>';
 }
 
 function capcode($cap) {
     global $config;
-    
+
     if (!$cap)
         return false;
-    
+
     $capcode = array();
     if (isset($config['custom_capcode'][$cap])) {
         if (is_array($config['custom_capcode'][$cap])) {
@@ -156,59 +156,59 @@ function capcode($cap) {
     } else {
         $capcode['cap'] = sprintf($config['capcode'], $cap);
     }
-    
+
     return $capcode;
 }
 
 function truncate($body, $url, $max_lines = false, $max_chars = false) {
     global $config;
-    
+
     if ($max_lines === false)
         $max_lines = $config['body_truncate'];
     if ($max_chars === false)
         $max_chars = $config['body_truncate_char'];
-    
+
     // We don't want to risk truncating in the middle of an HTML comment.
     // It's easiest just to remove them all first.
     $body = preg_replace('/<!--.*?-->/s', '', $body);
-    
+
     $original_body = $body;
-    
+
     $lines = substr_count($body, '<br/>');
-    
+
     // Limit line count
     if ($lines > $max_lines) {
         if (preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m))
             $body = $m[0];
     }
-    
+
     $body = mb_substr($body, 0, $max_chars);
-    
+
     if ($body != $original_body) {
         // Remove any corrupt tags at the end
         $body = preg_replace('/<([\w]+)?([^>]*)?$/', '', $body);
-        
+
         // Open tags
         if (preg_match_all('/<([\w]+)[^>]*>/', $body, $open_tags)) {
-            
+
             $tags = array();
             for ($x=0;$x<count($open_tags[0]);$x++) {
                 if (!preg_match('/\/(\s+)?>$/', $open_tags[0][$x]))
                     $tags[] = $open_tags[1][$x];
             }
-            
+
             // List successfully closed tags
             if (preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
                 for ($x=0;$x<count($closed_tags[0]);$x++) {
                     unset($tags[array_search($closed_tags[2][$x], $tags)]);
                 }
             }
-            
+
             // remove broken HTML entity at the end (if existent)
             $body = preg_replace('/&[^;]+$/', '', $body);
-            
+
             $tags_no_close_needed = array("colgroup", "dd", "dt", "li", "optgroup", "option", "p", "tbody", "td", "tfoot", "th", "thead", "tr", "br", "img");
-            
+
             // Close any open tags
             foreach ($tags as &$tag) {
                 if (!in_array($tag, $tags_no_close_needed))
@@ -218,10 +218,10 @@ function truncate($body, $url, $max_lines = false, $max_chars = false) {
             // remove broken HTML entity at the end (if existent)
             $body = preg_replace('/&[^;]*$/', '', $body);
         }
-        
+
         $body .= '<span class="toolong">'.sprintf(_('Post too long. Click <a href="%s">here</a> to view the full text.'), $url).'</span>';
     }
-    
+
     return $body;
 }
 
@@ -231,21 +231,21 @@ function bidi_cleanup($data) {
 
     $explicits  = '\xE2\x80\xAA|\xE2\x80\xAB|\xE2\x80\xAD|\xE2\x80\xAE';
     $pdf        = '\xE2\x80\xAC';
-    
+
     preg_match_all("!$explicits!",  $data, $m1, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
     preg_match_all("!$pdf!",    $data, $m2, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-    
+
     if (count($m1) || count($m2)){
-    
+
         $p = array();
         foreach ($m1 as $m){ $p[$m[0][1]] = 'push'; }
         foreach ($m2 as $m){ $p[$m[0][1]] = 'pop'; }
         ksort($p);
-    
+
         $offset = 0;
         $stack = 0;
         foreach ($p as $pos => $type){
-    
+
             if ($type == 'push'){
                 $stack++;
             }else{
@@ -259,15 +259,15 @@ function bidi_cleanup($data) {
                 }
             }
         }
-    
+
         # now add some pops if your stack is bigger than 0
         for ($i=0; $i<$stack; $i++){
             $data .= "\xE2\x80\xAC";
         }
-    
+
         return $data;
     }
-    
+
     return $data;
 }
 
@@ -282,24 +282,24 @@ function secure_link($href) {
 
 function embed_html($link) {
     global $config;
-    
+
     foreach ($config['embedding'] as $embed) {
         if ($html = preg_replace($embed[0], $embed[1], $link)) {
                 if ($html == $link)
                     continue; // Nope
-            
+
             $html = str_replace('%%tb_width%%', $config['embed_width'], $html);
             $html = str_replace('%%tb_height%%', $config['embed_height'], $html);
-            
+
             return $html;
         }
     }
-    
+
     if ($link[0] == '<') {
         // Prior to v0.9.6-dev-8, HTML code for embedding was stored in the database instead of the link.
         return $link;
     }
-    
+
     return 'Embedding error.';
 }
 
@@ -308,29 +308,29 @@ class Post {
         global $config;
         if (!isset($root))
             $root = &$config['root'];
-        
+
         foreach ($post as $key => $value) {
             $this->{$key} = $value;
         }
 
         if (isset($this->files) && $this->files)
-            $this->files = @json_decode($this->files);
-        
+            $this->files = json_decode($this->files);
+
         $this->subject = utf8tohtml($this->subject);
         $this->name = utf8tohtml($this->name);
         $this->mod = $mod;
         $this->root = $root;
-        
+
         if ($this->embed)
             $this->embed = embed_html($this->embed);
-        
+
         $this->modifiers = extract_modifiers($this->body_nomarkup);
-        
+
         if ($config['always_regenerate_markup']) {
             $this->body = $this->body_nomarkup;
             markup($this->body);
         }
-        
+
         if ($this->mod)
             // Fix internal links
             // Very complicated regex
@@ -342,13 +342,13 @@ class Post {
     }
     public function link($pre = '', $page = false) {
         global $config, $board;
-        
+
         return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
     }
-    
+
     public function build($index=false) {
         global $board, $config;
-        
+
         return Element('post_reply.html', array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'mod' => $this->mod));
     }
 };
@@ -358,14 +358,14 @@ class Thread {
         global $config;
         if (!isset($root))
             $root = &$config['root'];
-        
+
         foreach ($post as $key => $value) {
             $this->{$key} = $value;
         }
-        
+
         if (isset($this->files))
             $this->files = @json_decode($this->files);
-        
+
         $this->subject = utf8tohtml($this->subject);
         $this->name = utf8tohtml($this->name);
         $this->mod = $mod;
@@ -375,17 +375,17 @@ class Thread {
         $this->posts = array();
         $this->omitted = 0;
         $this->omitted_images = 0;
-        
+
         if ($this->embed)
             $this->embed = embed_html($this->embed);
-        
+
         $this->modifiers = extract_modifiers($this->body_nomarkup);
-        
+
         if ($config['always_regenerate_markup']) {
             $this->body = $this->body_nomarkup;
             markup($this->body);
         }
-        
+
         if ($this->mod)
             // Fix internal links
             // Very complicated regex
@@ -397,7 +397,7 @@ class Thread {
     }
     public function link($pre = '', $page = false) {
         global $config, $board;
-        
+
         return $this->root . $board['dir'] . $config['dir']['res'] . link_for((array)$this, $page == '50') . '#' . $pre . $this->id;
     }
     public function add(Post $post) {
@@ -408,9 +408,9 @@ class Thread {
     }
     public function build($index=false, $isnoko50=false) {
         global $board, $config, $debug;
-        
+
         $hasnoko50 = $this->postCount() >= $config['noko50_min'];
-        
+
         event('show-thread', $this);
 
         $file = ($index && $config['file_board']) ? 'post_thread_fileboard.html' : 'post_thread.html';
@@ -419,4 +419,3 @@ class Thread {
         return $built;
     }
 };
-