From f25ddbb3a623fd4d314ecdf389568b417791f1cb Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:04:51 +1000 Subject: 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 -- cgit v1.3 From f4f76bf3c6824dcd3339c3616ab1c14ceb1c8f7b Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:09:05 +1000 Subject: 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) { -- cgit v1.3 From 9826aae5b9e69f3e87905d86e1ad948b1a669be4 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:09:28 +1000 Subject: 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) { -- cgit v1.3 From 66df02c2e46a302078f31c4c2e247a4d9d5938b5 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:31:01 +1000 Subject: 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; } -- cgit v1.3 From 399a5ab5d10d7db4083c4af62326f3f4e6c97280 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:33:08 +1000 Subject: 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; } -- cgit v1.3 From 6ce881284330487fe3dff3cf740f6befc49914de Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:36:36 +1000 Subject: 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); -- cgit v1.3 From 5c942f8c9e2305c529b83ef7a544b56febc7e3ae Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 17:43:01 +1000 Subject: 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 -- cgit v1.3 From 0a37976936cb1194bd91d3c6f74dcbb93fa5610a Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 18:02:58 +1000 Subject: 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); } -- cgit v1.3 From 4488965f91209ea433f69e60ac3bee508ab34e06 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 3 Jun 2011 18:12:18 +1000 Subject: 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 . '
'; -- cgit v1.3 From d7ff4947b5f8d8e429e4f8fccae50a7c06b646bc Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Sat, 4 Jun 2011 17:37:11 +1000 Subject: 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. -- cgit v1.3 From cce8b3955d5df03a6adca5e5e11d2bef039cc917 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Wed, 23 Nov 2011 21:44:22 +1100 Subject: 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 + + -- cgit v1.3 From 40b59c36da5e07c649336ec374337d1114c7118b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 15:28:43 +1100 Subject: 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 -- cgit v1.3 From ff697004b08630d16d55f699f353147dc7e60f0c Mon Sep 17 00:00:00 2001 From: Marcin Łabanowski Date: Fri, 2 Mar 2012 22:41:04 +0100 Subject: 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'); +?> -- cgit v1.3 From a2d29860e6773b181e1c0670e2458e43321e2cd2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 15:55:12 +1100 Subject: 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'); -?> -- cgit v1.3 From 61f1d0865ea0113e53f8c3921863f04a8503df8d Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:01:52 +1100 Subject: 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(); + +}); + -- cgit v1.3 From e6854ad5469f7885a2858692f37c767662b390bf Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:05:39 +1100 Subject: 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() { -- cgit v1.3 From a79b8c473b8ac136ede9f1333be891b11d068f76 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 16:45:59 +1100 Subject: 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'); -- cgit v1.3 From 28c2dd9d065c20c2a8a70d62aa7b6e79b66cd2e7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 19:41:56 +1100 Subject: 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; + }); + }); +}); + -- cgit v1.3 From 81663b7d86c97fc808df8b201868bcda90e319ce Mon Sep 17 00:00:00 2001 From: Marcin Łabanowski Date: Wed, 22 Feb 2012 16:43:43 +0100 Subject: +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 00000000..79ed93b9 Binary files /dev/null and b/stylesheets/img/testorange_bg.gif differ diff --git a/stylesheets/img/testorange_f_bg.gif b/stylesheets/img/testorange_f_bg.gif new file mode 100644 index 00000000..1887e7fa Binary files /dev/null and b/stylesheets/img/testorange_f_bg.gif differ diff --git a/stylesheets/img/testorange_testo.png b/stylesheets/img/testorange_testo.png new file mode 100644 index 00000000..3d91c159 Binary files /dev/null and b/stylesheets/img/testorange_testo.png differ diff --git a/stylesheets/img/testorange_textarea_bg.gif b/stylesheets/img/testorange_textarea_bg.gif new file mode 100644 index 00000000..1c7bf27b Binary files /dev/null and b/stylesheets/img/testorange_textarea_bg.gif differ diff --git a/stylesheets/img/testorange_top_bg.gif b/stylesheets/img/testorange_top_bg.gif new file mode 100644 index 00000000..c1d18282 Binary files /dev/null and b/stylesheets/img/testorange_top_bg.gif differ 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; +} + -- cgit v1.3 From d47bfe019b52f11fff3c5149b36cd905d07832cd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 20:00:57 +1100 Subject: 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. -- cgit v1.3 From d3b1f4cfa31c6c5a451b0bc5df500c51a8d04186 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 20:19:35 +1100 Subject: 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'; * -- cgit v1.3 From 9df2ce179e87694eed2be5bac4293f9cccaf7870 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 21:55:22 +1100 Subject: 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"; -- cgit v1.3 From 9daf12dccf19c772a4f40b3e65d9fa2b4f8888e9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 21:57:13 +1100 Subject: 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); -- cgit v1.3 From 6d56e006007ce950b1211e627108367125f1ec78 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 22:04:27 +1100 Subject: 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(); -- cgit v1.3 From b8fca6a3250436e185250dbe46cab418c2247052 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Wed, 14 Mar 2012 23:32:49 +1100 Subject: Added Tinyboard-Kusabax --- README.md | 30 ------ kusabax.php | 275 -------------------------------------------------- migration/kusabax.php | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 275 insertions(+), 305 deletions(-) delete mode 100755 kusabax.php create mode 100755 migration/kusabax.php 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/kusabax.php deleted file mode 100755 index eed12e0a..00000000 --- a/kusabax.php +++ /dev/null @@ -1,275 +0,0 @@ - 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 */ - - 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); - $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); - - // >quotes - $body = str_replace('"unkfunc"', '"quote"', $body); - - // >>cites - $body = preg_replace('//', '', $body); - - // Public bans - $body = preg_replace('/
\((.+?)\)<\/b><\/font>/', '($1)', $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']; - - // Get databse link - $kusabax = $pdo; - // Clear - unset($pdo); - - // Open Tinyboard database - $config['db'] = $__temp; - unset($__temp); - - $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']]; - - $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)); - - // 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']) || $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); - $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); - - // 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 - $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); - - // 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); - - // Insert post - $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 . '
'; - } - $page['body'] .= '

