Skip to content
Snippets Groups Projects
Commit efd13e4a authored by Elmar Ludwig's avatar Elmar Ludwig Committed by Jan-Hendrik Willms
Browse files

use asButton() instead of custom JS code, fixes #2830

Closes #2830

Merge request studip/studip!1916
parent f78672d3
No related branches found
No related tags found
No related merge requests found
...@@ -718,28 +718,26 @@ class MessagesController extends AuthenticatedController { ...@@ -718,28 +718,26 @@ class MessagesController extends AuthenticatedController {
/* delete all sent or received messages */ /* delete all sent or received messages */
public function purge_action($sndrec) public function purge_action($sndrec)
{ {
if (Request::isPost()) { CSRFProtection::verifyUnsafeRequest();
CSRFProtection::verifyUnsafeRequest();
$query = "SELECT message_id
$query = "SELECT message_id FROM message_user
FROM message_user WHERE snd_rec = :sndrec
WHERE snd_rec = :sndrec AND user_id = :id
AND user_id = :id AND deleted != 1";
AND deleted != 1"; $returnedMessages = DBManager::get()->fetchFirst($query, [
$returnedMessages = DBManager::get()->fetchFirst($query, [ 'sndrec' => $sndrec,
'sndrec' => $sndrec, 'id' => $GLOBALS['user']->id,
'id' => $GLOBALS['user']->id, ]);
]); foreach ($returnedMessages as $returnedMessage) {
foreach ($returnedMessages as $returnedMessage) { $this->deleteMessage($returnedMessage, $sndrec);
$this->deleteMessage($returnedMessage, $sndrec); }
} if ($sndrec === 'rec') {
if ($sndrec === 'rec') { PageLayout::postSuccess(_('Alle empfangenen Nachrichten wurden gelöscht.'));
PageLayout::postSuccess(_('Alle empfangenen Nachrichten wurden gelöscht.')); $this->redirect('messages/overview');
$this->redirect('messages/overview'); } else if ($sndrec === 'snd') {
} else if ($sndrec === 'snd') { PageLayout::postSuccess(_('Alle gesendeten Nachrichten wurden gelöscht.'));
PageLayout::postSuccess(_('Alle gesendeten Nachrichten wurden gelöscht.')); $this->redirect('messages/sent');
$this->redirect('messages/sent');
}
} }
} }
...@@ -1009,8 +1007,8 @@ class MessagesController extends AuthenticatedController { ...@@ -1009,8 +1007,8 @@ class MessagesController extends AuthenticatedController {
_('Nachrichten im Posteingang löschen'), _('Nachrichten im Posteingang löschen'),
$this->url_for('messages/purge/rec'), $this->url_for('messages/purge/rec'),
Icon::create('trash'), Icon::create('trash'),
['onclick' => 'return STUDIP.Dialog.confirmAsPost("' . $message . '", this.href);'] ['data-confirm' => $message]
); )->asButton();
} }
} elseif ($action === 'sent') { } elseif ($action === 'sent') {
if (MessageUser::countBySQL("snd_rec = 'snd' AND user_id = :id AND deleted != 1 LIMIT 1", ['id' => $GLOBALS['user']->id])) { if (MessageUser::countBySQL("snd_rec = 'snd' AND user_id = :id AND deleted != 1 LIMIT 1", ['id' => $GLOBALS['user']->id])) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment