From f4b93f8b1cb99ac327505e26b6166e01ac14a3a6 Mon Sep 17 00:00:00 2001 From: 8chan Date: Wed, 8 Oct 2014 18:20:47 -0700 Subject: [PATCH 1/8] Enable infinite scroll by default --- inc/instance-config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/instance-config.php b/inc/instance-config.php index c928b0d9..f57476f1 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -132,6 +132,7 @@ $config['additional_javascript'][] = 'js/id_highlighter.js'; $config['additional_javascript'][] = 'js/id_colors.js'; $config['additional_javascript'][] = 'js/inline.js'; + $config['additional_javascript'][] = 'js/infinite-scroll.js'; $config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'; From f645b8a999ce366de01c132d85e943ae22c7a7b2 Mon Sep 17 00:00:00 2001 From: 8chan Date: Wed, 8 Oct 2014 18:21:00 -0700 Subject: [PATCH 2/8] Fix boards index setting --- templates/mod/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mod/settings.html b/templates/mod/settings.html index 38a5b168..cb397f8e 100644 --- a/templates/mod/settings.html +++ b/templates/mod/settings.html @@ -32,7 +32,7 @@ Poster ID's Display SAGE! after saged posts Automatically convert ... to … - No index
Hide from boards index
and do not index in search engines + No index
Hide from boards index
and do not index in search engines [code] tags Oekaki Format math between $$ From 6267cdcf9a0cad7a9aaeb378ef4737489bf302cf Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 03:19:23 +0000 Subject: [PATCH 3/8] Fix --- templates/mod/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/mod/settings.html b/templates/mod/settings.html index caa12b1a..b389873d 100644 --- a/templates/mod/settings.html +++ b/templates/mod/settings.html @@ -32,7 +32,7 @@ Poster ID's Display SAGE! after saged posts Automatically convert ... to … - No index
Hide from boards index
and do not index in search engines + No index
Hide from boards index
and do not index in search engines Public bans
Displays your bans for the public [code] tags Oekaki From de7c089d7b9b154a63a55f3ea15604bace2ac9fe Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 16:58:00 -0700 Subject: [PATCH 4/8] this download all script doesnt even work --- create.php | 4 +--- inc/instance-config.php | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/create.php b/create.php index 673f8b7c..43d3671e 100644 --- a/create.php +++ b/create.php @@ -10,9 +10,7 @@ $cbRecaptcha = true; include "inc/lib/recaptcha/recaptchalib.php"; } - checkBan('*'); -$bannedWords = array('/^cake$/', '8ch', '/^cp$/', 'child', '/^inc$/', '/^static$/', '/^templates$/', '/^js$/', '/^stylesheets$/', '/^tools$/', '/^pedo$/', '/^reports$/'); $ayah = (($config['ayah_enabled']) ? new AYAH() : false); @@ -78,7 +76,7 @@ foreach (listBoards() as $i => $board) { error(_('Board already exists!')); } -foreach ($bannedWords as $i => $w) { +foreach ($config['banned_boards'] as $i => $w) { if ($w[0] !== '/') { if (strpos($uri,$w) !== false) error(_("Cannot create board with banned word $w")); diff --git a/inc/instance-config.php b/inc/instance-config.php index 2e0ba78f..fc2d868b 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -109,8 +109,6 @@ $config['additional_javascript'][] = 'js/webm-settings.js'; $config['additional_javascript'][] = 'js/expand-video.js'; $config['additional_javascript'][] = 'js/treeview.js'; - $config['additional_javascript'][] = 'js/download-all.js'; - $config['additional_javascript'][] = 'js/jszip.min.js'; $config['additional_javascript'][] = 'js/quick-post-controls.js'; $config['additional_javascript'][] = 'js/expand-too-long.js'; $config['additional_javascript'][] = 'js/settings.js'; @@ -133,8 +131,9 @@ $config['additional_javascript'][] = 'js/id_colors.js'; $config['additional_javascript'][] = 'js/inline.js'; $config['additional_javascript'][] = 'js/infinite-scroll.js'; + $config['additional_javascript'][] = 'js/download-original.js'; - $config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'; + //$config['font_awesome_css'] = '/netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'; $config['stylesheets']['Dark'] = 'dark.css'; $config['stylesheets']['Photon'] = 'photon.css'; @@ -144,7 +143,7 @@ $config['markup'][] = array("/\[spoiler\](.+?)\[\/spoiler\]/", "\$1"); $config['markup'][] = array("/~~(.+?)~~/", "\$1"); - $config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array(''=>'https://twitter.com/infinitechan')); + $config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/bans.html', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array(''=>'https://twitter.com/infinitechan')); //$config['boards'] = array(array('' => '/', '' => '/boards.html', '' => '/faq.html', '' => '/random.php', '' => '/create.php', '' => '/search.php', '' => '/mod.php', '' => 'https://qchat.rizon.net/?channels=#8chan'), array('b', 'meta', 'int'), array('v', 'a', 'tg', 'fit', 'pol', 'tech', 'mu', 'co', 'sp', 'boards'), array(''=>'https://twitter.com/infinitechan')); $config['footer'][] = 'Contribute to 8chan.co development at github'; From 1ebf9c4d8cacf736e20b59a2251701756d232abd Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 16:59:40 -0700 Subject: [PATCH 5/8] Maybe fix locales? --- templates/themes/public_banlist/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/themes/public_banlist/theme.php b/templates/themes/public_banlist/theme.php index f2b65839..d65b1c7c 100644 --- a/templates/themes/public_banlist/theme.php +++ b/templates/themes/public_banlist/theme.php @@ -16,7 +16,7 @@ public static function build($action, $settings) { global $config; - if ($action == 'all') + if ($action == 'all' || $action == 'bans.html') file_write($config['dir']['home'] . $settings['file_bans'], PBanlist::homepage($settings)); if ($action == 'all' || $action == 'bans') From f95cc5d8bfae4efb03a7b5aef17d9b232a91823d Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 16:59:58 -0700 Subject: [PATCH 6/8] .x.x less confusing...will change to less_ip eventually --- inc/bans.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/bans.php b/inc/bans.php index 99cd9442..7f36c92f 100644 --- a/inc/bans.php +++ b/inc/bans.php @@ -219,7 +219,7 @@ class Bans { $ban['mask'] = preg_split("/[\.:]/", $ban['mask']); $ban['mask'] = array_slice($ban['mask'], 0, 2); $ban['mask'] = implode(".", $ban['mask']); - $ban['mask'] .= ".*"; + $ban['mask'] .= ".x.x"; if (isset ($subnet)) { $ban['mask'] .= "/$subnet"; } From 426f33ca3be1398ee615ce8defd7113c6ff6ea2d Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 17:00:06 -0700 Subject: [PATCH 7/8] Update FAQ --- faq.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/faq.php b/faq.php index efcb3cda..14b2ae83 100644 --- a/faq.php +++ b/faq.php @@ -46,18 +46,27 @@ $body = <<[tex] tags if enabled by board owner -

Are you really a cripple?

-

Yes.

-

How are featured boards chosen?

Top fifteen boards excluding /meta/, /b/ and /int/.

Who owns /meta/, /b/, and /int/?

No one, so they are de facto property of the administration.

+

Where's the mobile app?

+

There is no official mobile app, however there is an unofficial Android app at wingy/Exodus.

+ +

I don't provide support for this app, ask the developer of it if you have a problem with it.

+ +

Where's the archive?

+

There isn't one yet and there will never be an official archive.

+

How do I donate?

Donations can be sent to 1NpQaXqmCBji6gfX8UgaQEmEstvVY7U32C (Bitcoin) or LUPgSCJt3iGeJXUETVhmnbQ89Riaq1yjZm (Litecoin). PayPal is also accepted @ fredrick.brennan1@gmail.com .

You may also donate monthly via Patreon at http://www.patreon.com/user?u=162165. + +

Are you really a cripple?

+

Yes.

+ EOT; From d26762af15e4c2a7d787987d60d7adc9b4356d1f Mon Sep 17 00:00:00 2001 From: 8chan Date: Thu, 9 Oct 2014 17:48:23 -0700 Subject: [PATCH 8/8] Make inline work on new_post event --- js/inline.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/js/inline.js b/js/inline.js index 63b7a8df..57c359b7 100644 --- a/js/inline.js +++ b/js/inline.js @@ -138,8 +138,16 @@ $(document).ready(function() { // don't attach to outbound links if (App.options.get('useInlining')) { - $('.body a:not([rel]), .mentioned a') - .attr('onclick', null)// XXX disable highlightReply - .click(inline) + var assign_inline = function() { + $('.body a:not([rel]), .mentioned a') + .attr('onclick', null)// XXX disable highlightReply + .click(inline) + } + + assign_inline(); + + $(document).on('new_post', function(e, post) { + assign_inline(); + }); } });