diff --git a/post.php b/post.php
index ee652a18..31f4f0bf 100644
--- a/post.php
+++ b/post.php
@@ -7,7 +7,8 @@ require_once 'inc/bootstrap.php';
$dropped_post = false;
-function handle_nntpchan() {
+function handle_nntpchan()
+{
global $config;
if ($_SERVER['REMOTE_ADDR'] != $config['nntpchan']['trusted_peer']) {
error("NNTPChan: Forbidden. $_SERVER[REMOTE_ADDR] is not a trusted peer");
@@ -18,13 +19,15 @@ function handle_nntpchan() {
$headers = json_encode($_GET);
- if (!isset ($_GET['Message-Id'])) {
- if (!isset ($_GET['Message-ID'])) {
+ if (!isset($_GET['Message-Id'])) {
+ if (!isset($_GET['Message-ID'])) {
error("NNTPChan: No message ID");
+ } else {
+ $msgid = $_GET['Message-ID'];
}
- else $msgid = $_GET['Message-ID'];
+ } else {
+ $msgid = $_GET['Message-Id'];
}
- else $msgid = $_GET['Message-Id'];
$groups = preg_split("/,\s*/", $_GET['Newsgroups']);
if (count($groups) != 1) {
@@ -38,7 +41,7 @@ function handle_nntpchan() {
$xboard = $config['nntpchan']['dispatch'][$group];
$ref = null;
- if (isset ($_GET['References'])) {
+ if (isset($_GET['References'])) {
$refs = preg_split("/,\s*/", $_GET['References']);
if (count($refs) > 1) {
@@ -82,9 +85,8 @@ function handle_nntpchan() {
if ($ct == 'text/plain') {
$content = file_get_contents("php://input");
- }
- elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') {
- _syslog(LOG_INFO, "MM: Files: ".print_r($GLOBALS, true)); // Debug
+ } elseif ($ct == 'multipart/mixed' || $ct == 'multipart/form-data') {
+ _syslog(LOG_INFO, "MM: Files: " . print_r($GLOBALS, true)); // Debug
$content = '';
@@ -92,31 +94,30 @@ function handle_nntpchan() {
foreach ($_FILES['attachment']['error'] as $id => $error) {
if ($_FILES['attachment']['type'][$id] == 'text/plain') {
$content .= file_get_contents($_FILES['attachment']['tmp_name'][$id]);
- }
- elseif ($_FILES['attachment']['type'][$id] == 'message/rfc822') { // Signed message, ignore for now
- }
- else { // A real attachment :^)
+ } elseif ($_FILES['attachment']['type'][$id] == 'message/rfc822') {
+ // Signed message, ignore for now
+ } else {
+ // A real attachment :^)
$file = array();
- $file['name'] = $_FILES['attachment']['name'][$id];
- $file['type'] = $_FILES['attachment']['type'][$id];
- $file['size'] = $_FILES['attachment']['size'][$id];
+ $file['name'] = $_FILES['attachment']['name'][$id];
+ $file['type'] = $_FILES['attachment']['type'][$id];
+ $file['size'] = $_FILES['attachment']['size'][$id];
$file['tmp_name'] = $_FILES['attachment']['tmp_name'][$id];
- $file['error'] = $_FILES['attachment']['error'][$id];
+ $file['error'] = $_FILES['attachment']['error'][$id];
$newfiles["file$id"] = $file;
}
}
$_FILES = $newfiles;
- }
- else {
+ } else {
error("NNTPChan: Wrong mime type: $ct");
}
$_POST['subject'] = isset($_GET['Subject']) ? ($_GET['Subject'] == 'None' ? '' : $_GET['Subject']) : '';
$_POST['board'] = $xboard;
- if (isset ($_GET['From'])) {
+ if (isset($_GET['From'])) {
list($name, $mail) = explode(" <", $_GET['From'], 2);
$mail = preg_replace('/>\s+$/', '', $mail);
@@ -125,30 +126,28 @@ function handle_nntpchan() {
$_POST['email'] = '';
}
- if (isset ($_GET['X_Sage'])) {
+ if (isset($_GET['X_Sage'])) {
$_POST['email'] = 'sage';
}
- $content = preg_replace_callback('/>>([0-9a-fA-F]{6,})/', function($id) use ($xboard) {
+ $content = preg_replace_callback('/>>([0-9a-fA-F]{6,})/', function ($id) use ($xboard) {
$id = $id[1];
$query = prepare("SELECT `board`,`id` FROM ``nntp_references`` WHERE `message_id_digest` LIKE :rule");
$idx = $id . "%";
$query->bindValue(':rule', $idx);
$query->execute() or error(db_error($query));
-
+
$ary = $query->fetchAll(PDO::FETCH_ASSOC);
if (count($ary) == 0) {
return ">>>>$id";
- }
- else {
+ } else {
$ret = array();
foreach ($ary as $v) {
if ($v['board'] != $xboard) {
- $ret[] = ">>>/".$v['board']."/".$v['id'];
- }
- else {
- $ret[] = ">>".$v['id'];
+ $ret[] = ">>>/" . $v['board'] . "/" . $v['id'];
+ } else {
+ $ret[] = ">>" . $v['id'];
}
}
return implode($ret, ", ");
@@ -164,15 +163,15 @@ function handle_nntpchan() {
'headers' => $headers,
'from_nntp' => true,
);
-
-
}
-function handle_delete(){
+function handle_delete()
+{
// Delete
global $config, $board, $mod;
- if (!isset($_POST['board'], $_POST['password']))
+ if (!isset($_POST['board'], $_POST['password'])) {
error($config['error']['bot']);
+ }
check_login(false);
$is_mod = !!$mod;
@@ -182,44 +181,48 @@ function handle_delete(){
error($config['error']['notamod']);
}
-
$password = &$_POST['password'];
-
- if ($password == '')
+
+ if ($password == '') {
error($config['error']['invalidpassword']);
-
+ }
+
$delete = array();
foreach ($_POST as $post => $value) {
if (preg_match('/^delete_(\d+)$/', $post, $m)) {
- $delete[] = (int)$m[1];
+ $delete[] = (int) $m[1];
}
}
-
+
checkDNSBL();
-
+
// Check if board exists
- if (!openBoard($_POST['board']))
+ if (!openBoard($_POST['board'])) {
error($config['error']['noboard']);
+ }
// Check if mod has permission to delete posts in this board
- if ($is_mod && !hasPermission($config['mod']['delete'], $board))
+ if ($is_mod && !hasPermission($config['mod']['delete'], $board)) {
error($config['error']['noaccess']);
-
+ }
+
// Check if banned
checkBan($board['uri']);
// Check if deletion is enabled
- if (!$is_mod && !$config['allow_delete'])
+ if (!$is_mod && !$config['allow_delete']) {
error(_('Post deletion is not allowed!'));
-
- if (empty($delete))
+ }
+
+ if (empty($delete)) {
error($config['error']['nodelete']);
-
+ }
+
foreach ($delete as &$id) {
$query = prepare(sprintf("SELECT `thread`, `time`,`password` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
$query->bindValue(':id', $id, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
-
+
if ($post = $query->fetch(PDO::FETCH_ASSOC)) {
$thread = false;
if ($config['user_moderation'] && $post['thread']) {
@@ -227,24 +230,26 @@ function handle_delete(){
$thread_query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
$thread_query->execute() or error(db_error($query));
- $thread = $thread_query->fetch(PDO::FETCH_ASSOC);
+ $thread = $thread_query->fetch(PDO::FETCH_ASSOC);
}
if (isset($config['allow_thread_deletion']) && !$config['allow_thread_deletion'] && !$post['thread']) {
error($config['error']['nodeletethread']);
}
- if ($password != ''
- && $post['password'] != $password
+ if (
+ $password != ''
+ && $post['password'] != $password
&& (!$thread || $thread['password'] != $password)
- && !$is_mod) {
+ && !$is_mod
+ ) {
error($config['error']['invalidpassword']);
}
-
+
if ($post['time'] > time() - $config['delete_time']) {
error(sprintf($config['error']['delete_too_soon'], until($post['time'] + $config['delete_time'])));
}
-
+
if (isset($_POST['file'])) {
// Delete just the file
deleteFile($id);
@@ -254,16 +259,18 @@ function handle_delete(){
deletePost($id);
modLog("User deleted his own post #$id");
}
-
- _syslog(LOG_INFO, 'Deleted post: ' .
- '/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '')
+
+ _syslog(
+ LOG_INFO,
+ 'Deleted post: ' .
+ '/' . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['thread'] ? $post['thread'] : $id) . ($post['thread'] ? '#' . $id : '')
);
}
}
-
+
buildIndex();
-
+
$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
if (!isset($_POST['json_response'])) {
@@ -274,43 +281,46 @@ function handle_delete(){
echo json_encode(array('success' => true));
}
- // We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
- if (function_exists('fastcgi_finish_request'))
- @fastcgi_finish_request();
+ // We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
+ if (function_exists('fastcgi_finish_request'))
+ @fastcgi_finish_request();
rebuildThemes('post-delete', $board['uri']);
-
}
-function handle_report(){
- global $config,$board;
+function handle_report()
+{
+ global $config, $board;
if (!isset($_POST['board'], $_POST['reason']))
error($config['error']['bot']);
-
+
$report = array();
foreach ($_POST as $post => $value) {
if (preg_match('/^delete_(\d+)$/', $post, $m)) {
- $report[] = (int)$m[1];
+ $report[] = (int) $m[1];
}
}
-
+
checkDNSBL();
-
+
// Check if board exists
if (!openBoard($_POST['board']))
error($config['error']['noboard']);
-
+
// Check if banned
checkBan($board['uri']);
-
- if (empty($report))
+
+ if (empty($report)) {
error($config['error']['noreport']);
-
- if (strlen($_POST['reason']) > $config['report_max_length'])
+ }
+
+ if (strlen($_POST['reason']) > $config['report_max_length']) {
error($config['error']['toolongreport']);
-
- if (count($report) > $config['report_limit'])
+ }
+
+ if (count($report) > $config['report_limit']) {
error($config['error']['toomanyreports']);
+ }
if ($config['report_captcha'] && !isset($_POST['captcha_text'], $_POST['captcha_cookie'])) {
error($config['error']['bot']);
@@ -325,18 +335,18 @@ function handle_report(){
]));
if ($resp !== '1') {
- error($config['error']['captcha']);
+ error($config['error']['captcha']);
}
}
-
+
$reason = escape_markup_modifiers($_POST['reason']);
markup($reason);
-
+
foreach ($report as $id) {
$query = prepare(sprintf("SELECT `id`,`thread` , `body_nomarkup` FROM ``posts_%s`` WHERE `id` = :id", $board['uri']));
$query->bindValue(':id', $id, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
-
+
$thread = $query->fetch(PDO::FETCH_ASSOC);
$error = event('report', array('ip' => $_SERVER['REMOTE_ADDR'], 'board' => $board['uri'], 'post' => $post, 'reason' => $reason, 'link' => link_for($thread)));
@@ -345,9 +355,11 @@ function handle_report(){
}
if ($config['syslog'])
- _syslog(LOG_INFO, 'Reported post: ' .
- '/' . $board['dir'] . $config['dir']['res'] . link_for($thread) . ($thread['thread'] ? '#' . $id : '') .
- ' for "' . $reason . '"'
+ _syslog(
+ LOG_INFO,
+ 'Reported post: ' .
+ '/' . $board['dir'] . $config['dir']['res'] . link_for($thread) . ($thread['thread'] ? '#' . $id : '') .
+ ' for "' . $reason . '"'
);
$query = prepare("INSERT INTO ``reports`` VALUES (NULL, :time, :ip, :board, :post, :reason)");
$query->bindValue(':time', time(), PDO::PARAM_INT);
@@ -356,51 +368,52 @@ function handle_report(){
$query->bindValue(':post', $id, PDO::PARAM_INT);
$query->bindValue(':reason', $reason, PDO::PARAM_STR);
$query->execute() or error(db_error($query));
-
- if ($config['slack'])
- {
-
- function slack($message, $room = "reports", $icon = ":no_entry_sign:")
- {
- $room = ($room) ? $room : "reports";
- $data = "payload=" . json_encode(array(
- "channel" => "#{$room}",
- "text" => urlencode($message),
- "icon_emoji" => $icon
- ));
-
- // You can get your webhook endpoint from your Slack settings
- // For some reason using the configuration key doesn't work
- $ch = curl_init($config['slack_incoming_webhook_endpoint']);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
- curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- $result = curl_exec($ch);
- curl_close($ch);
-
- return $result;
- }
-
- $postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '... _*(POST TRIMMED)*_';
- $slackmessage = '<' .$config['domain'] . "/mod.php?/" . $board['dir'] . $config['dir']['res'] . ( $thread['thread'] ? $thread['thread'] : $id ) . ".html" . ($thread['thread'] ? '#' . $id : '') . '> \n ' . $reason . '\n ' . $postcontent . '\n';
-
- $slackresult = slack($slackmessage, $config['slack_channel']);
-
- }
-
-
- if(isset($config['matrix'])){
- $reported_post_url = $config['domain'] . "/mod.php?/" . $board['dir'] . $config['dir']['res'] . ( $thread['thread'] ? $thread['thread'] : $id ) . ".html";
- $post_url = $config['matrix']['host'] . "/_matrix/client/r0/rooms/" . $config['matrix']['room_id'] . "/send/m.room.message?access_token=" . $config['matrix']['access_token'];
-
+
+ if ($config['slack']) {
+ function slack($message, $room = "reports", $icon = ":no_entry_sign:")
+ {
+ $room = ($room) ? $room : "reports";
+ $data = "payload=" . json_encode(
+ array(
+ "channel" => "#{$room}",
+ "text" => urlencode($message),
+ "icon_emoji" => $icon
+ )
+ );
+
+ // You can get your webhook endpoint from your Slack settings
+ // For some reason using the configuration key doesn't work
+ $ch = curl_init($config['slack_incoming_webhook_endpoint']);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ $result = curl_exec($ch);
+ curl_close($ch);
+
+ return $result;
+ }
+
+ $postcontent = mb_substr($thread['body_nomarkup'], 0, 120) . '... _*(POST TRIMMED)*_';
+ $slackmessage = '<' . $config['domain'] . "/mod.php?/" . $board['dir'] . $config['dir']['res'] . ($thread['thread'] ? $thread['thread'] : $id) . ".html" . ($thread['thread'] ? '#' . $id : '') . '> \n ' . $reason . '\n ' . $postcontent . '\n';
+
+ $slackresult = slack($slackmessage, $config['slack_channel']);
+ }
+
+
+ if (isset($config['matrix'])) {
+ $reported_post_url = $config['domain'] . "/mod.php?/" . $board['dir'] . $config['dir']['res'] . ($thread['thread'] ? $thread['thread'] : $id) . ".html";
+ $post_url = $config['matrix']['host'] . "/_matrix/client/r0/rooms/" . $config['matrix']['room_id'] . "/send/m.room.message?access_token=" . $config['matrix']['access_token'];
+
$trimmed_post = strlen($thread['body_nomarkup']) > $config['matrix']['max_message_length'] ? ' [...]' : '';
$postcontent = mb_substr($thread['body_nomarkup'], 0, $config['matrix']['max_message_length']) . $trimmed_post;
- $matrix_message = $reported_post_url . ($thread['thread'] ? '#' . $id : '') . " \nReason:\n" . $reason . " \nPost:\n" . $postcontent . " \n";
- $post_data = json_encode(array(
+ $matrix_message = $reported_post_url . ($thread['thread'] ? '#' . $id : '') . " \nReason:\n" . $reason . " \nPost:\n" . $postcontent . " \n";
+ $post_data = json_encode(
+ array(
"msgtype" => "m.text",
"body" => $matrix_message
- ));
+ )
+ );
$ch = curl_init($post_url);
curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
@@ -409,25 +422,25 @@ function handle_report(){
curl_close($ch);
}
}
-
+
$is_mod = isset($_POST['mod']) && $_POST['mod'];
$root = $is_mod ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
-
+
if (!isset($_POST['json_response'])) {
$index = $root . $board['dir'] . $config['file_index'];
- $reported_post = $root . $board['dir'] . $config['dir']['res'] . ( $thread['thread'] ? $thread['thread'] : $id ) . ".html" . ($thread['thread'] ? '#' . $id : '') ;
+ $reported_post = $root . $board['dir'] . $config['dir']['res'] . ($thread['thread'] ? $thread['thread'] : $id) . ".html" . ($thread['thread'] ? '#' . $id : '');
//header('Location: ' . $reported_post);
-
- echo Element('page.html', array('config' => $config, 'body' => '
', 'title' => _('Report submitted!')));
+
+ echo Element('page.html', array('config' => $config, 'body' => '', 'title' => _('Report submitted!')));
} else {
header('Content-Type: text/json');
echo json_encode(array('success' => true));
}
-
}
-function handle_post(){
- global $config,$dropped_post,$board, $mod,$pdo;
+function handle_post()
+{
+ global $config, $dropped_post, $board, $mod, $pdo;
if (!isset($_POST['body'], $_POST['board']) && !$dropped_post) {
error($config['error']['bot']);
@@ -436,29 +449,33 @@ function handle_post(){
$post = array('board' => $_POST['board'], 'files' => array());
// Check if board exists
- if (!openBoard($post['board']))
+ if (!openBoard($post['board'])) {
error($config['error']['noboard']);
-
+ }
+
$board_locked_check = (!isset($_POST['mod']) || !$_POST['mod'])
- && ($config['board_locked']===true
- || (is_array($config['board_locked']) && in_array(strtolower($_POST['board']), $config['board_locked'])));
+ && ($config['board_locked'] === true
+ || (is_array($config['board_locked']) && in_array(strtolower($_POST['board']), $config['board_locked'])));
- if ($board_locked_check){
+ if ($board_locked_check) {
error("Board is locked");
}
- if (!isset($_POST['name']))
+ if (!isset($_POST['name'])) {
$_POST['name'] = $config['anonymous'];
-
- if (!isset($_POST['email']))
+ }
+
+ if (!isset($_POST['email'])) {
$_POST['email'] = '';
-
- if (!isset($_POST['subject']))
+ }
+
+ if (!isset($_POST['subject'])) {
$_POST['subject'] = '';
-
+ }
+
if (!isset($_POST['password']))
- $_POST['password'] = '';
-
+ $_POST['password'] = '';
+
if (isset($_POST['thread'])) {
$post['op'] = false;
$post['thread'] = round($_POST['thread']);
@@ -471,12 +488,16 @@ function handle_post(){
// Check for CAPTCHA right after opening the board so the "return" link is in there
if ($config['recaptcha']) {
if (!isset($_POST['g-recaptcha-response']))
- error($config['error']['bot']);
+ error($config['error']['bot']);
// Check what reCAPTCHA has to say...
- $resp = json_decode(file_get_contents(sprintf('https://www.google.com/recaptcha/api/siteverify?secret=%s&response=%s&remoteip=%s',
- $config['recaptcha_private'],
- urlencode($_POST['g-recaptcha-response']),
- $_SERVER['REMOTE_ADDR'])), true);
+ $resp = json_decode(file_get_contents(
+ sprintf(
+ 'https://www.google.com/recaptcha/api/siteverify?secret=%s&response=%s&remoteip=%s',
+ $config['recaptcha_private'],
+ urlencode($_POST['g-recaptcha-response']),
+ $_SERVER['REMOTE_ADDR']
+ )
+ ), true);
if (!$resp['success']) {
error($config['error']['captcha']);
@@ -484,46 +505,48 @@ function handle_post(){
}
if (isset($config['simple_spam']) && $post['op']) {
- if(!isset($_POST['simple_spam']) || $config['simple_spam']['answer'] != $_POST['simple_spam']){
+ if (!isset($_POST['simple_spam']) || $config['simple_spam']['answer'] != $_POST['simple_spam']) {
error($config['error']['simple_spam']);
}
}
- if(isset($config['securimage']) && $config['securimage']){
-
- if(!isset($_POST['captcha'])){
+ if (isset($config['securimage']) && $config['securimage']) {
+ if (!isset($_POST['captcha'])) {
error($config['error']['securimage']['missing']);
}
- if(empty($_POST['captcha'])){
+ if (empty($_POST['captcha'])) {
error($config['error']['securimage']['empty']);
}
- $query=prepare('DELETE FROM captchas WHERE timebindValue(':ip', $_SERVER['REMOTE_ADDR']);
$query->bindValue(':code', $_POST['captcha']);
$query->execute();
- if($query->rowCount()==0){
+ if ($query->rowCount() == 0) {
error($config['error']['securimage']['bad']);
}
}
- if (!(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
- (!$post['op'] && $_POST['post'] == $config['button_reply']))) {
-
+ if (
+ !(($post['op'] && $_POST['post'] == $config['button_newtopic']) ||
+ (!$post['op'] && $_POST['post'] == $config['button_reply']))
+ ) {
error($config['error']['bot']);
}
// Check the referrer
- if ($config['referer_match'] !== false &&
- (!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER'])))) {
+ if (
+ $config['referer_match'] !== false &&
+ (!isset($_SERVER['HTTP_REFERER']) || !preg_match($config['referer_match'], rawurldecode($_SERVER['HTTP_REFERER'])))
+ ) {
error($config['error']['referer']);
}
checkDNSBL();
-
+
// Check if banned
checkBan($board['uri']);
@@ -533,23 +556,28 @@ function handle_post(){
// Liar. You're not a mod.
error($config['error']['notamod']);
}
-
+
$post['sticky'] = $post['op'] && isset($_POST['sticky']);
$post['locked'] = $post['op'] && isset($_POST['lock']);
$post['raw'] = isset($_POST['raw']);
-
- if ($post['sticky'] && !hasPermission($config['mod']['sticky'], $board['uri']))
+
+ if ($post['sticky'] && !hasPermission($config['mod']['sticky'], $board['uri'])) {
error($config['error']['noaccess']);
- if ($post['locked'] && !hasPermission($config['mod']['lock'], $board['uri']))
+ }
+ if ($post['locked'] && !hasPermission($config['mod']['lock'], $board['uri'])) {
error($config['error']['noaccess']);
- if ($post['raw'] && !hasPermission($config['mod']['rawhtml'], $board['uri']))
+ }
+ if ($post['raw'] && !hasPermission($config['mod']['rawhtml'], $board['uri'])) {
error($config['error']['noaccess']);
+ }
}
if (!$post['mod'] && $config['spam']['enabled'] == true) {
$post['antispam_hash'] = checkSpam(
- array($board['uri'],
- isset($post['thread']) ? $post['thread'] : ($config['try_smarter'] && isset($_POST['page']) ? 0 - (int)$_POST['page'] : null))
+ array(
+ $board['uri'],
+ isset($post['thread']) ? $post['thread'] : ($config['try_smarter'] && isset($_POST['page']) ? 0 - (int) $_POST['page'] : null)
+ )
);
//$post['antispam_hash'] = checkSpam();
@@ -557,31 +585,29 @@ function handle_post(){
error($config['error']['spam']);
}
}
-
+
if ($config['robot_enable'] && $config['robot_mute']) {
checkMute();
}
- }
- else {
+ } else {
$mod = $post['mod'] = false;
}
-
+
//Check if thread exists
if (!$post['op']) {
$query = prepare(sprintf("SELECT `sticky`,`locked`,`cycle`,`sage`,`slug` FROM ``posts_%s`` WHERE `id` = :id AND `thread` IS NULL LIMIT 1", $board['uri']));
$query->bindValue(':id', $post['thread'], PDO::PARAM_INT);
$query->execute() or error(db_error());
-
+
if (!$thread = $query->fetch(PDO::FETCH_ASSOC)) {
// Non-existant
error($config['error']['nonexistant']);
}
- }
- else {
+ } else {
$thread = false;
}
-
+
// Check for an embed field
if ($config['enable_embedding'] && isset($_POST['embed']) && !empty($_POST['embed'])) {
// yep; validate it
@@ -601,107 +627,117 @@ function handle_post(){
}
if (!hasPermission($config['mod']['bypass_field_disable'], $board['uri'])) {
- if ($config['field_disable_name'])
- $_POST['name'] = $config['anonymous']; // "forced anonymous"
-
- if ($config['field_disable_email'])
+ if ($config['field_disable_name']) {
+ // "forced anonymous".
+ $_POST['name'] = $config['anonymous'];
+ }
+
+ if ($config['field_disable_email']) {
$_POST['email'] = '';
-
- if ($config['field_disable_password'])
+ }
+
+ if ($config['field_disable_password']) {
$_POST['password'] = '';
-
- if ($config['field_disable_subject'] || (!$post['op'] && $config['field_disable_reply_subject']))
+ }
+
+ if ($config['field_disable_subject'] || (!$post['op'] && $config['field_disable_reply_subject'])) {
$_POST['subject'] = '';
+ }
}
-
+
if ($config['allow_upload_by_url'] && isset($_POST['file_url1']) && !empty($_POST['file_url1'])) {
- function unlink_tmp_file($file) {
+ function unlink_tmp_file($file)
+ {
@unlink($file);
fatal_error_handler();
}
- function upload_by_url($config,$post,$url) {
- $post['file_url'] = $url;
- if (!preg_match('@^https?://@', $post['file_url']))
- error($config['error']['invalidimg']);
-
- if (mb_strpos($post['file_url'], '?') !== false)
- $url_without_params = mb_substr($post['file_url'], 0, mb_strpos($post['file_url'], '?'));
- else
- $url_without_params = $post['file_url'];
+ function upload_by_url($config, $post, $url)
+ {
+ $post['file_url'] = $url;
+ if (!preg_match('@^https?://@', $post['file_url'])) {
+ error($config['error']['invalidimg']);
+ }
- $post['extension'] = strtolower(mb_substr($url_without_params, mb_strrpos($url_without_params, '.') + 1));
+ if (mb_strpos($post['file_url'], '?') !== false) {
+ $url_without_params = mb_substr($post['file_url'], 0, mb_strpos($post['file_url'], '?'));
+ } else {
+ $url_without_params = $post['file_url'];
+ }
- if ($post['op'] && $config['allowed_ext_op']) {
- if (!in_array($post['extension'], $config['allowed_ext_op']))
+ $post['extension'] = strtolower(mb_substr($url_without_params, mb_strrpos($url_without_params, '.') + 1));
+
+ if ($post['op'] && $config['allowed_ext_op']) {
+ if (!in_array($post['extension'], $config['allowed_ext_op'])) {
+ error($config['error']['unknownext']);
+ }
+ } else if (!in_array($post['extension'], $config['allowed_ext']) && !in_array($post['extension'], $config['allowed_ext_files'])) {
error($config['error']['unknownext']);
+ }
+
+ $post['file_tmp'] = tempnam($config['tmp'], 'url');
+ register_shutdown_function('unlink_tmp_file', $post['file_tmp']);
+
+ $fp = fopen($post['file_tmp'], 'w');
+
+ $curl = curl_init();
+ curl_setopt($curl, CURLOPT_URL, $post['file_url']);
+ curl_setopt($curl, CURLOPT_FAILONERROR, true);
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+ curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
+ curl_setopt($curl, CURLOPT_TIMEOUT, $config['upload_by_url_timeout']);
+ curl_setopt($curl, CURLOPT_USERAGENT, 'Tinyboard');
+ curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
+ curl_setopt($curl, CURLOPT_FILE, $fp);
+ curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+ curl_setopt($curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+
+ if (curl_exec($curl) === false) {
+ error($config['error']['nomove'] . '
Curl says: ' . curl_error($curl));
+ }
+
+ curl_close($curl);
+
+ fclose($fp);
+
+ $_FILES[$post['file_tmp']] = array(
+ 'name' => basename($url_without_params),
+ 'tmp_name' => $post['file_tmp'],
+ 'file_tmp' => true,
+ 'error' => 0,
+ 'size' => filesize($post['file_tmp'])
+ );
}
- else if (!in_array($post['extension'], $config['allowed_ext']) && !in_array($post['extension'], $config['allowed_ext_files']))
- error($config['error']['unknownext']);
-
- $post['file_tmp'] = tempnam($config['tmp'], 'url');
- register_shutdown_function('unlink_tmp_file', $post['file_tmp']);
-
- $fp = fopen($post['file_tmp'], 'w');
-
- $curl = curl_init();
- curl_setopt($curl, CURLOPT_URL, $post['file_url']);
- curl_setopt($curl, CURLOPT_FAILONERROR, true);
- curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
- curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
- curl_setopt($curl, CURLOPT_TIMEOUT, $config['upload_by_url_timeout']);
- curl_setopt($curl, CURLOPT_USERAGENT, 'Tinyboard');
- curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
- curl_setopt($curl, CURLOPT_FILE, $fp);
- curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
- curl_setopt($curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 );
-
- if (curl_exec($curl) === false)
- error($config['error']['nomove'] . '
Curl says: ' . curl_error($curl));
-
- curl_close($curl);
-
- fclose($fp);
-
- $_FILES[$post['file_tmp']] = array(
- 'name' => basename($url_without_params),
- 'tmp_name' => $post['file_tmp'],
- 'file_tmp' => true,
- 'error' => 0,
- 'size' => filesize($post['file_tmp'])
- );
+
+ for ($counter = 1; $counter <= $config['max_images']; $counter++) {
+ $varname = "file_url" . $counter;
+ if (isset($_POST[$varname]) && !empty($_POST[$varname])) {
+ upload_by_url($config, $post, $_POST[$varname]);
+ }
}
-
- for( $counter = 1; $counter <= $config['max_images']; $counter++ ) {
- $varname = "file_url". $counter;
- if (isset($_POST[$varname]) && !empty($_POST[$varname])){
- upload_by_url($config,$post,$_POST[$varname]);
+ }
+
+ // Convert multiple upload format to array of files. This makes the following code
+ // work the same whether we used the JS or HTML multiple file upload techniques.
+ if (array_key_exists('file_multiple', $_FILES)) {
+ $file_array = $_FILES['file_multiple'];
+ $_FILES = [];
+ // If more than 0 files were uploaded
+ if (!empty($file_array['tmp_name'][0])) {
+ $i = 0;
+ $n = count($file_array['tmp_name']);
+ while ($i < $n) {
+ $_FILES[strval($i + 1)] = array(
+ 'name' => $file_array['name'][$i],
+ 'tmp_name' => $file_array['tmp_name'][$i],
+ 'type' => $file_array['type'][$i],
+ 'error' => $file_array['error'][$i],
+ 'size' => $file_array['size'][$i]
+ );
+ $i++;
}
}
-
- }
-
- // Convert multiple upload format to array of files. This makes the following code
- // work the same whether we used the JS or HTML multiple file upload techniques.
- if (array_key_exists('file_multiple', $_FILES)) {
- $file_array = $_FILES['file_multiple'];
- $_FILES = [];
- // If more than 0 files were uploaded
- if (!empty($file_array['tmp_name'][0])) {
- $i = 0;
- $n = count($file_array['tmp_name']);
- while ($i < $n) {
- $_FILES[strval($i+1)] = array(
- 'name' => $file_array['name'][$i],
- 'tmp_name' => $file_array['tmp_name'][$i],
- 'type' => $file_array['type'][$i],
- 'error' => $file_array['error'][$i],
- 'size' => $file_array['size'][$i]
- );
- $i++;
- }
- }
- }
+ }
$post['name'] = $_POST['name'] != '' ? $_POST['name'] : $config['anonymous'];
$post['subject'] = $_POST['subject'];
@@ -709,7 +745,7 @@ function handle_post(){
$post['body'] = $_POST['body'];
$post['password'] = $_POST['password'];
$post['has_file'] = (!isset($post['embed']) && (($post['op'] && !isset($post['no_longer_require_an_image_for_op']) && $config['force_image_op']) || count($_FILES) > 0));
-
+
if (!$dropped_post) {
if (!($post['has_file'] || isset($post['embed'])) || (($post['op'] && $config['force_body_op']) || (!$post['op'] && $config['force_body']))) {
$stripped_whitespace = preg_replace('/[\s]/u', '', $post['body']);
@@ -717,31 +753,30 @@ function handle_post(){
error($config['error']['tooshort_body']);
}
}
-
+
if (!$post['op']) {
// Check if thread is locked
// but allow mods to post
if ($thread['locked'] && !hasPermission($config['mod']['postinlocked'], $board['uri'])) {
error($config['error']['locked']);
}
-
+
$numposts = numPosts($post['thread']);
-
- $replythreshold = isset($thread['cycle']) && $thread['cycle'] ? $numposts['replies'] - 1 : $numposts['replies'];
- $imagethreshold = isset($thread['cycle']) && $thread['cycle'] ? $numposts['images'] - 1 : $numposts['images'];
+
+ $replythreshold = isset($thread['cycle']) && $thread['cycle'] ? $numposts['replies'] - 1 : $numposts['replies'];
+ $imagethreshold = isset($thread['cycle']) && $thread['cycle'] ? $numposts['images'] - 1 : $numposts['images'];
if ($config['reply_hard_limit'] != 0 && $config['reply_hard_limit'] <= $replythreshold) {
error($config['error']['reply_hard_limit']);
}
-
+
if ($post['has_file'] && $config['image_hard_limit'] != 0 && $config['image_hard_limit'] <= $imagethreshold) {
error($config['error']['image_hard_limit']);
}
}
- }
- else {
+ } else {
if (!$post['op']) {
- $numposts = numPosts($post['thread']);
+ $numposts = numPosts($post['thread']);
}
}
@@ -763,83 +798,93 @@ function handle_post(){
}
$max_size = $config['max_filesize'];
- if (array_key_exists('board_specific',$config)){
- if (array_key_exists($board['uri'],$config['board_specific'])){
- if (array_key_exists('max_filesize',$config['board_specific'][$board['uri']])){
+ if (array_key_exists('board_specific', $config)) {
+ if (array_key_exists($board['uri'], $config['board_specific'])) {
+ if (array_key_exists('max_filesize', $config['board_specific'][$board['uri']])) {
$max_size = $config['board_specific'][$board['uri']]['max_filesize'];
}
}
}
if ($size > $max_size)
- error(sprintf3($config['error']['filesize'], array(
- 'sz' => number_format($size),
- 'filesz' => number_format($size),
- 'maxsz' => number_format($config['max_filesize'])
- )));
+ error(sprintf3(
+ $config['error']['filesize'],
+ array(
+ 'sz' => number_format($size),
+ 'filesz' => number_format($size),
+ 'maxsz' => number_format($config['max_filesize'])
+ )
+ ));
$post['filesize'] = $size;
}
$post['capcode'] = false;
-
+
if ($mod && preg_match('/^((.+) )?## (.+)$/', $post['name'], $matches)) {
$name = $matches[2] != '' ? $matches[2] : $config['anonymous'];
$cap = $matches[3];
-
+
if (isset($config['mod']['capcode'][$mod['type']])) {
- if ( $config['mod']['capcode'][$mod['type']] === true ||
+ if (
+ $config['mod']['capcode'][$mod['type']] === true ||
(is_array($config['mod']['capcode'][$mod['type']]) &&
in_array($cap, $config['mod']['capcode'][$mod['type']])
- )) {
-
+ )
+ ) {
+
$post['capcode'] = utf8tohtml($cap);
$post['name'] = $name;
}
}
- }
- else if ($config['joke_capcode']) {
+ } else if ($config['joke_capcode']) {
if (strtolower($post['email']) == 'joke') {
- if (isset($config['joke_capcode_default'])){
+ if (isset($config['joke_capcode_default'])) {
$cap = $config['joke_capcode_default'];
- }
- else {
+ } else {
$cap = "joke";
}
$post['capcode'] = utf8tohtml($cap);
$post['email'] = '';
}
}
-
+
$trip = generate_tripcode($post['name']);
$post['name'] = $trip[0];
$post['trip'] = isset($trip[1]) ? $trip[1] : ''; // XX: Dropped posts and tripcodes
-
+
$noko = false;
if (strtolower($post['email']) == 'noko') {
$noko = true;
$post['email'] = '';
- } elseif (strtolower($post['email']) == 'nonoko'){
+ } elseif (strtolower($post['email']) == 'nonoko') {
$noko = false;
$post['email'] = '';
- } else $noko = $config['always_noko'];
-
+ } else {
+ $noko = $config['always_noko'];
+ }
+
if ($post['has_file']) {
$i = 0;
foreach ($_FILES as $key => $file) {
if ($file['size'] && $file['tmp_name']) {
- if (!in_array($file['error'], array(UPLOAD_ERR_NO_FILE, UPLOAD_ERR_OK))) {
- error(sprintf3($config['error']['phpfileserror'], array(
- 'index' => $i+1,
- 'code' => $file['error']
- )));
- }
- $post['files'][] = process_filenames($file, $board['dir'], (sizeof($_FILES) > 1), $i);
- $i++;
+ if (!in_array($file['error'], array(UPLOAD_ERR_NO_FILE, UPLOAD_ERR_OK))) {
+ error(sprintf3(
+ $config['error']['phpfileserror'],
+ array(
+ 'index' => $i + 1,
+ 'code' => $file['error']
+ )
+ ));
+ }
+ $post['files'][] = process_filenames($file, $board['dir'], (sizeof($_FILES) > 1), $i);
+ $i++;
}
}
}
- if (empty($post['files'])) $post['has_file'] = false;
+ if (empty($post['files'])) {
+ $post['has_file'] = false;
+ }
if (!$dropped_post) {
// Check for a file
@@ -865,7 +910,7 @@ function handle_post(){
if (!$dropped_post) {
// Check string lengths
if (mb_strlen($post['name']) > 35) {
- error(sprintf($config['error']['toolong'], 'name'));
+ error(sprintf($config['error']['toolong'], 'name'));
}
if (mb_strlen($post['email']) > 40) {
error(sprintf($config['error']['toolong'], 'email'));
@@ -885,58 +930,61 @@ function handle_post(){
}
wordfilters($post['body']);
-
+
$post['body'] = escape_markup_modifiers($post['body']);
if ($mod && isset($post['raw']) && $post['raw']) {
$post['body'] .= "\n1";
}
-
+
if (!$dropped_post)
- if (($config['country_flags'] && !$config['allow_no_country']) || ($config['country_flags'] && $config['allow_no_country'] && !isset($_POST['no_country']))) {
- $gi=geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
-
- function ipv4to6($ip) {
- if (strpos($ip, ':') !== false) {
- if (strpos($ip, '.') > 0)
- $ip = substr($ip, strrpos($ip, ':')+1);
- else return $ip; //native ipv6
+ if (($config['country_flags'] && !$config['allow_no_country']) || ($config['country_flags'] && $config['allow_no_country'] && !isset($_POST['no_country']))) {
+ $gi = geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD);
+
+ function ipv4to6($ip)
+ {
+ if (strpos($ip, ':') !== false) {
+ if (strpos($ip, '.') > 0)
+ $ip = substr($ip, strrpos($ip, ':') + 1);
+ else
+ return $ip; //native ipv6
+ }
+ $iparr = array_pad(explode('.', $ip), 4, 0);
+ $part7 = base_convert(($iparr[0] * 256) + $iparr[1], 10, 16);
+ $part8 = base_convert(($iparr[2] * 256) + $iparr[3], 10, 16);
+ return '::ffff:' . $part7 . ':' . $part8;
+ }
+
+ if ($country_code = geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) {
+ if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2')))
+ $post['body'] .= "\n" . strtolower($country_code) . "" .
+ "\n" . geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR'])) . "";
}
- $iparr = array_pad(explode('.', $ip), 4, 0);
- $part7 = base_convert(($iparr[0] * 256) + $iparr[1], 10, 16);
- $part8 = base_convert(($iparr[2] * 256) + $iparr[3], 10, 16);
- return '::ffff:'.$part7.':'.$part8;
- }
-
- if ($country_code = geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) {
- if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2')))
- $post['body'] .= "\n".strtolower($country_code)."".
- "\n".geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."";
}
- }
if ($config['user_flag'] && isset($_POST['user_flag']))
- if (!empty($_POST['user_flag']) ){
-
- $user_flag = $_POST['user_flag'];
+ if (!empty($_POST['user_flag'])) {
+ $user_flag = $_POST['user_flag'];
- if (!isset($config['user_flags'][$user_flag]))
- error(_('Invalid flag selection!'));
+ if (!isset($config['user_flags'][$user_flag])) {
+ error(_('Invalid flag selection!'));
+ }
- $flag_alt = isset($user_flag_alt) ? $user_flag_alt : $config['user_flags'][$user_flag];
+ $flag_alt = isset($user_flag_alt) ? $user_flag_alt : $config['user_flags'][$user_flag];
- $post['body'] .= "\n" . strtolower($user_flag) . "" .
- "\n" . $flag_alt . "";
- }
+ $post['body'] .= "\n" . strtolower($user_flag) . "" .
+ "\n" . $flag_alt . "";
+ }
if ($config['allowed_tags'] && $post['op'] && isset($_POST['tag']) && isset($config['allowed_tags'][$_POST['tag']])) {
$post['body'] .= "\n" . $_POST['tag'] . "";
}
- if (!$dropped_post)
+ if (!$dropped_post) {
if ($config['proxy_save'] && isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
- $proxy = preg_replace("/[^0-9a-fA-F.,: ]/", '', $_SERVER['HTTP_X_FORWARDED_FOR']);
- $post['body'] .= "\n".$proxy."";
+ $proxy = preg_replace("/[^0-9a-fA-F.,: ]/", '', $_SERVER['HTTP_X_FORWARDED_FOR']);
+ $post['body'] .= "\n" . $proxy . "";
+ }
}
if (mysql_version() >= 50503) {
@@ -944,7 +992,7 @@ function handle_post(){
} else {
// MySQL's `utf8` charset only supports up to 3-byte symbols
// Remove anything >= 0x010000
-
+
$chars = preg_split('//u', $post['body'], -1, PREG_SPLIT_NO_EMPTY);
$post['body_nomarkup'] = '';
foreach ($chars as $char) {
@@ -960,8 +1008,12 @@ function handle_post(){
if ($post['has_file']) {
$md5cmd = false;
- if ($config['bsd_md5']) $md5cmd = '/sbin/md5 -r';
- if ($config['gnu_md5']) $md5cmd = 'md5sum';
+ if ($config['bsd_md5']) {
+ $md5cmd = '/sbin/md5 -r';
+ }
+ if ($config['gnu_md5']) {
+ $md5cmd = 'md5sum';
+ }
$allhashes = '';
@@ -973,23 +1025,23 @@ function handle_post(){
} elseif (!in_array($file['extension'], $config['allowed_ext']) && !in_array($file['extension'], $config['allowed_ext_files'])) {
error($config['error']['unknownext']);
}
-
+
$file['is_an_image'] = !in_array($file['extension'], $config['allowed_ext_files']);
-
+
// Truncate filename if it is too long
$file['filename'] = mb_substr($file['filename'], 0, $config['max_filename_len']);
-
+
$upload = $file['tmp_name'];
-
- if (!is_readable($upload))
+
+ if (!is_readable($upload)) {
error($config['error']['nomove']);
+ }
if ($md5cmd) {
$output = shell_exec_error($md5cmd . " " . escapeshellarg($upload));
$output = explode(' ', $output);
$hash = $output[0];
- }
- else {
+ } else {
$hash = md5_file($upload);
}
@@ -997,163 +1049,170 @@ function handle_post(){
$allhashes .= $hash;
}
- if (count ($post['files']) == 1) {
+ if (count($post['files']) == 1) {
$post['filehash'] = $hash;
- }
- else {
+ } else {
$post['filehash'] = md5($allhashes);
}
}
if (!hasPermission($config['mod']['bypass_filters'], $board['uri']) && !$dropped_post) {
require_once 'inc/filters.php';
-
do_filters($post);
}
if ($post['has_file']) {
foreach ($post['files'] as $key => &$file) {
- if ($file['is_an_image']) {
- if ($config['ie_mime_type_detection'] !== false) {
- // Check IE MIME type detection XSS exploit
- $buffer = file_get_contents($upload, null, null, null, 255);
- if (preg_match($config['ie_mime_type_detection'], $buffer)) {
- undoImage($post);
- error($config['error']['mime_exploit']);
+ if ($file['is_an_image']) {
+ if ($config['ie_mime_type_detection'] !== false) {
+ // Check IE MIME type detection XSS exploit
+ $buffer = file_get_contents($upload, null, null, null, 255);
+ if (preg_match($config['ie_mime_type_detection'], $buffer)) {
+ undoImage($post);
+ error($config['error']['mime_exploit']);
+ }
}
- }
-
- require_once 'inc/image.php';
-
- // find dimensions of an image using GD
- if (!$size = @getimagesize($file['tmp_name'])) {
- error($config['error']['invalidimg']);
- }
- if (!in_array($size[2], array(IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_BMP))) {
- error($config['error']['invalidimg']);
- }
- if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
- error($config['error']['maxsize']);
- }
-
- if ($config['convert_auto_orient'] && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg')) {
- // The following code corrects the image orientation.
- // Currently only works with the 'convert' option selected but it could easily be expanded to work with the rest if you can be bothered.
- if (!($config['redraw_image'] || (($config['strip_exif'] && !$config['use_exiftool']) && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg')))) {
- if (in_array($config['thumb_method'], array('convert', 'convert+gifsicle', 'gm', 'gm+gifsicle'))) {
- $exif = @exif_read_data($file['tmp_name']);
- $gm = in_array($config['thumb_method'], array('gm', 'gm+gifsicle'));
- if (isset($exif['Orientation']) && $exif['Orientation'] != 1) {
- if ($config['convert_manual_orient']) {
- $error = shell_exec_error(($gm ? 'gm ' : '') . 'convert ' .
- escapeshellarg($file['tmp_name']) . ' ' .
- ImageConvert::jpeg_exif_orientation(false, $exif) . ' ' .
- ($config['strip_exif'] ? '+profile "*"' :
- ($config['use_exiftool'] ? '' : '+profile "*"')
- ) . ' ' .
- escapeshellarg($file['tmp_name']));
- if ($config['use_exiftool'] && !$config['strip_exif']) {
- if ($exiftool_error = shell_exec_error(
- 'exiftool -overwrite_original -q -q -orientation=1 -n ' .
- escapeshellarg($file['tmp_name'])))
- error(_('exiftool failed!'), null, $exiftool_error);
+
+ require_once 'inc/image.php';
+
+ // find dimensions of an image using GD
+ if (!$size = @getimagesize($file['tmp_name'])) {
+ error($config['error']['invalidimg']);
+ }
+ if (!in_array($size[2], array(IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_BMP))) {
+ error($config['error']['invalidimg']);
+ }
+ if ($size[0] > $config['max_width'] || $size[1] > $config['max_height']) {
+ error($config['error']['maxsize']);
+ }
+
+ if ($config['convert_auto_orient'] && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg')) {
+ // The following code corrects the image orientation.
+ // Currently only works with the 'convert' option selected but it could easily be expanded to work with the rest if you can be bothered.
+ if (!($config['redraw_image'] || (($config['strip_exif'] && !$config['use_exiftool']) && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg')))) {
+ if (in_array($config['thumb_method'], array('convert', 'convert+gifsicle', 'gm', 'gm+gifsicle'))) {
+ $exif = @exif_read_data($file['tmp_name']);
+ $gm = in_array($config['thumb_method'], array('gm', 'gm+gifsicle'));
+ if (isset($exif['Orientation']) && $exif['Orientation'] != 1) {
+ if ($config['convert_manual_orient']) {
+ $error = shell_exec_error(($gm ? 'gm ' : '') . 'convert ' .
+ escapeshellarg($file['tmp_name']) . ' ' .
+ ImageConvert::jpeg_exif_orientation(false, $exif) . ' ' .
+ ($config['strip_exif'] ? '+profile "*"' : ($config['use_exiftool'] ? '' : '+profile "*"')
+ ) . ' ' .
+ escapeshellarg($file['tmp_name']));
+ if ($config['use_exiftool'] && !$config['strip_exif']) {
+ if (
+ $exiftool_error = shell_exec_error(
+ 'exiftool -overwrite_original -q -q -orientation=1 -n ' .
+ escapeshellarg($file['tmp_name'])
+ )
+ )
+ error(_('exiftool failed!'), null, $exiftool_error);
+ } else {
+ // TODO: Find another way to remove the Orientation tag from the EXIF profile
+ // without needing `exiftool`.
+ }
} else {
- // TODO: Find another way to remove the Orientation tag from the EXIF profile
- // without needing `exiftool`.
- }
- } else {
- $error = shell_exec_error(($gm ? 'gm ' : '') . 'convert ' .
+ $error = shell_exec_error(($gm ? 'gm ' : '') . 'convert ' .
escapeshellarg($file['tmp_name']) . ' -auto-orient ' . escapeshellarg($upload));
+ }
+ if ($error) {
+ error(_('Could not auto-orient image!'), null, $error);
+ }
+ $size = @getimagesize($file['tmp_name']);
+ if ($config['strip_exif']) {
+ $file['exif_stripped'] = true;
+ }
}
- if ($error) {
- error(_('Could not auto-orient image!'), null, $error);
- }
- $size = @getimagesize($file['tmp_name']);
- if ($config['strip_exif'])
- $file['exif_stripped'] = true;
}
}
}
- }
- // create image object
- $image = new Image($file['tmp_name'], $file['extension'], $size);
- if ($image->size->width > $config['max_width'] || $image->size->height > $config['max_height']) {
- $image->delete();
+ // create image object
+ $image = new Image($file['tmp_name'], $file['extension'], $size);
+ if ($image->size->width > $config['max_width'] || $image->size->height > $config['max_height']) {
+ $image->delete();
- error($config['error']['maxsize']);
- }
-
- $file['width'] = $image->size->width;
- $file['height'] = $image->size->height;
-
- if ($config['spoiler_images'] && isset($_POST['spoiler'])) {
- $file['thumb'] = 'spoiler';
-
- $size = @getimagesize($config['spoiler_image']);
- $file['thumbwidth'] = $size[0];
- $file['thumbheight'] = $size[1];
- } elseif ($config['minimum_copy_resize'] &&
- $image->size->width <= $config['thumb_width'] &&
- $image->size->height <= $config['thumb_height'] &&
- $file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'])) {
-
- // Copy, because there's nothing to resize
- copy($file['tmp_name'], $file['thumb']);
-
- $file['thumbwidth'] = $image->size->width;
- $file['thumbheight'] = $image->size->height;
- } else {
- $thumb = $image->resize(
- $config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'],
- $post['op'] ? $config['thumb_op_width'] : $config['thumb_width'],
- $post['op'] ? $config['thumb_op_height'] : $config['thumb_height']
- );
-
- $thumb->to($file['thumb']);
+ error($config['error']['maxsize']);
+ }
- $file['thumbwidth'] = $thumb->width;
- $file['thumbheight'] = $thumb->height;
-
- $thumb->_destroy();
- }
+ $file['width'] = $image->size->width;
+ $file['height'] = $image->size->height;
+
+ if ($config['spoiler_images'] && isset($_POST['spoiler'])) {
+ $file['thumb'] = 'spoiler';
+
+ $size = @getimagesize($config['spoiler_image']);
+ $file['thumbwidth'] = $size[0];
+ $file['thumbheight'] = $size[1];
+ } elseif (
+ $config['minimum_copy_resize'] &&
+ $image->size->width <= $config['thumb_width'] &&
+ $image->size->height <= $config['thumb_height'] &&
+ $file['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'])
+ ) {
+ // Copy, because there's nothing to resize
+ copy($file['tmp_name'], $file['thumb']);
+
+ $file['thumbwidth'] = $image->size->width;
+ $file['thumbheight'] = $image->size->height;
+ } else {
+ $thumb = $image->resize(
+ $config['thumb_ext'] ? $config['thumb_ext'] : $file['extension'],
+ $post['op'] ? $config['thumb_op_width'] : $config['thumb_width'],
+ $post['op'] ? $config['thumb_op_height'] : $config['thumb_height']
+ );
+
+ $thumb->to($file['thumb']);
- if ($config['redraw_image'] || (!@$file['exif_stripped'] && $config['strip_exif'] && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg'))) {
- if (!$config['redraw_image'] && $config['use_exiftool']) {
- if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
- escapeshellarg($file['tmp_name']))) {
- error(_('Could not strip EXIF metadata!'), null, $error);
+ $file['thumbwidth'] = $thumb->width;
+ $file['thumbheight'] = $thumb->height;
+
+ $thumb->_destroy();
+ }
+
+ if ($config['redraw_image'] || (!@$file['exif_stripped'] && $config['strip_exif'] && ($file['extension'] == 'jpg' || $file['extension'] == 'jpeg'))) {
+ if (!$config['redraw_image'] && $config['use_exiftool']) {
+ if (
+ $error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
+ escapeshellarg($file['tmp_name']))
+ ) {
+ error(_('Could not strip EXIF metadata!'), null, $error);
+ } else {
+ clearstatcache(true, $file['tmp_name']);
+ if (($newfilesize = filesize($file['tmp_name'])) !== false) {
+ $file['size'] = $newfilesize;
+ }
+ }
} else {
- clearstatcache(true, $file['tmp_name']);
- if (($newfilesize = filesize($file['tmp_name'])) !== false)
- $file['size'] = $newfilesize;
+ $image->to($file['file']);
+ $dont_copy_file = true;
}
- } else {
- $image->to($file['file']);
- $dont_copy_file = true;
}
- }
- $image->destroy();
- } else {
- if (($file['extension'] == "pdf" && $config['pdf_file_thumbnail']) ||
- ($file['extension'] == "djvu" && $config['djvu_file_thumbnail']) ){
- $path = $file['thumb'];
- $error = shell_exec_error( 'convert -size '.$config['thumb_width'].'x'.$config['thumb_height'].' -thumbnail '.$config['thumb_width'].'x'.$config['thumb_height'].' -background white -alpha remove ' .
- escapeshellarg($file['tmp_name']. '[0]') . ' ' .
- escapeshellarg($file['thumb']));
+ $image->destroy();
+ } else {
+ if (
+ ($file['extension'] == "pdf" && $config['pdf_file_thumbnail']) ||
+ ($file['extension'] == "djvu" && $config['djvu_file_thumbnail'])
+ ) {
+ $path = $file['thumb'];
+ $error = shell_exec_error('convert -size ' . $config['thumb_width'] . 'x' . $config['thumb_height'] . ' -thumbnail ' . $config['thumb_width'] . 'x' . $config['thumb_height'] . ' -background white -alpha remove ' .
+ escapeshellarg($file['tmp_name'] . '[0]') . ' ' .
+ escapeshellarg($file['thumb']));
+
+ if ($error) {
+ $path = sprintf($config['file_thumb'], isset($config['file_icons'][$file['extension']]) ? $config['file_icons'][$file['extension']] : $config['file_icons']['default']);
+ }
- if ($error){
- $path = sprintf($config['file_thumb'],isset($config['file_icons'][$file['extension']]) ? $config['file_icons'][$file['extension']] : $config['file_icons']['default']);
+ $file['thumb'] = basename($file['thumb']);
+ $size = @getimagesize($path);
+ $file['thumbwidth'] = $size[0];
+ $file['thumbheight'] = $size[1];
+ $file['width'] = $size[0];
+ $file['height'] = $size[1];
}
-
- $file['thumb'] = basename($file['thumb']);
- $size = @getimagesize($path);
- $file['thumbwidth'] = $size[0];
- $file['thumbheight'] = $size[1];
- $file['width'] = $size[0];
- $file['height'] = $size[1];
- }
- /*if (($file['extension'] == "epub" && $config['epub_file_thumbnail'])){
+ /*if (($file['extension'] == "epub" && $config['epub_file_thumbnail'])){
$path = $file['thumb'];
// Open epub
// Get file list
@@ -1197,112 +1256,120 @@ function handle_post(){
$file['thumbheight'] = $size[1];
$file['width'] = $size[0];
$file['height'] = $size[1];
- }*/
- else if ($file['extension'] == "txt" && $config['txt_file_thumbnail']){
- $path = $file['thumb'];
- $error = shell_exec_error( 'convert -thumbnail x300 xc:white -pointsize 12 -fill black -annotate +15+15 ' .
- escapeshellarg( '@' . $file['tmp_name']) . ' ' .
- escapeshellarg($file['thumb']));
+ }*/ else if ($file['extension'] == "txt" && $config['txt_file_thumbnail']) {
+ $path = $file['thumb'];
+ $error = shell_exec_error('convert -thumbnail x300 xc:white -pointsize 12 -fill black -annotate +15+15 ' .
+ escapeshellarg('@' . $file['tmp_name']) . ' ' .
+ escapeshellarg($file['thumb']));
+
+ if ($error) {
+ $path = sprintf($config['file_thumb'], isset($config['file_icons'][$file['extension']]) ? $config['file_icons'][$file['extension']] : $config['file_icons']['default']);
+ }
- if ($error){
- $path = sprintf($config['file_thumb'],isset($config['file_icons'][$file['extension']]) ? $config['file_icons'][$file['extension']] : $config['file_icons']['default']);
+ $file['thumb'] = basename($file['thumb']);
+ $size = @getimagesize($path);
+ $file['thumbwidth'] = $size[0];
+ $file['thumbheight'] = $size[1];
+ $file['width'] = $size[0];
+ $file['height'] = $size[1];
+ } else if ($file['extension'] == "svg") {
+ // Copy, because there's nothing to resize
+ $file['thumb'] = substr_replace($file['thumb'], $file['extension'], strrpos($file['thumb'], '.') + 1);
+ copy($file['tmp_name'], $file['thumb']);
+ $file['thumbwidth'] = $config['thumb_width'];
+ $file['thumbheight'] = $config['thumb_height'];
+ $file['thumb'] = basename($file['thumb']);
+ } else {
+ // not an image
+ //copy($config['file_thumb'], $post['thumb']);
+ $file['thumb'] = 'file';
+
+ $size = @getimagesize(
+ sprintf(
+ $config['file_thumb'],
+ isset($config['file_icons'][$file['extension']]) ?
+ $config['file_icons'][$file['extension']] : $config['file_icons']['default']
+ )
+ );
+ $file['thumbwidth'] = $size[0];
+ $file['thumbheight'] = $size[1];
}
-
- $file['thumb'] = basename($file['thumb']);
- $size = @getimagesize($path);
- $file['thumbwidth'] = $size[0];
- $file['thumbheight'] = $size[1];
- $file['width'] = $size[0];
- $file['height'] = $size[1];
}
- else if ($file['extension'] == "svg"){
- // Copy, because there's nothing to resize
- $file['thumb'] = substr_replace($file['thumb'] , $file['extension'], strrpos($file['thumb'] , '.') +1);
- copy($file['tmp_name'], $file['thumb']);
- $file['thumbwidth'] = $config['thumb_width'];
- $file['thumbheight'] = $config['thumb_height'];
- $file['thumb'] = basename($file['thumb']);
-
- }
- else {
- // not an image
- //copy($config['file_thumb'], $post['thumb']);
- $file['thumb'] = 'file';
-
- $size = @getimagesize(sprintf($config['file_thumb'],
- isset($config['file_icons'][$file['extension']]) ?
- $config['file_icons'][$file['extension']] : $config['file_icons']['default']));
- $file['thumbwidth'] = $size[0];
- $file['thumbheight'] = $size[1];
- }
- }
- if ($config['tesseract_ocr'] && $file['thumb'] != 'file') { // Let's OCR it!
- $fname = $file['tmp_name'];
+ if ($config['tesseract_ocr'] && $file['thumb'] != 'file') {
+ // Let's OCR it!
+ $fname = $file['tmp_name'];
- if ($file['height'] > 500 || $file['width'] > 500) {
- $fname = $file['thumb'];
- }
+ if ($file['height'] > 500 || $file['width'] > 500) {
+ $fname = $file['thumb'];
+ }
- if ($fname == 'spoiler') { // We don't have that much CPU time, do we?
- }
- else {
- $tmpname = __DIR__ . "/tmp/tesseract/".rand(0,10000000);
+ if ($fname == 'spoiler') {
+ // We don't have that much CPU time, do we?
+ } else {
+ $tmpname = __DIR__ . "/tmp/tesseract/" . rand(0, 10000000);
- // Preprocess command is an ImageMagick b/w quantization
- $error = shell_exec_error(sprintf($config['tesseract_preprocess_command'], escapeshellarg($fname)) . " | " .
- 'tesseract stdin '.escapeshellarg($tmpname).' '.$config['tesseract_params']);
- $tmpname .= ".txt";
+ // Preprocess command is an ImageMagick b/w quantization
+ $error = shell_exec_error(sprintf($config['tesseract_preprocess_command'], escapeshellarg($fname)) . " | " .
+ 'tesseract stdin ' . escapeshellarg($tmpname) . ' ' . $config['tesseract_params']);
+ $tmpname .= ".txt";
- $value = @file_get_contents($tmpname);
- @unlink($tmpname);
+ $value = @file_get_contents($tmpname);
+ @unlink($tmpname);
- if ($value && trim($value)) {
- // This one has an effect, that the body is appended to a post body. So you can write a correct
- // spamfilter.
- $post['body_nomarkup'] .= "".htmlspecialchars($value)."";
+ if ($value && trim($value)) {
+ // This one has an effect, that the body is appended to a post body. So you can write a correct
+ // spamfilter.
+ $post['body_nomarkup'] .= "" . htmlspecialchars($value) . "";
+ }
}
}
- }
- if (!isset($dont_copy_file) || !$dont_copy_file) {
- if (isset($file['file_tmp'])) {
- if (!@rename($file['tmp_name'], $file['file']))
+ if (!isset($dont_copy_file) || !$dont_copy_file) {
+ if (isset($file['file_tmp'])) {
+ if (!@rename($file['tmp_name'], $file['file'])) {
+ error($config['error']['nomove']);
+ }
+ chmod($file['file'], 0644);
+ } elseif (!@move_uploaded_file($file['tmp_name'], $file['file'])) {
error($config['error']['nomove']);
- chmod($file['file'], 0644);
- } elseif (!@move_uploaded_file($file['tmp_name'], $file['file']))
- error($config['error']['nomove']);
+ }
}
}
if ($config['image_reject_repost']) {
if ($p = getPostByHash($post['filehash'])) {
undoImage($post);
- error(sprintf($config['error']['fileexists'],
- ($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
- ($board['dir'] . $config['dir']['res'] .
- ($p['thread'] ?
- $p['thread'] . '.html#' . $p['id']
- :
- $p['id'] . '.html'
- ))
- ));
+ error(
+ sprintf(
+ $config['error']['fileexists'],
+ ($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
+ ($board['dir'] . $config['dir']['res'] .
+ ($p['thread'] ?
+ $p['thread'] . '.html#' . $p['id']
+ :
+ $p['id'] . '.html'
+ ))
+ )
+ );
}
} else if (!$post['op'] && $config['image_reject_repost_in_thread']) {
if ($p = getPostByHashInThread($post['filehash'], $post['thread'])) {
undoImage($post);
- error(sprintf($config['error']['fileexistsinthread'],
- ($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
- ($board['dir'] . $config['dir']['res'] .
- ($p['thread'] ?
- $p['thread'] . '.html#' . $p['id']
- :
- $p['id'] . '.html'
- ))
- ));
+ error(
+ sprintf(
+ $config['error']['fileexistsinthread'],
+ ($post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root']) .
+ ($board['dir'] . $config['dir']['res'] .
+ ($p['thread'] ?
+ $p['thread'] . '.html#' . $p['id']
+ :
+ $p['id'] . '.html'
+ ))
+ )
+ );
}
}
-
}
// Do filters again if OCRing
@@ -1318,46 +1385,51 @@ function handle_post(){
error($config['error']['unoriginal']);
}
}
-
+
// Remove board directories before inserting them into the database.
if ($post['has_file']) {
foreach ($post['files'] as $key => &$file) {
$file['file_path'] = $file['file'];
$file['thumb_path'] = $file['thumb'];
$file['file'] = mb_substr($file['file'], mb_strlen($board['dir'] . $config['dir']['img']));
- if ($file['is_an_image'] && $file['thumb'] != 'spoiler')
+ if ($file['is_an_image'] && $file['thumb'] != 'spoiler') {
$file['thumb'] = mb_substr($file['thumb'], mb_strlen($board['dir'] . $config['dir']['thumb']));
+ }
}
}
// Custom /leftypol/ var to check if Tor
$tor = ($_SERVER['REMOTE_ADDR'] == '127.0.0.1');
- $post = (object)$post;
- $post->files = array_map(function($a) { return (object)$a; }, $post->files);
+ $post = (object) $post;
+ $post->files = array_map(function ($a) {
+ return (object) $a;
+ }, $post->files);
$error = event('post', $post, $tor);
- $post->files = array_map(function($a) { return (array)$a; }, $post->files);
+ $post->files = array_map(function ($a) {
+ return (array) $a;
+ }, $post->files);
if ($error) {
- undoImage((array)$post);
+ undoImage((array) $post);
error($error);
}
- $post = (array)$post;
+ $post = (array) $post;
if ($post['files']) {
$post['files'] = $post['files'];
}
$post['num_files'] = sizeof($post['files']);
-
+
$post['id'] = $id = post($post);
$post['slug'] = slugify($post);
-
+
if ($dropped_post && $dropped_post['from_nntp']) {
- $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES ".
- "(:board , :id , :message_id , :message_id_digest , false, :headers)");
+ $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES " .
+ "(:board , :id , :message_id , :message_id_digest , false, :headers)");
$query->bindValue(':board', $dropped_post['board']);
$query->bindValue(':id', $id);
@@ -1376,15 +1448,15 @@ function handle_post(){
$message = gen_nntp($headers, $files);
- $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES ".
- "(:board , :id , :message_id , :message_id_digest , true , :headers)");
+ $query = prepare("INSERT INTO ``nntp_references`` (`board`, `id`, `message_id`, `message_id_digest`, `own`, `headers`) VALUES " .
+ "(:board , :id , :message_id , :message_id_digest , true , :headers)");
$query->bindValue(':board', $post['board']);
- $query->bindValue(':id', $post['id']);
- $query->bindValue(':message_id', $msgid);
- $query->bindValue(':message_id_digest', sha1($msgid));
- $query->bindValue(':headers', json_encode($headers));
- $query->execute() or error(db_error($query));
+ $query->bindValue(':id', $post['id']);
+ $query->bindValue(':message_id', $msgid);
+ $query->bindValue(':message_id_digest', sha1($msgid));
+ $query->bindValue(':headers', json_encode($headers));
+ $query->execute() or error(db_error($query));
// Let's broadcast it!
nntp_publish($message, $msgid);
@@ -1400,17 +1472,17 @@ function handle_post(){
$query->bindValue(':limit', $config['cycle_limit'], PDO::PARAM_INT);
$query->execute() or error(db_error($query));
}
-
+
if (isset($post['antispam_hash'])) {
incrementSpamHash($post['antispam_hash']);
}
-
+
if (isset($post['tracked_cites']) && !empty($post['tracked_cites'])) {
$insert_rows = array();
foreach ($post['tracked_cites'] as $cite) {
$insert_rows[] = '(' .
- $pdo->quote($board['uri']) . ', ' . (int)$id . ', ' .
- $pdo->quote($cite[0]) . ', ' . (int)$cite[1] . ')';
+ $pdo->quote($board['uri']) . ', ' . (int) $id . ', ' .
+ $pdo->quote($cite[0]) . ', ' . (int) $cite[1] . ')';
}
query('INSERT INTO ``cites`` VALUES ' . implode(', ', $insert_rows)) or error(db_error());
}
@@ -1421,28 +1493,30 @@ function handle_post(){
if (isset($_SERVER['HTTP_REFERER'])) {
// Tell Javascript that we posted successfully
- if (isset($_COOKIE[$config['cookies']['js']]))
+ if (isset($_COOKIE[$config['cookies']['js']])) {
$js = json_decode($_COOKIE[$config['cookies']['js']]);
- else
+ }
+ else {
$js = (object) array();
+ }
// Tell it to delete the cached post for referer
$js->{$_SERVER['HTTP_REFERER']} = true;
// Encode and set cookie
setcookie($config['cookies']['js'], json_encode($js), 0, $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, false, false);
}
-
+
$root = $post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
-
+
if ($noko) {
$redirect = $root . $board['dir'] . $config['dir']['res'] .
link_for($post, false, false, $thread) . (!$post['op'] ? '#' . $id : '');
-
+
if (!$post['op'] && isset($_SERVER['HTTP_REFERER'])) {
$regex = array(
'board' => str_replace('%s', '(\w{1,8})', preg_quote($config['board_path'], '/')),
'page' => str_replace('%d', '(\d+)', preg_quote($config['file_page'], '/')),
'page50' => '(' . str_replace('%d', '(\d+)', preg_quote($config['file_page50'], '/')) . '|' .
- str_replace(array('%d', '%s'), array('(\d+)', '[a-z0-9-]+'), preg_quote($config['file_page50_slug'], '/')) . ')',
+ str_replace(array('%d', '%s'), array('(\d+)', '[a-z0-9-]+'), preg_quote($config['file_page50_slug'], '/')) . ')',
'res' => preg_quote($config['dir']['res'], '/'),
);
@@ -1453,48 +1527,54 @@ function handle_post(){
}
} else {
$redirect = $root . $board['dir'] . $config['file_index'];
-
}
buildThread($post['op'] ? $id : $post['thread']);
-
- if ($config['syslog'])
+
+ if ($config['syslog']) {
_syslog(LOG_INFO, 'New post: /' . $board['dir'] . $config['dir']['res'] .
link_for($post) . (!$post['op'] ? '#' . $id : ''));
-
- if (!$post['mod']) header('X-Associated-Content: "' . $redirect . '"');
+ }
+
+ if (!$post['mod']) {
+ header('X-Associated-Content: "' . $redirect . '"');
+ }
if (!isset($_POST['json_response'])) {
header('Location: ' . $redirect, true, $config['redirect_http']);
} else {
header('Content-Type: text/json; charset=utf-8');
- echo json_encode(array(
- 'redirect' => $redirect,
- 'noko' => $noko,
- 'id' => $id
- ));
+ echo json_encode(
+ array(
+ 'redirect' => $redirect,
+ 'noko' => $noko,
+ 'id' => $id
+ )
+ );
}
-
+
if ($post['op']) {
clean($id);
-
+
if ($config['try_smarter'])
$build_pages = range(1, $config['max_pages']);
}
-
+
event('post-after', $post);
-
+
// If this is a new thread or the poster is returning to the index, let's build it before they redirect
- if ($post['op'] || !$noko)
+ if ($post['op'] || !$noko) {
buildIndex();
-
+ }
+
// We are already done, let's continue our heavy-lifting work in the background (if we run off FastCGI)
if (function_exists('fastcgi_finish_request')) {
@fastcgi_finish_request();
}
- if (!$post['op'] && $noko)
+ if (!$post['op'] && $noko) {
buildIndex();
+ }
if ($post['op']) {
rebuildThemes('post-thread', $board['uri']);
@@ -1503,13 +1583,14 @@ function handle_post(){
}
}
-function handle_appeal(){
+function handle_appeal()
+{
global $config;
if (!isset($_POST['ban_id']))
error($config['error']['bot']);
-
- $ban_id = (int)$_POST['ban_id'];
-
+
+ $ban_id = (int) $_POST['ban_id'];
+
$bans = Bans::find($_SERVER['REMOTE_ADDR']);
foreach ($bans as $_ban) {
if ($_ban['id'] == $ban_id) {
@@ -1517,50 +1598,48 @@ function handle_appeal(){
break;
}
}
-
+
if (!isset($ban)) {
error($config['error']['noban']);
}
-
+
if ($ban['expires'] && $ban['expires'] - $ban['created'] <= $config['ban_appeals_min_length']) {
error($config['error']['tooshortban']);
}
-
+
$query = query("SELECT `denied` FROM ``ban_appeals`` WHERE `ban_id` = $ban_id") or error(db_error());
$ban_appeals = $query->fetchAll(PDO::FETCH_COLUMN);
-
+
if (count($ban_appeals) >= $config['ban_appeals_max']) {
error($config['error']['toomanyappeals']);
}
-
+
foreach ($ban_appeals as $is_denied) {
- if (!$is_denied)
+ if (!$is_denied) {
error($config['error']['pendingappeal']);
+ }
}
-
+
if (strlen($_POST['appeal']) > $config['ban_appeal_max_chars']) {
error($config['error']['toolongappeal']);
}
-
+
$query = prepare("INSERT INTO ``ban_appeals`` VALUES (NULL, :ban_id, :time, :message, 0)");
$query->bindValue(':ban_id', $ban_id, PDO::PARAM_INT);
$query->bindValue(':time', time(), PDO::PARAM_INT);
$query->bindValue(':message', $_POST['appeal']);
$query->execute() or error(db_error($query));
-
- displayBan($ban);
+ displayBan($ban);
}
// Is it a post coming from NNTP? Let's extract it and pretend it's a normal post.
if (isset($_GET['Newsgroups'])) {
- if($config['nntpchan']['enabled']){
+ if ($config['nntpchan']['enabled']) {
handle_nntpchan();
- }
- else {
+ } else {
error("NNTPChan: NNTPChan support is disabled");
- }
-
+ }
}
if (isset($_POST['delete'])) {