'; - - echo Element('page.html', $page); - - diff --git a/migration/kusabax.php b/migration/kusabax.php new file mode 100755 index 00000000..eed12e0a --- /dev/null +++ b/migration/kusabax.php @@ -0,0 +1,275 @@ + 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 */ + + 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); + $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); + + // >quotes + $body = str_replace('"unkfunc"', '"quote"', $body); + + // >>cites + $body = preg_replace('/
/', '', $body); + + // Public bans + $body = preg_replace('/
\((.+?)\)<\/b><\/font>/', '($1)', $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']; + + // Get databse link + $kusabax = $pdo; + // Clear + unset($pdo); + + // Open Tinyboard database + $config['db'] = $__temp; + unset($__temp); + + $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']]; + + $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)); + + // 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']) || $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); + $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); + + // 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 + $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); + + // 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); + + // Insert post + $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 . '
'; + } + $page['body'] .= '

'; + + echo Element('page.html', $page); + + -- cgit v1.3 From 65996db1c2e43d3e1f0c8e6c12391fbbcadbb099 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:39:04 +1100 Subject: 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 . '
'; } -- cgit v1.3 From 4c9440b1d04bbe785e6b44a6325350da6c90f951 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:42:02 +1100 Subject: 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, -- cgit v1.3 From 2482723ff2f567c4b041f9f0840f34049f0881b7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 00:44:06 +1100 Subject: 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. -- cgit v1.3 From 64c1f6821c90297cf3d1c4b8a4bbec6fe4449016 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 01:44:29 +1100 Subject: 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: $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'; -- cgit v1.3 From 9e20b4071f485e63b63d7c93249af00e8e2df3b0 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 03:14:09 +1100 Subject: 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: 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"; -- cgit v1.3 From 8e101ab95659696d83f82c4ff7b7d92e60fce13e Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 04:55:59 +1100 Subject: 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(); +}); + -- cgit v1.3 From 70e7840566c46333cb93d00472d03f788a3668f8 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 05:04:08 +1100 Subject: . --- 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(); -}); - -- cgit v1.3 From 2bc3c10ee7abe34631323db01eefdfaa5b97d886 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 06:22:14 +1100 Subject: 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. + -- cgit v1.3 From ee54df825a71dab1bfb03fdf91138240f3110a9d Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 14:44:15 +1100 Subject: 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); +}); + -- cgit v1.3 From 34301da174acd3cfb326f03693657aeacd58be27 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 16:19:26 +1100 Subject: 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'; * */ -- cgit v1.3 From a3b3e1cc64ff79dc670e84e7843e99ad83a61676 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 16:42:58 +1100 Subject: 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); }); -- cgit v1.3 From 85cc117b33c70841e4a8dfba7f81b6d154cae109 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 17:05:33 +1100 Subject: 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', ''); + }); + }); +}); + -- cgit v1.3 From 9fab9253a358c96a2fcfa5004da6018901467bf4 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:14:54 +1100 Subject: 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'); + }); +}); + -- cgit v1.3 From f3d784de510fc550eb384a4cefe58c76f6e9c3f4 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:42:17 +1100 Subject: 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!'); -- cgit v1.3 From ae848ef6663ec90c1e83f3729558c59547b2e0e7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 18:57:43 +1100 Subject: 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', ''); }); -- cgit v1.3 From af7b5b5d78b5981a2b47cea0afa614bc70a6c7f5 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 20:40:52 +1100 Subject: 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'); }); -- cgit v1.3 From 224c7763076bc6c59aaddaa6fb47091b95ffb46e Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 15 Mar 2012 22:16:26 +1100 Subject: 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: 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'); -- cgit v1.3 From 53f4bf6136c99e4ca4099357173226c229885844 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 02:04:17 +1100 Subject: 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 { -- cgit v1.3 From f48d338ce051070a0eb096ab5cac073f19467549 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:08:03 +1100 Subject: $('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; -- cgit v1.3 From a5739602296251b698aab834205829ac37edca1b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:29:58 +1100 Subject: 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); }); }); }); -- cgit v1.3 From 1d7381554d3647c92db3b8b1b1f7a96d6f2653dd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:42:17 +1100 Subject: 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) -- cgit v1.3 From 34fc25f71629a52f76c4c48bc543eb65835ca40b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 09:48:37 +1100 Subject: 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()); }); }); }); -- cgit v1.3 From ccf17c3d6f0bf8ef28308f31369bacda6ecc41a2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Fri, 16 Mar 2012 20:22:26 +1100 Subject: 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(); -- cgit v1.3 From 50624ba5ce953552c98f3042de4664d6ec0879e3 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:40:15 +1100 Subject: 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()); }); }); -- cgit v1.3 From 68e873315a0104968a722b7814ad1ce1c62243dd Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:45:38 +1100 Subject: 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, -- cgit v1.3 From e34de4e09dc8bdb8fad59b08348d60e9e0a694e9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:46:44 +1100 Subject: 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); } }); -- cgit v1.3 From 134146e32cc873b6a8a74a4b2084ad9ae984f8e2 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:51:45 +1100 Subject: 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); } -- cgit v1.3 From ce25db62ea6064069414d0f5b2bb53132a51c328 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 07:54:08 +1100 Subject: 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); } }); } -- cgit v1.3 From a2ac54e01ee8a9176ba5054d453fc5f2a3662908 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 08:09:24 +1100 Subject: 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'); -- cgit v1.3 From bf7fd32c21762803bf22d2e55a0e07334b2b9139 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 08:12:47 +1100 Subject: 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; } -- cgit v1.3 From 443c79047be865c747bb7e47f685d041cde85e28 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 10:59:14 +1100 Subject: 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()); }); }); -- cgit v1.3 From de5e7e27ece1b91f58302e918cafb38adf6584f7 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 11:10:59 +1100 Subject: 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(); -- cgit v1.3 From c36d654a083913d186442bb639212e9531b9dec1 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sat, 17 Mar 2012 11:33:20 +1100 Subject: 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); }); }); }); -- cgit v1.3 From 7d3938458175f03d0ca864bd4d08bc7f03306581 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 00:36:51 +1100 Subject: 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 -- cgit v1.3 From 0c8941fc5b463c4d8225e314ffd5da517953f98a Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 01:00:58 +1100 Subject: 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'); + -- cgit v1.3 From 8208d7151bc952462c9220304877525dcc398cea Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 20:47:45 +1100 Subject: 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'); -- cgit v1.3 From 21a1152ebead57c60c76c341d4f8ec8bc737949b Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 23:55:01 +1100 Subject: 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); }); }); -- cgit v1.3 From d38801fc4ed63e6caa4d4a39b88c1d250a09b6b9 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Sun, 18 Mar 2012 23:57:38 +1100 Subject: 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() { -- cgit v1.3 From 741e30e22fd05ebbb7eea969f919ea1573db815a Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:11:55 +1100 Subject: 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); + } } }); } -- cgit v1.3 From 8afaba9a810f28e49c52229c1e89a101c7839453 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:33:06 +1100 Subject: 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 + ''); + }); + }); +}); + -- cgit v1.3 From d0e20ca71f24f783a515437e58bfedc52faa2e00 Mon Sep 17 00:00:00 2001 From: Michael Save Date: Mon, 19 Mar 2012 00:48:06 +1100 Subject: show-mentions.js -> show-backlinks.js --- js/show-backlinks.js | 37 +++++++++++++++++++++++++++++++++++++ js/show-mentions.js | 37 ------------------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 js/show-backlinks.js delete mode 100644 js/show-mentions.js diff --git a/js/show-backlinks.js b/js/show-backlinks.js new file mode 100644 index 00000000..da55845a --- /dev/null +++ b/js/show-backlinks.js @@ -0,0 +1,37 @@ +/* + * 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-backlinks.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 + ''); + }); + }); +}); + diff --git a/js/show-mentions.js b/js/show-mentions.js deleted file mode 100644 index 8fe938de..00000000 --- a/js/show-mentions.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 + ''); - }); - }); -}); - -- cgit v1.3 From cbc00d7c5feb04795f91a2a5ffc94fa697e65ef2 Mon Sep 17 00:00:00 2001 From: Circlepuller Date: Sat, 24 Mar 2012 01:01:43 -0400 Subject: 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 00000000..a231913f Binary files /dev/null and b/stylesheets/img/fade-miku.png differ diff --git a/stylesheets/img/fade-yellow.png b/stylesheets/img/fade-yellow.png new file mode 100755 index 00000000..bd071754 Binary files /dev/null and b/stylesheets/img/fade-yellow.png differ diff --git a/stylesheets/miku.css b/stylesheets/miku.css new file mode 100755 index 00000000..2eabfba8 --- /dev/null +++ b/stylesheets/miku.css @@ -0,0 +1,87 @@ +/** + * miku.css + * For AwsumChan by Circlepuller + */ +body { + background: #D2FFEE url('img/fade-miku.png') top repeat-x; +} + +a:link, a:visited { + text-decoration: none; + color: #0093AB; +} + +a:link:hover, a:visited:hover { + color: #DD0000; +} + +a.post_no { + color: #000033; +} + +p.intro a.email span.name { + color: #0093AB; +} + +p.intro a.email:hover span.name { + color: #DD0000; +} + +h2, div.title, h1 { + color: #800000; +} + +form table tr th { + background: #95D2D3; +} + +div.banner { + background-color: #E04000; +} + +div.post.op hr { + border-color: #B7C9D5; +} + +p.intro span.subject { + color: #117743; + font-weight: 800; +} + +p.intro span.name { + color: #117743; + font-weight: 800; +} + +div.post.reply.highlighted { + background: #9988EE; +} + +div.post.reply { + background: #B6DDDE; + border-color: #8FCCCD; +} + +div.ban { + border: 1px solid #0093AB; +} + +div.ban h2 { + background: #B6DDDE; + color: #0093AB; +} + +div.pages { + color: #8899AA; + background: #B6DDDE; + border-right: 1px solid #8FCCCD; + border-bottom: 1px solid #8FCCCD; +} + +hr { + border-color: #B7D9C5; +} + +div.boardlist { + color: #0093AB; +} \ No newline at end of file diff --git a/stylesheets/wasabi.css b/stylesheets/wasabi.css new file mode 100755 index 00000000..7c7a0b39 --- /dev/null +++ b/stylesheets/wasabi.css @@ -0,0 +1,390 @@ +/** + * wasabi.css + * For AwsumChan by Circlepuller + */ +body { + background: #F7F9B0 url('img/fade-yellow.png') repeat-x 50% 0%; + color: black; + font-family: arial, helvetica, sans-serif; + font-size: 10pt; + margin: 0 8px; + padding-left: 5px; + padding-right: 5px; +} +table * { + margin: 0; +} +a:link, a:visited { + text-decoration: underline; + color: #400040; +} +a:link:hover, a:visited:hover { + color: limegreen; +} +a.post_no { + color: black; + text-decoration: none; + margin: 0; + padding: 0; +} +p.intro a.post_no, p.intro a.email { + margin: 0; +} +p.intro a.email span.name { + color: #34345C; +} +p.intro a.email:hover span.name { + color: #ff0000; +} +p.intro label { + display: inline; +} +h2 { + color: #AF0A0F; + font-size: 11pt; + margin: 0px; + padding: 0px; +} +h1 { + font-family: tahoma; + letter-spacing: -2px; + font-size: 20pt; + margin-bottom: 0; +} +h1.logo img { + display: inline; + float: none; + background-image: url('/static/logo_bg.gif'); + background-repeat: no-repeat; + background-position: center; +} +div.title, h1 { + color: #AF0A0F; + text-align: center; +} +div.title { + font-size: 8pt; + margin-bottom: 2em; +} +form { + margin-bottom: 4em; +} +form table { + margin: auto; +} +form table input { + height: auto; +} +input[type="text"], input[type="password"], textarea { + border: 1px solid #a9a9a9; + text-indent: 0px; + text-shadow: none; + text-transform: none; + word-spacing: normal; +} +form table tr td { + text-align: left; + margin: 0px; + padding: 0px; +} +form table tr th { + text-align: left; + padding: 4px; +} +form table tr th { + background: #D7FE85; +} +form table tr td div { + text-align: center; + float: left; + padding-left: 3px; +} +form table tr td div input { + display: block; + margin: 2px auto 0 auto; +} +form table tr td div label { + font-size: 10px; +} +.unimportant, .unimportant * { + font-size: 10px; +} +p.fileinfo { + display: block; + margin: 0px; + padding-right: 7em; +} +div.banner { + background-color: #400040; + font-size: 12pt; + font-weight: bold; + text-align: center; + margin: 1em 0; +} +div.banner, div.banner a { + color: white; +} +div.banner a:hover { + color: #EEF2FF; + text-decoration: none; +} +img.banner { + float: none; + margin: 4px auto 0 auto; +} +img { + display: block; + float: left; + margin: 10px 20px; + border: none; +} +div.post img { + padding: 5px; + margin: 5px 20px 0 0; +} +div.post img.icon { + display: inline; + float: none; + margin: 0 5px; + padding: 0; +} +div.post.op { + margin-right: 20px; + margin-bottom: 5px; +} +div.post.op hr { + border-color: #D9BFB7; +} +p.intro { + margin: 0.5em 0; + padding: 0; + padding-bottom: 0.2em; +} +input.delete { + float: left; + margin: 1px 6px 0 0; +} +p.intro span.subject { + color: #0F0C5D; + font-weight: bold; +} +p.intro span.name { + color: #117743; + font-weight: bold; +} +p.intro a.capcode, p.intro a.nametag { + color: #F00000; + margin-left: 0; +} +p.intro a { + margin-left: 8px; +} +div.delete { + float: right; +} +div.post.reply p { + margin: 0.3em 0 0 0; +} +div.post.reply p.body { + margin-left: 1.8em; + margin-top: 0.8em; + padding-right: 3em; + padding-bottom: 0.3em; +} +div.post.reply.highlighted { + background: greenyellow; +} +div.post.reply p.body a { + color: #D00; +} +div.post { + max-width: 97%; +} +div.post p.body { + word-wrap: break-word; +} +div.post.reply { + background: #D7FE85; + margin: 0.2em 16px; + padding: 0.2em 0.3em 0.5em 0.6em; + border-width: 1px; + border-style: none solid solid none; + border-color: lightgreen; + display: inline-block; +} +span.trip { + color: #228854; +} +span.quote { + color: #789922; +} +span.omitted { + display: block; + margin-top: 1em; +} +br.clear { + clear: left; +} +span.controls { + float: right; + margin: 0; + padding: 0; + font-size: 80%; +} +span.controls.op { + float: none; + margin-left: 10px; +} +span.controls a { + margin: 0; +} +div#wrap { + width: 900px; + margin:0 auto; +} +div.ban { + background-color: white; + border: 1px solid #400040; + max-width: 700px; + margin: 30px auto; +} +div.ban p, div.ban h2 { + padding: 3px 7px; +} +div.ban h2 { + background: #D7FE85; + color: #400040; + font-size: 12pt; +} +div.ban p { + font-size: 12px; + margin-bottom: 12px; +} +div.ban p.reason { + font-weight: bold; +} +span.heading { + color: #AF0A0F; + font-size: 11pt; + font-weight: bold; + display: block; +} +span.spoiler { + background: black; + color: black; +} +div.post.reply p.body span.spoiler a { + color: black; +} +span.spoiler:hover, div.post.reply p.body span.spoiler:hover a { + color: white; +} +div.styles { + float: right; + padding-bottom: 20px; +} +div.styles a { + margin: 0 10px; +} +div.styles a.selected { + text-decoration: none; +} +table.test { + width: 100%; +} +table.test td, table.test th { + text-align: left; + padding: 5px; +} +table.test tr.h th { + background: #98E; +} +table.test td img { + margin: 0; +} +fieldset label { + display: block; +} +div.pages { + color: limegreen; + background: #D7FE85; + display: inline; + padding: 8px; + border-right: 1px solid limegreen; + border-bottom: 1px solid limegreen; +} +div.pages a.selected { + color: black; + font-weight: bolder; +} +div.pages a:link { + text-decoration: none; +} +div.pages form { + margin: 0; + padding: 0; + display: inline; +} +div.pages form input { + margin: 0 5px; + display: inline; +} +hr { + border: none; + border-top: 1px solid limegreen; + height: 0px; +} +div.boardlist { + color: limegreen; + font-size: 9pt; + margin-top: 3px; +} +div.boardlist.bottom { + margin-top: 20px; +} +div.boardlist a { + text-decoration: none; +} +div.report { + color: #333; +} +table.modlog { + margin: auto; + width: 100%; +} +table.modlog tr td { + text-align: left; + margin: 0px; + padding: 4px 15px 0 0; +} +table.modlog tr th { + text-align: left; + padding: 4px 15px 5px 5px; + white-space: nowrap; +} +table.modlog tr th { + background: #D7FE85; +} +td.minimal, th.minimal { + width: 1%; + white-space: nowrap; +} +div.top_notice { + text-align: center; + margin: 5px auto; +} +span.public_ban { + display: block; + color: red; + font-weight: bold; + margin-top: 15px; +} +span.toolong { + display: block; + margin-top: 15px; +} +div.blotter { + color: red; + font-weight: bold; + text-align: center; +} \ No newline at end of file -- cgit v1.3 From 2df1ebd88c266d984cbaa6c26917c2ea89c2ae0e Mon Sep 17 00:00:00 2001 From: Michael Save Date: Thu, 29 Mar 2012 22:16:59 +1100 Subject: 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'); + }); + }); + } +}); + -- cgit v1.3