Change 'Clear reports' to 'Approve' and make approval permanent

This commit is contained in:
Trevor Slocum 2021-04-15 21:16:01 -07:00
parent 07b4e57ad3
commit 0851c4528a
2 changed files with 9 additions and 4 deletions

View File

@ -573,6 +573,10 @@ if (!isset($_GET['delete']) && !isset($_GET['manage']) && (isset($_POST['name'])
fancyDie(__('Sorry, an invalid post identifier was sent. Please go back, refresh the page, and try again.')); fancyDie(__('Sorry, an invalid post identifier was sent. Please go back, refresh the page, and try again.'));
} }
if ($post['moderated'] == 1) {
fancyDie(__('Moderators have determined that post does not break any rules.'));
}
$report = reportByIP($post['id'], remoteAddress()); $report = reportByIP($post['id'], remoteAddress());
if (!empty($report)) { if (!empty($report)) {
fancyDie(__('You have already submitted a report for that post.')); fancyDie(__('You have already submitted a report for that post.'));
@ -1028,10 +1032,11 @@ EOF;
if ($_GET['clearreports'] > 0) { if ($_GET['clearreports'] > 0) {
$post = postByID($_GET['clearreports']); $post = postByID($_GET['clearreports']);
if ($post) { if ($post) {
approvePostByID($post['id']);
deleteReportsByPost($post['id']); deleteReportsByPost($post['id']);
manageLogAction(sprintf(__('Cleared reports for %s'), postLink('>>' . $post['id']))); manageLogAction(__('Approved') . ' ' . postLink('>>' . $post['id']));
$text .= manageInfo(__('Reports cleared.')); $text .= manageInfo(sprintf(__('Post No.%d approved.'), $post['id']));
} else { } else {
fancyDie(__("Sorry, there doesn't appear to be a post with that ID.")); fancyDie(__("Sorry, there doesn't appear to be a post with that ID."));
} }

View File

@ -1226,7 +1226,7 @@ EOF;
$report_html = ''; $report_html = '';
$reports = reportsByPost($post['id']); $reports = reportsByPost($post['id']);
if (TINYIB_REPORT && count($reports) > 0) { if (TINYIB_REPORT && count($reports) > 0) {
$txt_clear_reports = __('Clear reports'); $txt_clear_reports = __('Approve');
$report_info = count($reports) . ' ' . plural(count($reports), __('report'), __('reports')); $report_info = count($reports) . ' ' . plural(count($reports), __('report'), __('reports'));
$report_html = <<<EOF $report_html = <<<EOF
<tr><td align="right" width="50%;"> <tr><td align="right" width="50%;">
@ -1314,7 +1314,7 @@ function manageEditKeyword($id) {
<label for="action">$txt_action</label> <label for="action">$txt_action</label>
<select name="action"> <select name="action">
EOF; EOF;
if (TINYIB_REPORT) { if (TINYIB_REPORT && TINYIB_REQMOD != 'all') {
$return .= '<option value="report"' . ($v_action == 'report' ? ' selected' : '') . '>' . __('Report') . '</option>'; $return .= '<option value="report"' . ($v_action == 'report' ? ' selected' : '') . '>' . __('Report') . '</option>';
} }
$return .= '<option value="delete"' . ($v_action == 'delete' ? ' selected' : '') . '>' . __('Delete') . '</option>'; $return .= '<option value="delete"' . ($v_action == 'delete' ? ' selected' : '') . '>' . __('Delete') . '</option>';