From f25ddbb3a623fd4d314ecdf389568b417791f1cb Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:04:51 +1000 Subject: [PATCH 01/71] init --- README.md | 22 +++++ kusabax.php | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+) create mode 100755 README.md create mode 100755 kusabax.php diff --git a/README.md b/README.md new file mode 100755 index 00000000..8d5fb5c3 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +# Kusaba X Database Migration + +## About +This script pulls board information, posts and images from an already existing [Kusaba X][k] installation and replicates them in [Tinyboard][o]. It should be helpful for those who already use Kusaba X][k], and want to switch over to Tinyboard. +[o]: http://tinyboard.org/ +[k]: http://kusabax.cultnet.net/ + +## Requirements + 1. [Tinyboard][o] >= v0.9.2 + +## Use + 1. Install Tinyboard (>= v0.9.2) normally. + 2. Download and place `kusabax.php` in the root folder of Tinyboard. + 3. Edit the script and fill in your Kusaba X configuration. You can find KU_RANDOMSEED from Kusaba X's config.php file. + 4. Run the script in a web browser. + +## Documentation +Visit the Tinyboard development wiki at for help. + +## License +See [LICENSE.md][l] for the license. +[l]: http://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md \ No newline at end of file diff --git a/kusabax.php b/kusabax.php new file mode 100755 index 00000000..4d8637e8 --- /dev/null +++ b/kusabax.php @@ -0,0 +1,227 @@ + Array('timeout' => 5, 'persistent' => false)); + $kusabaxc['db']['type'] = 'mysql'; + $kusabaxc['db']['server'] = 'localhost'; + $kusabaxc['db']['user'] = ''; + $kusabaxc['db']['password'] = ''; + $kusabaxc['db']['database'] = ''; + // KusabaX table prefix + $kusabaxc['db']['prefix'] = ''; + // Anything more to add to the DSN string (eg. port=xxx;foo=bar) + $kusabaxc['db']['dsn'] = ''; + // From your KusabaX config; needed to decode IP addresses + $kusabaxc['randomseed'] = ''; //KU_RANDOMSEED + // KusabaX directory (without trailing slash) + $kusabaxc['root'] = '/var/www/kusabax'; + + /* End Config */ + + + // KusabaX functions + function md5_decrypt($enc_text, $password, $iv_len = 16) { + $enc_text = base64_decode($enc_text); + $n = strlen($enc_text); + $i = $iv_len; + $plain_text = ''; + $iv = substr($password ^ substr($enc_text, 0, $iv_len), 0, 512); + while ($i < $n) { + $block = substr($enc_text, $i, 16); + $plain_text .= $block ^ pack('H*', md5($iv)); + $iv = substr($block . $iv, 0, 512) ^ $password; + $i += 16; + } + return preg_replace('/\\x13\\x00*$/', '', $plain_text); + } + + // KusabaX -> Tinyboard HTML + function convert_markup($body) { + global $config; + $body = stripslashes($body); + + // Replace >quotes + $body = str_replace('"unkfunc"', '"quote"', $body); + + // Replace >>cites + $body = preg_replace('//', '', $body); + + return $body; + } + + require 'inc/functions.php'; + require 'inc/display.php'; + require 'inc/template.php'; + require 'inc/database.php'; + require 'inc/user.php'; + $step = isset($_GET['step']) ? round($_GET['step']) : 0; + $page = Array( + 'config' => $config, + 'title' => 'KusabaX Database Migration', + 'body' => '' + ); + + $log = Array(); + + // Trick Tinyboard into opening the KusabaX databse instead + $__temp = $config['db']; + $config['db'] = $kusabaxc['db']; + sql_open(); + // Get databse link + $kusabax = $pdo; + // Clear + unset($pdo); + + // Open Tinyboard database + $config['db'] = $__temp; + unset($__temp); + sql_open(); + + $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'boards`'); + $boards = listBoards(); + + // Copy boards table, briefly + $kusabax_boards = Array(); + while($board = $k_query->fetch()) { + // For later use... + $kusabax_boards[(int)$board['id']] = $board['name']; + + $already_exists = false; + foreach($boards as &$_board) { + if($_board['uri'] == $board['name']) { + // Board already exists in Tinyboard... + $log[] = 'Board /' . $board['name'] . '/ already exists.'; + $already_exists = true; + break; + } + } + if($already_exists) + continue; + + $log[] = 'Creating board: /' . $board['name'] . '/'; + + // Go ahead and create this new board... + $query = prepare('INSERT INTO `boards` VALUES (NULL, :uri, :title, :subtitle)'); + $query->bindValue(':uri', $board['name']); + $query->bindValue(':title', $board['desc']); + $query->bindValue(':subtitle', null, PDO::PARAM_NULL); + $query->execute() or error(db_error($query)); + + // Posting table + query(Element('posts.sql', Array('board' => $board['name']))) or error(db_error()); + + // Set up board (create directories, etc.) by opening it + openBoard($board['name']); + } + + + $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'posts` WHERE `IS_DELETED` = 0'); + while($post = $k_query->fetch()) { + if(!isset($kusabax_boards[(int)$post['boardid']])) { + // Board doesn't exist... + continue; + } + $board = $kusabax_boards[(int)$post['boardid']]; + + $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES (:id, :thread, :subject, :email, :name, :trip, :capcode, :body, :time, :bump, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, :embed)", $board)); + + // Post ID + $query->bindValue(':id', $post['id'], PDO::PARAM_INT); + + // Thread (`parentid`) + if($post['parentid'] == 0) + $query->bindValue(':thread', null, PDO::PARAM_NULL); + else + $query->bindValue(':thread', (int)$post['parentid'], PDO::PARAM_INT); + + // Name + if(empty($post['name'])) + $post['name'] = $config['anonymous']; + $query->bindValue(':name', $post['name'], PDO::PARAM_INT); + + // Trip + if(empty($post['tripcode'])) + $query->bindValue(':trip', null, PDO::PARAM_NULL); + else + $query->bindValue(':trip', $post['tripcode'], PDO::PARAM_STR); + + // Email + $query->bindValue(':email', $post['email'], PDO::PARAM_STR); + + // Subject + $query->bindValue(':subject', $post['subject'], PDO::PARAM_STR); + + // Body (`message`) + $query->bindValue(':body', convert_markup($post['message']), PDO::PARAM_STR); + + // File + if(empty($post['file'])) { + $query->bindValue(':file', null, PDO::PARAM_NULL); + $query->bindValue(':width', null, PDO::PARAM_NULL); + $query->bindValue(':height', null, PDO::PARAM_NULL); + $query->bindValue(':filesize', null, PDO::PARAM_NULL); + $query->bindValue(':filename', null, PDO::PARAM_NULL); + $query->bindValue(':filehash', null, PDO::PARAM_NULL); + $query->bindValue(':thumb', null, PDO::PARAM_NULL); + $query->bindValue(':thumbwidth', null, PDO::PARAM_NULL); + $query->bindValue(':thumbheight', null, PDO::PARAM_NULL); + } else { + $query->bindValue(':file', $post['file'] . '.' . $post['file_type'], PDO::PARAM_STR); + $query->bindValue(':width', $post['image_w'], PDO::PARAM_INT); + $query->bindValue(':height', $post['image_h'], PDO::PARAM_INT); + $query->bindValue(':filesize', $post['file_size'], PDO::PARAM_INT); + $query->bindValue(':filename', $post['file_original'] . '.' . $post['file_type'], PDO::PARAM_STR); + // They use MD5; we use SHA1 by default. + $query->bindValue(':filehash', null, PDO::PARAM_NULL); + + $query->bindValue(':thumb', $post['file'] . '.' . $post['file_type'], PDO::PARAM_STR); + $query->bindValue(':thumbwidth', $post['thumb_w'], PDO::PARAM_INT); + $query->bindValue(':thumbheight', $post['thumb_h'], PDO::PARAM_INT); + } + + // IP + $query->bindValue(':ip', md5_decrypt($post['ip'], $kusabaxc['randomseed']), PDO::PARAM_STR); + + // Time (`timestamp`) + $query->bindValue(':time', $post['timestamp'], PDO::PARAM_INT); + + // Bump (`bumped`) + $query->bindValue(':bump', $post['bumped'], PDO::PARAM_INT); + + // Locked + $query->bindValue(':locked', $post['locked'], PDO::PARAM_INT); + + // Sticky + $query->bindValue(':sticky', $post['stickied'], PDO::PARAM_INT); + + // Stuff we can't do (yet) + $query->bindValue(':embed', null, PDO::PARAM_NULL); + $query->bindValue(':password', null, PDO::PARAM_NULL); + $query->bindValue(':capcode', null, PDO::PARAM_NULL); + + + $log[] = 'Replicating post ' . $post['id'] . ' on /' . $board . '/'; + + if(!empty($post['file'])) { + // Copy file + $file_path = $kusabaxc['root'] . '/' . $board . '/src/' . $post['file'] . '.' . $post['file_type']; + $thumb_path = $kusabaxc['root'] . '/' . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; + + $log[] = 'Copying file: ' . $file_path . ''; + + copy($file_path, sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']); + copy($thumb_path, sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']); + } + + // Insert post + $query->execute() or $log[] = 'Error: ' . db_error($query); + } + + $page['body'] = '

Migrating…

'; + foreach($log as &$l) { + $page['body'] .= $l . '
'; + } + $page['body'] .= '

