diff --git a/inc/instance-config.php b/inc/instance-config.php index 08203c03..c3c68f37 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -108,6 +108,7 @@ $config['spam']['enabled'] = true; $config['spam_noticer']['enabled'] = true; $config['spam_noticer']['base_url'] = 'http://localhost:8300'; $config['spam_noticer']['ui_url'] = 'https://dev-spamnoticer.leftychan.net/static/index.html'; +$config['spam_noticer']['imageboard_root'] = 'http://dev.leftychan.net/'; $config['spam_noticer']['website_name'] = "leftychan_dev"; /* @@ -505,5 +506,4 @@ $config['filters'][] = array( ); $config['global_message'] = '
'; -$config['spam_noticer']['website_name'] = "leftychan_dev"; $config['debug'] = true; diff --git a/inc/mod/pages.php b/inc/mod/pages.php index 2d4f9f81..763d4c72 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -1821,7 +1821,6 @@ function mod_ban_post(string $board, $delete, $post_num, $token = false) { $po, $board, $spamnoticer_info); - print_err('$spamnoticer_result: ' . $spamnoticer_result); } $will_ban = $spamnoticer_info->ban; diff --git a/inc/spamnoticer.php b/inc/spamnoticer.php index b49cd62b..4db42d32 100644 --- a/inc/spamnoticer.php +++ b/inc/spamnoticer.php @@ -108,10 +108,12 @@ function addToSpamNoticer($config, $post, $boardname, BanFormFieldsForSpamnotice 'time_stamp' => $post->time, 'website_name' => $config['spam_noticer']['website_name'], 'board_name' => $boardname, - 'thread_id' => isset($post->thread) ? $post->thread : NULL, 'reporter_name' => getUsername() ]; + if (isset($post->thread)) { + $json_payload['thread_id'] = $post->thread; + } try { $multipart = array(); @@ -164,10 +166,13 @@ function checkWithSpamNoticer($config, $post, $boardname) { 'time_stamp' => time(), 'website_name' => $config['spam_noticer']['website_name'], 'board_name' => $boardname, - 'thread_id' => array_key_exists('thread', $post) ? $post['thread'] : NULL, 'delete_token' => $post['delete_token'], ]; + if (array_key_exists('thread', $post)) { + $json_payload['thread_id'] = $post['thread']; + } + $result = new SpamNoticerResult(); try {