From 5335f67746a3450dbda2e6c9582b6ee0d8adbbc5 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sun, 19 Aug 2018 19:17:03 -0300 Subject: [PATCH] Update version 4.2.0 --- README.md | 2 +- client/package.json | 2 +- server/controllers/article/add-topic.php | 2 +- server/controllers/article/add.php | 2 +- server/controllers/article/delete-topic.php | 2 +- server/controllers/article/delete.php | 2 +- server/controllers/article/edit-topic.php | 2 +- server/controllers/article/edit.php | 2 +- server/controllers/article/get-all.php | 2 +- server/controllers/staff/add.php | 2 +- server/controllers/staff/assign-ticket.php | 2 +- server/controllers/staff/delete.php | 2 +- server/controllers/staff/edit.php | 2 +- server/controllers/staff/get-all-tickets.php | 2 +- server/controllers/staff/get-all.php | 2 +- server/controllers/staff/get-new-tickets.php | 2 +- server/controllers/staff/get-tickets.php | 2 +- server/controllers/staff/get.php | 2 +- server/controllers/staff/last-events.php | 2 +- server/controllers/staff/search-tickets.php | 2 +- server/controllers/staff/un-assign-ticket.php | 2 +- server/controllers/system/add-api-key.php | 2 +- server/controllers/system/add-department.php | 2 +- server/controllers/system/backup-database.php | 2 +- .../controllers/system/check-requirements.php | 2 +- server/controllers/system/csv-import.php | 2 +- .../controllers/system/delete-all-users.php | 2 +- server/controllers/system/delete-api-key.php | 2 +- .../controllers/system/delete-department.php | 2 +- .../system/disable-registration.php | 2 +- .../system/disable-user-system.php | 2 +- server/controllers/system/download.php | 2 +- server/controllers/system/edit-department.php | 2 +- .../controllers/system/edit-mail-template.php | 2 +- server/controllers/system/edit-settings.php | 2 +- .../system/enable-registration.php | 2 +- .../controllers/system/enable-user-system.php | 2 +- server/controllers/system/get-api-keys.php | 2 +- server/controllers/system/get-logs.php | 2 +- .../controllers/system/get-mail-templates.php | 2 +- server/controllers/system/get-settings.php | 2 +- server/controllers/system/get-stats.php | 2 +- server/controllers/system/init-admin.php | 2 +- server/controllers/system/init-database.php | 2 +- server/controllers/system/init-settings.php | 2 +- .../controllers/system/installation-done.php | 2 +- .../system/recover-mail-template.php | 2 +- server/controllers/system/test-smtp.php | 2 +- .../ticket/add-custom-response.php | 2 +- .../controllers/ticket/change-department.php | 2 +- server/controllers/ticket/change-priority.php | 2 +- server/controllers/ticket/check.php | 2 +- server/controllers/ticket/close.php | 2 +- server/controllers/ticket/comment.php | 2 +- server/controllers/ticket/create.php | 2 +- .../ticket/delete-custom-response.php | 2 +- .../ticket/edit-custom-response.php | 2 +- .../ticket/get-custom-responses.php | 2 +- server/controllers/ticket/get.php | 2 +- server/controllers/ticket/re-open.php | 2 +- server/controllers/ticket/seen.php | 2 +- server/controllers/user/ban.php | 2 +- server/controllers/user/check-session.php | 2 +- server/controllers/user/delete.php | 2 +- server/controllers/user/edit-email.php | 2 +- server/controllers/user/edit-password.php | 2 +- server/controllers/user/get-user.php | 2 +- server/controllers/user/get-users.php | 2 +- server/controllers/user/get.php | 2 +- server/controllers/user/list-ban.php | 2 +- server/controllers/user/login.php | 2 +- server/controllers/user/logout.php | 2 +- server/controllers/user/recover-password.php | 2 +- .../user/send-recover-password.php | 2 +- server/controllers/user/signup.php | 20 ++++++------- server/controllers/user/un-ban.php | 2 +- server/controllers/user/verify.php | 2 +- server/models/APIKey.php | 2 +- server/models/Article.php | 2 +- server/models/Ban.php | 2 +- server/models/CustomResponse.php | 2 +- server/models/Department.php | 2 +- server/models/Log.php | 2 +- server/models/MailTemplate.php | 2 +- server/models/Staff.php | 2 +- server/models/Stat.php | 2 +- server/models/Ticket.php | 2 +- server/models/Ticketevent.php | 2 +- server/models/Topic.php | 2 +- server/models/User.php | 2 +- version_upgrades/4.2.0/4.2.0.php | 28 +++++++++++++++++++ 91 files changed, 127 insertions(+), 99 deletions(-) create mode 100644 version_upgrades/4.2.0/4.2.0.php diff --git a/README.md b/README.md index d93f7973..50f8b973 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![OpenSupports](http://www.opensupports.com/logo.png) -[![Build Status](https://travis-ci.org/opensupports/opensupports.svg?branch=master)](https://travis-ci.org/opensupports/opensupports) v4.1.2 +[![Build Status](https://travis-ci.org/opensupports/opensupports.svg?branch=master)](https://travis-ci.org/opensupports/opensupports) v4.2.0 OpenSupports is an open source ticket system built primarily with PHP and ReactJS. Please, visit our website for more information: [http://www.opensupports.com/](http://www.opensupports.com/) diff --git a/client/package.json b/client/package.json index 26cafcb1..1aa67b0f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "OpenSupports", - "version": "4.1.2", + "version": "4.2.0", "author": "Ivan Diaz ", "description": "Open source ticket system made with PHP and ReactJS", "repository": { diff --git a/server/controllers/article/add-topic.php b/server/controllers/article/add-topic.php index 9cfd29a8..247f3f47 100755 --- a/server/controllers/article/add-topic.php +++ b/server/controllers/article/add-topic.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/add-topic Add topic - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add topic * diff --git a/server/controllers/article/add.php b/server/controllers/article/add.php index ccd697a9..8e309e5a 100755 --- a/server/controllers/article/add.php +++ b/server/controllers/article/add.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/add Add article - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add article * diff --git a/server/controllers/article/delete-topic.php b/server/controllers/article/delete-topic.php index 1296873c..6e8f2174 100755 --- a/server/controllers/article/delete-topic.php +++ b/server/controllers/article/delete-topic.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/delete-topic Delete topic - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete topic * diff --git a/server/controllers/article/delete.php b/server/controllers/article/delete.php index fda5d33d..0d3ef1f7 100755 --- a/server/controllers/article/delete.php +++ b/server/controllers/article/delete.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/delete Delete article - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete article * diff --git a/server/controllers/article/edit-topic.php b/server/controllers/article/edit-topic.php index 0087e51b..f60e5c3c 100755 --- a/server/controllers/article/edit-topic.php +++ b/server/controllers/article/edit-topic.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/edit-topic Edit topic - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit topic * diff --git a/server/controllers/article/edit.php b/server/controllers/article/edit.php index e5c1a50e..2f30a62c 100755 --- a/server/controllers/article/edit.php +++ b/server/controllers/article/edit.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/edit Edit article - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit a article * diff --git a/server/controllers/article/get-all.php b/server/controllers/article/get-all.php index 847400b4..b3cb39b6 100755 --- a/server/controllers/article/get-all.php +++ b/server/controllers/article/get-all.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /article/get-all Get all articles - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get all articles * diff --git a/server/controllers/staff/add.php b/server/controllers/staff/add.php index 3d06a620..c788cb02 100755 --- a/server/controllers/staff/add.php +++ b/server/controllers/staff/add.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /staff/add Add staff - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add staff * diff --git a/server/controllers/staff/assign-ticket.php b/server/controllers/staff/assign-ticket.php index 58b7859d..e6735525 100755 --- a/server/controllers/staff/assign-ticket.php +++ b/server/controllers/staff/assign-ticket.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /staff/assign-ticket Assign ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Assign ticket * diff --git a/server/controllers/staff/delete.php b/server/controllers/staff/delete.php index 6a5c7db2..f2a8c244 100755 --- a/server/controllers/staff/delete.php +++ b/server/controllers/staff/delete.php @@ -4,7 +4,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /staff/delete Delete staff - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete staff * diff --git a/server/controllers/staff/edit.php b/server/controllers/staff/edit.php index bdb6b811..24311b44 100755 --- a/server/controllers/staff/edit.php +++ b/server/controllers/staff/edit.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/edit Edit staff - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit staff * diff --git a/server/controllers/staff/get-all-tickets.php b/server/controllers/staff/get-all-tickets.php index 5a36bbac..a8f9781c 100755 --- a/server/controllers/staff/get-all-tickets.php +++ b/server/controllers/staff/get-all-tickets.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/get-all-tickets Get all tickets - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get all tickets * diff --git a/server/controllers/staff/get-all.php b/server/controllers/staff/get-all.php index 305da700..0efe1d64 100755 --- a/server/controllers/staff/get-all.php +++ b/server/controllers/staff/get-all.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/get-all Get all staffs - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get all staffs * diff --git a/server/controllers/staff/get-new-tickets.php b/server/controllers/staff/get-new-tickets.php index 5289edd3..76e282b1 100755 --- a/server/controllers/staff/get-new-tickets.php +++ b/server/controllers/staff/get-new-tickets.php @@ -4,7 +4,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/get-new-tickets Get new tickets - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get new tickets * diff --git a/server/controllers/staff/get-tickets.php b/server/controllers/staff/get-tickets.php index 0d69af59..9dd0269c 100755 --- a/server/controllers/staff/get-tickets.php +++ b/server/controllers/staff/get-tickets.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/get-tickets Get tickets - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get tickets * diff --git a/server/controllers/staff/get.php b/server/controllers/staff/get.php index 64423de7..8b1e6793 100755 --- a/server/controllers/staff/get.php +++ b/server/controllers/staff/get.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /staff/get Get staff - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get staff * diff --git a/server/controllers/staff/last-events.php b/server/controllers/staff/last-events.php index f13bd1df..f915e375 100755 --- a/server/controllers/staff/last-events.php +++ b/server/controllers/staff/last-events.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/last-events Get last events - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get last events * diff --git a/server/controllers/staff/search-tickets.php b/server/controllers/staff/search-tickets.php index f90106d9..6ac6cf3c 100755 --- a/server/controllers/staff/search-tickets.php +++ b/server/controllers/staff/search-tickets.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /staff/search-tickets Search tickets - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Search tickets * diff --git a/server/controllers/staff/un-assign-ticket.php b/server/controllers/staff/un-assign-ticket.php index 0ebb7e06..61866277 100755 --- a/server/controllers/staff/un-assign-ticket.php +++ b/server/controllers/staff/un-assign-ticket.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /staff/un-assign-ticket Un-assign ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Un-assign ticket * diff --git a/server/controllers/system/add-api-key.php b/server/controllers/system/add-api-key.php index d86d9e46..cc6234f9 100755 --- a/server/controllers/system/add-api-key.php +++ b/server/controllers/system/add-api-key.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/add-api-key Add APIKey - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add APIKey * diff --git a/server/controllers/system/add-department.php b/server/controllers/system/add-department.php index 0d42846b..58cd7c06 100755 --- a/server/controllers/system/add-department.php +++ b/server/controllers/system/add-department.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/add-department Add department - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add department * diff --git a/server/controllers/system/backup-database.php b/server/controllers/system/backup-database.php index b0fa9a1a..b1253252 100755 --- a/server/controllers/system/backup-database.php +++ b/server/controllers/system/backup-database.php @@ -3,7 +3,7 @@ use Ifsnop\Mysqldump as IMysqldump; /** * @api {post} /system/backup-database Backup database - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Backup database * diff --git a/server/controllers/system/check-requirements.php b/server/controllers/system/check-requirements.php index 1958460f..99bd57dd 100755 --- a/server/controllers/system/check-requirements.php +++ b/server/controllers/system/check-requirements.php @@ -2,7 +2,7 @@ /** * @api {post} /system/check-requirements Checks requirements - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Check requirements * diff --git a/server/controllers/system/csv-import.php b/server/controllers/system/csv-import.php index 6943f717..73fb2bb3 100755 --- a/server/controllers/system/csv-import.php +++ b/server/controllers/system/csv-import.php @@ -2,7 +2,7 @@ /** * @api {post} /system/csv-import CSV import - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName CSV import * diff --git a/server/controllers/system/delete-all-users.php b/server/controllers/system/delete-all-users.php index 4f378a6b..2dd6902d 100755 --- a/server/controllers/system/delete-all-users.php +++ b/server/controllers/system/delete-all-users.php @@ -3,7 +3,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /system/delete-all-users Delete all users - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete all users * diff --git a/server/controllers/system/delete-api-key.php b/server/controllers/system/delete-api-key.php index c26feec5..86ffed5a 100755 --- a/server/controllers/system/delete-api-key.php +++ b/server/controllers/system/delete-api-key.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/delete-api-key Delete APIKey - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete APIKey * diff --git a/server/controllers/system/delete-department.php b/server/controllers/system/delete-department.php index 00665746..17b4ac38 100755 --- a/server/controllers/system/delete-department.php +++ b/server/controllers/system/delete-department.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /system/delete-department Delete department - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete department * diff --git a/server/controllers/system/disable-registration.php b/server/controllers/system/disable-registration.php index f6cc45bd..2de734d8 100755 --- a/server/controllers/system/disable-registration.php +++ b/server/controllers/system/disable-registration.php @@ -2,7 +2,7 @@ /** * @api {post} /system/disable-registration Disable registration - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Disable registration * diff --git a/server/controllers/system/disable-user-system.php b/server/controllers/system/disable-user-system.php index a5da2419..16d36906 100755 --- a/server/controllers/system/disable-user-system.php +++ b/server/controllers/system/disable-user-system.php @@ -2,7 +2,7 @@ /** * @api {post} /system/disable-user-system Disable user system - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Disable user system * diff --git a/server/controllers/system/download.php b/server/controllers/system/download.php index 7a1d4714..7ad437f4 100755 --- a/server/controllers/system/download.php +++ b/server/controllers/system/download.php @@ -4,7 +4,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {get} /system/download Download file - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Download file * diff --git a/server/controllers/system/edit-department.php b/server/controllers/system/edit-department.php index 29534f50..a03b85f4 100755 --- a/server/controllers/system/edit-department.php +++ b/server/controllers/system/edit-department.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /system/edit-department Edit department - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit department * diff --git a/server/controllers/system/edit-mail-template.php b/server/controllers/system/edit-mail-template.php index 80f0140f..6a76166b 100755 --- a/server/controllers/system/edit-mail-template.php +++ b/server/controllers/system/edit-mail-template.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/edit-mail-template Edit mail template - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit mail template * diff --git a/server/controllers/system/edit-settings.php b/server/controllers/system/edit-settings.php index bb56fdf4..5aa92802 100755 --- a/server/controllers/system/edit-settings.php +++ b/server/controllers/system/edit-settings.php @@ -2,7 +2,7 @@ /** * @api {post} /system/edit-settings Edit settings - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit settings * diff --git a/server/controllers/system/enable-registration.php b/server/controllers/system/enable-registration.php index 2d6135dd..c39e33b5 100755 --- a/server/controllers/system/enable-registration.php +++ b/server/controllers/system/enable-registration.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/enable-registration Enable registration - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Enable registration * diff --git a/server/controllers/system/enable-user-system.php b/server/controllers/system/enable-user-system.php index 4a38ae0f..83c4c3ba 100755 --- a/server/controllers/system/enable-user-system.php +++ b/server/controllers/system/enable-user-system.php @@ -2,7 +2,7 @@ /** * @api {post} /system/enable-user-system Enable user system - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Enable user system * diff --git a/server/controllers/system/get-api-keys.php b/server/controllers/system/get-api-keys.php index 988e0e81..870a69dc 100755 --- a/server/controllers/system/get-api-keys.php +++ b/server/controllers/system/get-api-keys.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/get-api-keys Get APIKeys - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get APIKeys * diff --git a/server/controllers/system/get-logs.php b/server/controllers/system/get-logs.php index 7bbb2def..9ef33f21 100755 --- a/server/controllers/system/get-logs.php +++ b/server/controllers/system/get-logs.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/get-logs Get logs - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get logs * diff --git a/server/controllers/system/get-mail-templates.php b/server/controllers/system/get-mail-templates.php index fd556d68..85f9f3ae 100755 --- a/server/controllers/system/get-mail-templates.php +++ b/server/controllers/system/get-mail-templates.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/get-mail-templates Get mail templates - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get mail templates * diff --git a/server/controllers/system/get-settings.php b/server/controllers/system/get-settings.php index e1124ad6..53489d78 100755 --- a/server/controllers/system/get-settings.php +++ b/server/controllers/system/get-settings.php @@ -2,7 +2,7 @@ /** * @api {post} /system/get-settings Get settings - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get settings * diff --git a/server/controllers/system/get-stats.php b/server/controllers/system/get-stats.php index 284efe3e..7dbc7c04 100755 --- a/server/controllers/system/get-stats.php +++ b/server/controllers/system/get-stats.php @@ -4,7 +4,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /system/get-stats Get stats - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get stats * diff --git a/server/controllers/system/init-admin.php b/server/controllers/system/init-admin.php index 773b7995..599c354f 100755 --- a/server/controllers/system/init-admin.php +++ b/server/controllers/system/init-admin.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /system/init-admin Init admin - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Init admin * diff --git a/server/controllers/system/init-database.php b/server/controllers/system/init-database.php index b62aa61c..2e16f121 100755 --- a/server/controllers/system/init-database.php +++ b/server/controllers/system/init-database.php @@ -4,7 +4,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /system/init-database Init database - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Init database * diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index b027e077..97a87009 100755 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /system/init-settings Init settings - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Init settings * diff --git a/server/controllers/system/installation-done.php b/server/controllers/system/installation-done.php index 74ebaaff..af7ba9b9 100755 --- a/server/controllers/system/installation-done.php +++ b/server/controllers/system/installation-done.php @@ -3,7 +3,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /system/installation-done Installation done - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Installation done * diff --git a/server/controllers/system/recover-mail-template.php b/server/controllers/system/recover-mail-template.php index 399f55f6..887cd8e4 100755 --- a/server/controllers/system/recover-mail-template.php +++ b/server/controllers/system/recover-mail-template.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/recover-mail-template Recover mail template - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Recover mail template * diff --git a/server/controllers/system/test-smtp.php b/server/controllers/system/test-smtp.php index 86343b5d..3d5e36c9 100644 --- a/server/controllers/system/test-smtp.php +++ b/server/controllers/system/test-smtp.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /system/test-smtp Test SMTP Connection - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Test SMTP Connection * diff --git a/server/controllers/ticket/add-custom-response.php b/server/controllers/ticket/add-custom-response.php index 806798fc..ce6f13ac 100755 --- a/server/controllers/ticket/add-custom-response.php +++ b/server/controllers/ticket/add-custom-response.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/add-custom-response Add custom responses - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Add a custom response * diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php index 7c327466..036a3120 100755 --- a/server/controllers/ticket/change-department.php +++ b/server/controllers/ticket/change-department.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/change-department Change department - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Change department * diff --git a/server/controllers/ticket/change-priority.php b/server/controllers/ticket/change-priority.php index 3ab57d62..286d181e 100755 --- a/server/controllers/ticket/change-priority.php +++ b/server/controllers/ticket/change-priority.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /ticket/change-priority Change priority - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Change priority * diff --git a/server/controllers/ticket/check.php b/server/controllers/ticket/check.php index 853c90ff..1edf1f53 100755 --- a/server/controllers/ticket/check.php +++ b/server/controllers/ticket/check.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/check Check ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Check ticket * diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php index c65e5105..1b0d71f6 100755 --- a/server/controllers/ticket/close.php +++ b/server/controllers/ticket/close.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/close Close ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Close * diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php index 3c106f40..8f09492b 100755 --- a/server/controllers/ticket/comment.php +++ b/server/controllers/ticket/comment.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/comment Comment ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Comment ticket * diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php index f3f55545..6af609b5 100755 --- a/server/controllers/ticket/create.php +++ b/server/controllers/ticket/create.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/create Create ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Create ticket * diff --git a/server/controllers/ticket/delete-custom-response.php b/server/controllers/ticket/delete-custom-response.php index c816f153..204c1dcf 100755 --- a/server/controllers/ticket/delete-custom-response.php +++ b/server/controllers/ticket/delete-custom-response.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/delete-custom-response Delete custom response - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete custom response * diff --git a/server/controllers/ticket/edit-custom-response.php b/server/controllers/ticket/edit-custom-response.php index 78750312..d4bad091 100755 --- a/server/controllers/ticket/edit-custom-response.php +++ b/server/controllers/ticket/edit-custom-response.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/edit-custom-response Edit custom response - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit custom response * diff --git a/server/controllers/ticket/get-custom-responses.php b/server/controllers/ticket/get-custom-responses.php index 6a5c219e..5697efb3 100755 --- a/server/controllers/ticket/get-custom-responses.php +++ b/server/controllers/ticket/get-custom-responses.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/get-custom-responses Get custom responses - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get custom responses * diff --git a/server/controllers/ticket/get.php b/server/controllers/ticket/get.php index 3bb12482..d1a62b4d 100755 --- a/server/controllers/ticket/get.php +++ b/server/controllers/ticket/get.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; DataValidator::with('CustomValidations', true); /** * @api {post} /ticket/get Get ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get ticket * diff --git a/server/controllers/ticket/re-open.php b/server/controllers/ticket/re-open.php index 9c022629..56b1a183 100755 --- a/server/controllers/ticket/re-open.php +++ b/server/controllers/ticket/re-open.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /ticket/re-open Reopen ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Reopen ticket * diff --git a/server/controllers/ticket/seen.php b/server/controllers/ticket/seen.php index 0f79d1c3..5c40d406 100755 --- a/server/controllers/ticket/seen.php +++ b/server/controllers/ticket/seen.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /ticket/seen See ticket - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName See ticket * diff --git a/server/controllers/user/ban.php b/server/controllers/user/ban.php index b80ff0d6..52b72d66 100755 --- a/server/controllers/user/ban.php +++ b/server/controllers/user/ban.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/ban Ban email - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Ban email * diff --git a/server/controllers/user/check-session.php b/server/controllers/user/check-session.php index fd119da2..613815f8 100755 --- a/server/controllers/user/check-session.php +++ b/server/controllers/user/check-session.php @@ -2,7 +2,7 @@ /** * @api {post} /user/check-session Check session - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Check session * diff --git a/server/controllers/user/delete.php b/server/controllers/user/delete.php index 8787d1bb..5422e80e 100755 --- a/server/controllers/user/delete.php +++ b/server/controllers/user/delete.php @@ -4,7 +4,7 @@ use RedBeanPHP\Facade as RedBean; /** * @api {post} /user/delete Delete user - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Delete user * diff --git a/server/controllers/user/edit-email.php b/server/controllers/user/edit-email.php index 3aba96a7..cd8e188a 100755 --- a/server/controllers/user/edit-email.php +++ b/server/controllers/user/edit-email.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/edit-email Edit email - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit email * diff --git a/server/controllers/user/edit-password.php b/server/controllers/user/edit-password.php index 3a173d00..758c254d 100755 --- a/server/controllers/user/edit-password.php +++ b/server/controllers/user/edit-password.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/edit-password Edit password - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Edit password * diff --git a/server/controllers/user/get-user.php b/server/controllers/user/get-user.php index 101be6c0..812250e9 100755 --- a/server/controllers/user/get-user.php +++ b/server/controllers/user/get-user.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /user/get-user Get user information - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get user information * diff --git a/server/controllers/user/get-users.php b/server/controllers/user/get-users.php index cafaca92..5c53a796 100755 --- a/server/controllers/user/get-users.php +++ b/server/controllers/user/get-users.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/get-users Get users list - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get users list * diff --git a/server/controllers/user/get.php b/server/controllers/user/get.php index a36dfeb1..f85d4527 100755 --- a/server/controllers/user/get.php +++ b/server/controllers/user/get.php @@ -4,7 +4,7 @@ DataValidator::with('CustomValidations', true); /** * @api {post} /user/get Get my information - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get my Information * diff --git a/server/controllers/user/list-ban.php b/server/controllers/user/list-ban.php index 97799b27..1f625391 100755 --- a/server/controllers/user/list-ban.php +++ b/server/controllers/user/list-ban.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/list-ban Get ban list - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Get ban list * diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php index adcf792a..14c2ffe3 100755 --- a/server/controllers/user/login.php +++ b/server/controllers/user/login.php @@ -2,7 +2,7 @@ /** * @api {post} /user/login Login - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Login * diff --git a/server/controllers/user/logout.php b/server/controllers/user/logout.php index d02f448d..eb9dc091 100755 --- a/server/controllers/user/logout.php +++ b/server/controllers/user/logout.php @@ -1,7 +1,7 @@ csvImported = $csvImported; } @@ -67,14 +67,14 @@ class SignUpController extends Controller { ] ] ]; - + if(!$this->csvImported) { $validations['requestData']['captcha'] = [ 'validation' => DataValidator::captcha(), 'error' => ERRORS::INVALID_CAPTCHA ]; } - + return $validations; } @@ -82,7 +82,7 @@ class SignUpController extends Controller { if(!Controller::isUserSystemEnabled()) { throw new Exception(ERRORS::USER_SYSTEM_DISABLED); } - + $this->storeRequestData(); $apiKey = APIKey::getDataStore(Controller::request('apiKey'), 'token'); @@ -111,10 +111,10 @@ class SignUpController extends Controller { 'userId' => $userId, 'userEmail' => $this->userEmail ]); - + Log::createLog('SIGNUP', null, User::getDataStore($userId)); } - + public function storeRequestData() { $this->userName = Controller::request('name'); $this->userEmail = Controller::request('email'); @@ -136,17 +136,17 @@ class SignUpController extends Controller { return $userInstance->store(); } - + public function sendRegistrationMail() { $mailSender = MailSender::getInstance(); - + $mailSender->setTemplate(MailTemplate::USER_SIGNUP, [ 'to' => $this->userEmail, 'name' => $this->userName, 'url' => Setting::getSetting('url')->getValue(), 'verificationToken' => $this->verificationToken ]); - + $mailSender->send(); } } diff --git a/server/controllers/user/un-ban.php b/server/controllers/user/un-ban.php index 4ffea848..0b66e638 100755 --- a/server/controllers/user/un-ban.php +++ b/server/controllers/user/un-ban.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/un-ban Un ban - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Un ban * diff --git a/server/controllers/user/verify.php b/server/controllers/user/verify.php index fbb9d84d..7d8a16df 100755 --- a/server/controllers/user/verify.php +++ b/server/controllers/user/verify.php @@ -3,7 +3,7 @@ use Respect\Validation\Validator as DataValidator; /** * @api {post} /user/verify Verify email - * @apiVersion 4.1.0 + * @apiVersion 4.2.0 * * @apiName Verify email * diff --git a/server/models/APIKey.php b/server/models/APIKey.php index 3affed1e..21f8e5da 100755 --- a/server/models/APIKey.php +++ b/server/models/APIKey.php @@ -1,7 +1,7 @@ query("SELECT id,email FROM user"); +while($user = $userQueryResult->fetch_array(MYSQLI_ASSOC)) { + $id = $user['id']; + $parsedEmail = strtolower($user['email']); + $mysql->query("UPDATE user set email='$parsedEmail' WHERE id='$id'"); +} + +// Staff email to lowercase +$staffQueryResult = $mysql->query("SELECT id,email FROM staff"); +while($staff = $staffQueryResult->fetch_array(MYSQLI_ASSOC)) { + $id = $staff['id']; + $parsedEmail = strtolower($staff['email']); + $mysql->query("UPDATE staff set email='$parsedEmail' WHERE id='$id'"); +} + +// Ticeket email to lowercase +$ticketQueryResult = $mysql->query("SELECT id,author_email FROM ticket"); +while($ticket = $ticketQueryResult->fetch_array(MYSQLI_ASSOC)) { + if($ticket['author_email']) { + $id = $ticket['id']; + $parsedEmail = strtolower($ticket['author_email']); + $mysql->query("UPDATE ticket set author_email='$parsedEmail' WHERE id='$id'"); + } +}