diff --git a/inc/display.php b/inc/display.php
index c5065044..db6e7ef2 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -5,419 +5,419 @@
*/
if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
- // You cannot request this file directly.
- exit;
+ // You cannot request this file directly.
+ exit;
}
/*
- joaoptm78@gmail.com
- http://www.php.net/manual/en/function.filesize.php#100097
+ joaoptm78@gmail.com
+ http://www.php.net/manual/en/function.filesize.php#100097
*/
function format_bytes($size) {
- $units = array(' B', ' KB', ' MB', ' GB', ' TB');
- for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
- return round($size, 2).$units[$i];
+ $units = array(' B', ' KB', ' MB', ' GB', ' TB');
+ for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
+ return round($size, 2).$units[$i];
}
function doBoardListPart($list, $root, &$boards) {
- global $config;
-
- $body = '';
- foreach ($list as $key => $board) {
- if (is_array($board))
- $body .= ' [' . doBoardListPart($board, $root, $boards) . '] ';
- else {
- if (gettype($key) == 'string') {
- $body .= ' ' . $key . ' /';
- } else {
- $title = '';
- if (array_key_exists($board,$config['boards_alias'])){
- $actual_board = $config['boards_alias'][$board];
- if (isset ($boards[$actual_board])) {
- $title = ' title="'.$boards[$actual_board].'"';
- }
+ global $config;
- $body .= ' ' . $board . ' /';
- }
- else
- {
- if (isset ($boards[$board])) {
- $title = ' title="'.$boards[$board].'"';
- }
+ $body = '';
+ foreach ($list as $key => $board) {
+ if (is_array($board))
+ $body .= ' [' . doBoardListPart($board, $root, $boards) . '] ';
+ else {
+ if (gettype($key) == 'string') {
+ $body .= ' ' . $key . ' /';
+ } else {
+ $title = '';
+ if (array_key_exists($board,$config['boards_alias'])){
+ $actual_board = $config['boards_alias'][$board];
+ if (isset ($boards[$actual_board])) {
+ $title = ' title="'.$boards[$actual_board].'"';
+ }
- $body .= ' ' . $board . ' /';
- }
- }
- }
- }
- $body = preg_replace('/\/$/', '', $body);
-
- return $body;
+ $body .= ' ' . $board . ' /';
+ }
+ else
+ {
+ if (isset ($boards[$board])) {
+ $title = ' title="'.$boards[$board].'"';
+ }
+
+ $body .= ' ' . $board . ' /';
+ }
+ }
+ }
+ }
+ $body = preg_replace('/\/$/', '', $body);
+
+ return $body;
}
function createBoardlist($mod=false) {
- global $config;
-
- if (!isset($config['boards'])) return array('top'=>'','bottom'=>'');
-
- $xboards = listBoards();
- $boards = array();
- foreach ($xboards as $val) {
- $boards[$val['uri']] = $val['title'];
- }
+ global $config;
+
+ if (!isset($config['boards'])) return array('top'=>'','bottom'=>'');
+
+ $xboards = listBoards();
+ $boards = array();
+ foreach ($xboards as $val) {
+ $boards[$val['uri']] = $val['title'];
+ }
- $body = doBoardListPart($config['boards'], $mod?'?/':$config['root'], $boards);
+ $body = doBoardListPart($config['boards'], $mod?'?/':$config['root'], $boards);
- if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body))
- $body = '[' . $body . ']';
-
- $body = trim($body);
+ 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 = "";
-
- return array(
- 'top' => '
' . $body . '
' . $top,
- 'bottom' => '' . $body . '
'
- );
+ // Message compact-boardlist.js faster, so that page looks less ugly during loading
+ $top = "";
+
+ return array(
+ 'top' => '' . $body . '
' . $top,
+ 'bottom' => '' . $body . '
'
+ );
}
function loginForm($error=false, $username=false, $redirect=false) {
- global $config;
-
- die(Element('page.html', array(
- 'index' => $config['root'],
- 'title' => _('Login'),
- 'config' => $config,
- 'body' => Element('login.html', array(
- 'config'=>$config,
- 'error'=>$error,
- 'username'=>utf8tohtml($username),
- 'redirect'=>$redirect
- )
- )
- )));
+ global $config;
+
+ die(Element('page.html', array(
+ 'index' => $config['root'],
+ 'title' => _('Login'),
+ 'config' => $config,
+ 'body' => Element('login.html', array(
+ 'config'=>$config,
+ 'error'=>$error,
+ 'username'=>utf8tohtml($username),
+ 'redirect'=>$redirect
+ )
+ )
+ )));
}
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('@
@i', ' ', $body);
-
- // Strip tags but leave span tags which contain spoiler
- $body_with_spoiler_tags = strip_tags($body,'');
+ global $config;
+
+ if (!isset($len))
+ $len = &$config['mod']['snippet_length'];
+
+ // Replace line breaks with some whitespace
+ $body = preg_replace('@
@i', ' ', $body);
+
+ // Strip tags but leave span tags which contain spoiler
+ $body_with_spoiler_tags = strip_tags($body,'');
- // 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 = "" . utf8tohtml($body) . "";
- }
- else {
- $value = utf8tohtml($body);
- }
-
- // Re-escape the characters.
- return '' . utf8tohtml($body) . ($strlen > $len ? '…' : '') . '';
+ // 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 = "" . utf8tohtml($body) . "";
+ }
+ else {
+ $value = utf8tohtml($body);
+ }
+
+ // Re-escape the characters.
+ return '' . utf8tohtml($body) . ($strlen > $len ? '…' : '') . '';
}
function capcode($cap) {
- global $config;
-
- if (!$cap)
- return false;
-
- $capcode = array();
- if (isset($config['custom_capcode'][$cap])) {
- if (is_array($config['custom_capcode'][$cap])) {
- $capcode['cap'] = sprintf($config['custom_capcode'][$cap][0], $cap);
- if (isset($config['custom_capcode'][$cap][1]))
- $capcode['name'] = $config['custom_capcode'][$cap][1];
- if (isset($config['custom_capcode'][$cap][2]))
- $capcode['trip'] = $config['custom_capcode'][$cap][2];
- } else {
- $capcode['cap'] = sprintf($config['custom_capcode'][$cap], $cap);
- }
- } else {
- $capcode['cap'] = sprintf($config['capcode'], $cap);
- }
-
- return $capcode;
+ global $config;
+
+ if (!$cap)
+ return false;
+
+ $capcode = array();
+ if (isset($config['custom_capcode'][$cap])) {
+ if (is_array($config['custom_capcode'][$cap])) {
+ $capcode['cap'] = sprintf($config['custom_capcode'][$cap][0], $cap);
+ if (isset($config['custom_capcode'][$cap][1]))
+ $capcode['name'] = $config['custom_capcode'][$cap][1];
+ if (isset($config['custom_capcode'][$cap][2]))
+ $capcode['trip'] = $config['custom_capcode'][$cap][2];
+ } else {
+ $capcode['cap'] = sprintf($config['custom_capcode'][$cap], $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, '
');
-
- // Limit line count
- if ($lines > $max_lines) {
- if (preg_match('/(((.*?)
){' . $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$/', $open_tags[0][$x]))
- $tags[] = $open_tags[1][$x];
- }
-
- // List successfully closed tags
- if (preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
- for ($x=0;$xhere to view the full text.'), $url).'';
- }
-
- return $body;
+ 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, '
');
+
+ // Limit line count
+ if ($lines > $max_lines) {
+ if (preg_match('/(((.*?)
){' . $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$/', $open_tags[0][$x]))
+ $tags[] = $open_tags[1][$x];
+ }
+
+ // List successfully closed tags
+ if (preg_match_all('/(<\/([\w]+))>/', $body, $closed_tags)) {
+ for ($x=0;$xhere to view the full text.'), $url).'';
+ }
+
+ return $body;
}
function bidi_cleanup($data) {
- // Closes all embedded RTL and LTR unicode formatting blocks in a string so that
- // it can be used inside another without controlling its direction.
+ // Closes all embedded RTL and LTR unicode formatting blocks in a string so that
+ // it can be used inside another without controlling its direction.
- $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{
- if ($stack){
- $stack--;
- }else{
- # we have a pop without a push - remove it
- $data = substr($data, 0, $pos-$offset)
- .substr($data, $pos+3-$offset);
- $offset += 3;
- }
- }
- }
-
- # 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;
+ $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{
+ if ($stack){
+ $stack--;
+ }else{
+ # we have a pop without a push - remove it
+ $data = substr($data, 0, $pos-$offset)
+ .substr($data, $pos+3-$offset);
+ $offset += 3;
+ }
+ }
+ }
+
+ # 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;
}
function secure_link_confirm($text, $title, $confirm_message, $href) {
- global $config;
+ global $config;
- return '' . $text . '';
+ return '' . $text . '';
}
function secure_link($href) {
- return $href . '/' . make_secure_link_token($href);
+ return $href . '/' . make_secure_link_token($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.';
+ 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.';
}
class Post {
- public function __construct($post, $root=null, $mod=false) {
- global $config;
- if (!isset($root))
- $root = &$config['root'];
-
- foreach ($post as $key => $value) {
- $this->{$key} = $value;
- }
+ public function __construct($post, $root=null, $mod=false) {
+ 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->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
- $this->body = preg_replace(
- '/body
- );
- }
- 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));
- }
+ if (isset($this->files) && $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
+ $this->body = preg_replace(
+ '/body
+ );
+ }
+ 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));
+ }
};
class Thread {
- public function __construct($post, $root = null, $mod = false, $hr = true) {
- 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;
- $this->root = $root;
- $this->hr = $hr;
+ public function __construct($post, $root = null, $mod = false, $hr = true) {
+ 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;
+ $this->root = $root;
+ $this->hr = $hr;
- $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
- $this->body = preg_replace(
- '/body
- );
- }
- 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) {
- $this->posts[] = $post;
- }
- public function postCount() {
- return count($this->posts) + $this->omitted;
- }
- public function build($index=false, $isnoko50=false) {
- global $board, $config, $debug;
-
- $hasnoko50 = $this->postCount() >= $config['noko50_min'];
-
- event('show-thread', $this);
+ $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
+ $this->body = preg_replace(
+ '/body
+ );
+ }
+ 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) {
+ $this->posts[] = $post;
+ }
+ public function postCount() {
+ return count($this->posts) + $this->omitted;
+ }
+ 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';
- $built = Element($file, array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod));
+ $file = ($index && $config['file_board']) ? 'post_thread_fileboard.html' : 'post_thread.html';
+ $built = Element($file, array('config' => $config, 'board' => $board, 'post' => &$this, 'index' => $index, 'hasnoko50' => $hasnoko50, 'isnoko50' => $isnoko50, 'mod' => $this->mod));
- return $built;
- }
+ return $built;
+ }
};