'; + + echo Element('page.html', $page); +?> \ No newline at end of file From f4f76bf3c6824dcd3339c3616ab1c14ceb1c8f7b Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:09:05 +1000 Subject: [PATCH 02/71] check if configured before running --- kusabax.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kusabax.php b/kusabax.php index 4d8637e8..e70f1f1e 100755 --- a/kusabax.php +++ b/kusabax.php @@ -18,6 +18,8 @@ /* End Config */ + if(empty($kusabaxc['db']['user'])) + error('Did you forget to configure the script?'); // KusabaX functions function md5_decrypt($enc_text, $password, $iv_len = 16) { From 9826aae5b9e69f3e87905d86e1ad948b1a669be4 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:09:28 +1000 Subject: [PATCH 03/71] stupid mistake --- kusabax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kusabax.php b/kusabax.php index e70f1f1e..317c8ebf 100755 --- a/kusabax.php +++ b/kusabax.php @@ -19,7 +19,7 @@ /* End Config */ if(empty($kusabaxc['db']['user'])) - error('Did you forget to configure the script?'); + die('Did you forget to configure the script?'); // KusabaX functions function md5_decrypt($enc_text, $password, $iv_len = 16) { From 66df02c2e46a302078f31c4c2e247a4d9d5938b5 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:31:01 +1000 Subject: [PATCH 04/71] infinite timeout --- kusabax.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kusabax.php b/kusabax.php index 317c8ebf..f1ae080c 100755 --- a/kusabax.php +++ b/kusabax.php @@ -21,6 +21,9 @@ if(empty($kusabaxc['db']['user'])) die('Did you forget to configure the script?'); + // Infinite timeout + set_time_limit(0); + // KusabaX functions function md5_decrypt($enc_text, $password, $iv_len = 16) { $enc_text = base64_decode($enc_text); @@ -42,12 +45,15 @@ global $config; $body = stripslashes($body); - // Replace >quotes + // >quotes $body = str_replace('"unkfunc"', '"quote"', $body); - // Replace >>cites + // >>cites $body = preg_replace('//', '', $body); + // Public bans + $body = preg_replace('/
\((.+?)\)<\/b><\/font>/', '$1', $body); + return $body; } From 399a5ab5d10d7db4083c4af62326f3f4e6c97280 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:33:08 +1000 Subject: [PATCH 05/71] public bans; --- kusabax.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kusabax.php b/kusabax.php index f1ae080c..9f6ea7a5 100755 --- a/kusabax.php +++ b/kusabax.php @@ -4,9 +4,9 @@ $kusabaxc = Array('db' => Array('timeout' => 5, 'persistent' => false)); $kusabaxc['db']['type'] = 'mysql'; $kusabaxc['db']['server'] = 'localhost'; - $kusabaxc['db']['user'] = ''; - $kusabaxc['db']['password'] = ''; - $kusabaxc['db']['database'] = ''; + $kusabaxc['db']['user'] = 'kusaba'; + $kusabaxc['db']['password'] = 'kusaba'; + $kusabaxc['db']['database'] = 'kusaba'; // KusabaX table prefix $kusabaxc['db']['prefix'] = ''; // Anything more to add to the DSN string (eg. port=xxx;foo=bar) @@ -52,7 +52,7 @@ $body = preg_replace('//', '', $body); // Public bans - $body = preg_replace('/
\((.+?)\)<\/b><\/font>/', '$1', $body); + $body = preg_replace('/
\((.+?)\)<\/b><\/font>/', '($1)', $body); return $body; } From 6ce881284330487fe3dff3cf740f6befc49914de Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:36:36 +1000 Subject: [PATCH 06/71] safer IP address decryption (KU_RANDOMSEED) --- kusabax.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kusabax.php b/kusabax.php index 9f6ea7a5..6b17499a 100755 --- a/kusabax.php +++ b/kusabax.php @@ -188,7 +188,14 @@ } // IP - $query->bindValue(':ip', md5_decrypt($post['ip'], $kusabaxc['randomseed']), PDO::PARAM_STR); + $ip = md5_decrypt($post['ip'], $kusabaxc['randomseed']); + if(!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $ip)) { + // Invalid IP address. Wrong KU_RANDOMSEED? + + $log[] = 'Invalid IP address returned after decryption. Wrong KU_RANDOMSEED?'; + $ip = '0.0.0.0'; // just set it to something valid and continue + } + $query->bindValue(':ip', $ip, PDO::PARAM_STR); // Time (`timestamp`) $query->bindValue(':time', $post['timestamp'], PDO::PARAM_INT); From 5c942f8c9e2305c529b83ef7a544b56febc7e3ae Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:43:01 +1000 Subject: [PATCH 07/71] check if destination and source files exist before attempting to copy --- kusabax.php | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/kusabax.php b/kusabax.php index 6b17499a..ebe76773 100755 --- a/kusabax.php +++ b/kusabax.php @@ -4,9 +4,9 @@ $kusabaxc = Array('db' => Array('timeout' => 5, 'persistent' => false)); $kusabaxc['db']['type'] = 'mysql'; $kusabaxc['db']['server'] = 'localhost'; - $kusabaxc['db']['user'] = 'kusaba'; - $kusabaxc['db']['password'] = 'kusaba'; - $kusabaxc['db']['database'] = 'kusaba'; + $kusabaxc['db']['user'] = ''; + $kusabaxc['db']['password'] = ''; + $kusabaxc['db']['database'] = ''; // KusabaX table prefix $kusabaxc['db']['prefix'] = ''; // Anything more to add to the DSN string (eg. port=xxx;foo=bar) @@ -222,10 +222,24 @@ $file_path = $kusabaxc['root'] . '/' . $board . '/src/' . $post['file'] . '.' . $post['file_type']; $thumb_path = $kusabaxc['root'] . '/' . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; - $log[] = 'Copying file: ' . $file_path . ''; + $to_file_path = sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']; + $to_thumb_path = sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']; - copy($file_path, sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']); - copy($thumb_path, sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']); + if(!file_exists($to_file_path)) { + $log[] = 'Copying file: ' . $file_path . ''; + if(!@copy($file_path, $to_file_path)) { + $err = error_get_last(); + $log[] = 'Could not copy ' . $file_path . ': ' . $err['message']; + } + } + + if(!file_exists($to_thumb_path)) { + $log[] = 'Copying file: ' . $thumb_path . ''; + if(!@copy($thumb_path, $to_thumb_path)) { + $err = error_get_last(); + $log[] = 'Could not copy ' . $thumb_path. ': ' . $err['message']; + } + } } // Insert post From 0a37976936cb1194bd91d3c6f74dcbb93fa5610a Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 18:02:58 +1000 Subject: [PATCH 08/71] deleted/removed images --- kusabax.php | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/kusabax.php b/kusabax.php index ebe76773..983bf21e 100755 --- a/kusabax.php +++ b/kusabax.php @@ -131,6 +131,8 @@ } $board = $kusabax_boards[(int)$post['boardid']]; + $log[] = 'Replicating post ' . $post['id'] . ' on /' . $board . '/'; + $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES (:id, :thread, :subject, :email, :name, :trip, :capcode, :body, :time, :bump, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, :embed)", $board)); // Post ID @@ -163,8 +165,11 @@ $query->bindValue(':body', convert_markup($post['message']), PDO::PARAM_STR); // File - if(empty($post['file'])) { - $query->bindValue(':file', null, PDO::PARAM_NULL); + if(empty($post['file']) || $post['file'] == 'removed') { + if($post['file'] == 'removed') + $query->bindValue(':file', 'deleted', PDO::PARAM_STR); + else + $query->bindValue(':file', null, PDO::PARAM_NULL); $query->bindValue(':width', null, PDO::PARAM_NULL); $query->bindValue(':height', null, PDO::PARAM_NULL); $query->bindValue(':filesize', null, PDO::PARAM_NULL); @@ -185,6 +190,29 @@ $query->bindValue(':thumb', $post['file'] . '.' . $post['file_type'], PDO::PARAM_STR); $query->bindValue(':thumbwidth', $post['thumb_w'], PDO::PARAM_INT); $query->bindValue(':thumbheight', $post['thumb_h'], PDO::PARAM_INT); + + // Copy file + $file_path = $kusabaxc['root'] . '/' . $board . '/src/' . $post['file'] . '.' . $post['file_type']; + $thumb_path = $kusabaxc['root'] . '/' . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; + + $to_file_path = sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']; + $to_thumb_path = sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']; + + if(!file_exists($to_file_path)) { + $log[] = 'Copying file: ' . $file_path . ''; + if(!@copy($file_path, $to_file_path)) { + $err = error_get_last(); + $log[] = 'Could not copy ' . $file_path . ': ' . $err['message']; + } + } + + if(!file_exists($to_thumb_path)) { + $log[] = 'Copying file: ' . $thumb_path . ''; + if(!@copy($thumb_path, $to_thumb_path)) { + $err = error_get_last(); + $log[] = 'Could not copy ' . $thumb_path. ': ' . $err['message']; + } + } } // IP @@ -214,34 +242,6 @@ $query->bindValue(':password', null, PDO::PARAM_NULL); $query->bindValue(':capcode', null, PDO::PARAM_NULL); - - $log[] = 'Replicating post ' . $post['id'] . ' on /' . $board . '/'; - - if(!empty($post['file'])) { - // Copy file - $file_path = $kusabaxc['root'] . '/' . $board . '/src/' . $post['file'] . '.' . $post['file_type']; - $thumb_path = $kusabaxc['root'] . '/' . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; - - $to_file_path = sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']; - $to_thumb_path = sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']; - - if(!file_exists($to_file_path)) { - $log[] = 'Copying file: ' . $file_path . ''; - if(!@copy($file_path, $to_file_path)) { - $err = error_get_last(); - $log[] = 'Could not copy ' . $file_path . ': ' . $err['message']; - } - } - - if(!file_exists($to_thumb_path)) { - $log[] = 'Copying file: ' . $thumb_path . ''; - if(!@copy($thumb_path, $to_thumb_path)) { - $err = error_get_last(); - $log[] = 'Could not copy ' . $thumb_path. ': ' . $err['message']; - } - } - } - // Insert post $query->execute() or $log[] = 'Error: ' . db_error($query); } From 4488965f91209ea433f69e60ac3bee508ab34e06 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 18:12:18 +1000 Subject: [PATCH 09/71] news --- kusabax.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/kusabax.php b/kusabax.php index 983bf21e..b2f6322f 100755 --- a/kusabax.php +++ b/kusabax.php @@ -246,6 +246,25 @@ $query->execute() or $log[] = 'Error: ' . db_error($query); } + // News + $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'front` WHERE `page` = 0'); + while($news = $k_query->fetch()) { + // Check if already exists + $query = prepare("SELECT 1 FROM `news` WHERE `body` = :body AND `time` = :time"); + $query->bindValue(':time', $news['timestamp'], PDO::PARAM_INT); + $query->bindValue(':body', $news['message'], PDO::PARAM_STR); + $query->execute() or error(db_error($query)); + if($query->fetch()) + continue; + + $query = prepare("INSERT INTO `news` VALUES (NULL, :name, :time, :subject, :body)"); + $query->bindValue(':name', $news['poster'], PDO::PARAM_STR); + $query->bindValue(':time', $news['timestamp'], PDO::PARAM_INT); + $query->bindValue(':subject', $news['subject'], PDO::PARAM_STR); + $query->bindValue(':body', $news['message'], PDO::PARAM_STR); + $query->execute() or $log[] = 'Error: ' . db_error($query); + } + $page['body'] = '

Migrating…

'; foreach($log as &$l) { $page['body'] .= $l . '
'; From d7ff4947b5f8d8e429e4f8fccae50a7c06b646bc Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Sat, 4 Jun 2011 17:37:11 +1000 Subject: [PATCH 10/71] readme update --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 8d5fb5c3..162a3787 100755 --- a/README.md +++ b/README.md @@ -14,6 +14,11 @@ This script pulls board information, posts and images from an already existing [ 3. Edit the script and fill in your Kusaba X configuration. You can find KU_RANDOMSEED from Kusaba X's config.php file. 4. Run the script in a web browser. +## What's copied? (in the future, more will be added.) + 1. Basic board information + 2. Posts + 3. News + ## Documentation Visit the Tinyboard development wiki at for help. From cce8b3955d5df03a6adca5e5e11d2bef039cc917 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Wed, 23 Nov 2011 21:44:22 +1100 Subject: [PATCH 11/71] compatibility with >= v0.9.4 --- README.md | 6 +++--- kusabax.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 162a3787..8c5d9eee 100755 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ This script pulls board information, posts and images from an already existing [ [k]: http://kusabax.cultnet.net/ ## Requirements - 1. [Tinyboard][o] >= v0.9.2 + 1. [Tinyboard][o] >= v0.9.4 ## Use - 1. Install Tinyboard (>= v0.9.2) normally. + 1. Install Tinyboard (>= v0.9.4) normally. 2. Download and place `kusabax.php` in the root folder of Tinyboard. 3. Edit the script and fill in your Kusaba X configuration. You can find KU_RANDOMSEED from Kusaba X's config.php file. 4. Run the script in a web browser. @@ -24,4 +24,4 @@ Visit the Tinyboard development wiki at for help. ## License See [LICENSE.md][l] for the license. -[l]: http://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md \ No newline at end of file +[l]: http://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md diff --git a/kusabax.php b/kusabax.php index b2f6322f..eed12e0a 100755 --- a/kusabax.php +++ b/kusabax.php @@ -74,7 +74,7 @@ // Trick Tinyboard into opening the KusabaX databse instead $__temp = $config['db']; $config['db'] = $kusabaxc['db']; - sql_open(); + // Get databse link $kusabax = $pdo; // Clear @@ -83,7 +83,6 @@ // Open Tinyboard database $config['db'] = $__temp; unset($__temp); - sql_open(); $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'boards`'); $boards = listBoards(); @@ -133,7 +132,7 @@ $log[] = 'Replicating post ' . $post['id'] . ' on /' . $board . '/'; - $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES (:id, :thread, :subject, :email, :name, :trip, :capcode, :body, :time, :bump, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, :embed)", $board)); + $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES (:id, :thread, :subject, :email, :name, :trip, :capcode, :body, :time, :bump, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board)); // Post ID $query->bindValue(':id', $post['id'], PDO::PARAM_INT); @@ -272,4 +271,5 @@ $page['body'] .= '

