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

Fix blank strings of titles and contents BE

This commit is contained in:
Guillermo Giuliana 2020-01-31 14:19:48 -03:00
parent 72a9b1ef0e
commit e44559618f
30 changed files with 94 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/controllers/article/add-topic.php
View File

@ -36,9 +36,9 @@ class AddTopicController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 100),
'error' => ERRORS::INVALID_NAME
]
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_TITLE
],
]
];
}

4
server/controllers/article/add.php
View File

@ -40,11 +40,11 @@ class AddArticleController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'title' => [
'validation' => DataValidator::length(1, 100),
'validation' => DataValidator::notBlank()->length(1, 100),
'error' => ERRORS::INVALID_NAME
],
'content' => [
'validation' => DataValidator::length(10),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'topicId' => [

7
server/controllers/article/edit-topic.php
View File

@ -38,7 +38,12 @@ class EditTopicController extends Controller {
'topicId' => [
'validation' => DataValidator::dataStoreId('topic'),
'error' => ERRORS::INVALID_TOPIC
]
],
'name' => [
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_NAME
],
]
];
}

10
server/controllers/article/edit.php
View File

@ -41,7 +41,15 @@ class EditArticleController extends Controller {
'articleId' => [
'validation' => DataValidator::dataStoreId('article'),
'error' => ERRORS::INVALID_TOPIC
]
],
'title' => [
'validation' => DataValidator::notBlank()->length(5, 100),
'error' => ERRORS::INVALID_TITLE
],
'content' => [
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
]
];
}

2
server/controllers/staff/edit.php
View File

@ -42,7 +42,7 @@ class EditStaffController extends Controller {
'error' => ERRORS::INVALID_EMAIL
],
'password' => [
'validation' => DataValidator::oneOf(DataValidator::length(5, 200), DataValidator::falseVal()),
'validation' => DataValidator::oneOf(DataValidator::notBlank()->length(5, 200), DataValidator::falseVal()),
'error' => ERRORS::INVALID_PASSWORD
],
'level' => [

2
server/controllers/staff/invite.php
View File

@ -47,7 +47,7 @@ class InviteStaffController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55),
'validation' => DataValidator::notBlank()->length(2, 55),
'error' => ERRORS::INVALID_NAME
],
'email' => [

2
server/controllers/staff/search-tickets.php
View File

@ -35,7 +35,7 @@ class SearchTicketStaffController extends Controller {
'permission' => 'staff_1',
'requestData' => [
'query' => [
'validation' => DataValidator::length(1),
'validation' => DataValidator::notBlank()->length(1),
'error' => ERRORS::INVALID_QUERY
],
'page' => [

2
server/controllers/system/add-api-key.php
View File

@ -34,7 +34,7 @@ class AddAPIKeyController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55)->alnum(),
'validation' => DataValidator::notBlank()->length(2, 55)->alnum(),
'error' => ERRORS::INVALID_NAME
],
'type' => [

6
server/controllers/system/add-custom-field.php
View File

@ -37,9 +37,13 @@ class AddCustomFieldController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 100),
'validation' => DataValidator::notBlank()->length(2, 100),
'error' => ERRORS::INVALID_NAME
],
'description' => [
'validation' => DataValidator::notBlank()->length(2, 100),
'error' => ERRORS::INVALID_DESCRIPTION
],
'type' => [
'validation' => DataValidator::oneOf(
DataValidator::equals('text'),

2
server/controllers/system/add-department.php
View File

@ -31,7 +31,7 @@ class AddDepartmentController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 100),
'validation' => DataValidator::notBlank()->length(2, 100),
'error' => ERRORS::INVALID_NAME
]
]

2
server/controllers/system/delete-api-key.php
View File

@ -31,7 +31,7 @@ class DeleteAPIKeyController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55),
'validation' => DataValidator::notBlank()->length(2, 55),
'error' => ERRORS::INVALID_NAME
]
]

6
server/controllers/system/edit-department.php
View File

@ -37,7 +37,11 @@ class EditDepartmentController extends Controller {
'departmentId' => [
'validation' => DataValidator::dataStoreId('department'),
'error' => ERRORS::INVALID_DEPARTMENT
]
],
'name' => [
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_NAME
],
]
];
}

6
server/controllers/system/edit-mail-template.php
View File

