tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-30 01:05:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix Issues with installation process [skip ci]

Browse Source
This commit is contained in:
ivan 2017-03-29 18:53:00 -03:00
parent 48614fcc00
commit e49d93dbb0
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,10 @@ class DownloadController extends Controller {
$staffUser = Staff::getDataStore($fileName, 'profilePic'); $staffUser = Staff::getDataStore($fileName, 'profilePic');
if($staffUser->isNull()) { if($staffUser->isNull()) {
$session = Session::getInstance();
$loggedUser = Controller::getLoggedUser(); $loggedUser = Controller::getLoggedUser();
if($loggedUser->isNull()) { if(!$session->sessionExists()) {
print ''; print '';
return; return;
} }
@ -55,10 +56,22 @@ class DownloadController extends Controller {
} }
private function isNotAuthor($ticket, $loggedUser) { private function isNotAuthor($ticket, $loggedUser) {
return Controller::isStaffLogged() || $ticket->author->id !== $loggedUser->id; $session = Session::getInstance();
if($session->getTicketNumber()) {
return $session->getTicketNumber() !== $ticket->ticketNumber;
} else {
return Controller::getLoggedUser()->level >= 1 || $ticket->author->id !== $loggedUser->id;
}
} }
private function isNotOwner($ticket, $loggedUser) { private function isNotOwner($ticket, $loggedUser) {
return !Controller::isStaffLogged() || !$ticket->owner || $ticket->owner->id !== $loggedUser->id; $session = Session::getInstance();
if($session->getTicketNumber()) {
return $session->getTicketNumber() !== $ticket->ticketNumber;
} else {
return !(Controller::getLoggedUser()->level >= 1) || !$ticket->owner || $ticket->owner->id !== $loggedUser->id;
}
} }
} }

2
server/libs/Controller.php
View File

@ -17,7 +17,7 @@ abstract class Controller {
$this->validate(); $this->validate();
$this->handler(); $this->handler();
} catch (\Exception $exception) { } catch (\Exception $exception) {
Response::respondError($exception->getMessage() . ' on line ' . $exception->getFile() . ':' . $exception->getLine()); Response::respondError($exception->getMessage());
return; return;
} }
}; };

2
tests/system/get-mail-templates.rb
View File

@ -10,6 +10,6 @@ describe'system/get-mail-templates' do
(result['status']).should.equal('success') (result['status']).should.equal('success')
(result['data'].size).should.equal(18) (result['data'].size).should.equal(90)
end end
end end