Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan-Hendrik Willms
Stud.IP
Commits
efd13e4a
Commit
efd13e4a
authored
1 year ago
by
Elmar Ludwig
Committed by
Jan-Hendrik Willms
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/messages.php
+22
-24
22 additions, 24 deletions
app/controllers/messages.php
with
22 additions
and
24 deletions
app/controllers/messages.php
+
22
−
24
View file @
efd13e4a
...
@@ -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
]))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment