tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-29 08:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to close their tickets with user system disabled

Browse Source
This commit is contained in:
Kallys 2017-06-01 12:14:23 +02:00
parent 13ed10dc4e
commit d576ec726e
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/controllers/ticket/close.php
View File

@ -30,15 +30,34 @@ class CloseController extends Controller {
private $ticket; private $ticket;
public function validations() { public function validations() {
return [ $session = Session::getInstance();
'permission' => 'user',
'requestData' => [ if (Controller::isUserSystemEnabled() || Controller::isStaffLogged()) {
'ticketNumber' => [ return [
'validation' => DataValidator::validTicketNumber(), 'permission' => 'user',
'error' => ERRORS::INVALID_TICKET 'requestData' => [
'ticketNumber' => [
'validation' => DataValidator::validTicketNumber(),
'error' => ERRORS::INVALID_TICKET
]
] ]
] ];
]; } else {
return [
'permission' => 'any',
'requestData' => [
'ticketNumber' => [
'validation' => DataValidator::equals($session->getTicketNumber()),
'error' => ERRORS::INVALID_TICKET
],
'csrf_token' => [
'validation' => DataValidator::equals($session->getToken()),
'error' => Controller::request('csrf_token') . ' != ' . $session->getToken()
]
]
];
}
} }
public function handler() { public function handler() {
@ -62,10 +81,14 @@ class CloseController extends Controller {
} }
private function shouldDenyPermission() { private function shouldDenyPermission() {
$user = Controller::getLoggedUser(); if(Controller::isUserSystemEnabled() || Controller::isStaffLogged()) {
$user = Controller::getLoggedUser();
return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) || return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) ||
(Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id); (Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id);
} else {
return $this->ticket->ticket_number != Session::getInstance()->getTicketNumber();
}
} }
private function markAsUnread() { private function markAsUnread() {
@ -95,8 +118,8 @@ class CloseController extends Controller {
$mailSender = new MailSender(); $mailSender = new MailSender();
$mailSender->setTemplate(MailTemplate::TICKET_CLOSED, [ $mailSender->setTemplate(MailTemplate::TICKET_CLOSED, [
'to' => $this->ticket->author->email, 'to' => ($this->ticket->author) ? $this->ticket->author->email : $this->ticket->authorEmail,
'name' => $this->ticket->author->name, 'name' => ($this->ticket->author) ? $this->ticket->author->name : $this->ticket->authorName,
'ticketNumber' => $this->ticket->ticketNumber, 'ticketNumber' => $this->ticket->ticketNumber,
'title' => $this->ticket->title, 'title' => $this->ticket->title,
'url' => Setting::getSetting('url')->getValue() 'url' => Setting::getSetting('url')->getValue()
@ -104,4 +127,4 @@ class CloseController extends Controller {
$mailSender->send(); $mailSender->send();
} }
} }