tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from Kallys/close-ticket 

Allow users to close their tickets with user system disabled
This commit is contained in:
Ivan Diaz 2017-06-12 18:58:14 -03:00 committed by GitHub
parent db3ef9be13 33ddbd972d
commit f9c05d9792
1 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,9 @@ class CloseController extends Controller {
private $ticket; private $ticket;
public function validations() { public function validations() {
$session = Session::getInstance();
if (Controller::isUserSystemEnabled() || Controller::isStaffLogged()) {
return [ return [
'permission' => 'user', 'permission' => 'user',
'requestData' => [ 'requestData' => [
@ -39,6 +42,21 @@ class CloseController extends Controller {
] ]
] ]
]; ];
} else {
return [
'permission' => 'any',
'requestData' => [
'ticketNumber' => [
'validation' => DataValidator::equals($session->getTicketNumber()),
'error' => ERRORS::INVALID_TICKET
],
'csrf_token' => [
'validation' => DataValidator::equals($session->getToken()),
'error' => ERRORS::INVALID_TOKEN
]
]
];
}
} }
public function handler() { public function handler() {
@ -62,10 +80,13 @@ class CloseController extends Controller {
} }
private function shouldDenyPermission() { private function shouldDenyPermission() {
$user = Controller::getLoggedUser(); if(Controller::isStaffLogged()) {
return $this->ticket->owner && $this->ticket->owner->id !== Controller::getLoggedUser()->id;
return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) || } else if(Controller::isUserSystemEnabled()) {
(Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id); return $this->ticket->author->id !== Controller::getLoggedUser()->id;
} else {
return false;
}
} }
private function markAsUnread() { private function markAsUnread() {
@ -95,8 +116,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()