@ -46,15 +46,15 @@ class EditMailTemplateController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'template' => [
'validation' => DataValidator::length(4),
'validation' => DataValidator::notBlank()->length(4),
'error' => ERRORS::INVALID_TEMPLATE
],
'language' => [
'validation' => DataValidator::length(2, 2),
'validation' => DataValidator::notBlank()->length(2,2),
'error' => ERRORS::INVALID_LANGUAGE
],
'subject' => [
'validation' => DataValidator::length(4),
'validation' => DataValidator::notBlank()->length(4),
'error' => ERRORS::INVALID_SUBJECT
],
]

2
server/controllers/system/email-polling.php
View File

@ -12,7 +12,7 @@ class EmailPollingController extends Controller {
'permission' => 'any',
'requestData' => [
'token' => [
'validation' => DataValidator::length(1, 200),
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_TOKEN
]
]

4
server/controllers/system/get-mail-template.php
View File

@ -31,11 +31,11 @@ class GetMailTemplateController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'template' => [
'validation' => DataValidator::length(4),
'validation' => DataValidator::notBlank()->length(4),
'error' => ERRORS::INVALID_TEMPLATE
],
'language' => [
'validation' => DataValidator::length(2, 2),
'validation' => DataValidator::notBlank()->length(2, 2),
'error' => ERRORS::INVALID_LANGUAGE
],
]

4
server/controllers/system/init-admin.php
View File

@ -36,7 +36,7 @@ class InitAdminController extends Controller {
'permission' => 'any',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55),
'validation' => DataValidator::notBlank()->length(2, 55),
'error' => ERRORS::INVALID_NAME
],
'email' => [
@ -44,7 +44,7 @@ class InitAdminController extends Controller {
'error' => ERRORS::INVALID_EMAIL
],
'password' => [
'validation' => DataValidator::length(5, 200),
'validation' => DataValidator::notBlank()->length(5, 200),
'error' => ERRORS::INVALID_PASSWORD
],
]

4
server/controllers/system/recover-mail-template.php
View File

@ -33,11 +33,11 @@ class RecoverMailTemplateController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'template' => [
'validation' => DataValidator::length(4),
'validation' => DataValidator::notBlank()->length(4),
'error' => ERRORS::INVALID_TEMPLATE
],
'language' => [
'validation' => DataValidator::length(2, 2),
'validation' => DataValidator::notBlank()->length(2, 2),
'error' => ERRORS::INVALID_LANGUAGE
],
]

4
server/controllers/ticket/add-custom-response.php
View File

