diff --git a/config.php.in b/config.php.in index 710dda4b..3ce7471e 100644 --- a/config.php.in +++ b/config.php.in @@ -495,6 +495,7 @@ define('ACTION_VIEW_JOURNAL', 17); define('ACTION_NOT_SPAM', 18); define('ACTION_MARK_AS_PRIVATE', 19); define('ACTION_MARK_MESSAGE_FOR_REMOVAL', 20); +define('ACTION_REJECT_REMOVAL', 21); $actions = array( 'unknown' => 1, @@ -509,7 +510,9 @@ $actions = array( 'save_search' => 11, 'download_attachment' => 15, 'journal' => 17, - 'private' => 19 + 'private' => 19, + 'marked_for_removal', 20, + 'reject_removal', 21 ); diff --git a/webui/controller/audit/helper.php b/webui/controller/audit/helper.php index af248ce8..053b5636 100644 --- a/webui/controller/audit/helper.php +++ b/webui/controller/audit/helper.php @@ -66,6 +66,7 @@ class ControllerAuditHelper extends Controller { $this->data['actions'][ACTION_VIEW_JOURNAL] = $this->data['text_view_journal']; $this->data['actions'][ACTION_MARK_MESSAGE_FOR_REMOVAL] = $this->data['text_remove_request']; $this->data['actions'][ACTION_MARK_AS_PRIVATE] = $this->data['text_mark_private']; + $this->data['actions'][ACTION_REJECT_REMOVAL] = $this->data['text_reject_removal']; diff --git a/webui/controller/message/rejectremove.php b/webui/controller/message/rejectremove.php index 1e47b8d2..12208607 100644 --- a/webui/controller/message/rejectremove.php +++ b/webui/controller/message/rejectremove.php @@ -37,6 +37,8 @@ class ControllerMessageRejectRemove extends Controller { // Shouldn't we ask for a token or something as well? + AUDIT(ACTION_REJECT_REMOVAL, '', '', $id, ''); + $db->query("UPDATE " . TABLE_DELETED . " SET deleted=0, approver=?, date2=?, reason2=? WHERE id=?", [$this->data['username'], NOW, $this->request->post['reason2'], $id]); syslog(LOG_INFO, $this->data['username'] . " rejected removing message: $id"); diff --git a/webui/language/cz/messages.php b/webui/language/cz/messages.php index 86385d15..b215459d 100644 --- a/webui/language/cz/messages.php +++ b/webui/language/cz/messages.php @@ -494,3 +494,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/de/messages.php b/webui/language/de/messages.php index cbed91ad..c18e4738 100644 --- a/webui/language/de/messages.php +++ b/webui/language/de/messages.php @@ -501,3 +501,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php index c361427d..e88f048e 100644 --- a/webui/language/en/messages.php +++ b/webui/language/en/messages.php @@ -288,6 +288,7 @@ $_['text_ref'] = "Reference"; $_['text_refresh_period'] = "Refresh period"; $_['text_refresh_qr_code'] = "Refresh QR code"; $_['text_reject'] = "Reject"; +$_['text_rejected_removal'] = "rejected removal"; $_['text_reason_of_rejection'] = "Reason of rejection"; $_['text_relay_details'] = "Relay details"; $_['text_relay_status'] = "Relay status"; diff --git a/webui/language/es/messages.php b/webui/language/es/messages.php index cc230f9c..dba25b13 100644 --- a/webui/language/es/messages.php +++ b/webui/language/es/messages.php @@ -499,3 +499,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/fr/messages.php b/webui/language/fr/messages.php index 41b74b4f..7f404f30 100644 --- a/webui/language/fr/messages.php +++ b/webui/language/fr/messages.php @@ -496,3 +496,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php index d6e70f9c..ef3c7474 100644 --- a/webui/language/hu/messages.php +++ b/webui/language/hu/messages.php @@ -290,6 +290,7 @@ $_['text_ref'] = "Hivatkozás"; $_['text_refresh_period'] = "Frissítési periódus"; $_['text_refresh_qr_code'] = "QR kód frissítése"; $_['text_reject'] = "Elutasítás"; +$_['text_rejected_removal'] = "törlés elutasítva"; $_['text_relay_details'] = "Relay részletek"; $_['text_relay_status'] = "Relay státusz"; $_['text_remove'] = "Törlés"; diff --git a/webui/language/pl/messages.php b/webui/language/pl/messages.php index 515c5880..1ab3e5c0 100644 --- a/webui/language/pl/messages.php +++ b/webui/language/pl/messages.php @@ -495,3 +495,4 @@ $_['text_no_selected_message'] = "no selected message"; $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/pt/messages.php b/webui/language/pt/messages.php index b6f6896d..7aaa6873 100644 --- a/webui/language/pt/messages.php +++ b/webui/language/pt/messages.php @@ -488,3 +488,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/ru/messages.php b/webui/language/ru/messages.php index 0efcd96e..3ec67ed2 100644 --- a/webui/language/ru/messages.php +++ b/webui/language/ru/messages.php @@ -497,3 +497,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal"; diff --git a/webui/language/tr/messages.php b/webui/language/tr/messages.php index 83163588..fc80d340 100644 --- a/webui/language/tr/messages.php +++ b/webui/language/tr/messages.php @@ -497,3 +497,4 @@ $_['text_create_note'] = "Create note"; $_['text_wildcard_domains'] = "Wildcard domains"; $_['text_remove_request'] = "remove request"; +$_['text_rejected_removal'] = "rejected removal";