'; echo Element('page.html', $page); -?> \ No newline at end of file + + From 40b59c36da5e07c649336ec374337d1114c7118b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 15:28:43 +1100 Subject: [PATCH 12/71] init --- README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..e69de29b From ff697004b08630d16d55f699f353147dc7e60f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81abanowski?= Date: Fri, 2 Mar 2012 22:41:04 +0100 Subject: [PATCH 13/71] a command-line tool for rebuilding js, html, etc.; based on mod.php; also introduced dynamic main.js names in order to prevent aggressive caching, based on filemtime of templates/main.js --- tools/rebuild.php | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100755 tools/rebuild.php diff --git a/tools/rebuild.php b/tools/rebuild.php new file mode 100755 index 00000000..8be13f27 --- /dev/null +++ b/tools/rebuild.php @@ -0,0 +1,67 @@ +#!/usr/bin/php + "{$config['dir']['template']}/cache" + )); + $twig->clearCacheFiles(); + + echo 'Regenerating theme files...'."\n"; + rebuildThemes('all'); + + echo 'Generating Javascript file...'."\n"; + buildJavascript(); + + $boards = listBoards(); + + foreach($boards as &$board) { + echo "Opening board /{$board['uri']}/...\n"; + openBoard($board['uri']); + + echo 'Creating index pages...'+"\n"; + buildIndex(); + + $query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error()); + while($post = $query->fetch()) { + echo "Rebuilding #{$post['id']}...\n"; + buildThread($post['id']); + } + } + echo 'Complete!'."\n"; + + printf('Took %g seconds.'."\n", microtime(true) - $start); + + //modLog('Rebuilt everything using tools/rebuild.php'); +?> From a2d29860e6773b181e1c0670e2458e43321e2cd2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 15:55:12 +1100 Subject: [PATCH 14/71] rebuild.php revision --- tools/rebuild.php | 70 ++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/tools/rebuild.php b/tools/rebuild.php index 8be13f27..8bb8373b 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -1,67 +1,75 @@ #!/usr/bin/php "{$config['dir']['template']}/cache" )); $twig->clearCacheFiles(); - - echo 'Regenerating theme files...'."\n"; + + echo "Regenerating theme files...\n"; rebuildThemes('all'); - - echo 'Generating Javascript file...'."\n"; + + echo "Generating Javascript file...\n"; buildJavascript(); - + $boards = listBoards(); - + foreach($boards as &$board) { echo "Opening board /{$board['uri']}/...\n"; openBoard($board['uri']); - - echo 'Creating index pages...'+"\n"; + + echo "Creating index pages...\n"; buildIndex(); - + $query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error()); while($post = $query->fetch()) { echo "Rebuilding #{$post['id']}...\n"; buildThread($post['id']); } } - echo 'Complete!'."\n"; + + printf("Complete! Took %g seconds\n", microtime(true) - $start); + + // modLog('Rebuilt everything using tools/rebuild.php'); - printf('Took %g seconds.'."\n", microtime(true) - $start); - - //modLog('Rebuilt everything using tools/rebuild.php'); -?> From 61f1d0865ea0113e53f8c3921863f04a8503df8d Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:01:52 +1100 Subject: [PATCH 15/71] forced anon --- js/forced-anon.js | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 js/forced-anon.js diff --git a/js/forced-anon.js b/js/forced-anon.js new file mode 100644 index 00000000..a7e43062 --- /dev/null +++ b/js/forced-anon.js @@ -0,0 +1,66 @@ +$(document).ready(function(){ + var enable_fa = function() { + $('p.intro label').each(function() { + if($(this).children('a.capcode').length == 0) { + var id = $(this).parent().children('a.post_no:eq(1)').text(); + + if($(this).children('a.email').length != 0) + var p = $(this).children('a.email'); + else + var p = $(this); + + old_info[id] = {'name': p.children('span.name').text(), 'trip': p.children('span.trip').text()}; + + p.children('span.name').text('Anonymous'); + if(p.children('span.trip').length != 0) + p.children('span.trip').text(''); + } + }); + }; + + var disable_fa = function() { + $('p.intro label').each(function() { + if($(this).children('a.capcode').length == 0) { + var id = $(this).parent().children('a.post_no:eq(1)').text(); + + if(old_info[id]) { + if($(this).children('a.email').length != 0) + var p = $(this).children('a.email'); + else + var p = $(this); + + p.children('span.name').text(old_info[id]['name']); + if(p.children('span.trip').length != 0) + p.children('span.trip').text(old_info[id]['trip']); + } + } + }); + }; + + old_info = {}; + forced_anon = localStorage['forcedanon'] ? true : false; + + $('hr:first').before(''); + $('div#forced-anon a').text('Forced anonymity (' + (forced_anon ? 'enabled' : 'disabled') + ')'); + + $('div#forced-anon a').click(function() { + forced_anon = !forced_anon; + + if(forced_anon) { + $('div#forced-anon a').text('Forced anonymity (enabled)'); + localStorage.forcedanon = true; + enable_fa(); + } else { + $('div#forced-anon a').text('Forced anonymity (disabled)'); + delete localStorage.forcedanon; + disable_fa(); + } + + return false; + }); + + if(forced_anon) + enable_fa(); + +}); + From e6854ad5469f7885a2858692f37c767662b390bf Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:05:39 +1100 Subject: [PATCH 16/71] copyright notice and usage --- js/forced-anon.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/js/forced-anon.js b/js/forced-anon.js index a7e43062..86af4063 100644 --- a/js/forced-anon.js +++ b/js/forced-anon.js @@ -1,3 +1,16 @@ +/* + * forced-anon.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/forced-anon.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = $config['root'] . 'jquery.min.js'; + * $config['additional_javascript'][] = $config['root'] . 'forced-anon.js'; + * + */ + $(document).ready(function(){ var enable_fa = function() { $('p.intro label').each(function() { From a79b8c473b8ac136ede9f1333be891b11d068f76 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:45:59 +1100 Subject: [PATCH 17/71] use system account --- tools/inc/cli.php | 10 ++++++++++ tools/rebuild.php | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 tools/inc/cli.php diff --git a/tools/inc/cli.php b/tools/inc/cli.php new file mode 100644 index 00000000..5305c1ac --- /dev/null +++ b/tools/inc/cli.php @@ -0,0 +1,10 @@ + -1, + 'type' => ADMIN, + 'username' => '?', + 'boards' => Array('*') +); + + diff --git a/tools/rebuild.php b/tools/rebuild.php index 8bb8373b..9099ffeb 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -7,7 +7,14 @@ require 'inc/user.php'; require 'inc/mod.php'; - set_time_limit($config['mod']['rebuild_timelimit']); + require dirname(__FILE__) . '/inc/cli.php'; + + $mod = Array( + 'id' => -1, + 'type' => ADMIN, + 'username' => '?', + 'boards' => Array('*') + ); $start = microtime(true); @@ -71,5 +78,5 @@ printf("Complete! Took %g seconds\n", microtime(true) - $start); - // modLog('Rebuilt everything using tools/rebuild.php'); + modLog('Rebuilt everything using tools/rebuild.php'); From 28c2dd9d065c20c2a8a70d62aa7b6e79b66cd2e7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 19:41:56 +1100 Subject: [PATCH 18/71] quick reply --- js/quick-reply.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 js/quick-reply.js diff --git a/js/quick-reply.js b/js/quick-reply.js new file mode 100644 index 00000000..e963ca6e --- /dev/null +++ b/js/quick-reply.js @@ -0,0 +1,45 @@ +/* + * quick-reply.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/quick-reply.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = $config['root'] . 'jquery.min.js'; + * $config['additional_javascript'][] = $config['root'] . 'quick-reply.js'; + * + */ + +$(document).ready(function(){ + if($('div.banner').length != 0) + return; // not index + + txt_new_topic = $('form[name=post] input[type=submit]').val(); + txt_new_reply = 'New Reply'; + + undo_quick_reply = function() { + $('div.banner').remove(); + $('form[name=post] input[type=submit]').val(txt_new_topic); + $('form[name=post] input[name=quick-reply]').remove(); + } + + $('div.post.op').each(function() { + var id = $(this).children('p.intro').children('a.post_no:eq(1)').text(); + $('[Quick reply]').insertAfter($(this).children('p.intro').children('a:last')).click(function() { + $('div.banner').remove(); + $('') + .insertBefore('form[name=post]'); + $('form[name=post] input[type=submit]').val(txt_new_reply); + + $('').appendTo($('form[name=post]')); + + $('form[name=post] textarea').select(); + + window.scrollTo(0, 0); + + return false; + }); + }); +}); + From 81663b7d86c97fc808df8b201868bcda90e319ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81abanowski?= Date: Wed, 22 Feb 2012 16:43:43 +0100 Subject: [PATCH 19/71] +piwnichan styles addition - futaba+vichan and testorange --- stylesheets/futaba+vichan.css | 88 +++++++++ stylesheets/img/testorange_bg.gif | Bin 0 -> 2618 bytes stylesheets/img/testorange_f_bg.gif | Bin 0 -> 143 bytes stylesheets/img/testorange_testo.png | Bin 0 -> 20588 bytes stylesheets/img/testorange_textarea_bg.gif | Bin 0 -> 292 bytes stylesheets/img/testorange_top_bg.gif | Bin 0 -> 6551 bytes stylesheets/testorange.css | 208 +++++++++++++++++++++ 7 files changed, 296 insertions(+) create mode 100644 stylesheets/futaba+vichan.css create mode 100644 stylesheets/img/testorange_bg.gif create mode 100644 stylesheets/img/testorange_f_bg.gif create mode 100644 stylesheets/img/testorange_testo.png create mode 100644 stylesheets/img/testorange_textarea_bg.gif create mode 100644 stylesheets/img/testorange_top_bg.gif create mode 100644 stylesheets/testorange.css diff --git a/stylesheets/futaba+vichan.css b/stylesheets/futaba+vichan.css new file mode 100644 index 00000000..b9b610ab --- /dev/null +++ b/stylesheets/futaba+vichan.css @@ -0,0 +1,88 @@ +/* +piwnichan style, based on futaba.css of Tinyboard */ + +body { + background: #ffe; + color: #800000; + font-family: sans-serif; + font-size: 13px; +} +div.title h1 { + font-size: 24px; +} +div.title p { + font-size: 10px; +} +div.pages { + font-size: 13px !important; +} +a:link, a:visited, p.intro a.email span.name { + color: #0000ff; + font-size: inherit; + text-decoration: inherit; +} +a:link:hover { + color: #d00; + text-decoration: inherit; +} +span.omitted { + color: gray; +} +a.post_no { + color: #800000; +} +div.post.reply { + border: 0px; + background: #f0e0d6; +} +div.post.reply.highlighted { + background: #f0c0b0; + border-color: #d9bfb7; +} +div.post.reply p.body a { + color: navy; +} +p.intro span.subject { + color: #d00; +} +form table tr th { + background: #EA8; +} +div.ban h2 { + background: #FCA; + color: inherit; +} +div.ban { + border-color: #800; +} +div.ban p { + color: black; +} +div.pages { + padding: 7px 5px; + color: maroon; + font-size: 12pt; + + background: none; + border-width: 1px; + border-style: inset; + +} +div.pages a.selected { + color: #800; +} +hr { + border-width: 1px; + border-style: inset; +} +div.boardlist { + color: #B86; +} +div.boardlist a { + color: #800; +} +unimportant, .unimportant * { + font-size: 13px; +} +table.modlog tr th { + background: #EA8; +} diff --git a/stylesheets/img/testorange_bg.gif b/stylesheets/img/testorange_bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..79ed93b931225f81cf54c6eea3d278897fbe02de GIT binary patch literal 2618 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 JI~5!Z)&K)-KUn|( literal 0 HcmV?d00001 diff --git a/stylesheets/img/testorange_testo.png b/stylesheets/img/testorange_testo.png new file mode 100644 index 0000000000000000000000000000000000000000..3d91c159125e9a61b00a1ec27c641b67362b61af GIT binary patch literal 20588 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 literal 0 HcmV?d00001 diff --git a/stylesheets/img/testorange_top_bg.gif b/stylesheets/img/testorange_top_bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..c1d1828294769df41824d63387a4e3c94cbae35f GIT binary patch literal 6551 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 Mw+@X&!eHnB59N(})c^nh literal 0 HcmV?d00001 diff --git a/stylesheets/testorange.css b/stylesheets/testorange.css new file mode 100644 index 00000000..40f3585e --- /dev/null +++ b/stylesheets/testorange.css @@ -0,0 +1,208 @@ +/* +piwnichan style, based on testorange.css from Karachan */ + +body { + font-family: sans-serif; + font-size: 12px; + color:#bebebe; + + background-color: #1e1e1e; + background-image: url('img/testorange_testo.png'), url('img/testorange_top_bg.gif'), url('img/testorange_bg.gif'); + background-repeat: no-repeat, repeat-x, repeat; + background-attachment: fixed, scroll, scroll; + background-position: right bottom, 0% 0%, 0% 0%; +} + +a:link, a:visited, div.post.reply p.body a { + color:#ff9100; + text-decoration: none; +} +a:link:hover, a:visited:hover, div.post.reply p.body a:hover { + color:#ffff00; +} + +a.email span.name { + color:#ff9100 !important; + +} + +input { + color: #000; + background: #fff; +} +textarea { + background: #dedede url('img/testorange_textarea_bg.gif') repeat-x; +} +input, textarea { + border: 1px #fff solid; +} + +hr { + width: 100%; + height: 1px; + border: none; + background: #707070; + overflow: hidden; +} + +.reflink a:hover{ + font-weight: bold; +} +.adminbar { + text-align:right; + clear:both; + float:right; +} +h1 { + clear:both; + text-align:center; + font-size: 2.5em; + color:#ff9100; + width:100%; +} +div.title { + color:#ff9100; +} +div.banner, .replymode, .catalogmode { + text-align:center; + margin: 5px 0 5px 0; + padding: 5px 2px 5px 2px; + color:#000; + font-weight: bold; + width:100%; +} +.postblock, form table th { + color: #000; + font-size: 11px; + font-weight: bold; + text-align: center !important; +} + +.postarea { +} +.rules { + width: 468px; + font-size: 10px; +} +.rules li { + margin-left: 1em; +} +.footer { + text-align:center; + font-size:12px; +} +.passvalid { + text-align:center; + width:100%; + color:#ffffff; +} +.dellist { + font-weight: bold; + text-align:center; +} +.delbuttons { + text-align:center; + padding-bottom:4px; + +} +.managehead { + background-color: #1e1e1e; + color: #bebebe; + padding:0px; +} +.postlists { + background: #000; + width:100%; + padding:0px; + color: #bebebe; +} +.row1 { + background-color: #1e1e1e; + color: #bebebe; +} +.row2 { + background: #1e1e1e; + color: #bebebe; +} +.unkfunc { + background:inherit; + color:#789922; +} +.filesize { + text-decoration:none; +} +.filetitle { + background:inherit; + font-size:1.2em; + color: #bebebe; + font-weight:800; +} +span.name, .postername { + color:#fff !important; + font-weight:bold; +} +span.trip, .postertrip { + color:#707070; +} +.oldpost { + color:#CC1105; + font-weight:800; +} +.omittedposts { + color:#707070; +} +.reply { + padding: 5px; + border: 1px #707070 solid !important; + background: #282828 !important; + + -webkit-border-radius: 10px; + -khtml-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; +} +.replyhl { + background-color: #1e1e1e; + color: #bebebe; +} +.doubledash { + vertical-align:top; + clear:both; + float:left; +} +.replytitle { + font-size: 1.2em; + color:#fff; + font-weight:800; +} +.commentpostername { + color: #fff; + font-weight:800; +} +.thumbnailmsg { + font-size: small; + color: #bebebe; +} +form table th, div.banner, div.pages, .replymode, .postblock, .passvalid, .catalogmode { + background: #ff9100 url('img/testorange_f_bg.gif') repeat-x !important; +} +div.pages { + color: black; + border: 0; +} + +.abbrev { + color:#707070; +} +.highlight { + background:#000; + border: 1px dashed #ff9100; +} + +#watchedthreads { + background-color: #282828 !important; +} + +.reflinkpreview { + background-color: #282828 !important; +} + From d47bfe019b52f11fff3c5149b36cd905d07832cd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 20:00:57 +1100 Subject: [PATCH 20/71] readme --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index e69de29b..12b825eb 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,11 @@ +# Tinyboard Tools +This repository is a collection of management scripts, javascript addons, stylesheets and miscellaneous tools for [Tinyboard](http://github.com/savetheinternet/Tinyboard). + +## Directories +* ```tools/``` -- Command-line management scripts for Tinyboard. These should not be publicly executable. +* ```stylesheets/``` -- Additional stylesheets for Tinyboard, mainly user contributions. +* ```js/``` -- Useful Javascript addons for Tinyboard, such as "quick reply" and client-side "forced anonymous". Most of these can be included using ```$config['additional_javascript']```. + + +## License +The contents of this repository are licensed under the terms of [Tinyboard's license](https://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md) unless stated otherwise. From d3b1f4cfa31c6c5a451b0bc5df500c51a8d04186 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 20:19:35 +1100 Subject: [PATCH 21/71] Quick reply needs $config['quick_reply'] = true; --- js/quick-reply.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/quick-reply.js b/js/quick-reply.js index e963ca6e..f0587cd9 100644 --- a/js/quick-reply.js +++ b/js/quick-reply.js @@ -6,6 +6,7 @@ * Copyright (c) 2012 Michael Save * * Usage: + * $config['quick_reply'] = true; * $config['additional_javascript'][] = $config['root'] . 'jquery.min.js'; * $config['additional_javascript'][] = $config['root'] . 'quick-reply.js'; * From 9df2ce179e87694eed2be5bac4293f9cccaf7870 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 21:55:22 +1100 Subject: [PATCH 22/71] per-board javascript files --- tools/rebuild.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/rebuild.php b/tools/rebuild.php index 9099ffeb..56f94aa9 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -60,6 +60,8 @@ echo "Generating Javascript file...\n"; buildJavascript(); + $main_js = $config['file_script']; + $boards = listBoards(); foreach($boards as &$board) { @@ -69,6 +71,12 @@ echo "Creating index pages...\n"; buildIndex(); + if($config['file_script'] != $main_js) { + // different javascript file + echo "Generating Javascript file...\n"; + buildJavascript(); + } + $query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error()); while($post = $query->fetch()) { echo "Rebuilding #{$post['id']}...\n"; From 9daf12dccf19c772a4f40b3e65d9fa2b4f8888e9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 21:57:13 +1100 Subject: [PATCH 23/71] add jquery --- js/jquery.min.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 js/jquery.min.js diff --git a/js/jquery.min.js b/js/jquery.min.js new file mode 100644 index 00000000..b1b47b81 --- /dev/null +++ b/js/jquery.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); From 6d56e006007ce950b1211e627108367125f1ec78 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 22:04:27 +1100 Subject: [PATCH 24/71] use "Submit" for submit button if appropriate --- js/quick-reply.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/quick-reply.js b/js/quick-reply.js index f0587cd9..0062cd1e 100644 --- a/js/quick-reply.js +++ b/js/quick-reply.js @@ -17,7 +17,7 @@ $(document).ready(function(){ return; // not index txt_new_topic = $('form[name=post] input[type=submit]').val(); - txt_new_reply = 'New Reply'; + txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : 'New Reply'; undo_quick_reply = function() { $('div.banner').remove(); From b8fca6a3250436e185250dbe46cab418c2247052 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 23:32:49 +1100 Subject: [PATCH 25/71] Added Tinyboard-Kusabax --- README.md | 30 ---------------------------- kusabax.php => migration/kusabax.php | 0 2 files changed, 30 deletions(-) rename kusabax.php => migration/kusabax.php (100%) diff --git a/README.md b/README.md index 7b8951b4..12b825eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Tinyboard Tools This repository is a collection of management scripts, javascript addons, stylesheets and miscellaneous tools for [Tinyboard](http://github.com/savetheinternet/Tinyboard). @@ -10,32 +9,3 @@ This repository is a collection of management scripts, javascript addons, styles ## License The contents of this repository are licensed under the terms of [Tinyboard's license](https://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md) unless stated otherwise. -======= -# Kusaba X Database Migration - -## About -This script pulls board information, posts and images from an already existing [Kusaba X][k] installation and replicates them in [Tinyboard][o]. It should be helpful for those who already use Kusaba X][k], and want to switch over to Tinyboard. -[o]: http://tinyboard.org/ -[k]: http://kusabax.cultnet.net/ - -## Requirements - 1. [Tinyboard][o] >= v0.9.4 - -## Use - 1. Install Tinyboard (>= v0.9.4) normally. - 2. Download and place `kusabax.php` in the root folder of Tinyboard. - 3. Edit the script and fill in your Kusaba X configuration. You can find KU_RANDOMSEED from Kusaba X's config.php file. - 4. Run the script in a web browser. - -## What's copied? (in the future, more will be added.) - 1. Basic board information - 2. Posts - 3. News - -## Documentation -Visit the Tinyboard development wiki at for help. - -## License -See [LICENSE.md][l] for the license. -[l]: http://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md ->>>>>>> cce8b3955d5df03a6adca5e5e11d2bef039cc917 diff --git a/kusabax.php b/migration/kusabax.php similarity index 100% rename from kusabax.php rename to migration/kusabax.php From 65996db1c2e43d3e1f0c8e6c12391fbbcadbb099 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:39:04 +1100 Subject: [PATCH 26/71] KusabaX migration script is now compatible with v0.9.5 Do embedding, capcodes Cleaner config --- migration/kusabax.php | 116 +++++++++++++++++++++++++++++------------- 1 file changed, 81 insertions(+), 35 deletions(-) diff --git a/migration/kusabax.php b/migration/kusabax.php index eed12e0a..69579ffc 100755 --- a/migration/kusabax.php +++ b/migration/kusabax.php @@ -1,28 +1,36 @@  Array('timeout' => 5, 'persistent' => false)); - $kusabaxc['db']['type'] = 'mysql'; - $kusabaxc['db']['server'] = 'localhost'; - $kusabaxc['db']['user'] = ''; - $kusabaxc['db']['password'] = ''; - $kusabaxc['db']['database'] = ''; - // KusabaX table prefix - $kusabaxc['db']['prefix'] = ''; - // Anything more to add to the DSN string (eg. port=xxx;foo=bar) - $kusabaxc['db']['dsn'] = ''; - // From your KusabaX config; needed to decode IP addresses - $kusabaxc['randomseed'] = ''; //KU_RANDOMSEED - // KusabaX directory (without trailing slash) - $kusabaxc['root'] = '/var/www/kusabax'; + // Path to KusabaX configuration file + $kusabaxc['config'] = '../kusabax/config.php'; + + /* End config */ - /* End Config */ + $kusabaxc['config'] = '/home/savetheinternet/public_html/kusabax/config.php'; - if(empty($kusabaxc['db']['user'])) - die('Did you forget to configure the script?'); - // Infinite timeout - set_time_limit(0); + if(!isset($kusabaxc['config']) || empty($kusabaxc['config'])) + error('Did you forget to configure the script?'); + + // Load KusabaX config + require $kusabaxc['config']; + + if(KU_DBTYPE != 'mysql' && KU_DBTYPE != 'mysqli') + error('Database type ' . KU_DBTYPE . ' not supported!'); + + $kusabaxc['db']['type'] = 'mysql'; + $kusabaxc['db']['server'] = KU_DBHOST; + $kusabaxc['db']['user'] = KU_DBUSERNAME; + $kusabaxc['db']['password'] = KU_DBPASSWORD; + $kusabaxc['db']['database'] = KU_DBDATABASE; + $kusabaxc['db']['dsn'] = ''; + $kusabaxc['db']['timeout'] = 5; + $kusabaxc['db']['persistent'] = false; + // KusabaX functions function md5_decrypt($enc_text, $password, $iv_len = 16) { @@ -75,6 +83,8 @@ $__temp = $config['db']; $config['db'] = $kusabaxc['db']; + sql_open(); + // Get databse link $kusabax = $pdo; // Clear @@ -84,7 +94,7 @@ $config['db'] = $__temp; unset($__temp); - $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'boards`'); + $k_query = $kusabax->query('SELECT * FROM `' . KU_DBPREFIX . 'boards`'); $boards = listBoards(); // Copy boards table, briefly @@ -121,9 +131,8 @@ openBoard($board['name']); } - - $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'posts` WHERE `IS_DELETED` = 0'); - while($post = $k_query->fetch()) { + $k_query = $kusabax->query('SELECT `' . KU_DBPREFIX . 'posts`.*, `' . KU_DBPREFIX . '`.`type` FROM `' . KU_DBPREFIX . 'posts` LEFT JOIN `' . KU_DBPREFIX . 'staff` ON `posterauthority` = `' . KU_DBPREFIX . 'staff`.`id` WHERE `IS_DELETED` = 0') or error(db_error($kusabax)); + while($post = $k_query->fetch(PDO::FETCH_ASSOC)) { if(!isset($kusabax_boards[(int)$post['boardid']])) { // Board doesn't exist... continue; @@ -132,7 +141,10 @@ $log[] = 'Replicating post ' . $post['id'] . ' on /' . $board . '/'; - $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES (:id, :thread, :subject, :email, :name, :trip, :capcode, :body, :time, :bump, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed)", $board)); + $query = prepare(sprintf("INSERT INTO `posts_%s` VALUES + ( + :id, :thread, :subject, :email, :name, :trip, :capcode, :body, NULL, :time, :time, :thumb, :thumbwidth, :thumbheight, :file, :width, :height, :filesize, :filename, :filehash, :password, :ip, :sticky, :locked, 0, :embed + )", $board)); // Post ID $query->bindValue(':id', $post['id'], PDO::PARAM_INT); @@ -146,7 +158,7 @@ // Name if(empty($post['name'])) $post['name'] = $config['anonymous']; - $query->bindValue(':name', $post['name'], PDO::PARAM_INT); + $query->bindValue(':name', trim($post['name']), PDO::PARAM_STR); // Trip if(empty($post['tripcode'])) @@ -155,14 +167,16 @@ $query->bindValue(':trip', $post['tripcode'], PDO::PARAM_STR); // Email - $query->bindValue(':email', $post['email'], PDO::PARAM_STR); + $query->bindValue(':email', trim($post['email']), PDO::PARAM_STR); // Subject - $query->bindValue(':subject', $post['subject'], PDO::PARAM_STR); + $query->bindValue(':subject', trim($post['subject']), PDO::PARAM_STR); // Body (`message`) $query->bindValue(':body', convert_markup($post['message']), PDO::PARAM_STR); + $embed_code = false; + // File if(empty($post['file']) || $post['file'] == 'removed') { if($post['file'] == 'removed') @@ -177,6 +191,31 @@ $query->bindValue(':thumb', null, PDO::PARAM_NULL); $query->bindValue(':thumbwidth', null, PDO::PARAM_NULL); $query->bindValue(':thumbheight', null, PDO::PARAM_NULL); + } elseif($post['file_size'] == 0 && empty($post['file_md5'])) { + // embed + $query->bindValue(':file', null, PDO::PARAM_NULL); + $query->bindValue(':width', null, PDO::PARAM_NULL); + $query->bindValue(':height', null, PDO::PARAM_NULL); + $query->bindValue(':filesize', null, PDO::PARAM_NULL); + $query->bindValue(':filename', null, PDO::PARAM_NULL); + $query->bindValue(':filehash', null, PDO::PARAM_NULL); + $query->bindValue(':thumb', null, PDO::PARAM_NULL); + $query->bindValue(':thumbwidth', null, PDO::PARAM_NULL); + $query->bindValue(':thumbheight', null, PDO::PARAM_NULL); + + if($post['file_type'] == 'you') { + // youtube + + foreach($config['embedding'] as $embed) { + if(strpos($embed[0], 'youtube\.com') !== false) { + $embed_code = preg_replace($embed[0], $embed[1], 'http://youtube.com/watch?v=' . $post['file']); + $embed_code = str_replace('%%tb_width%%', $config['embed_width'], $embed_code); + $embed_code = str_replace('%%tb_height%%', $config['embed_height'], $embed_code); + + $query->bindValue(':embed', $embed_code, PDO::PARAM_STR); + } + } + } } else { $query->bindValue(':file', $post['file'] . '.' . $post['file_type'], PDO::PARAM_STR); $query->bindValue(':width', $post['image_w'], PDO::PARAM_INT); @@ -191,8 +230,8 @@ $query->bindValue(':thumbheight', $post['thumb_h'], PDO::PARAM_INT); // Copy file - $file_path = $kusabaxc['root'] . '/' . $board . '/src/' . $post['file'] . '.' . $post['file_type']; - $thumb_path = $kusabaxc['root'] . '/' . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; + $file_path = KU_BOARDSDIR . $board . '/src/' . $post['file'] . '.' . $post['file_type']; + $thumb_path = KU_BOARDSDIR . $board . '/thumb/' . $post['file'] . 's.' . $post['file_type']; $to_file_path = sprintf($config['board_path'], $board) . $config['dir']['img'] . $post['file'] . '.' . $post['file_type']; $to_thumb_path = sprintf($config['board_path'], $board) . $config['dir']['thumb'] . $post['file'] . '.' . $post['file_type']; @@ -214,8 +253,11 @@ } } + if(!$embed_code) + $query->bindValue(':embed', null, PDO::PARAM_NULL); + // IP - $ip = md5_decrypt($post['ip'], $kusabaxc['randomseed']); + $ip = md5_decrypt($post['ip'], KU_RANDOMSEED); if(!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $ip)) { // Invalid IP address. Wrong KU_RANDOMSEED? @@ -236,17 +278,21 @@ // Sticky $query->bindValue(':sticky', $post['stickied'], PDO::PARAM_INT); - // Stuff we can't do (yet) - $query->bindValue(':embed', null, PDO::PARAM_NULL); + // Impossible $query->bindValue(':password', null, PDO::PARAM_NULL); - $query->bindValue(':capcode', null, PDO::PARAM_NULL); + + if($post['posterauthority']) { + $query->bindValue(':capcode', $post['type'] == 1 ? 'Admin' : 'Mod', PDO::PARAM_STR); + } else { + $query->bindValue(':capcode', null, PDO::PARAM_NULL); + } // Insert post $query->execute() or $log[] = 'Error: ' . db_error($query); } // News - $k_query = $kusabax->query('SELECT * FROM `' . $kusabaxc['db']['prefix'] . 'front` WHERE `page` = 0'); + $k_query = $kusabax->query('SELECT * FROM `' . KU_DBPREFIX . 'front` WHERE `page` = 0'); while($news = $k_query->fetch()) { // Check if already exists $query = prepare("SELECT 1 FROM `news` WHERE `body` = :body AND `time` = :time"); @@ -264,7 +310,7 @@ $query->execute() or $log[] = 'Error: ' . db_error($query); } - $page['body'] = '

