diff --git a/8chan-captcha/config.example.php b/8chan-captcha/config.example.php deleted file mode 100644 index d011b3f46..000000000 --- a/8chan-captcha/config.example.php +++ /dev/null @@ -1,15 +0,0 @@ - 'SET NAMES utf8')); - -// Captcha expiration: -$expires_in = 120; // 120 seconds - -// Captcha dimensions: -$width = 300; -$height = 80; - -// Captcha length: -$length = 6; diff --git a/8chan-captcha/cool-php-captcha-0.3.1/captcha.php b/8chan-captcha/cool-php-captcha-0.3.1/captcha.php index 4f7421944..f8f0ce359 100644 --- a/8chan-captcha/cool-php-captcha-0.3.1/captcha.php +++ b/8chan-captcha/cool-php-captcha-0.3.1/captcha.php @@ -31,7 +31,7 @@ class SimpleCaptcha { * directory to another location outise the web server * */ - public $resourcesPath = 'cool-php-captcha-0.3.1/resources'; + public $resourcesPath = '8chan-captcha/cool-php-captcha-0.3.1/resources'; /** Min word length (for non-dictionary random text generation) */ public $minWordLength = 5; diff --git a/8chan-captcha/entrypoint.php b/8chan-captcha/entrypoint.php index d0edd3dad..213ddb6fd 100644 --- a/8chan-captcha/entrypoint.php +++ b/8chan-captcha/entrypoint.php @@ -3,8 +3,8 @@ $mode = @$_GET['mode']; -require_once("config.php"); -require_once("functions.php"); +chdir('..'); // for "cool PHP CAPTCHA"'s resourcesPath +include "inc/functions.php"; // general 8chan functions switch ($mode) { // Request: GET entrypoint.php?mode=get&extra=1234567890 @@ -26,7 +26,7 @@ echo "You do not have JavaScript enabled. To fill out the CAPTCHA, please copy the ID to the post form in the ID field, and write the answer in the answer field.

