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

Ivan - Add validations before download and upload on comment [skip ci]

This commit is contained in:
ivan 2017-01-12 20:30:44 -03:00
parent f2401dcec7
commit 71984384cc
4 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/controllers/system/download.php
View File

@ -7,18 +7,48 @@ class DownloadController extends Controller {
public function validations() {
return [
'permission' => 'staff_1',
'permission' => 'user',
'requestData' => [
'file' => [
'validation' => DataValidator::alnum('_.')->noWhitespace()
'validation' => DataValidator::alnum('_.')->noWhitespace(),
'error' => ERRORS::INVALID_FILE
]
]
];
}
public function handler() {
$fileName = Controller::request('file');
$loggedUser = Controller::getLoggedUser();
$ticket = Ticket::getTicket($fileName, 'file');
if($ticket->isNull() || ($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser))) {
$ticketEvent = Ticketevent::getDataStore($fileName, 'file');
if($ticketEvent->isNull()) {
print '';
return;
}
$ticket = $ticketEvent->ticket;
if($this->isNotAuthor($ticket, $loggedUser) && $this->isNotOwner($ticket, $loggedUser)) {
print '';
return;
}
}
$fileDownloader = FileDownloader::getInstance();
$fileDownloader->setFileName(Controller::request('file'));
$fileDownloader->setFileName($fileName);
$fileDownloader->download();
}
private function isNotAuthor($ticket, $loggedUser) {
return Controller::isStaffLogged() || $ticket->author->id !== $loggedUser->id;
}
private function isNotOwner($ticket, $loggedUser) {
return !Controller::isStaffLogged() || !$ticket->owner || $ticket->owner->id !== $loggedUser->id;
}
}

1
server/controllers/ticket/comment.php
View File

@ -50,6 +50,7 @@ class CommentController extends Controller {
$comment = Ticketevent::getEvent(Ticketevent::COMMENT);
$comment->setProperties(array(
'content' => $this->content,
'file' => $this->uploadFile(),
'date' => Date::getCurrentDate()
));

22
server/controllers/ticket/create.php
View File

@ -75,26 +75,4 @@ class CreateController extends Controller {
$this->ticketNumber = $ticket->ticketNumber;
}
private function uploadFile() {
if(!isset($_FILES['file'])) return '';
$maxSize = Setting::getSetting('max-size')->getValue();
$fileGap = Setting::getSetting('file-gap')->getValue();
$fileFirst = Setting::getSetting('file-first-number')->getValue();
$fileQuantity = Setting::getSetting('file-quantity');
$fileUploader = FileUploader::getInstance();
$fileUploader->setMaxSize($maxSize);
$fileUploader->setGeneratorValues($fileGap, $fileFirst, $fileQuantity->getValue());
if($fileUploader->upload($_FILES['file'])) {
$fileQuantity->value++;
$fileQuantity->store();
return $fileUploader->getFileName();
} else {
throw new Exception(ERRORS::INVALID_FILE);
}
}
}

22
server/libs/Controller.php
View File

@ -60,4 +60,26 @@ abstract class Controller {
public static function getAppInstance() {
return \Slim\Slim::getInstance();
}
public function uploadFile() {
if(!isset($_FILES['file'])) return '';
$maxSize = Setting::getSetting('max-size')->getValue();
$fileGap = Setting::getSetting('file-gap')->getValue();
$fileFirst = Setting::getSetting('file-first-number')->getValue();
$fileQuantity = Setting::getSetting('file-quantity');
$fileUploader = FileUploader::getInstance();
$fileUploader->setMaxSize($maxSize);
$fileUploader->setGeneratorValues($fileGap, $fileFirst, $fileQuantity->getValue());
if($fileUploader->upload($_FILES['file'])) {
$fileQuantity->value++;
$fileQuantity->store();
return $fileUploader->getFileName();
} else {
throw new Exception(ERRORS::INVALID_FILE);
}
}
}