From d576ec726e85154947bf19756e70603c3a7dabc1 Mon Sep 17 00:00:00 2001 From: Kallys Date: Thu, 1 Jun 2017 12:14:23 +0200 Subject: [PATCH 1/6] Allow users to close their tickets with user system disabled --- server/controllers/ticket/close.php | 51 +++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php index d63b63ef..70a84b3a 100755 --- a/server/controllers/ticket/close.php +++ b/server/controllers/ticket/close.php @@ -30,15 +30,34 @@ class CloseController extends Controller { private $ticket; public function validations() { - return [ - 'permission' => 'user', - 'requestData' => [ - 'ticketNumber' => [ - 'validation' => DataValidator::validTicketNumber(), - 'error' => ERRORS::INVALID_TICKET + $session = Session::getInstance(); + + if (Controller::isUserSystemEnabled() || Controller::isStaffLogged()) { + return [ + 'permission' => 'user', + '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() { @@ -62,10 +81,14 @@ class CloseController extends Controller { } private function shouldDenyPermission() { - $user = Controller::getLoggedUser(); + if(Controller::isUserSystemEnabled() || Controller::isStaffLogged()) { + $user = Controller::getLoggedUser(); - return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) || - (Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id); + return (!Controller::isStaffLogged() && $this->ticket->author->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() { @@ -95,8 +118,8 @@ class CloseController extends Controller { $mailSender = new MailSender(); $mailSender->setTemplate(MailTemplate::TICKET_CLOSED, [ - 'to' => $this->ticket->author->email, - 'name' => $this->ticket->author->name, + 'to' => ($this->ticket->author) ? $this->ticket->author->email : $this->ticket->authorEmail, + 'name' => ($this->ticket->author) ? $this->ticket->author->name : $this->ticket->authorName, 'ticketNumber' => $this->ticket->ticketNumber, 'title' => $this->ticket->title, 'url' => Setting::getSetting('url')->getValue() @@ -104,4 +127,4 @@ class CloseController extends Controller { $mailSender->send(); } -} \ No newline at end of file +} From 463853aa70e141b612965209f33cf3cd00855069 Mon Sep 17 00:00:00 2001 From: AntonyAntonio Date: Sat, 10 Jun 2017 03:27:22 -0300 Subject: [PATCH 2/6] Guillermo - add new option for sending mails to staff when a new ticket is created --- server/controllers/staff/edit.php | 5 + server/controllers/system/init-admin.php | 3 +- server/controllers/ticket/create.php | 20 + server/data/InitialMails.php | 42 ++ .../ticket-created-staff-cn.html | 378 ++++++++++++++++++ .../ticket-created-staff-de.html | 378 ++++++++++++++++++ .../ticket-created-staff-en.html | 378 ++++++++++++++++++ .../ticket-created-staff-es.html | 378 ++++++++++++++++++ .../ticket-created-staff-fr.html | 378 ++++++++++++++++++ .../ticket-created-staff-in.html | 378 ++++++++++++++++++ .../ticket-created-staff-jp.html | 378 ++++++++++++++++++ .../ticket-created-staff-pt.html | 378 ++++++++++++++++++ .../ticket-created-staff-ru.html | 378 ++++++++++++++++++ .../ticket-created-staff-tr.html | 378 ++++++++++++++++++ server/models/MailTemplate.php | 1 + server/models/Staff.php | 9 +- tests/staff/edit.rb | 2 + tests/system/get-mail-templates.rb | 2 +- 18 files changed, 3859 insertions(+), 5 deletions(-) create mode 100644 server/data/mail-templates/ticket-created-staff-cn.html create mode 100644 server/data/mail-templates/ticket-created-staff-de.html create mode 100644 server/data/mail-templates/ticket-created-staff-en.html create mode 100644 server/data/mail-templates/ticket-created-staff-es.html create mode 100644 server/data/mail-templates/ticket-created-staff-fr.html create mode 100644 server/data/mail-templates/ticket-created-staff-in.html create mode 100644 server/data/mail-templates/ticket-created-staff-jp.html create mode 100644 server/data/mail-templates/ticket-created-staff-pt.html create mode 100644 server/data/mail-templates/ticket-created-staff-ru.html create mode 100644 server/data/mail-templates/ticket-created-staff-tr.html diff --git a/server/controllers/staff/edit.php b/server/controllers/staff/edit.php index ac7ab89f..6b7e0262 100755 --- a/server/controllers/staff/edit.php +++ b/server/controllers/staff/edit.php @@ -18,6 +18,7 @@ use Respect\Validation\Validator as DataValidator; * @apiParam {String} email The new email of the staff member. Optional. * @apiParam {String} password The new password of the staff member. Optional. * @apiParam {Number} level The new level of the staff member. Optional. + * @apiParam {Boolean} sendEmailOnNewTicket Indicates if it receives an email when a new ticket is created. * * @apiUse NO_PERMISSION * @apiUse INVALID_STAFF @@ -85,6 +86,10 @@ class EditStaffController extends Controller { if($fileUploader = $this->uploadFile(true)) { $this->staffInstance->profilePic = ($fileUploader instanceof FileUploader) ? $fileUploader->getFileName() : null; } + + if(Controller::request('sendEmailOnNewTicket') !== null && !Controller::request('staffId') ) { + $this->staffInstance->sendEmailOnNewTicket = Controller::request('sendEmailOnNewTicket'); + } $this->staffInstance->store(); } diff --git a/server/controllers/system/init-admin.php b/server/controllers/system/init-admin.php index 80f49609..1648fa0f 100755 --- a/server/controllers/system/init-admin.php +++ b/server/controllers/system/init-admin.php @@ -64,7 +64,8 @@ class InitAdminController extends Controller { 'profilePic' => '', 'level' => 3, 'sharedDepartmentList' => Department::getAll(), - 'sharedTicketList' => [] + 'sharedTicketList' => [], + 'sendEmailOnNewTicket' => 1 ]); foreach(Department::getAll() as $department) { diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php index 1a28bb6b..cb080497 100755 --- a/server/controllers/ticket/create.php +++ b/server/controllers/ticket/create.php @@ -97,6 +97,13 @@ class CreateController extends Controller { if(!Controller::isUserSystemEnabled()) { $this->sendMail(); } + + $staffs = Staff::find('send_email_on_new_ticket = 1'); + foreach ($staffs as $staff) { + if($staff->sharedDepartmentList->includesId(Controller::request('departmentId'))) { + $this->sendMailStaff($staff->email); + } + } Log::createLog('CREATE_TICKET', $this->ticketNumber); Response::respondSuccess([ @@ -154,4 +161,17 @@ class CreateController extends Controller { $mailSender->send(); } + + private function sendMailStaff($email) { + $mailSender = new MailSender(); + + $mailSender->setTemplate(MailTemplate::TICKET_CREATED_STAFF, [ + 'to' => $email, + 'name' => $this->name, + 'ticketNumber' => $this->ticketNumber, + 'title' => $this->title + ]); + + $mailSender->send(); + } } diff --git a/server/data/InitialMails.php b/server/data/InitialMails.php index 2ef94d8f..cc64e735 100755 --- a/server/data/InitialMails.php +++ b/server/data/InitialMails.php @@ -380,7 +380,49 @@ class InitialMails { 'subject' => '#{{ticketNumber}} 票已关闭 - OpenSupports', 'body' => file_get_contents('data/mail-templates/ticket-closed-cn.html') ] + ], + 'TICKET_CREATED_STAFF' => [ + 'en' => [ + 'subject' => '#{{ticketNumber}} Ticket created - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-en.html') + ], + 'es' => [ + 'subject' => '#{{ticketNumber}} Ticket creado - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-es.html') + ], + 'de' => [ + 'subject' => '#{{ticketNumber}} Ticket erstellt - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-de.html') + ], + 'fr' => [ + 'subject' => '#{{ticketNumber}} Ticket créé - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-fr.html') + ], + 'in' => [ + 'subject' => '#{{ticketNumber}} tiket dibuat - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-in.html') + ], + 'jp' => [ + 'subject' => '#{{ticketNumber}} チケットが作成されました - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-jp.html') + ], + 'pt' => [ + 'subject' => '#{{ticketNumber}} Ticket criado - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-pt.html') + ], + 'ru' => [ + 'subject' => '#{{ticketNumber}} Создан билет - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-ru.html') + ], + 'tr' => [ + 'subject' => '#{{ticketNumber}} Bilet oluşturuldu - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-tr.html') + ], + 'cn' => [ + 'subject' => '#{{ticketNumber}} 已创建票证 - OpenSupports', + 'body' => file_get_contents('data/mail-templates/ticket-created-staff-cn.html') ] + ] ]; } } \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-cn.html b/server/data/mail-templates/ticket-created-staff-cn.html new file mode 100644 index 00000000..a9ac1fde --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-cn.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket created +
+ 用戶 {{name}}。 他創造了一個題為新票 {{title}}。 +
+ + + + +
+ + + + + + + +
+ 您可以通过其票号访问票证。 +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-de.html b/server/data/mail-templates/ticket-created-staff-de.html new file mode 100644 index 00000000..697a050c --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-de.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket erstellt +
+ Der Benutzer {{name}} hat ein neues Ticket erstellt berechtigt {{title}}. +
+ + + + +
+ + + + + + + +
+ Sie können das Ticket nach der Fahrkartennummer erreichen. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-en.html b/server/data/mail-templates/ticket-created-staff-en.html new file mode 100644 index 00000000..01d13c76 --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-en.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket created +
+ User {{name}} has created a new ticket titled {{title}}. +
+ + + + +
+ + + + + + + +
+ You can access to the ticket by its ticket number. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-es.html b/server/data/mail-templates/ticket-created-staff-es.html new file mode 100644 index 00000000..b5a511eb --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-es.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket creado +
+ El usuario {{name}} ha creado un nuevo ticket titulado {{title}}. +
+ + + + +
+ + + + + + + +
+ Puedes ver el ticket usando el numero de ticket prensentado abajo. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-fr.html b/server/data/mail-templates/ticket-created-staff-fr.html new file mode 100644 index 00000000..f38dff7f --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-fr.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket créé +
+ L'utilisateur {{name}}. a créé un nouveau poste intitulé {{title}}. +
+ + + + +
+ + + + + + + +
+ Vous pouvez accéder au billet par son numéro de ticket. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-in.html b/server/data/mail-templates/ticket-created-staff-in.html new file mode 100644 index 00000000..89350bf2 --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-in.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ टिकट बनाया +
+ उपयोगकर्ता {{name}} हकदार एक नया पद बनाया गया है {{title}}. +
+ + + + +
+ + + + + + + +
+ आप अपने टिकट नंबर से टिकट तक पहुंच सकते हैं। +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-jp.html b/server/data/mail-templates/ticket-created-staff-jp.html new file mode 100644 index 00000000..9e0e50a3 --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-jp.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ チケットが作成されました +
+ ユーザーは {{name}} 彼は題した新しいチケットを作成しました {{title}}。 +
+ + + + +
+ + + + + + + +
+ そのチケット番号でチケットにアクセスできます。 +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-pt.html b/server/data/mail-templates/ticket-created-staff-pt.html new file mode 100644 index 00000000..9b8fa947 --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-pt.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Ticket criado +
+ O usuário {{name}} criou um novo bilhete de direito {{title}}. +
+ + + + +
+ + + + + + + +
+ Você pode acessar o bilhete pelo seu número de bilhete. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-ru.html b/server/data/mail-templates/ticket-created-staff-ru.html new file mode 100644 index 00000000..814a68e8 --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-ru.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Создан билет +
+ Пользователь {{name}} создал новый билет под названием {{title}}. +
+ + + + +
+ + + + + + + +
+ Вы можете получить доступ к билету по его номеру билета. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/data/mail-templates/ticket-created-staff-tr.html b/server/data/mail-templates/ticket-created-staff-tr.html new file mode 100644 index 00000000..5f29e64d --- /dev/null +++ b/server/data/mail-templates/ticket-created-staff-tr.html @@ -0,0 +1,378 @@ + + + + + + Support Center + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + +
+ logo +
+
+ +
+
+
+
+ + + + + + + + + + +
+ Bilet oluşturuldu +
+ Kullanıcı {{name}} başlıklı yeni bir bilet yarattı {{title}} . +
+ + + + +
+ + + + + + + +
+ Bilete bilet numarasından erişebilirsiniz. +
+ {{ticketNumber}} +
+
+
+
+
+
+ + + + +
+ OpenSupports
+ Open source ticket system
+ www.opensupports.com

+
+
+
+ + \ No newline at end of file diff --git a/server/models/MailTemplate.php b/server/models/MailTemplate.php index 436b4b3f..6f1bce1f 100755 --- a/server/models/MailTemplate.php +++ b/server/models/MailTemplate.php @@ -22,6 +22,7 @@ class MailTemplate extends DataStore { const TICKET_CREATED = 'TICKET_CREATED'; const TICKET_RESPONDED = 'TICKET_RESPONDED'; const TICKET_CLOSED = 'TICKET_CLOSED'; + const TICKET_CREATED_STAFF = 'TICKET_CREATED_STAFF'; public static function getTemplate($type) { $globalLanguage = Setting::getSetting('language')->value; diff --git a/server/models/Staff.php b/server/models/Staff.php index 9681d6f5..dd448d35 100755 --- a/server/models/Staff.php +++ b/server/models/Staff.php @@ -31,14 +31,16 @@ class Staff extends DataStore { 'sharedDepartmentList', 'sharedTicketList', 'lastLogin', - 'ownStatList' + 'ownStatList', + 'sendEmailOnNewTicket' ]; } public function getDefaultProps() { return [ 'level' => 1, - 'ownStatList' => new DataStoreList() + 'ownStatList' => new DataStoreList(), + 'sendEmailOnNewTicket' => 0 ]; } @@ -55,7 +57,8 @@ class Staff extends DataStore { 'level' => $this->level, 'departments' => $this->sharedDepartmentList->toArray(), 'tickets' => $this->sharedTicketList->toArray(), - 'lastLogin' => $this->lastLogin + 'lastLogin' => $this->lastLogin , + 'sendEmailOnNewTicket' => $this->sendEmailOnNewTicket ]; } } diff --git a/tests/staff/edit.rb b/tests/staff/edit.rb index a42de635..117b7ee5 100644 --- a/tests/staff/edit.rb +++ b/tests/staff/edit.rb @@ -49,6 +49,7 @@ describe'/staff/edit' do csrf_userid: $csrf_userid, csrf_token: $csrf_token, email: 'newwstaff@opensupports.com', + sendEmailOnNewTicket: '1' }) (result['status']).should.equal('success') @@ -57,6 +58,7 @@ describe'/staff/edit' do (row['email']).should.equal('newwstaff@opensupports.com') (row['level']).should.equal('2') + (row['send_email_on_new_ticket']).should.equal('1') row = $database.getRow('department', 1, 'id') (row['owners']).should.equal('3') diff --git a/tests/system/get-mail-templates.rb b/tests/system/get-mail-templates.rb index 34dd2600..97a63e65 100644 --- a/tests/system/get-mail-templates.rb +++ b/tests/system/get-mail-templates.rb @@ -10,6 +10,6 @@ describe'system/get-mail-templates' do (result['status']).should.equal('success') - (result['data'].size).should.equal(90) + (result['data'].size).should.equal(100) end end From 33ddbd972d96bd9d1ddafebdc6bb6ce55447bb94 Mon Sep 17 00:00:00 2001 From: Kallys Date: Mon, 12 Jun 2017 12:22:31 +0200 Subject: [PATCH 3/6] Fix review comments --- server/controllers/ticket/close.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php index 70a84b3a..2db5b12e 100755 --- a/server/controllers/ticket/close.php +++ b/server/controllers/ticket/close.php @@ -18,7 +18,7 @@ DataValidator::with('CustomValidations', true); * * @apiUse NO_PERMISSION * @apiUse INVALID_TICKET - * + * * @apiSuccess {Object} data Empty object * */ @@ -52,8 +52,7 @@ class CloseController extends Controller { ], 'csrf_token' => [ 'validation' => DataValidator::equals($session->getToken()), - 'error' => Controller::request('csrf_token') . ' != ' . $session->getToken() - + 'error' => ERRORS::INVALID_TOKEN ] ] ]; @@ -76,18 +75,17 @@ class CloseController extends Controller { $this->sendMail(); Log::createLog('CLOSE', $this->ticket->ticketNumber); - + Response::respondSuccess(); } private function shouldDenyPermission() { - if(Controller::isUserSystemEnabled() || Controller::isStaffLogged()) { - $user = Controller::getLoggedUser(); - - return (!Controller::isStaffLogged() && $this->ticket->author->id !== $user->id) || - (Controller::isStaffLogged() && $this->ticket->owner && $this->ticket->owner->id !== $user->id); + if(Controller::isStaffLogged()) { + return $this->ticket->owner && $this->ticket->owner->id !== Controller::getLoggedUser()->id; + } else if(Controller::isUserSystemEnabled()) { + return $this->ticket->author->id !== Controller::getLoggedUser()->id; } else { - return $this->ticket->ticket_number != Session::getInstance()->getTicketNumber(); + return false; } } From 06cf7ddcbe7dd762abc492082475d22031d26801 Mon Sep 17 00:00:00 2001 From: AntonyAntonio Date: Tue, 13 Jun 2017 01:03:06 -0300 Subject: [PATCH 4/6] Guillermo - Issue #30 --- server/controllers/ticket/comment.php | 3 ++- server/controllers/ticket/get.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php index d9b1f672..15b4b036 100755 --- a/server/controllers/ticket/comment.php +++ b/server/controllers/ticket/comment.php @@ -20,6 +20,7 @@ DataValidator::with('CustomValidations', true); * @apiUse NO_PERMISSION * @apiUse INVALID_CONTENT * @apiUse INVALID_TICKET + * @apiUse INVALID_TOKEN * * @apiSuccess {Object} data Empty object * @@ -63,7 +64,7 @@ class CommentController extends Controller { ], 'csrf_token' => [ 'validation' => DataValidator::equals($session->getToken()), - 'error' => Controller::request('csrf_token') . ' ' . $session->getToken() + 'error' => ERRORS::INVALID_TOKEN ] ] diff --git a/server/controllers/ticket/get.php b/server/controllers/ticket/get.php index ce953561..8b62bad1 100755 --- a/server/controllers/ticket/get.php +++ b/server/controllers/ticket/get.php @@ -16,6 +16,7 @@ DataValidator::with('CustomValidations', true); * @apiParam {Number} ticketNumber The number of the ticket. * * @apiUse INVALID_TICKET + * @apiUse INVALID_TOKEN * @apiUse NO_PERMISSION * * @apiSuccess {[Ticket](#api-Data_Structures-ObjectTicket)} data Information about the requested ticket. @@ -52,7 +53,7 @@ class TicketGetController extends Controller { ], 'csrf_token' => [ 'validation' => DataValidator::equals($session->getToken()), - 'error' => $session->getToken() . ' != ' . Controller::request('csrf_token') + 'error' => ERRORS::INVALID_TOKEN ] ] ]; From d48d7ad8753f7847de3a5c4a42820906e40bfd44 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 13 Jun 2017 18:12:10 -0300 Subject: [PATCH 5/6] Ivan - Add SMTP configuration to installation --- client/src/app/install/install-layout.js | 2 ++ .../app/install/install-step-5-settings.js | 21 +++++++++++-------- .../app/install/install-step-5-settings.scss | 19 +++++++++++++++++ .../src/app/install/install-step-6-admin.js | 2 +- client/src/data/languages/cn.js | 7 ++++++- client/src/data/languages/de.js | 7 ++++++- client/src/data/languages/en.js | 1 + client/src/data/languages/es.js | 6 +++++- client/src/data/languages/fr.js | 6 +++++- client/src/data/languages/in.js | 6 +++++- client/src/data/languages/jp.js | 6 +++++- client/src/data/languages/pt.js | 6 +++++- client/src/data/languages/ru.js | 6 +++++- client/src/data/languages/tr.js | 6 +++++- client/src/reducers/config-reducer.js | 2 +- server/controllers/system/init-settings.php | 14 ++++++------- server/models/NullDataStore.php | 4 ++++ tests/system/init-settings.rb | 6 ++++++ 18 files changed, 100 insertions(+), 27 deletions(-) diff --git a/client/src/app/install/install-layout.js b/client/src/app/install/install-layout.js index f16a2a6b..a7f90da5 100644 --- a/client/src/app/install/install-layout.js +++ b/client/src/app/install/install-layout.js @@ -93,6 +93,8 @@ class InstallLayout extends React.Component { return 4; } else if(_.includes(pathname, 'step-6')) { return 5; + } else if(_.includes(pathname, 'step-7')) { + return 6; } } } diff --git a/client/src/app/install/install-step-5-settings.js b/client/src/app/install/install-step-5-settings.js index 8b1b7b7f..0c3aa00d 100644 --- a/client/src/app/install/install-step-5-settings.js +++ b/client/src/app/install/install-step-5-settings.js @@ -30,16 +30,19 @@ class InstallStep5Settings extends React.Component { {this.renderMessage()}
this.setState({form})}> - + - - - - - - {this.renderMessageSMTP()} +
+
+ + + + + + {this.renderMessageSMTP()} +
{i18n('NEXT')} diff --git a/client/src/app/install/install-step-5-settings.scss b/client/src/app/install/install-step-5-settings.scss index d29665a4..83c5c9f0 100644 --- a/client/src/app/install/install-step-5-settings.scss +++ b/client/src/app/install/install-step-5-settings.scss @@ -12,4 +12,23 @@ margin-left: 230px; min-width: 70px; } + + &__smtp-block { + text-align: center; + background-color: $very-light-grey; + padding: 30px; + margin-bottom: 30px; + + .header__title { + font-size: $font-size--md; + } + } + + &__attachments-field { + margin-bottom: 15px; + } + + &__smtp-message { + margin-top: 30px; + } } \ No newline at end of file diff --git a/client/src/app/install/install-step-6-admin.js b/client/src/app/install/install-step-6-admin.js index 6bdd4be0..7109ae71 100644 --- a/client/src/app/install/install-step-6-admin.js +++ b/client/src/app/install/install-step-6-admin.js @@ -28,7 +28,7 @@ class InstallStep6Admin extends React.Component {
- {i18n('NEXT')} + {i18n('NEXT')}
diff --git a/client/src/data/languages/cn.js b/client/src/data/languages/cn.js index 5e7cb1db..278123ef 100644 --- a/client/src/data/languages/cn.js +++ b/client/src/data/languages/cn.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': '在這裡，您可以通過更改電子郵件或密碼來修改用戶。', 'ENABLE_USER_SYSTEM_DESCRIPTION': '啟用/禁用用戶系統的使用。如果你禁用它，所有的用戶將被刪除，但票將被保留。如果啟用，將創建現有票證的用戶。', 'CSV_DESCRIPTION': 'CSV文件必須有3列：電子郵件，密碼，名稱。行數沒有限制。它將在文件中的每行中創建一個用戶。', + 'SMTP_SERVER_DESCRIPTION': 'SMTP服务器允许应用程序发送邮件。 如果您没有配置，OpenSupports将不会发送任何电子邮件。', //ERRORS 'EMAIL_OR_PASSWORD': '電子郵件或密碼無效', @@ -355,6 +356,10 @@ export default { 'LEFT_EMPTY_DATABASE': '留空为自动创建数据库', 'REMEMBER_ME': '记住我', 'EMAIL_LOWERCASE': '电子邮件', - 'PASSWORD_LOWERCASE': '密码' + 'PASSWORD_LOWERCASE': '密码', + 'SYSTEM_SETTINGS': '系统设置', + 'TEST_SMTP_CONNECTION': '测试SMTP连接', + 'SMTP_CONNECTION_SUCCESS': 'SMTP凭据有效', + 'SMTP_CONNECTION_ERROR': '无法连接到SMTP服务器' }; diff --git a/client/src/data/languages/de.js b/client/src/data/languages/de.js index 2cebb03d..1ad60689 100644 --- a/client/src/data/languages/de.js +++ b/client/src/data/languages/de.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Hier können Sie Ihren Benutzer bearbeiten, indem Sie Ihre E-Mail oder Ihr Passwort ändern.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Aktivieren / deaktivieren Sie die Verwendung eines Benutzersystems. Wenn du es deaktivierst, werden alle Benutzer gelöscht, aber die Tickets werden gehalten. Wenn Sie es aktivieren, werden die Benutzer der vorhandenen Tickets erstellt.', 'CSV_DESCRIPTION': 'Die CSV-Datei muss 3 Spalten haben: E-Mail, Passwort, Name. Es gibt kein Limit in Zeilenzahl. Es wird ein Benutzer pro Zeile in der Datei erstellt.', + 'SMTP_SERVER_DESCRIPTION': 'Die Konfiguration des SMTP-Servers ermöglicht es der Software, Mails zu senden. Wenn Sie es nicht konfigurieren, werden keine E-Mails von OpenSupports gesendet.', //ERRORS 'EMAIL_OR_PASSWORD': 'E-Mail oder Passwort ungültig', @@ -355,5 +356,9 @@ export default { 'LEFT_EMPTY_DATABASE': 'Leer leer für die automatische Datenbankerstellung', 'REMEMBER_ME': 'Merken', 'EMAIL_LOWERCASE': 'Email', - 'PASSWORD_LOWERCASE': 'Passwort' + 'PASSWORD_LOWERCASE': 'Passwort', + 'SYSTEM_SETTINGS': 'System settings', + 'TEST_SMTP_CONNECTION': 'SMTP-Verbindung testen', + 'SMTP_CONNECTION_SUCCESS': 'SMTP-Anmeldeinformationen sind gültig.', + 'SMTP_CONNECTION_ERROR': 'Kann keine Verbindung zum SMTP-Server herstellen.' }; diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index 9ac3225c..1fbf0306 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -286,6 +286,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Here you can edit your user by changing your email or your password.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Enable/disable the use of an user system. If you disable it, all users will be deleted but the tickets will be kept. If you enable it, the users of existent tickets will be created.', 'CSV_DESCRIPTION': 'The CSV file must have 3 columns: email, password, name. There is no limit in row count. It will be created one user per row in the file.', + 'SMTP_SERVER_DESCRIPTION': 'The configuration of the SMTP server allows the application to send mails. If you do not configure it, no emails will be sent by OpenSupports.', //ERRORS 'EMAIL_OR_PASSWORD': 'Email or password invalid', diff --git a/client/src/data/languages/es.js b/client/src/data/languages/es.js index ca369ea9..fd7f8584 100644 --- a/client/src/data/languages/es.js +++ b/client/src/data/languages/es.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Aquí puedes editar tu usuario cambiando tu correo electrónico o tu contraseña.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Habilitar/Deshabilitar el uso de un sistema de usuario. Si lo deshabilitas, todos los usuarios serán eliminados pero los tickets serán guardados. Si lo habilitas, se crearán los usuarios de los tickets existentes.', 'CSV_DESCRIPTION': 'El archivo CSV debe tener 3 columnas: correo electrónico, contraseña, nombre. No hay límite en el recuento de filas. Se creará un usuario por fila en el archivo.', + 'SMTP_SERVER_DESCRIPTION': 'La configuracion de SMTP permite que la applicacion mande emails. Si no es configurado, ningún mail sera enviado OpenSupports.', //ERRORS 'EMAIL_OR_PASSWORD': 'Email o contraseña inválida', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'Dejar vacío para la creación automática de bases de datos', 'REMEMBER_ME': 'Recordarme', 'EMAIL_LOWERCASE': 'email', - 'PASSWORD_LOWERCASE': 'contraseña' + 'PASSWORD_LOWERCASE': 'contraseña', + 'TEST_SMTP_CONNECTION': 'Probar conexion de SMTP', + 'SMTP_CONNECTION_SUCCESS': 'La credenciales de SMTP son correctas.', + 'SMTP_CONNECTION_ERROR': 'No es posible conectarse al servidor de SMTP.' }; diff --git a/client/src/data/languages/fr.js b/client/src/data/languages/fr.js index 7c35bbc3..a1c633bd 100644 --- a/client/src/data/languages/fr.js +++ b/client/src/data/languages/fr.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Ici, vous pouvez modifier votre utilisateur en changeant votre adresse e-mail ou votre mot de passe.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Activer / désactiver l\'utilisation d\'un système utilisateur. Si vous le désactivez, tous les utilisateurs seront supprimés, mais les tickets seront conservés. Si vous l\'activez, les utilisateurs des tickets existants seront créés.', 'CSV_DESCRIPTION': 'Le fichier CSV doit comporter 3 colonnes: email, mot de passe, nom. Il n\'y a pas de limite dans le nombre de lignes. Il sera créé un utilisateur par ligne dans le fichier.', + 'SMTP_SERVER_DESCRIPTION': 'La configuration du serveur SMTP permet à l\'application d\'envoyer des mails. Si vous ne le configurez pas, aucun service d\'email ne sera envoyé par OpenSupports.', //ERRORS 'EMAIL_OR_PASSWORD': 'E-mail ou mot de passe invalide', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'Laisser vide pour la création automatique de la base de données', 'REMEMBER_ME': 'Se souvenir de moi', 'EMAIL_LOWERCASE': 'email', - 'PASSWORD_LOWERCASE': 'mot de passe' + 'PASSWORD_LOWERCASE': 'mot de passe', + 'TEST_SMTP_CONNECTION': 'Test de connexion SMTP', + 'SMTP_CONNECTION_SUCCESS': 'Les informations d\'identification SMTP sont valides.', + 'SMTP_CONNECTION_ERROR': 'Ne peut pas se connecter au serveur SMTP.' }; diff --git a/client/src/data/languages/in.js b/client/src/data/languages/in.js index 7aec4cf6..5e019e72 100644 --- a/client/src/data/languages/in.js +++ b/client/src/data/languages/in.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'यहां आप अपना ईमेल या अपना पासवर्ड बदलकर अपना उपयोगकर्ता संपादित कर सकते हैं।', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'किसी उपयोगकर्ता सिस्टम के उपयोग को सक्षम / अक्षम करें यदि आप इसे अक्षम करते हैं, तो सभी उपयोगकर्ताओं को हटा दिया जाएगा लेकिन टिकट को रखा जाएगा। यदि आप इसे सक्षम करते हैं, तो विद्यमान टिकट के उपयोगकर्ता बनाए जाएंगे', 'CSV_DESCRIPTION': 'सीएसवी फ़ाइल में 3 कॉलम होना चाहिए: ईमेल, पासवर्ड, नाम। पंक्ति गणना में कोई सीमा नहीं है फ़ाइल में प्रति पंक्ति एक उपयोगकर्ता बनाया जाएगा।', + 'SMTP_SERVER_DESCRIPTION': 'एसएमटीपी सर्वर का कॉन्फ़िगरेशन एप्लिकेशन को मेल भेजने की अनुमति देता है। यदि आप इसे कॉन्फ़िगर नहीं करते हैं, तो OpenSupports द्वारा कोई ईमेल नहीं भेजा जाएगा।', //ERRORS 'EMAIL_OR_PASSWORD': 'ईमेल या पासवर्ड अमान्य', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'स्वचालित डेटाबेस निर्माण के लिए खाली छोड़ दिया', 'REMEMBER_ME': 'मुझे याद रखना', 'EMAIL_LOWERCASE': 'ईमेल', - 'PASSWORD_LOWERCASE': 'पासवर्ड' + 'PASSWORD_LOWERCASE': 'पासवर्ड', + 'TEST_SMTP_CONNECTION': 'परीक्षण एसएमटीपी कनेक्शन', + 'SMTP_CONNECTION_SUCCESS': 'SMTP क्रेडेंशियल्स मान्य हं।', + 'SMTP_CONNECTION_ERROR': 'एसएमटीपी सर्वर से कनेक्ट नहीं हो सकता' }; \ No newline at end of file diff --git a/client/src/data/languages/jp.js b/client/src/data/languages/jp.js index 87698547..0c4ac281 100644 --- a/client/src/data/languages/jp.js +++ b/client/src/data/languages/jp.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'ここでは、電子メールまたはパスワードを変更してユーザーを編集できます。', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'ユーザシステムの使用を有効/無効にします。無効にすると、すべてのユーザーは削除されますが、チケットは保持されます。これを有効にすると、既存のチケットのユーザーが作成されます。', 'CSV_DESCRIPTION': 'CSVファイルには、電子メール、パスワード、名前の3つの列が必要です。行数に制限はありません。ファイル内で行ごとに1人ずつ作成されます', + 'SMTP_SERVER_DESCRIPTION': 'SMTPサーバーの設定により、アプリケーションはメールを送信できます。 これを設定しないと、OpenSupportsから電子メールは送信されません。', //ERRORS 'EMAIL_OR_PASSWORD': '電子メールまたはパスワードが無効です', @@ -355,6 +356,9 @@ export default { 'LEFT_EMPTY_DATABASE': '自動データベース作成のために空のままにする', 'REMEMBER_ME': '覚えている', 'EMAIL_LOWERCASE': 'Eメール', - 'PASSWORD_LOWERCASE': 'パスワード' + 'PASSWORD_LOWERCASE': 'パスワード', + 'TEST_SMTP_CONNECTION': 'SMTP接続をテストする', + 'SMTP_CONNECTION_SUCCESS': 'SMTP資格情報が有効です。', + 'SMTP_CONNECTION_ERROR': 'SMTPサーバーに接続できません。' }; diff --git a/client/src/data/languages/pt.js b/client/src/data/languages/pt.js index a8151b18..939500a1 100644 --- a/client/src/data/languages/pt.js +++ b/client/src/data/languages/pt.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Aqui você pode editar seu usuário alterando seu e-mail ou sua senha.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Ativar / desativar o uso de um sistema de usuário. Se você desativá-lo, todos os usuários serão excluídos, mas os ingressos serão mantidos. Se você ativá-lo, os usuários de tickets existentes serão criados.', 'CSV_DESCRIPTION': 'O arquivo CSV deve ter 3 colunas: e-mail, senha, nome. Não há limite na contagem de linhas. Ele será criado um usuário por linha no arquivo.', + 'SMTP_SERVER_DESCRIPTION': 'A configuração do servidor SMTP permite que o aplicativo envie e-mails. Se você não configurá-lo, nenhum e-mail será enviado pela OpenSupports.', //ERRORS 'EMAIL_OR_PASSWORD': 'E-mail ou senha inválidos', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'Esquerda vazia para criação automática de banco de dados', 'REMEMBER_ME': 'Lembrar', 'EMAIL_LOWERCASE': 'email', - 'PASSWORD_LOWERCASE': 'senha' + 'PASSWORD_LOWERCASE': 'senha', + 'TEST_SMTP_CONNECTION': 'Testar conexão SMTP', + 'SMTP_CONNECTION_SUCCESS': 'As credenciais SMTP são válidas.', + 'SMTP_CONNECTION_ERROR': 'Não pode se conectar ao servidor SMTP.' }; \ No newline at end of file diff --git a/client/src/data/languages/ru.js b/client/src/data/languages/ru.js index e9debf26..ff561236 100644 --- a/client/src/data/languages/ru.js +++ b/client/src/data/languages/ru.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Здесь вы можете изменить своего пользователя, изменив свой адрес электронной почты или пароль.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Включить / отключить использование пользовательской системы. Если вы отключите его, все пользователи будут удалены. Если вы включите его, будут созданы пользователи существующих билетов.', 'CSV_DESCRIPTION': 'Файл CSV должен иметь 3 столбца: адрес электронной почты, пароль и имя. Количество строк не ограничено. В файле будет создан один пользователь для каждой строки.', + 'SMTP_SERVER_DESCRIPTION': 'Конфигурация SMTP-сервера позволяет приложению отправлять письма. Если вы не настроите его, никакие электронные письма не будут отправлены OpenSupports.', //ERRORS 'EMAIL_OR_PASSWORD': 'электронной почты или пароль недействительный', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'Пусто для автоматического создания базы данных', 'REMEMBER_ME': 'Запомнить', 'EMAIL_LOWERCASE': 'Эл. адрес', - 'PASSWORD_LOWERCASE': 'пароль' + 'PASSWORD_LOWERCASE': 'пароль', + 'TEST_SMTP_CONNECTION': 'Тестирование SMTP-соединения', + 'SMTP_CONNECTION_SUCCESS': 'Учетные данные SMTP действительны.', + 'SMTP_CONNECTION_ERROR': 'Не удается подключиться к SMTP-серверу.' }; diff --git a/client/src/data/languages/tr.js b/client/src/data/languages/tr.js index e5ceb9dc..0baf0487 100644 --- a/client/src/data/languages/tr.js +++ b/client/src/data/languages/tr.js @@ -285,6 +285,7 @@ export default { 'EDIT_PROFILE_VIEW_DESCRIPTION': 'Burada e-postanızı veya şifrenizi değiştirerek kullanıcıyı düzenleyebilirsiniz.', 'ENABLE_USER_SYSTEM_DESCRIPTION': 'Bir kullanıcı sisteminin kullanımını etkinleştirir / devre dışı bırakır. Devre dışı bırakırsanız, tüm kullanıcılar silinir ancak biletler muhafaza edilir. Etkinleştirirseniz, mevcut biletler kullanıcıları oluşturulur.', 'CSV_DESCRIPTION': 'CSV dosyasının 3 sütun olması gerekir: e-posta, şifre, ad. Satır sayısı sınırı yoktur. Dosya satır başına bir kullanıcı oluşturulur.', + 'SMTP_SERVER_DESCRIPTION': 'SMTP sunucusunun yapılandırması, uygulamanın postalar göndermesine izin verir. Onu yapılandırmazsanız, OpenSupports tarafından hiçbir e-posta gönderilmeyecektir', //ERRORS 'EMAIL_OR_PASSWORD': 'E-posta veya şifre geçersiz', @@ -355,5 +356,8 @@ export default { 'LEFT_EMPTY_DATABASE': 'Otomatik veritabanı oluşturulması için boş bırakıldı', 'REMEMBER_ME': 'Hatırlamak', 'EMAIL_LOWERCASE': 'e-posta', - 'PASSWORD_LOWERCASE': 'parola' + 'PASSWORD_LOWERCASE': 'parola', + 'TEST_SMTP_CONNECTION': 'SMTP bağlantısını test et', + 'SMTP_CONNECTION_SUCCESS': 'SMTP kimlik bilgileri geçerlidir.', + 'SMTP_CONNECTION_ERROR': 'SMTP sunucusuna bağlanılamıyor.' }; diff --git a/client/src/reducers/config-reducer.js b/client/src/reducers/config-reducer.js index 742dbef7..80fafb90 100644 --- a/client/src/reducers/config-reducer.js +++ b/client/src/reducers/config-reducer.js @@ -52,7 +52,7 @@ class ConfigReducer extends Reducer { onUserSystemSettingsChange(state, payload) { return _.extend({}, state, { 'user-system-enabled': !!(payload['user-system-enabled'] * 1), - 'allow-attachments': !!(payload['allow-attachments'] * 1) + 'registration': !!(payload['registration'] * 1) }); } diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index 9ea63761..844b1fb8 100755 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -60,18 +60,18 @@ class InitSettingsController extends Controller { 'language' => Controller::request('language'), 'recaptcha-public' => '', 'recaptcha-private' => '', - 'no-reply-email' => Controller::request('no-reply-email') || 'noreply@opensupports.com', - 'smtp-host' => Controller::request('smtp-host') || 'localhost', - 'smtp-port' => Controller::request('smtp-port') || 7070, - 'smtp-user' => Controller::request('smtp-user') || '', - 'smtp-pass' => Controller::request('smtp-pass') || '', + 'no-reply-email' => Controller::request('no-reply-email'), + 'smtp-host' => Controller::request('smtp-host'), + 'smtp-port' => Controller::request('smtp-port'), + 'smtp-user' => Controller::request('smtp-user'), + 'smtp-pass' => Controller::request('smtp-password'), 'time-zone' => 0, 'maintenance-mode' => 0, 'layout' => 'boxed', 'allow-attachments' => !!Controller::request('allow-attachments'), 'max-size' => 1024, - 'title' => Controller::request('title') || 'Support Center', - 'url' => Controller::request('url') || ('http://' . $_SERVER['HTTP_HOST']), + 'title' => Controller::request('title') ? Controller::request('title') : 'Support Center', + 'url' => Controller::request('url') ? Controller::request('url') : ('http://' . $_SERVER['HTTP_HOST']), 'registration' => !!Controller::request('registration'), 'user-system-enabled' => !!Controller::request('user-system-enabled'), 'last-stat-day' => date('YmdHi', strtotime(' -12 day ')), diff --git a/server/models/NullDataStore.php b/server/models/NullDataStore.php index cef6a849..0976abe8 100755 --- a/server/models/NullDataStore.php +++ b/server/models/NullDataStore.php @@ -18,4 +18,8 @@ class NullDataStore extends DataStore { public function store() { return null; } + + public function getValue() { + return null; + } } \ No newline at end of file diff --git a/tests/system/init-settings.rb b/tests/system/init-settings.rb index 362a0727..920815dc 100644 --- a/tests/system/init-settings.rb +++ b/tests/system/init-settings.rb @@ -3,6 +3,12 @@ describe '/system/init-settings' do result = request('/system/init-settings', { 'user-system-enabled' => true, 'registration' => true, + 'title' => 'Support Center', + 'smtp-host' => 'localhost', + 'smtp-port' => 7070, + 'smtp-user' => 'noreply@opensupports.com', + 'smtp-password' => '', + 'no-reply-email' => 'noreply@opensupports.com', 'language' => 'en' }) From feee217510a5e1fd41535f9d0a4569f750fcd25d Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 13 Jun 2017 18:18:46 -0300 Subject: [PATCH 6/6] Ivan - Fix MailSender instance to use singleton --- server/controllers/ticket/create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php index 248f7bf4..fab7335f 100755 --- a/server/controllers/ticket/create.php +++ b/server/controllers/ticket/create.php @@ -163,7 +163,7 @@ class CreateController extends Controller { } private function sendMailStaff($email) { - $mailSender = new MailSender(); + $mailSender = MailSender::getInstance(); $mailSender->setTemplate(MailTemplate::TICKET_CREATED_STAFF, [ 'to' => $email,