@ -36,11 +36,11 @@ class AddCustomResponseController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'name' => [
'validation' => DataValidator::length(5, 100),
'validation' => DataValidator::notBlank()->length(5, 100),
'error' => ERRORS::INVALID_NAME
],
'content' => [
'validation' => DataValidator::length(20, 500),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'language' => [

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

@ -47,7 +47,7 @@ class CommentController extends Controller {
'permission' => 'user',
'requestData' => [
'content' => [
'validation' => DataValidator::length(20, 5000),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'ticketNumber' => [
@ -61,7 +61,7 @@ class CommentController extends Controller {
'permission' => 'any',
'requestData' => [
'content' => [
'validation' => DataValidator::length(20, 5000),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'ticketNumber' => [
@ -83,7 +83,6 @@ class CommentController extends Controller {
$isAuthor = $this->session->isTicketSession() || $this->ticket->isAuthor($this->user);
$isOwner = $this->ticket->isOwner($this->user);
$private = Controller::request('private');
if(!Controller::isStaffLogged() && Controller::isUserSystemEnabled() && !$isAuthor){
throw new RequestException(ERRORS::NO_PERMISSION);
}

2
server/controllers/ticket/create-tag.php
View File

@ -34,7 +34,7 @@ class CreateTagController extends Controller {
'permission' => 'staff_3',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 100),
'validation' => DataValidator::notBlank()->length(2, 100),
'error' => ERRORS::INVALID_NAME
],
'color' => [

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

@ -54,11 +54,11 @@ class CreateController extends Controller {
'permission' => 'user',
'requestData' => [
'title' => [
'validation' => DataValidator::length(1, 200),
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_TITLE
],
'content' => [
'validation' => DataValidator::length(10, 5000),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'departmentId' => [
@ -83,7 +83,7 @@ class CreateController extends Controller {
'error' => ERRORS::INVALID_EMAIL
];
$validations['requestData']['name'] = [
'validation' => DataValidator::length(2, 40),
'validation' => DataValidator::notBlank()->length(2, 40),
'error' => ERRORS::INVALID_NAME
];
}

4
server/controllers/ticket/edit-comment.php
View File

@ -36,7 +36,7 @@ class EditCommentController extends Controller {
'permission' => 'user',
'requestData' => [
'content' => [
'validation' => DataValidator::length(10, 5000),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'ticketNumber' => [
@ -50,7 +50,7 @@ class EditCommentController extends Controller {
'permission' => 'any',
'requestData' => [
'content' => [
'validation' => DataValidator::length(10, 5000),
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'ticketNumber' => [

10
server/controllers/ticket/edit-custom-response.php
View File

@ -37,7 +37,15 @@ class EditCustomResponseController extends Controller {
'id' => [
'validation' => DataValidator::dataStoreId('customresponse'),
'error' => ERRORS::INVALID_NAME
]
],
'content' => [
'validation' => DataValidator::content(),
'error' => ERRORS::INVALID_CONTENT
],
'name' => [
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_NAME
],
]
];
}

4
server/controllers/ticket/edit-tag.php
View File

@ -41,6 +41,10 @@ class EditTagController extends Controller {
'color' => [
'validation' => DataValidator::hexRgbColor()->startsWith('#'),
'error' => ERRORS::INVALID_COLOR
],
'name' => [
'validation' => DataValidator::notBlank()->length(1, 200),
'error' => ERRORS::INVALID_NAME
]
]
];

2
server/controllers/user/edit-password.php
View File

@ -33,7 +33,7 @@ class EditPassword extends Controller {
'permission' => 'user',
'requestData' => [
'newPassword' => [
'validation' => DataValidator::length(5, 200),
'validation' => DataValidator::notBlank()->length(5, 200),
'error' => ERRORS::INVALID_PASSWORD
]
]

2
server/controllers/user/invite.php
View File

@ -45,7 +45,7 @@ class InviteUserController extends Controller {
'permission' => 'staff_1',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55),
'validation' => DataValidator::notBlank()->length(2, 55),
'error' => ERRORS::INVALID_NAME
],
'email' => [

2
server/controllers/user/recover-password.php
View File

@ -48,7 +48,7 @@ class RecoverPasswordController extends Controller {
'error' => ERRORS::INVALID_EMAIL
],
'password' => [
'validation' => DataValidator::length(5, 200),
'validation' => DataValidator::notBlank()->length(5, 200),
'error' => ERRORS::INVALID_PASSWORD
]
]

4
server/controllers/user/signup.php
View File

@ -56,7 +56,7 @@ class SignUpController extends Controller {
'permission' => 'any',
'requestData' => [
'name' => [
'validation' => DataValidator::length(2, 55),
'validation' => DataValidator::notBlank()->length(2, 55),
'error' => ERRORS::INVALID_NAME
],
'email' => [
@ -64,7 +64,7 @@ class SignUpController extends Controller {
'error' => ERRORS::INVALID_EMAIL
],
'password' => [
'validation' => DataValidator::length(5, 200),
'validation' => DataValidator::notBlank()->length(5, 200),
'error' => ERRORS::INVALID_PASSWORD
]
]

5
server/data/ERRORS.php
View File

@ -39,6 +39,10 @@
* @apiDefine INVALID_NAME
* @apiError {String} INVALID_NAME The name is invalid, probably too short.
*/
/**
* @apiDefine INVALID_DESCRIPTION
* @apiError {String} INVALID_DESCRIPTION The description is invalid.
*/
/**
* @apiDefine INVALID_SETTING
* @apiError {String} INVALID_SETTING The setting are invalid.
@ -307,6 +311,7 @@ class ERRORS {
const INVALID_EMAIL = 'INVALID_EMAIL';
const INVALID_PASSWORD = 'INVALID_PASSWORD';
const INVALID_NAME = 'INVALID_NAME';
const INVALID_DESCRIPTION = 'INVALID_DESCRIPTION';
const INVALID_SETTING = 'INVALID_SETTING';
const INVALID_DEPARTMENT = 'INVALID_DEPARTMENT';
const INVALID_TICKET = 'INVALID_TICKET';

14
server/libs/validations/content.php Normal file
View File

@ -0,0 +1,14 @@
<?php
namespace CustomValidations;
use Respect\Validation\Rules\AbstractRule;
class Content extends AbstractRule {
public function validate($content) {
$content = str_replace(" ",'',preg_replace("/<\s*[^>]*>/",'',$content));
if($content != '')return true;
return false;
}
}