CAPTCHA ID: $cookie
CAPTCHA image: $html"; } else { header("Content-type: application/json"); - echo json_encode(["cookie" => $cookie, "captchahtml" => $html, "expires_in" => $expires_in]); + echo json_encode(["cookie" => $cookie, "captchahtml" => $html, "expires_in" => $config['captcha']['expires_in']]); } break; @@ -41,18 +41,17 @@ die(); } - cleanup($pdo, $expires_in); + cleanup(); - $query = $pdo->prepare("SELECT * FROM `captchas` WHERE `cookie` = ? AND `extra` = ?"); + $query = prepare("SELECT * FROM `captchas` WHERE `cookie` = ? AND `extra` = ?"); $query->execute([$_GET['cookie'], $_GET['extra']]); - $ary = $query->fetchAll(); if (!$ary) { echo "0"; } else { - $query = $pdo->prepare("DELETE FROM `captchas` WHERE `cookie` = ? AND `extra` = ?"); + $query = prepare("DELETE FROM `captchas` WHERE `cookie` = ? AND `extra` = ?"); $query->execute([$_GET['cookie'], $_GET['extra']]); if ($ary[0]['text'] !== $_GET['text']) { diff --git a/8chan-captcha/functions.php b/8chan-captcha/functions.php index 4a8248d1c..d935f5fec 100644 --- a/8chan-captcha/functions.php +++ b/8chan-captcha/functions.php @@ -1,12 +1,9 @@ '; - $query = $pdo->prepare("INSERT INTO `captchas` (`cookie`, `extra`, `text`, `created_at`) VALUES (?, ?, ?, ?)"); + $query = prepare("INSERT INTO `captchas` (`cookie`, `extra`, `text`, `created_at`) VALUES (?, ?, ?, ?)"); $query->execute( [$cookie, $extra, $text, time()]); return array("cookie" => $cookie, "html" => $html); @@ -32,7 +29,8 @@ function rand_string($length, $charset) { return $ret; } -function cleanup ($pdo, $expires_in) { - $pdo->prepare("DELETE FROM `captchas` WHERE `created_at` < ?")->execute([time() - $expires_in]); +function cleanup () { + global $config; + prepare("DELETE FROM `captchas` WHERE `created_at` < ?")->execute([time() - $config['captcha']['expires_in']]); } diff --git a/inc/config.php b/inc/config.php index 5a046d914..8536ab445 100644 --- a/inc/config.php +++ b/inc/config.php @@ -308,14 +308,22 @@ // Enable custom captcha provider $config['captcha']['enabled'] = false; + // Custom CAPTCHA provider general settings + + // Captcha expiration: + $config['captcha']['expires_in'] = 120; // 120 seconds + + // Captcha length: + $config['captcha']['length'] = 6; + /* * Custom captcha provider path (You will need to change these depending on your configuration! It cannot be * automatically determined because provider_check requires curl which needs to know the domain of your site.) * * Specify yourimageboard.com/$config['root']/8chan-captcha/entrypoint.php for the default provider or write your own */ - $config['captcha']['provider_get'] = 'http://localhost/infinity/8chan-captcha/entrypoint.php'; - $config['captcha']['provider_check'] = 'http://localhost/infinity/8chan-captcha/entrypoint.php'; + $config['captcha']['provider_get'] = 'http://localhost/8chan-captcha/entrypoint.php'; + $config['captcha']['provider_check'] = 'http://localhost/8chan-captcha/entrypoint.php'; // Custom captcha extra field (eg. charset) $config['captcha']['extra'] = 'abcdefghijklmnopqrstuvwxyz'; diff --git a/inc/functions.php b/inc/functions.php index adf6cdb01..045cf81b6 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -24,6 +24,7 @@ } require_once 'inc/lib/parsedown/Parsedown.php'; // todo: option for parsedown instead of Tinyboard/STI markup require_once 'inc/mod/auth.php'; +require_once '8chan-captcha/functions.php'; // the user is not currently logged in as a moderator $mod = false; diff --git a/post.php b/post.php index 8860edc83..21e7f9fee 100644 --- a/post.php +++ b/post.php @@ -148,10 +148,22 @@ function strip_array($var) { ])); if ($resp !== '1') { - error($config['error']['captcha']); + $error = $config['error']['captcha']; } } + if (isset($error)) { + if ($config['report_captcha']) { + $captcha = generate_captcha($config['captcha']['extra']); + } else { + $captcha = null; + } + + $body = Element('report.html', array('board' => $board, 'config' => $config, 'error' => $error, 'reason_prefill' => $_POST['reason'], 'post' => 'delete_'.$report[0], 'captcha' => $captcha)); + echo Element('page.html', ['config' => $config, 'body' => $body]); + die(); + } + $reason = escape_markup_modifiers($_POST['reason']); markup($reason); diff --git a/report.php b/report.php index 405626f7b..e09b10759 100644 --- a/report.php +++ b/report.php @@ -10,8 +10,6 @@ } if ($config['report_captcha']) { - include '8chan-captcha/functions.php'; - $captcha = generate_captcha($config['captcha']['extra']); } else { $captcha = null; diff --git a/templates/report.html b/templates/report.html index 291f93132..b34f74303 100644 --- a/templates/report.html +++ b/templates/report.html @@ -1,4 +1,9 @@
+ {% if error %} +
+ {{ error|e }} +
+ {% endif %} {% if global %} @@ -6,11 +11,11 @@

Attention!

This form is only for reporting child pornography, bot spam and credit card numbers, social security numbers or banking information. DMCA requests and all other deletion requests MUST be sent via email to admin@8chan.co.

8chan is unmoderated and allows posts without collecting ANY information from the poster less the details of their post. Furthermore, all boards on 8chan are user created and not actively monitored by anyone but the board creator.

8chan has a small volunteer staff to handle this queue, please do not waste their time by filling it with nonsense! If you made a report with this tool and the post was not deleted, do not make the report again! Email admin@8chan.co instead. Abuse of the global report system could lead to address blocks against your IP from 8chan.

Again, 8chan's global volunteers do not handle board specific issues. You most likely want to click "Report" instead to reach the creator and volunteers he assigned to this board.

{% endif %}

{% trans %}Enter reason below...{% endtrans %}

- + {% if config.report_captcha %}

{% trans %}To submit your report, please fill out the CAPTCHA below.{% endtrans %}

{{ captcha['html'] }}
- +
{% endif %}