harmacist/tinyib
1
0
Fork 0
forked from GithubBackups/tinyib
Code Pull Requests Activity

Clarify error displayed when a message or file/embed is required to post

Browse Source
This commit is contained in:
Trevor Slocum 2018-08-01 11:15:02 -07:00
parent aabd70bca4
commit b7e0f7e5eb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
imgboard.php
View File

@ -71,7 +71,7 @@ if (TINYIB_TIMEZONE != '') {
$redirect = true; $redirect = true;
// Check if the request is to make a post // Check if the request is to make a post
if (isset($_POST['message']) || isset($_POST['file'])) { if (!isset($_GET['delete']) && !isset($_GET['manage']) && (isset($_POST['name']) || isset($_POST['email']) || isset($_POST['subject']) || isset($_POST['message']) || isset($_POST['file']) || isset($_POST['embed']) || isset($_POST['password']))) {
if (TINYIB_DBMIGRATE) { if (TINYIB_DBMIGRATE) {
fancyDie('Posting is currently disabled.<br>Please try again in a few moments.'); fancyDie('Posting is currently disabled.<br>Please try again in a few moments.');
} }
@ -279,10 +279,10 @@ if (isset($_POST['message']) || isset($_POST['file'])) {
if ($post['file'] == '') { // No file uploaded if ($post['file'] == '') { // No file uploaded
$allowed = ""; $allowed = "";
if (!empty($tinyib_uploads)) { if (!empty($tinyib_uploads) && ($rawpost || !in_array('file', $hide_fields))) {
$allowed = "file"; $allowed = "file";
} }
if (!empty($tinyib_embeds)) { if (!empty($tinyib_embeds) && ($rawpost || !in_array('embed', $hide_fields))) {
if ($allowed != "") { if ($allowed != "") {
$allowed .= " or "; $allowed .= " or ";
} }
@ -291,8 +291,15 @@ if (isset($_POST['message']) || isset($_POST['file'])) {
if ($post['parent'] == TINYIB_NEWTHREAD && $allowed != "" && !TINYIB_NOFILEOK) { if ($post['parent'] == TINYIB_NEWTHREAD && $allowed != "" && !TINYIB_NOFILEOK) {
fancyDie("A $allowed is required to start a thread."); fancyDie("A $allowed is required to start a thread.");
} }
if (str_replace('<br>', '', $post['message']) == "") { if (!$rawpost && str_replace('<br>', '', $post['message']) == "") {
fancyDie("Please enter a message" . ($allowed != "" ? " and/or upload a $allowed" : "") . "."); $die_msg = "";
if (!in_array('message', $hide_fields)) {
$die_msg .= "enter a message " . ($allowed != "" ? " and/or " : "");
}
if ($allowed != "") {
$die_msg .= "upload a $allowed";
}
fancyDie("Please $die_msg.");
} }
} else { } else {
echo $post['file_original'] . ' uploaded.<br>'; echo $post['file_original'] . ' uploaded.<br>';