Migrating…

'; + $page['body'] = '

Migrating…

'; foreach($log as &$l) { $page['body'] .= $l . '
'; } From 4c9440b1d04bbe785e6b44a6325350da6c90f951 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:42:02 +1100 Subject: [PATCH 27/71] removed my config location from default --- migration/kusabax.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/migration/kusabax.php b/migration/kusabax.php index 69579ffc..789802f2 100755 --- a/migration/kusabax.php +++ b/migration/kusabax.php @@ -5,13 +5,17 @@ /* Config */ - // Path to KusabaX configuration file - $kusabaxc['config'] = '../kusabax/config.php'; + // Path to KusabaX configuration file (config.php) + $kusabaxc['config'] = ''; /* End config */ - $kusabaxc['config'] = '/home/savetheinternet/public_html/kusabax/config.php'; + require 'inc/functions.php'; + require 'inc/display.php'; + require 'inc/template.php'; + require 'inc/database.php'; + require 'inc/user.php'; if(!isset($kusabaxc['config']) || empty($kusabaxc['config'])) error('Did you forget to configure the script?'); @@ -65,11 +69,6 @@ return $body; } - require 'inc/functions.php'; - require 'inc/display.php'; - require 'inc/template.php'; - require 'inc/database.php'; - require 'inc/user.php'; $step = isset($_GET['step']) ? round($_GET['step']) : 0; $page = Array( 'config' => $config, From 2482723ff2f567c4b041f9f0840f34049f0881b7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:44:06 +1100 Subject: [PATCH 28/71] readme update: migration/ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12b825eb..ed3aca4c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This repository is a collection of management scripts, javascript addons, styles * ```tools/``` -- Command-line management scripts for Tinyboard. These should not be publicly executable. * ```stylesheets/``` -- Additional stylesheets for Tinyboard, mainly user contributions. * ```js/``` -- Useful Javascript addons for Tinyboard, such as "quick reply" and client-side "forced anonymous". Most of these can be included using ```$config['additional_javascript']```. - +* ```migration/``` -- Database migration scripts for other imageboards. ## License The contents of this repository are licensed under the terms of [Tinyboard's license](https://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md) unless stated otherwise. From 64c1f6821c90297cf3d1c4b8a4bbec6fe4449016 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 01:44:29 +1100 Subject: [PATCH 29/71] get_httpd_privileges() function for CLI scripts --- tools/inc/cli.php | 71 +++++++++++++++++++++++++++++++++++++++++++++++ tools/rebuild.php | 33 +--------------------- 2 files changed, 72 insertions(+), 32 deletions(-) diff --git a/tools/inc/cli.php b/tools/inc/cli.php index 5305c1ac..fbb3cfc5 100644 --- a/tools/inc/cli.php +++ b/tools/inc/cli.php @@ -1,5 +1,36 @@ -1, 'type' => ADMIN, @@ -7,4 +38,44 @@ $mod = Array( 'boards' => Array('*') ); +function get_httpd_privileges() { + global $config, $shell_path; + + if(php_sapi_name() != 'cli') + die("get_httpd_privileges(): invoked from HTTP client.\n"); + + echo "Dropping priviledges...\n"; + + if(!is_writable('.')) + die("get_httpd_privileges(): web directory is not writable\n"); + + if(!is_writable('inc/')) + die("get_httpd_privileges(): inc/ directory is not writable\n"); + + $filename = '.' . md5(rand()) . '.php'; + + echo "Copying rebuilder to web directory...\n"; + + copy($shell_path . '/' . $_SERVER['PHP_SELF'], $filename); + copy(__FILE__, 'inc/cli.php'); + + chmod($filename, 0666); + chmod('inc/cli.php', 0666); + + if(preg_match('/^https?:\/\//', $config['root'])) { + $url = $config['root'] . $filename; + } else { + // assume localhost + $url = 'http://localhost' . $config['root'] . $filename; + } + + echo "Downloading $url\n"; + + passthru('curl -s -N ' . escapeshellarg($url)); + + unlink($filename); + unlink('inc/cli.php'); + + exit(0); +} diff --git a/tools/rebuild.php b/tools/rebuild.php index 56f94aa9..0dfd9899 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -1,12 +1,5 @@ #!/usr/bin/php Date: Thu, 15 Mar 2012 02:11:38 +1100 Subject: [PATCH 30/71] $TINYBOARD_PATH environment varaible --- tools/inc/cli.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/inc/cli.php b/tools/inc/cli.php index fbb3cfc5..fcf1c26a 100644 --- a/tools/inc/cli.php +++ b/tools/inc/cli.php @@ -2,6 +2,7 @@ /* * This script will look for Tinyboard in the following places (in order): + * - $TINYBOARD_PATH environment varaible * - ./ * - ./Tinyboard/ * - ../ @@ -9,7 +10,9 @@ $shell_path = getcwd(); -if(file_exists('inc/functions.php')) +if(getenv('TINYBOARD_PATH') !== false) + $dir = getenv('TINYBOARD_PATH'); +elseif(file_exists('inc/functions.php')) $dir = false; elseif(file_exists('Tinyboard') && is_dir('Tinyboard') && file_exists('Tinyboard/inc/functions.php')) $dir = 'Tinyboard'; @@ -21,8 +24,12 @@ else if($dir && !chdir($dir)) die('Could not change directory to ' . $dir . '!'); -// follow symlink -chdir(realpath('inc') . '/..'); +if(!getenv('TINYBOARD_PATH')) { + // follow symlink + chdir(realpath('inc') . '/..'); +} + +echo 'Tinyboard: ' . getcwd() . "\n"; require 'inc/functions.php'; require 'inc/display.php'; From 9e20b4071f485e63b63d7c93249af00e8e2df3b0 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 03:14:09 +1100 Subject: [PATCH 31/71] copy environment when dropping privileges --- tools/inc/cli.php | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/inc/cli.php b/tools/inc/cli.php index fcf1c26a..8fdb6c39 100644 --- a/tools/inc/cli.php +++ b/tools/inc/cli.php @@ -8,6 +8,7 @@ * - ../ */ +set_time_limit(0); $shell_path = getcwd(); if(getenv('TINYBOARD_PATH') !== false) @@ -56,21 +57,33 @@ function get_httpd_privileges() { if(!is_writable('.')) die("get_httpd_privileges(): web directory is not writable\n"); - if(!is_writable('inc/')) - die("get_httpd_privileges(): inc/ directory is not writable\n"); - $filename = '.' . md5(rand()) . '.php'; + $inc_filename = '.' . md5(rand()) . '.php'; echo "Copying rebuilder to web directory...\n"; - copy($shell_path . '/' . $_SERVER['PHP_SELF'], $filename); - copy(__FILE__, 'inc/cli.php'); + // replace "/inc/cli.php" with its new filename + passthru("cat " . escapeshellarg($shell_path . '/' . $_SERVER['PHP_SELF']) . " | sed \"s/'\/inc\/cli\.php'/'\/{$inc_filename}'/\" > {$filename}"); + + // copy environment + $inc_header = " Date: Thu, 15 Mar 2012 03:15:45 +1100 Subject: [PATCH 32/71] remove redundant code --- tools/rebuild.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/rebuild.php b/tools/rebuild.php index 0dfd9899..29331ce4 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -2,13 +2,6 @@ -1, - 'type' => ADMIN, - 'username' => '?', - 'boards' => Array('*') - ); - $start = microtime(true); echo "== Tinyboard {$config['version']} ==\n"; From 8e101ab95659696d83f82c4ff7b7d92e60fce13e Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 04:55:59 +1100 Subject: [PATCH 33/71] banner-reload-helper.js --- js/banner-reload-helper.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 js/banner-reload-helper.js diff --git a/js/banner-reload-helper.js b/js/banner-reload-helper.js new file mode 100644 index 00000000..22d2106c --- /dev/null +++ b/js/banner-reload-helper.js @@ -0,0 +1,21 @@ +/* + * banner-reload-helper.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/banner-reload-helper.js + * + * For 4chon. + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = $config['root'] . 'banner-reload-helper.js'; + * + */ + +$(document).ready(function(){ + var img = document.getElementsByTagName('img')[0]; + if(img.className != 'banner') + return; + img.src = img.src + '?' + new Date().getTime(); +}); + From 70e7840566c46333cb93d00472d03f788a3668f8 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 05:04:08 +1100 Subject: [PATCH 34/71] . --- js/banner-reload-helper.js | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 js/banner-reload-helper.js diff --git a/js/banner-reload-helper.js b/js/banner-reload-helper.js deleted file mode 100644 index 22d2106c..00000000 --- a/js/banner-reload-helper.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * banner-reload-helper.js - * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/banner-reload-helper.js - * - * For 4chon. - * - * Released under the MIT license - * Copyright (c) 2012 Michael Save - * - * Usage: - * $config['additional_javascript'][] = $config['root'] . 'banner-reload-helper.js'; - * - */ - -$(document).ready(function(){ - var img = document.getElementsByTagName('img')[0]; - if(img.className != 'banner') - return; - img.src = img.src + '?' + new Date().getTime(); -}); - From 2bc3c10ee7abe34631323db01eefdfaa5b97d886 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 06:22:14 +1100 Subject: [PATCH 35/71] readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ed3aca4c..4eb22ca9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Tinyboard Tools -This repository is a collection of management scripts, javascript addons, stylesheets and miscellaneous tools for [Tinyboard](http://github.com/savetheinternet/Tinyboard). +This repository is a collection of management scripts, javascript addons, stylesheets, and miscellaneous tools for [Tinyboard](http://github.com/savetheinternet/Tinyboard). ## Directories * ```tools/``` -- Command-line management scripts for Tinyboard. These should not be publicly executable. @@ -9,3 +9,4 @@ This repository is a collection of management scripts, javascript addons, styles ## License The contents of this repository are licensed under the terms of [Tinyboard's license](https://github.com/savetheinternet/Tinyboard/blob/master/LICENSE.md) unless stated otherwise. + From ee54df825a71dab1bfb03fdf91138240f3110a9d Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 14:44:15 +1100 Subject: [PATCH 36/71] auto-reload.js: bringing AJAX to tinyboard --- js/auto-reload.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 js/auto-reload.js diff --git a/js/auto-reload.js b/js/auto-reload.js new file mode 100644 index 00000000..3789a136 --- /dev/null +++ b/js/auto-reload.js @@ -0,0 +1,33 @@ +/* + * auto-reload.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/auto-reload.js + * + * Brings AJAX to Tinyboard. + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = $config['root'] . 'auto-reload.js'; + * + */ + +$(document).ready(function(){ + if($('div.banner').length == 0) + return; // not index + + setInterval(function() { + $.ajax({ + url: document.location, + success: function(data) { + $(data).find('div.post.reply').each(function() { + var id = $(this).attr('id'); + if($('#' + id).length == 0) { + $(this).insertAfter($('div.reply:last').next()).after('
'); + } + }); + } + }); + }, 6000); +}); + From 34301da174acd3cfb326f03693657aeacd58be27 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 16:19:26 +1100 Subject: [PATCH 37/71] local-time.js: convert times into user's timezone --- js/auto-reload.js | 3 ++- js/forced-anon.js | 4 ++-- js/local-time.js | 42 ++++++++++++++++++++++++++++++++++++++++++ js/quick-reply.js | 4 ++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 js/local-time.js diff --git a/js/auto-reload.js b/js/auto-reload.js index 3789a136..70b4acc3 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -8,7 +8,8 @@ * Copyright (c) 2012 Michael Save * * Usage: - * $config['additional_javascript'][] = $config['root'] . 'auto-reload.js'; + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/auto-reload.js'; * */ diff --git a/js/forced-anon.js b/js/forced-anon.js index 86af4063..6949769d 100644 --- a/js/forced-anon.js +++ b/js/forced-anon.js @@ -6,8 +6,8 @@ * Copyright (c) 2012 Michael Save * * Usage: - * $config['additional_javascript'][] = $config['root'] . 'jquery.min.js'; - * $config['additional_javascript'][] = $config['root'] . 'forced-anon.js'; + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/forced-anon.js'; * */ diff --git a/js/local-time.js b/js/local-time.js new file mode 100644 index 00000000..6d0a163a --- /dev/null +++ b/js/local-time.js @@ -0,0 +1,42 @@ +/* + * local-time.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/local-time.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['quick_reply'] = true; + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/local-time.js'; + * + */ + +$(document).ready(function(){ + var iso8601 = function(s) { + s = s.replace(/\.\d\d\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + return new Date(s); + }; + var zeropad = function(num, count) { + return [Math.pow(10, count - num.toString().length), num].join('').substr(1); + }; + + $('time').each(function() { + if(!$(this).text().match(/^\d+\/\d+\/\d+ \(\w+\) \d+:\d+:\d+$/)) + return; + + var t = iso8601($(this).attr('datetime')); + + $(this).text( + // date + zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) + + " (" + ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][t.getDay()] + ") " + + // time + zeropad(t.getHours(), 2) + ":" + zeropad(t.getMinutes(), 2) + ":" + zeropad(t.getSeconds(), 2) + ); + }); +}); + diff --git a/js/quick-reply.js b/js/quick-reply.js index 0062cd1e..cc1a45a2 100644 --- a/js/quick-reply.js +++ b/js/quick-reply.js @@ -7,8 +7,8 @@ * * Usage: * $config['quick_reply'] = true; - * $config['additional_javascript'][] = $config['root'] . 'jquery.min.js'; - * $config['additional_javascript'][] = $config['root'] . 'quick-reply.js'; + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/quick-reply.js'; * */ From a3b3e1cc64ff79dc670e84e7843e99ad83a61676 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 16:42:58 +1100 Subject: [PATCH 38/71] Don't check for new posts unless user is scrolled past the most recent one. --- js/auto-reload.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 70b4acc3..83e9751e 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -18,6 +18,9 @@ $(document).ready(function(){ return; // not index setInterval(function() { + if($(window).scrollTop() + $(window).height() < $('div.post.reply:last').position().top + $('div.post.reply:last').height()) + return; // not scrolled past last reply + $.ajax({ url: document.location, success: function(data) { @@ -29,6 +32,6 @@ $(document).ready(function(){ }); } }); - }, 6000); + }, 5000); }); From 85cc117b33c70841e4a8dfba7f81b6d154cae109 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 17:05:33 +1100 Subject: [PATCH 39/71] post-hover.js --- js/post-hover.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 js/post-hover.js diff --git a/js/post-hover.js b/js/post-hover.js new file mode 100644 index 00000000..4771c42d --- /dev/null +++ b/js/post-hover.js @@ -0,0 +1,30 @@ +/* + * post-hover.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/post-hover.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/post-hover.js'; + * + */ + +$(document).ready(function(){ + $('p.body a:not([rel="nofollow"])').each(function() { + var id; + + if(id = $(this).text().match(/^>>(\d+)$/)) { + id = id[1]; + } + + var post = $('div.post#reply_' + id); + $(this).hover(function() { + post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-color')); + }, function() { + post.attr('style', ''); + }); + }); +}); + From 9fab9253a358c96a2fcfa5004da6018901467bf4 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:14:54 +1100 Subject: [PATCH 40/71] quick-post-controls.js --- js/quick-post-controls.js | 78 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 js/quick-post-controls.js diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js new file mode 100644 index 00000000..a9cade95 --- /dev/null +++ b/js/quick-post-controls.js @@ -0,0 +1,78 @@ +/* + * quick-posts-controls.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/quick-posts-controls.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/quick-post-controls.js'; + * + */ + +$(document).ready(function(){ + var open_form = function() { + var thread = $(this).parent().parent().hasClass('op'); + var id = $(this).attr('name').match(/^delete_(\d+)$/)[1]; + var submitButton; + + if(this.checked) { + var post_form = $('
' + + '

' + + (!thread ? '
' : '') + + + '' + + + ': ' + + '' + + '' + + '' + + ' ' + + + '
' + + + ': ' + + '' + + ' ' + + '
' + + ''); + post_form + .attr('action', $('form:first').attr('action')) + .append($('input[name=board]:first')) + .find('input:not([type="checkbox"]):not([type="submit"]):not([type="hidden"])').keypress(function(e) { + if(e.which == 13) { + e.preventDefault(); + if($(this).attr('name') == 'password') { + post_form.find('input[name=delete]').click(); + } else if($(this).attr('name') == 'reason') { + post_form.find('input[name=report]').click(); + } + + return false; + } + + return true; + }); + + if(thread) { + post_form.prependTo($(this).parent().parent().find('p.body')); + } else { + post_form.appendTo($(this).parent().parent()); + //post_form.insertBefore($(this)); + } + } else { + var elm = $(this).parent().parent().find('form'); + + if(elm.attr('class') == 'post-actions') + elm.remove(); + } + }; + + $('div.post input[type=checkbox].delete').each(function() { + $(this).change(open_form); + if(this.checked) + $(this).trigger('change'); + }); +}); + From f3d784de510fc550eb384a4cefe58c76f6e9c3f4 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:42:17 +1100 Subject: [PATCH 41/71] Fixed bug redeclaring gettext functions. Edit KusabaX config before including it. --- migration/kusabax.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/migration/kusabax.php b/migration/kusabax.php index 789802f2..1561214f 100755 --- a/migration/kusabax.php +++ b/migration/kusabax.php @@ -6,8 +6,9 @@ /* Config */ // Path to KusabaX configuration file (config.php) + // Warning: This script will ignore anything past the first `require`. This is only a problem if you've extensively modified your config.php $kusabaxc['config'] = ''; - + /* End config */ @@ -20,8 +21,25 @@ if(!isset($kusabaxc['config']) || empty($kusabaxc['config'])) error('Did you forget to configure the script?'); + if(!file_exists($kusabaxc['config']) || !is_readable($kusabaxc['config'])) + error('Kusaba X config file doesn\'t exist or I can\'t read it.'); + + $temp = tempnam($config['tmp'], 'kusabax'); + + $raw_config = file_get_contents($kusabaxc['config']); + + // replace __FILE__ with the actual filename + $raw_config = str_replace('__FILE__', '\'' . addslashes(realpath($kusabaxc['config'])) . '\'', $raw_config); + + // remove anything after the first `require` + $raw_config = substr($raw_config, 0, strpos($raw_config, 'require KU_ROOTDIR')); + + file_put_contents($temp, $raw_config); + // Load KusabaX config - require $kusabaxc['config']; + require $temp; + + unlink($temp); if(KU_DBTYPE != 'mysql' && KU_DBTYPE != 'mysqli') error('Database type ' . KU_DBTYPE . ' not supported!'); From ae848ef6663ec90c1e83f3729558c59547b2e0e7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:57:43 +1100 Subject: [PATCH 42/71] use border-right-color for firefox --- js/post-hover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/post-hover.js b/js/post-hover.js index 4771c42d..d151e5b3 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -21,7 +21,7 @@ $(document).ready(function(){ var post = $('div.post#reply_' + id); $(this).hover(function() { - post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-color')); + post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); }, function() { post.attr('style', ''); }); From af7b5b5d78b5981a2b47cea0afa614bc70a6c7f5 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 20:40:52 +1100 Subject: [PATCH 43/71] better scroll events --- js/auto-reload.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 83e9751e..5070c9ca 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -17,10 +17,9 @@ $(document).ready(function(){ if($('div.banner').length == 0) return; // not index - setInterval(function() { - if($(window).scrollTop() + $(window).height() < $('div.post.reply:last').position().top + $('div.post.reply:last').height()) - return; // not scrolled past last reply - + var poll_interval; + + var poll = function() { $.ajax({ url: document.location, success: function(data) { @@ -32,6 +31,20 @@ $(document).ready(function(){ }); } }); - }, 5000); + + poll_interval = setTimeout(poll, 5000); + }; + + $(window).scroll(function() { + if($(this).scrollTop() + $(this).height() < $('div.post.reply:last').position().top + $('div.post.reply:last').height()) { + clearTimeout(poll_interval); + poll_interval = false; + return; + } + + if(poll_interval === false) { + poll_interval = setTimeout(poll, 1500); + } + }).trigger('scroll'); }); From 224c7763076bc6c59aaddaa6fb47091b95ffb46e Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 22:16:26 +1100 Subject: [PATCH 44/71] pass command line arguments to http client --- tools/inc/cli.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/inc/cli.php b/tools/inc/cli.php index 8fdb6c39..1dcf12a6 100644 --- a/tools/inc/cli.php +++ b/tools/inc/cli.php @@ -30,7 +30,7 @@ if(!getenv('TINYBOARD_PATH')) { chdir(realpath('inc') . '/..'); } -echo 'Tinyboard: ' . getcwd() . "\n"; +putenv('TINYBOARD_PATH=' . getcwd()); require 'inc/functions.php'; require 'inc/display.php'; @@ -47,7 +47,7 @@ $mod = Array( ); function get_httpd_privileges() { - global $config, $shell_path; + global $config, $shell_path, $argv; if(php_sapi_name() != 'cli') die("get_httpd_privileges(): invoked from HTTP client.\n"); @@ -65,15 +65,18 @@ function get_httpd_privileges() { // replace "/inc/cli.php" with its new filename passthru("cat " . escapeshellarg($shell_path . '/' . $_SERVER['PHP_SELF']) . " | sed \"s/'\/inc\/cli\.php'/'\/{$inc_filename}'/\" > {$filename}"); - // copy environment $inc_header = " Date: Thu, 15 Mar 2012 22:37:43 +1100 Subject: [PATCH 45/71] rebuild.php command line switches (--quiet, --board, etc.) --- tools/rebuild.php | 80 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/tools/rebuild.php b/tools/rebuild.php index 29331ce4..0e63dc74 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -1,25 +1,56 @@ #!/usr/bin/php + * Rebuild only the specified board. + * + * -f, --full + * Rebuild replies as well as threads (re-markup). + * + */ + require dirname(__FILE__) . '/inc/cli.php'; - $start = microtime(true); - - echo "== Tinyboard {$config['version']} ==\n"; - if(!is_writable($config['file_script'])) { get_httpd_privileges(); } - echo "Clearing template cache...\n"; + $start = microtime(true); + + // parse command line + $opts = getopt('qfb:', Array('board:', 'quick', 'full', 'quiet')); + $options = Array(); + + $options['board'] = isset($opts['board']) ? $opts['board'] : (isset($opts['b']) ? $opts['b'] : false); + $options['quiet'] = isset($opts['q']) || isset($opts['quiet']); + $options['quick'] = isset($opts['quick']); + $options['full'] = isset($opts['full']) || isset($opts['f']); + + if(!$options['quiet']) + echo "== Tinyboard {$config['version']} ==\n"; + + if(!$options['quiet']) + echo "Clearing template cache...\n"; $twig = new Twig_Environment($loader, Array( 'cache' => "{$config['dir']['template']}/cache" )); $twig->clearCacheFiles(); - echo "Regenerating theme files...\n"; + if(!$options['quiet']) + echo "Regenerating theme files...\n"; rebuildThemes('all'); - echo "Generating Javascript file...\n"; + if(!$options['quiet']) + echo "Generating Javascript file...\n"; buildJavascript(); $main_js = $config['file_script']; @@ -27,26 +58,47 @@ $boards = listBoards(); foreach($boards as &$board) { - echo "Opening board /{$board['uri']}/...\n"; - openBoard($board['uri']); + if($options['board'] && $board['uri'] != $options['board']) + continue; - echo "Creating index pages...\n"; - buildIndex(); + if(!$options['quiet']) + echo "Opening board /{$board['uri']}/...\n"; + openBoard($board['uri']); if($config['file_script'] != $main_js) { // different javascript file - echo "Generating Javascript file...\n"; + if(!$options['quiet']) + echo "Generating Javascript file...\n"; buildJavascript(); } + + if(!$options['quiet']) + echo "Creating index pages...\n"; + buildIndex(); + + if($options['quick']) + continue; // do no more + + if($options['full']) { + $query = query(sprintf("SELECT `id` FROM `posts_%s`", $board['uri'])) or error(db_error()); + while($post = $query->fetch()) { + if(!$options['quiet']) + echo "Rebuilding #{$post['id']}...\n"; + rebuildPost($post['id']); + } + } + $query = query(sprintf("SELECT `id` FROM `posts_%s` WHERE `thread` IS NULL", $board['uri'])) or error(db_error()); while($post = $query->fetch()) { - echo "Rebuilding #{$post['id']}...\n"; + if(!$options['quiet']) + echo "Rebuilding #{$post['id']}...\n"; buildThread($post['id']); } } - printf("Complete! Took %g seconds\n", microtime(true) - $start); + if(!$options['quiet']) + printf("Complete! Took %g seconds\n", microtime(true) - $start); modLog('Rebuilt everything using tools/rebuild.php'); From 53f4bf6136c99e4ca4099357173226c229885844 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 02:04:17 +1100 Subject: [PATCH 46/71] quick-posts-controls.js: Fill in password automatically. fix-report-delete-submit.js --- js/fix-report-delete-submit.js | 26 ++++++++++++++++++++++++++ js/quick-post-controls.js | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 js/fix-report-delete-submit.js diff --git a/js/fix-report-delete-submit.js b/js/fix-report-delete-submit.js new file mode 100644 index 00000000..e950721f --- /dev/null +++ b/js/fix-report-delete-submit.js @@ -0,0 +1,26 @@ +/* + * fix-report-delete-submit.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/fix-report-delete-submit.js + * + * Fixes a known bug regarding the delete/report submit buttons. + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/fix-report-delete-submit.js'; + * + */ + +$(document).ready(function(){ + $('form[name="postcontrols"] div.delete input:not([type="checkbox"]):not([type="submit"]):not([type="hidden"])').keypress(function(e) { + if(e.which == 13) { + e.preventDefault(); + $(this).next().click(); + return false; + } + return true; + }); +}); + diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js index a9cade95..f9e53be1 100644 --- a/js/quick-post-controls.js +++ b/js/quick-post-controls.js @@ -18,7 +18,7 @@ $(document).ready(function(){ var submitButton; if(this.checked) { - var post_form = $('
' + + var post_form = $('' + '
' + (!thread ? '
' : '') + @@ -55,6 +55,8 @@ $(document).ready(function(){ return true; }); + post_form.find('input[type="password"]').val(localStorage.password); + if(thread) { post_form.prependTo($(this).parent().parent().find('p.body')); } else { From f48d338ce051070a0eb096ab5cac073f19467549 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:08:03 +1100 Subject: [PATCH 47/71] $('div.post.reply:last') is too specific; use $('div.post:last') or else it won't include the OP --- js/auto-reload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 5070c9ca..0921c36d 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -26,7 +26,7 @@ $(document).ready(function(){ $(data).find('div.post.reply').each(function() { var id = $(this).attr('id'); if($('#' + id).length == 0) { - $(this).insertAfter($('div.reply:last').next()).after('
'); + $(this).insertAfter($('div.post:last').next()).after('
'); } }); } @@ -36,7 +36,7 @@ $(document).ready(function(){ }; $(window).scroll(function() { - if($(this).scrollTop() + $(this).height() < $('div.post.reply:last').position().top + $('div.post.reply:last').height()) { + if($(this).scrollTop() + $(this).height() < $('div.post:last').position().top + $('div.post:last').height()) { clearTimeout(poll_interval); poll_interval = false; return; From a5739602296251b698aab834205829ac37edca1b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:29:58 +1100 Subject: [PATCH 48/71] show actual posts instead of highlighting them --- js/post-hover.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index d151e5b3..06dd55a2 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -20,10 +20,22 @@ $(document).ready(function(){ } var post = $('div.post#reply_' + id); - $(this).hover(function() { - post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); + $(this).hover(function(e) { + post.clone() + .attr('id', 'post-hover-' + id) + .addClass('post-hover') + .css('position', 'absolute') + .css('left', e.pageX + 15) + .css('top', e.pageY - post.height() - 15) + .css('border-style', 'solid') + .css('box-shadow', '1px 1px 1px #999') + .insertAfter($(this).parent()); }, function() { - post.attr('style', ''); + $('.post-hover').remove(); + }).mousemove(function(e) { + $('#post-hover-' + id) + .css('left', e.pageX + 15) + .css('top', e.pageY - post.height() - 15); }); }); }); From 1d7381554d3647c92db3b8b1b1f7a96d6f2653dd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:42:17 +1100 Subject: [PATCH 49/71] Don't show post when it's already in view. Highlight it instead. --- js/post-hover.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 06dd55a2..335e3ac4 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -20,17 +20,26 @@ $(document).ready(function(){ } var post = $('div.post#reply_' + id); + if(post.length == 0) + return; + $(this).hover(function(e) { - post.clone() - .attr('id', 'post-hover-' + id) - .addClass('post-hover') - .css('position', 'absolute') - .css('left', e.pageX + 15) - .css('top', e.pageY - post.height() - 15) - .css('border-style', 'solid') - .css('box-shadow', '1px 1px 1px #999') - .insertAfter($(this).parent()); + if($(window).scrollTop() <= post.offset().top + post.height()) { + // post is in view + post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); + } else { + post.clone() + .attr('id', 'post-hover-' + id) + .addClass('post-hover') + .css('position', 'absolute') + .css('left', e.pageX + 15) + .css('top', e.pageY - post.height() - 15) + .css('border-style', 'solid') + .css('box-shadow', '1px 1px 1px #999') + .insertAfter($(this).parent()); + } }, function() { + post.attr('style', ''); $('.post-hover').remove(); }).mousemove(function(e) { $('#post-hover-' + id) From 34fc25f71629a52f76c4c48bc543eb65835ca40b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:48:37 +1100 Subject: [PATCH 50/71] clip to top --- js/post-hover.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 335e3ac4..89808f54 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -32,19 +32,19 @@ $(document).ready(function(){ .attr('id', 'post-hover-' + id) .addClass('post-hover') .css('position', 'absolute') - .css('left', e.pageX + 15) - .css('top', e.pageY - post.height() - 15) .css('border-style', 'solid') .css('box-shadow', '1px 1px 1px #999') .insertAfter($(this).parent()); + $(this).trigger('mousemove'); } }, function() { post.attr('style', ''); $('.post-hover').remove(); }).mousemove(function(e) { + var top = e.pageY - post.height() - 15; $('#post-hover-' + id) - .css('left', e.pageX + 15) - .css('top', e.pageY - post.height() - 15); + .css('left', $(this).width() + e.pageX) + .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()); }); }); }); From ccf17c3d6f0bf8ef28308f31369bacda6ecc41a2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 20:22:26 +1100 Subject: [PATCH 51/71] quick-post-controls.js: clone input element or Tinyboard will consider everyone a bot when posting --- js/quick-post-controls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js index f9e53be1..90a46cd9 100644 --- a/js/quick-post-controls.js +++ b/js/quick-post-controls.js @@ -39,7 +39,7 @@ $(document).ready(function(){ ''); post_form .attr('action', $('form:first').attr('action')) - .append($('input[name=board]:first')) + .append($('input[name=board]:first').clone()) .find('input:not([type="checkbox"]):not([type="submit"]):not([type="hidden"])').keypress(function(e) { if(e.which == 13) { e.preventDefault(); From 50624ba5ce953552c98f3042de4664d6ec0879e3 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:40:15 +1100 Subject: [PATCH 52/71] Use AJAX to fetch posts that aren't on the current page. --- js/post-hover.js | 53 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 89808f54..0d0f3bb1 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -19,31 +19,52 @@ $(document).ready(function(){ id = id[1]; } - var post = $('div.post#reply_' + id); - if(post.length == 0) - return; - + var post = false; $(this).hover(function(e) { - if($(window).scrollTop() <= post.offset().top + post.height()) { - // post is in view - post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); + var start_hover = function(link) { + if(post.is(':visible') && $(window).scrollTop() <= post.offset().top + post.height()) { + // post is in view + post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); + } else { + post.clone() + .attr('id', 'post-hover-' + id) + .addClass('post-hover') + .css('position', 'absolute') + .css('border-style', 'solid') + .css('box-shadow', '1px 1px 1px #999') + .css('display', 'block') + .insertAfter($(link).parent()); + $(link).trigger('mousemove'); + } + }; + + post = $('div.post#reply_' + id); + if(post.length > 0) { + start_hover(this); } else { - post.clone() - .attr('id', 'post-hover-' + id) - .addClass('post-hover') - .css('position', 'absolute') - .css('border-style', 'solid') - .css('box-shadow', '1px 1px 1px #999') - .insertAfter($(this).parent()); - $(this).trigger('mousemove'); + var link = this; + $.ajax({ + url: $(this).attr('href'), + context: document.body, + success: function(data) { + post = $('div.post:first').prepend($(data).find('div.post#reply_' + id).css('display', 'none').addClass('hidden')).find('div.post#reply_' + id); + start_hover(link, post); + } + }); } }, function() { + if(!post) + return; post.attr('style', ''); + if(post.hasClass('hidden')) + post.css('display', 'none'); $('.post-hover').remove(); }).mousemove(function(e) { + if(!post) + return; var top = e.pageY - post.height() - 15; $('#post-hover-' + id) - .css('left', $(this).width() + e.pageX) + .css('left', e.pageX) .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()); }); }); From 68e873315a0104968a722b7814ad1ce1c62243dd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:45:38 +1100 Subject: [PATCH 53/71] Ensure no double-fetching of posts. --- js/post-hover.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/post-hover.js b/js/post-hover.js index 0d0f3bb1..39c4aca6 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -12,6 +12,7 @@ */ $(document).ready(function(){ + var dont_fetch_again = []; $('p.body a:not([rel="nofollow"])').each(function() { var id; @@ -43,6 +44,12 @@ $(document).ready(function(){ start_hover(this); } else { var link = this; + + if($.inArray($(this).attr('href'), dont_fetch_again) != -1) { + return; + } + + dont_fetch_again.push($(this).attr('href')); $.ajax({ url: $(this).attr('href'), context: document.body, From e34de4e09dc8bdb8fad59b08348d60e9e0a694e9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:46:44 +1100 Subject: [PATCH 54/71] Allow post-hover.js to work with forced-anon.js --- js/forced-anon.js | 2 +- js/post-hover.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/forced-anon.js b/js/forced-anon.js index 6949769d..0f7f1c70 100644 --- a/js/forced-anon.js +++ b/js/forced-anon.js @@ -12,7 +12,7 @@ */ $(document).ready(function(){ - var enable_fa = function() { + enable_fa = function() { $('p.intro label').each(function() { if($(this).children('a.capcode').length == 0) { var id = $(this).parent().children('a.post_no:eq(1)').text(); diff --git a/js/post-hover.js b/js/post-hover.js index 39c4aca6..d7d567cd 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -55,6 +55,8 @@ $(document).ready(function(){ context: document.body, success: function(data) { post = $('div.post:first').prepend($(data).find('div.post#reply_' + id).css('display', 'none').addClass('hidden')).find('div.post#reply_' + id); + if(localStorage['forcedanon']) + enable_fa(); start_hover(link, post); } }); From 134146e32cc873b6a8a74a4b2084ad9ae984f8e2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:51:45 +1100 Subject: [PATCH 55/71] Allow post-hover.js to work /without/ forced-anon.js... --- js/post-hover.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index d7d567cd..5e5f4bab 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -54,8 +54,10 @@ $(document).ready(function(){ url: $(this).attr('href'), context: document.body, success: function(data) { - post = $('div.post:first').prepend($(data).find('div.post#reply_' + id).css('display', 'none').addClass('hidden')).find('div.post#reply_' + id); - if(localStorage['forcedanon']) + post = $('div.post:first') + .prepend($(data).find('div.post#reply_' + id).css('display', 'none').addClass('hidden')) + .find('div.post#reply_' + id); + if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) enable_fa(); start_hover(link, post); } From ce25db62ea6064069414d0f5b2bb53132a51c328 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:54:08 +1100 Subject: [PATCH 56/71] css bug --- js/post-hover.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/post-hover.js b/js/post-hover.js index 5e5f4bab..e8b0c9b0 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -27,6 +27,8 @@ $(document).ready(function(){ // post is in view post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); } else { + var top = e.pageY - post.height() - 15; + post.clone() .attr('id', 'post-hover-' + id) .addClass('post-hover') @@ -34,6 +36,8 @@ $(document).ready(function(){ .css('border-style', 'solid') .css('box-shadow', '1px 1px 1px #999') .css('display', 'block') + .css('left', e.pageX) + .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()) .insertAfter($(link).parent()); $(link).trigger('mousemove'); } @@ -59,7 +63,7 @@ $(document).ready(function(){ .find('div.post#reply_' + id); if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) enable_fa(); - start_hover(link, post); + start_hover(link); } }); } From a2ac54e01ee8a9176ba5054d453fc5f2a3662908 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 08:09:24 +1100 Subject: [PATCH 57/71] Check if post is below viewable region. --- js/post-hover.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index e8b0c9b0..808570c5 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -21,9 +21,15 @@ $(document).ready(function(){ } var post = false; + var hovering = false; $(this).hover(function(e) { + hovering = true; + var start_hover = function(link) { - if(post.is(':visible') && $(window).scrollTop() <= post.offset().top + post.height()) { + if(post.is(':visible') && + post.offset().top + post.height() >= $(window).scrollTop() && + post.offset().top <= $(window).scrollTop() + $(window).height() + ) { // post is in view post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); } else { @@ -44,6 +50,7 @@ $(document).ready(function(){ }; post = $('div.post#reply_' + id); + console.log(post); if(post.length > 0) { start_hover(this); } else { @@ -63,13 +70,16 @@ $(document).ready(function(){ .find('div.post#reply_' + id); if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) enable_fa(); - start_hover(link); + if(hovering) + start_hover(link); } }); } }, function() { + hovering = false; if(!post) return; + post.attr('style', ''); if(post.hasClass('hidden')) post.css('display', 'none'); From bf7fd32c21762803bf22d2e55a0e07334b2b9139 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 08:12:47 +1100 Subject: [PATCH 58/71] start_hover() causing weird positing issues when using AJAX method --- js/post-hover.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 808570c5..f9e032aa 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -42,8 +42,6 @@ $(document).ready(function(){ .css('border-style', 'solid') .css('box-shadow', '1px 1px 1px #999') .css('display', 'block') - .css('left', e.pageX) - .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()) .insertAfter($(link).parent()); $(link).trigger('mousemove'); } @@ -52,10 +50,9 @@ $(document).ready(function(){ post = $('div.post#reply_' + id); console.log(post); if(post.length > 0) { - start_hover(this); + start_hover(this, e); } else { var link = this; - if($.inArray($(this).attr('href'), dont_fetch_again) != -1) { return; } From 443c79047be865c747bb7e47f685d041cde85e28 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 10:59:14 +1100 Subject: [PATCH 59/71] post-hover.js: Fix position on AJAX. Fetch all replies when using AJAX. --- js/post-hover.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index f9e032aa..d68c103d 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -22,8 +22,10 @@ $(document).ready(function(){ var post = false; var hovering = false; + var hovered_at; $(this).hover(function(e) { hovering = true; + hovered_at = {'x': e.pageX, 'y': e.pageY}; var start_hover = function(link) { if(post.is(':visible') && @@ -33,8 +35,6 @@ $(document).ready(function(){ // post is in view post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color')); } else { - var top = e.pageY - post.height() - 15; - post.clone() .attr('id', 'post-hover-' + id) .addClass('post-hover') @@ -48,26 +48,28 @@ $(document).ready(function(){ }; post = $('div.post#reply_' + id); - console.log(post); if(post.length > 0) { - start_hover(this, e); + start_hover(this); } else { var link = this; - if($.inArray($(this).attr('href'), dont_fetch_again) != -1) { + var url = $(this).attr('href').replace(/#.*$/, ''); + + if($.inArray(url, dont_fetch_again) != -1) { return; } + dont_fetch_again.push(url); - dont_fetch_again.push($(this).attr('href')); $.ajax({ - url: $(this).attr('href'), + url: url, context: document.body, success: function(data) { - post = $('div.post:first') - .prepend($(data).find('div.post#reply_' + id).css('display', 'none').addClass('hidden')) - .find('div.post#reply_' + id); + $('div.post:first').prepend($(data).find('div.post.reply').css('display', 'none').addClass('hidden')); + if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) enable_fa(); - if(hovering) + + post = $('div.post#reply_' + id); + if(hovering && post.length > 0) start_hover(link); } }); @@ -84,9 +86,11 @@ $(document).ready(function(){ }).mousemove(function(e) { if(!post) return; - var top = e.pageY - post.height() - 15; + + var top = (e.pageY ? e.pageY : hovered_at['y']) - 10; + $('#post-hover-' + id) - .css('left', e.pageX) + .css('left', (e.pageX ? e.pageX : hovered_at['x'])) .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()); }); }); From de5e7e27ece1b91f58302e918cafb38adf6584f7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 11:10:59 +1100 Subject: [PATCH 60/71] Don't clone replies we can already see. That will break stuff. --- js/post-hover.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/post-hover.js b/js/post-hover.js index d68c103d..68dfc98e 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -63,7 +63,10 @@ $(document).ready(function(){ url: url, context: document.body, success: function(data) { - $('div.post:first').prepend($(data).find('div.post.reply').css('display', 'none').addClass('hidden')); + $(data).find('div.post.reply').each(function() { + if($('#' + $(this).attr('id')).length == 0) + $('div.post:first').prepend($(this).css('display', 'none').addClass('hidden')); + }); if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) enable_fa(); From c36d654a083913d186442bb639212e9531b9dec1 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 11:33:20 +1100 Subject: [PATCH 61/71] Clip post to page borders. --- js/post-hover.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index 68dfc98e..f6ac69aa 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -90,11 +90,20 @@ $(document).ready(function(){ if(!post) return; + var hover = $('#post-hover-' + id); + if(hover.length == 0) + return; + var top = (e.pageY ? e.pageY : hovered_at['y']) - 10; - $('#post-hover-' + id) - .css('left', (e.pageX ? e.pageX : hovered_at['x'])) - .css('top', top > $(window).scrollTop() ? top : $(window).scrollTop()); + if(e.pageY < $(window).scrollTop() + 15) { + top = $(window).scrollTop(); + } else if(e.pageY > $(window).scrollTop() + $(window).height() - hover.height() - 15) { + top = $(window).scrollTop() + $(window).height() - hover.height() - 15; + } + + + hover.css('left', (e.pageX ? e.pageX : hovered_at['x'])).css('top', top); }); }); }); From 7d3938458175f03d0ca864bd4d08bc7f03306581 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 00:36:51 +1100 Subject: [PATCH 62/71] Don't forget new lines on error. --- tools/inc/cli.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/inc/cli.php b/tools/inc/cli.php index 1dcf12a6..4dc19412 100644 --- a/tools/inc/cli.php +++ b/tools/inc/cli.php @@ -20,10 +20,10 @@ elseif(file_exists('Tinyboard') && is_dir('Tinyboard') && file_exists('Tinyboard elseif(file_exists('../inc/functions.php')) $dir = '..'; else - die('Could not locate Tinyboard directory!'); + die("Could not locate Tinyboard directory!\n"); if($dir && !chdir($dir)) - die('Could not change directory to ' . $dir . '!'); + die("Could not change directory to {$dir}\n"); if(!getenv('TINYBOARD_PATH')) { // follow symlink From 0c8941fc5b463c4d8225e314ffd5da517953f98a Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 01:00:58 +1100 Subject: [PATCH 63/71] benchmark.php: Benchmark thumbnailing methods --- tools/benchmark.php | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 tools/benchmark.php diff --git a/tools/benchmark.php b/tools/benchmark.php new file mode 100755 index 00000000..60aba638 --- /dev/null +++ b/tools/benchmark.php @@ -0,0 +1,52 @@ +#!/usr/bin/php +resize( + $config['thumb_ext'] ? $config['thumb_ext'] : $extension, + $config['thumb_width'], + $config['thumb_height'] + ); + + $thumb->to($out); + $thumb->_destroy(); + $image->destroy(); + } + $end = microtime(true); + + printf("Took %.2f seconds (%.2f/second; %.2f ms)\n", $end - $start, $rate = ($count / ($end - $start)), 1000 / $rate); + + unlink($out); + } + + benchmark('gd'); + benchmark('imagick'); + benchmark('convert'); + From 8208d7151bc952462c9220304877525dcc398cea Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 20:47:45 +1100 Subject: [PATCH 64/71] Close board before writing modlog entry. --- tools/rebuild.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/rebuild.php b/tools/rebuild.php index 0e63dc74..1560893c 100755 --- a/tools/rebuild.php +++ b/tools/rebuild.php @@ -100,5 +100,6 @@ if(!$options['quiet']) printf("Complete! Took %g seconds\n", microtime(true) - $start); + unset($board); modLog('Rebuilt everything using tools/rebuild.php'); From 21a1152ebead57c60c76c341d4f8ec8bc737949b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 23:55:01 +1100 Subject: [PATCH 65/71] custom event for new posts, so auto-reload.js etc will work with forced-anon.js and post-hover.js --- js/auto-reload.js | 3 ++- js/forced-anon.js | 42 ++++++++++++++++++++++++------------------ js/post-hover.js | 24 +++++++++++++++--------- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 0921c36d..44a4b9be 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -27,12 +27,13 @@ $(document).ready(function(){ var id = $(this).attr('id'); if($('#' + id).length == 0) { $(this).insertAfter($('div.post:last').next()).after('
'); + $(document).trigger('new_post', this); } }); } }); - poll_interval = setTimeout(poll, 5000); + poll_interval = setTimeout(poll, 500); }; $(window).scroll(function() { diff --git a/js/forced-anon.js b/js/forced-anon.js index 0f7f1c70..9b9df1eb 100644 --- a/js/forced-anon.js +++ b/js/forced-anon.js @@ -11,24 +11,26 @@ * */ -$(document).ready(function(){ - enable_fa = function() { - $('p.intro label').each(function() { - if($(this).children('a.capcode').length == 0) { - var id = $(this).parent().children('a.post_no:eq(1)').text(); - - if($(this).children('a.email').length != 0) - var p = $(this).children('a.email'); - else - var p = $(this); - - old_info[id] = {'name': p.children('span.name').text(), 'trip': p.children('span.trip').text()}; - - p.children('span.name').text('Anonymous'); - if(p.children('span.trip').length != 0) - p.children('span.trip').text(''); - } - }); +$(document).ready(function() { + var force_anon = function() { + if($(this).children('a.capcode').length == 0) { + var id = $(this).parent().children('a.post_no:eq(1)').text(); + + if($(this).children('a.email').length != 0) + var p = $(this).children('a.email'); + else + var p = $(this); + + old_info[id] = {'name': p.children('span.name').text(), 'trip': p.children('span.trip').text()}; + + p.children('span.name').text('Anonymous'); + if(p.children('span.trip').length != 0) + p.children('span.trip').text(''); + } + }; + + var enable_fa = function() { + $('p.intro label').each(force_anon); }; var disable_fa = function() { @@ -75,5 +77,9 @@ $(document).ready(function(){ if(forced_anon) enable_fa(); + $(document).bind('new_post', function(e, post) { + if(forced_anon) + $(post).find('p.intro label').each(force_anon); + }); }); diff --git a/js/post-hover.js b/js/post-hover.js index f6ac69aa..c76ca0d8 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -13,17 +13,19 @@ $(document).ready(function(){ var dont_fetch_again = []; - $('p.body a:not([rel="nofollow"])').each(function() { + var init_hover = function() { + var link = $(this); + var id; - if(id = $(this).text().match(/^>>(\d+)$/)) { + if(id = $(link).text().match(/^>>(\d+)$/)) { id = id[1]; } var post = false; var hovering = false; var hovered_at; - $(this).hover(function(e) { + $(link).hover(function(e) { hovering = true; hovered_at = {'x': e.pageX, 'y': e.pageY}; @@ -52,7 +54,7 @@ $(document).ready(function(){ start_hover(this); } else { var link = this; - var url = $(this).attr('href').replace(/#.*$/, ''); + var url = $(link).attr('href').replace(/#.*$/, ''); if($.inArray(url, dont_fetch_again) != -1) { return; @@ -64,13 +66,10 @@ $(document).ready(function(){ context: document.body, success: function(data) { $(data).find('div.post.reply').each(function() { - if($('#' + $(this).attr('id')).length == 0) - $('div.post:first').prepend($(this).css('display', 'none').addClass('hidden')); + if($('#' + $(link).attr('id')).length == 0) + $('div.post:first').prepend($(link).css('display', 'none').addClass('hidden')); }); - if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) - enable_fa(); - post = $('div.post#reply_' + id); if(hovering && post.length > 0) start_hover(link); @@ -105,6 +104,13 @@ $(document).ready(function(){ hover.css('left', (e.pageX ? e.pageX : hovered_at['x'])).css('top', top); }); + }; + + $('p.body a:not([rel="nofollow"])').each(init_hover); + + // allow to work with auto-reload.js, etc. + $(document).bind('new_post', function(e, post) { + $(post).find('p.body a:not([rel="nofollow"])').each(init_hover); }); }); From d38801fc4ed63e6caa4d4a39b88c1d250a09b6b9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 23:57:38 +1100 Subject: [PATCH 66/71] auto-reload.js: poll every 5 seconds, not 500 ms --- js/auto-reload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/auto-reload.js b/js/auto-reload.js index 44a4b9be..f6981bdf 100644 --- a/js/auto-reload.js +++ b/js/auto-reload.js @@ -33,7 +33,7 @@ $(document).ready(function(){ } }); - poll_interval = setTimeout(poll, 500); + poll_interval = setTimeout(poll, 5000); }; $(window).scroll(function() { From 741e30e22fd05ebbb7eea969f919ea1573db815a Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:11:55 +1100 Subject: [PATCH 67/71] post-hover.js: Fixed bug on index pages --- js/post-hover.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/js/post-hover.js b/js/post-hover.js index c76ca0d8..7e085e97 100644 --- a/js/post-hover.js +++ b/js/post-hover.js @@ -53,8 +53,7 @@ $(document).ready(function(){ if(post.length > 0) { start_hover(this); } else { - var link = this; - var url = $(link).attr('href').replace(/#.*$/, ''); + var url = link.attr('href').replace(/#.*$/, ''); if($.inArray(url, dont_fetch_again) != -1) { return; @@ -66,13 +65,15 @@ $(document).ready(function(){ context: document.body, success: function(data) { $(data).find('div.post.reply').each(function() { - if($('#' + $(link).attr('id')).length == 0) - $('div.post:first').prepend($(link).css('display', 'none').addClass('hidden')); + if($('#' + $(this).attr('id')).length == 0) + $('div.post:first').prepend($(this).css('display', 'none').addClass('hidden')); + }); post = $('div.post#reply_' + id); - if(hovering && post.length > 0) + if(hovering && post.length > 0) { start_hover(link); + } } }); } From 8afaba9a810f28e49c52229c1e89a101c7839453 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:33:06 +1100 Subject: [PATCH 68/71] show-mentions.js --- js/show-mentions.js | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 js/show-mentions.js diff --git a/js/show-mentions.js b/js/show-mentions.js new file mode 100644 index 00000000..8fe938de --- /dev/null +++ b/js/show-mentions.js @@ -0,0 +1,37 @@ +/* + * show-mentions.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/show-mentions.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = 'js/show-mentions.js'; + * + */ + +$(document).ready(function(){ + $('div.post.reply').each(function() { + var reply_id = $(this).attr('id').replace(/^reply_/, ''); + + $(this).find('p.body a:not([rel="nofollow"])').each(function() { + var id, post, mentioned; + + if(id = $(this).text().match(/^>>(\d+)$/)) + id = id[1]; + else + return; + + post = $('#reply_' + id); + if(post.length == 0) + return; + + mentioned = post.find('p.intro span.mentioned'); + if(mentioned.length == 0) + mentioned = $('').appendTo(post.find('p.intro')); + + mentioned.append('>>' + reply_id + ''); + }); + }); +}); + From d0e20ca71f24f783a515437e58bfedc52faa2e00 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:48:06 +1100 Subject: [PATCH 69/71] show-mentions.js -> show-backlinks.js --- js/{show-mentions.js => show-backlinks.js} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename js/{show-mentions.js => show-backlinks.js} (88%) diff --git a/js/show-mentions.js b/js/show-backlinks.js similarity index 88% rename from js/show-mentions.js rename to js/show-backlinks.js index 8fe938de..da55845a 100644 --- a/js/show-mentions.js +++ b/js/show-backlinks.js @@ -1,12 +1,12 @@ /* - * show-mentions.js - * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/show-mentions.js + * show-backlinks.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/show-backlinks.js * * Released under the MIT license * Copyright (c) 2012 Michael Save * * Usage: - * $config['additional_javascript'][] = 'js/show-mentions.js'; + * $config['additional_javascript'][] = 'js/show-backlinks.js'; * */ From cbc00d7c5feb04795f91a2a5ffc94fa697e65ef2 Mon Sep 17 00:00:00 2001 From: Circlepuller Date: Sat, 24 Mar 2012 01:01:43 -0400 Subject: [PATCH 70/71] Added AwsumChan's stylesheets --- stylesheets/dark.css | 150 ++++++++++++ stylesheets/img/fade-miku.png | Bin 0 -> 234 bytes stylesheets/img/fade-yellow.png | Bin 0 -> 47975 bytes stylesheets/miku.css | 87 +++++++ stylesheets/wasabi.css | 390 ++++++++++++++++++++++++++++++++ 5 files changed, 627 insertions(+) create mode 100755 stylesheets/dark.css create mode 100755 stylesheets/img/fade-miku.png create mode 100755 stylesheets/img/fade-yellow.png create mode 100755 stylesheets/miku.css create mode 100755 stylesheets/wasabi.css diff --git a/stylesheets/dark.css b/stylesheets/dark.css new file mode 100755 index 00000000..e41f163f --- /dev/null +++ b/stylesheets/dark.css @@ -0,0 +1,150 @@ +/** + * dark.css + * For AwsumChan by Circlepuller + */ +body { + background: #1E1E1E; + color: #999999; + font-family: sans-serif; + font-size: 12px; +} +h1 { + font-size: 20pt; + text-align: center; + letter-spacing: 0px; +} +div.title, h1 { + color: lime; + font-family: Arial, Helvetica, sans-serif; +} +div.title p { + font-size: 10px; +} +a:link, a:visited, p.intro a.email span.name { + color: #CCCCCC; + text-decoration: underline; + font-family: sans-serif; +} +a:link:hover, a:visited:hover { + color: #FF0000; + font-family: sans-serif; + text-decoration: underline overline; +} +a.post_no { + color: #AAAAAA; + text-decoration: none; +} +a.post_no:hover { + color: maroon; + text-decoration: underline overline; +} +div.post.reply { + background: #333333; + border: #555555 1px solid; +} +div.post.reply.highlighted { + background: transparent; + border: transparent 0px solid; +} +div.post.reply p.body a:link, div.post.reply p.body a:visited { + color: #CCCCCC; +} +div.post.reply p.body a:link:hover, div.post.reply p.body a:visited:hover { + color: #FF0000; +} +p.intro span.subject { + font-size: 12px; + font-family: sans-serif; + color: #446655; + font-weight: 800; +} +p.intro span.name { + color: #00CC00; + font-weight: 800; +} +p.intro a.capcode, p.intro a.nametag { + color: magenta; + margin-left: 0; +} +p.intro a.email, p.intro a.email span.name, p.intro a.email:hover, p.intro a.email:hover span.name { + color: #00CCCC; +} +input[type="text"], textarea, select { + background: #333333; + color: #CCCCCC; + border: #666666 1px solid; + padding-left: 5px; + padding-right: -5px; + font-family: sans-serif; + font-size: 10pt; +} +input[type="password"] { + background: #333333; + color: #CCCCCC; + border: #666666 1px solid; +} +form table tr th { + background: #333333; + color: #AAAAAA; + font-weight: 800; + text-align: left; + padding: 0; +} +div.banner { + background: #00AA00; + color: #FFFFFF; + text-align: center; + width: 250px; + padding: 4px; + padding-left: 12px; + padding-right: 12px; + margin-left: auto; + margin-right: auto; + font-size: 12px; +} +input[type="submit"] { + background: #333333; + border: #888888 1px solid; + color: #CCCCCC; +} +input[type="submit"]:hover { + background: #555555; + border: #888888 1px solid; + color: #FF0000; +} +p.fileinfo a:hover { + text-decoration: underline; +} +span.trip { + color: #AAAAAA; +} +div.pages { + color: #AAAAAA; + background: #333333; + border: #666666 1px solid; + font-family: sans-serif; + font-size: 10pt; +} +div.pages a.selected { + color: #CCCCCC; +} +hr { + height: 1px; + border: #333333 1px solid; +} +div.boardlist { + color: #999999; +} +div.ban { + background-color: transparent; + border: transparent 0px solid; +} +div.ban h2 { + background: transparent; + color: lime; + font-size: 12px; +} +table.modlog tr th { + background: #333333; + color: #AAAAAA; +} \ No newline at end of file diff --git a/stylesheets/img/fade-miku.png b/stylesheets/img/fade-miku.png new file mode 100755 index 0000000000000000000000000000000000000000..a231913f1e4f1e4959ba1143d571682735e77dba GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^j6i&XgAGV(e(L@Tq*#ibJVQ8upoSx*1IXtr@Q5sC zVBi)4Va7{$>;3=*WlCHlN`mv#O3D+9QW+dm@{>{(+%k(&%kzt}ixr%MP1rVFUI0{= z;_2cTqA~I9rGuOe1|rQ5?Ki%A>~`*{-@6e0Us{VoSXuew?1U=Lt}HoxL;3_;h05O= z-nAWX!nkY>|K71-rDx#e*4%={9`hzEc}6Vi5?c@!y6n+=xy^H4{CRRHB=_mF7j>(C aB{A*hNzRkn9xM;EkHOQ`&t;ucLK6Tp!c@%w literal 0 HcmV?d00001 diff --git a/stylesheets/img/fade-yellow.png b/stylesheets/img/fade-yellow.png new file mode 100755 index 0000000000000000000000000000000000000000..bd071754ad88bf493995e635fd058fafab11e68b GIT binary patch literal 47975 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 Date: Thu, 29 Mar 2012 22:16:59 +1100 Subject: [PATCH 71/71] smartphone-spoiler.js --- js/smartphone-spoiler.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 js/smartphone-spoiler.js diff --git a/js/smartphone-spoiler.js b/js/smartphone-spoiler.js new file mode 100644 index 00000000..5dca82b7 --- /dev/null +++ b/js/smartphone-spoiler.js @@ -0,0 +1,28 @@ +/* + * smartphone-spoiler.js + * https://github.com/savetheinternet/Tinyboard-Tools/blob/master/js/smartphone-spoiler.js + * + * Released under the MIT license + * Copyright (c) 2012 Michael Save + * + * Usage: + * $config['additional_javascript'][] = 'js/smartphone-spoiler.js'; + * + */ + +$(document).ready(function(){ + /* This needs to be expanded upon: */ + var is_mobile = navigator.userAgent.match(/iPhone|iPod|iPad|Android/i); + + if(is_mobile) { + $('span.spoiler').each(function() { + $(this).click(function() { + if($(this).hasClass('show')) + $(this).css('color', 'black').removeClass('show'); + else + $(this).css('color', 'white').addClass('show'); + }); + }); + } +}); +