diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php index 0fa2ccda..82722804 100644 --- a/server/controllers/ticket/create.php +++ b/server/controllers/ticket/create.php @@ -11,7 +11,7 @@ class CreateController extends Controller { public function validations() { return [ - 'permission' => 'any', + 'permission' => 'user', 'requestData' => [ 'title' => [ 'validation' => DataValidator::length(3, 30), @@ -48,13 +48,12 @@ class CreateController extends Controller { 'language' => $this->language, 'department' => $this->departmentId, 'file' => '', - 'date' => date('F j, Y, g:i a'), + 'date' => Date::getCurrentDate(), 'unread' => false, 'closed' => false )); - //TODO: Add logged user as author - $ticket->setAuthor(User::getUser(1)); + $ticket->setAuthor(Controller::getLoggedUser()); $ticket->store(); } diff --git a/server/index.php b/server/index.php index 7a72813e..1e5151a0 100644 --- a/server/index.php +++ b/server/index.php @@ -15,6 +15,7 @@ include_once 'libs/Controller.php'; include_once 'libs/ControllerGroup.php'; include_once 'libs/Hashing.php'; include_once 'libs/MailSender.php'; +include_once 'libs/Date.php'; // LOAD DATA spl_autoload_register(function ($class) { diff --git a/server/libs/Date.php b/server/libs/Date.php new file mode 100644 index 00000000..1a43f5c9 --- /dev/null +++ b/server/libs/Date.php @@ -0,0 +1,6 @@ +<?php +class Date { + public static function getCurrentDate() { + return date('F j, Y, g:i a'); + } +} \ No newline at end of file diff --git a/server/models/Session.php b/server/models/Session.php index 3d543607..87339adc 100644 --- a/server/models/Session.php +++ b/server/models/Session.php @@ -65,6 +65,6 @@ class Session { } private function generateToken() { - return Hashing::generateRandomToken();; + return Hashing::generateRandomToken(); } } \ No newline at end of file diff --git a/tests/ticket/create.rb b/tests/ticket/create.rb index 40e66e66..5d3cd1f3 100644 --- a/tests/ticket/create.rb +++ b/tests/ticket/create.rb @@ -52,5 +52,5 @@ describe '/ticket/create' do (result['status']).should.equal('success') ticket = $database.getRow('ticket','Winter is coming','title') (ticket['content']).should.equal('The north remembers') - end + end end \ No newline at end of file