Merge branch 'develop'

INSTALL/matecat.sql

@@ -786,36 +786,36 @@ CREATE TABLE `projects`
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `qa_archived_reports`
+-- Table structure for table `project_templates`
 --
 
 DROP TABLE IF EXISTS `project_templates`;
 /*!40101 SET @saved_cs_client = @@character_set_client */;
 /*!40101 SET character_set_client = utf8mb4 */;
 CREATE TABLE `project_templates` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `is_default` tinyint(1) NOT NULL DEFAULT '0',
-  `uid` bigint(20) NOT NULL,
-  `id_team` int(11) NOT NULL,
-  `speech2text` tinyint(1) NOT NULL DEFAULT '0',
-  `lexica` tinyint(1) NOT NULL DEFAULT '0',
-  `tag_projection` tinyint(1) NOT NULL DEFAULT '0',
-  `pretranslate_100` tinyint(1) NOT NULL DEFAULT '0',
-  `pretranslate_101` tinyint(1) NOT NULL DEFAULT '1',
-  `get_public_matches` tinyint(1) NOT NULL DEFAULT '0',
-  `segmentation_rule` varchar(255) DEFAULT NULL,
-  `cross_language_matches` text,
-  `tm` text,
-  `mt` text,
-  `payable_rate_template_id` int(11) DEFAULT NULL,
-  `qa_model_template_id` int(11) DEFAULT NULL,
-  `filters_xliff_config_template_id` int(11) DEFAULT NULL,
-  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `modified_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uid_name_idx` (`uid`,`name`),
-  KEY `uid_idx` (`uid`)
+    `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    `name` varchar(255) NOT NULL,
+    `is_default` tinyint(1) NOT NULL DEFAULT '0',
+    `uid` bigint(20) NOT NULL,
+    `id_team` int(11) NOT NULL,
+    `pretranslate_100` tinyint(1) NOT NULL DEFAULT '0',
+    `pretranslate_101` tinyint(1) NOT NULL DEFAULT '1',
+    `get_public_matches` tinyint(1) NOT NULL DEFAULT '0',
+    `segmentation_rule` varchar(255) DEFAULT NULL,
+    `tm` text,
+    `mt` text,
+    `payable_rate_template_id` int(11) DEFAULT NULL,
+    `qa_model_template_id` int(11) DEFAULT NULL,
+    `filters_template_id` int(11) DEFAULT NULL,
+    `xliff_config_template_id` int(11) DEFAULT NULL,
+    `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+    `modified_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+    `subject` varchar(255) DEFAULT NULL,
+    `source_language` varchar(45) DEFAULT NULL,
+    `target_language` varchar(2048) DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uid_name_idx` (`uid`,`name`),
+    KEY `uid_idx` (`uid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

lib/Controller/API/App/Authentication/LoginController.php

@@ -25,8 +25,8 @@ class LoginController extends AbstractStatefulKleinController {
 
     use RateLimiterTrait;
 
-    public function logout() {
-        $this->broadcastLogout();
+    public function directLogout() {
+        $this->logout();
         $this->response->code( 200 );
     }
 

lib/Controller/API/Commons/Authentication/AuthenticationTrait.php

@@ -63,7 +63,7 @@ public function getUser(): ?Users_UserStruct {
     }
 
     public function broadcastLogout() {
-        AuthenticationHelper::destroyAuthentication( $_SESSION );
+        $this->logout();
         $queueHandler = new AMQHandler();
         $message      = json_encode( [
                 '_type' => 'logout',
@@ -77,4 +77,8 @@ public function broadcastLogout() {
         $queueHandler->publishToTopic( INIT::$SSE_NOTIFICATIONS_QUEUE_NAME, new Message( $message ) );
     }
 
+    public function logout(){
+        AuthenticationHelper::destroyAuthentication( $_SESSION );
+    }
+
 }

lib/Controller/API/V1/StatsController.php

@@ -5,8 +5,8 @@
 
 use API\Commons\KleinController;
 use API\Commons\Validators\ChunkPasswordValidator;
-use CatUtils;
 use API\V2\Validators\LoginValidator;
+use CatUtils;
 use Jobs_JobStruct;
 use WordCount\WordCountStruct;
 

lib/Controller/API/V2/ActivityLogController.php

@@ -12,11 +12,11 @@
 use ActivityLog\ActivityLogDao;
 use ActivityLog\ActivityLogStruct;
 use API\Commons\KleinController;
+use API\Commons\Validators\ChunkPasswordValidator;
+use API\Commons\Validators\ProjectPasswordValidator;
 use API\V2\Json\Activity;
 use Exception;
 use ReflectionException;
-use API\Commons\Validators\ChunkPasswordValidator;
-use API\Commons\Validators\ProjectPasswordValidator;
 
 class ActivityLogController extends KleinController {
 

lib/Controller/API/V2/BaseChunkController.php

@@ -3,8 +3,8 @@
 namespace API\V2;
 
 use API\Commons\KleinController;
-use Jobs_JobStruct;
 use Jobs_JobDao;
+use Jobs_JobStruct;
 use LQA\ChunkReviewDao;
 use ReflectionException;
 

lib/Controller/API/V2/ChangePasswordController.php

@@ -4,11 +4,11 @@
 
 use API\Commons\Validators\LoginValidator;
 use CatUtils;
-use Jobs_JobStruct;
 use Database;
 use Exception;
 use Features\ReviewExtended\ReviewUtils;
 use Jobs_JobDao;
+use Jobs_JobStruct;
 use LQA\ChunkReviewDao;
 use Projects_ProjectDao;
 use Projects_ProjectStruct;

lib/Controller/API/V2/ChunkController.php

@@ -9,14 +9,14 @@
 namespace API\V2;
 
 use API\Commons\Validators\ChunkPasswordValidator;
-use API\Commons\Validators\ProjectAccessValidator;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\ProjectAccessValidator;
 use API\V2\Json\Chunk;
-use Jobs_JobStruct;
 use Constants_JobStatus;
 use Exception;
 use Exceptions\NotFoundException;
 use Jobs_JobDao;
+use Jobs_JobStruct;
 use Projects_ProjectStruct;
 use Translations_SegmentTranslationDao;
 use Utils;

lib/Controller/API/V2/ChunkTranslationVersionController.php

@@ -11,8 +11,8 @@
 use API\Commons\Validators\ChunkPasswordValidator;
 use API\Commons\Validators\LoginValidator;
 use API\V2\Json\SegmentVersion as JsonFormatter;
-use Jobs_JobStruct;
 use Features\TranslationVersions\Model\TranslationVersionDao;
+use Jobs_JobStruct;
 
 
 class ChunkTranslationVersionController extends BaseChunkController {

lib/Controller/API/V2/CommentsController.php

@@ -11,9 +11,9 @@
 
 use API\Commons\Validators\ChunkPasswordValidator;
 use API\Commons\Validators\LoginValidator;
-use Jobs_JobStruct;
 use Comments_CommentDao;
 use Exception;
+use Jobs_JobStruct;
 
 class CommentsController extends BaseChunkController {
 

lib/Controller/API/V2/JobMergeController.php

@@ -9,8 +9,8 @@
 namespace API\V2;
 use API\Commons\Exceptions\NotFoundException;
 use API\Commons\KleinController;
-use API\Commons\Validators\ProjectPasswordValidator;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\ProjectPasswordValidator;
 use Jobs_JobStruct;
 use ProjectManager;
 

lib/Controller/API/V2/JobSplitController.php

@@ -11,8 +11,8 @@
 use API\Commons\Exceptions\NotFoundException;
 use API\Commons\Exceptions\UnprocessableException;
 use API\Commons\KleinController;
-use API\Commons\Validators\ProjectPasswordValidator;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\ProjectPasswordValidator;
 use Exception;
 use Jobs_JobStruct;
 use ProjectManager;

lib/Controller/API/V2/ProjectCompletionStatus.php

@@ -5,7 +5,6 @@
 use API\Commons\KleinController;
 use API\Commons\Validators\ProjectPasswordValidator;
 use API\Commons\Validators\ProjectValidator;
-use API\Commons\Validators\LoginValidator;
 use Features\ProjectCompletion\Model\ProjectCompletionStatusModel;
 use Projects_ProjectStruct;
 

lib/Controller/API/V2/ProjectsController.php

@@ -3,9 +3,9 @@
 namespace API\V2;
 
 use API\Commons\KleinController;
+use API\Commons\Validators\LoginValidator;
 use API\Commons\Validators\ProjectAccessValidator;
 use API\Commons\Validators\ProjectPasswordValidator;
-use API\Commons\Validators\LoginValidator;
 use API\V2\Json\Project;
 use API\V2\Json\ProjectAnonymous;
 use Constants_JobStatus;

lib/Controller/API/V2/ReviseTranslationIssuesController.php

@@ -10,8 +10,8 @@
 
 
 use API\Commons\Validators\JobPasswordValidator;
-use API\Commons\Validators\SegmentTranslation;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\SegmentTranslation;
 use API\V2\Json\SegmentVersion;
 use Chunks_ChunkDao;
 use Features\TranslationVersions\Model\TranslationVersionDao;

lib/Controller/API/V2/SegmentVersion.php

@@ -3,8 +3,8 @@
 namespace API\V2;
 
 use API\Commons\Validators\JobPasswordValidator;
-use API\Commons\Validators\SegmentValidator;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\SegmentValidator;
 use API\V2\Json\SegmentVersion as JsonFormatter;
 use Features\TranslationVersions\Model\TranslationVersionDao;
 

lib/Controller/API/V2/TeamMembersController.php

@@ -9,12 +9,10 @@
 
 namespace API\V2;
 
-use API\Commons\Authentication\AuthenticationHelper;
 use API\Commons\KleinController;
 use API\Commons\Validators\LoginValidator;
 use API\Commons\Validators\TeamAccessValidator;
 use API\V2\Json\Membership;
-use Bootstrap;
 use Exception;
 use ReflectionException;
 use TeamModel;

lib/Controller/API/V2/TeamsController.php

@@ -10,14 +10,12 @@
 namespace API\V2;
 
 
-use API\Commons\Authentication\AuthenticationHelper;
 use API\Commons\Error;
 use API\Commons\Exceptions\AuthorizationError;
 use API\Commons\KleinController;
 use API\Commons\Validators\LoginValidator;
 use API\Commons\Validators\TeamAccessValidator;
 use API\V2\Json\Team;
-use Bootstrap;
 use Exception;
 use InvalidArgumentException;
 use ReflectionException;

lib/Controller/API/V2/TeamsProjectsController.php

@@ -9,7 +9,6 @@
 namespace API\V2;
 
 
-use API\Commons\Authentication\AuthenticationHelper;
 use API\Commons\Exceptions\AuthorizationError;
 use API\Commons\Exceptions\NotFoundException;
 use API\Commons\KleinController;
@@ -18,7 +17,6 @@
 use API\Commons\Validators\TeamAccessValidator;
 use API\Commons\Validators\TeamProjectValidator;
 use API\V2\Json\Project;
-use Bootstrap;
 use Exception;
 use Exceptions\ValidationError;
 use ManageUtils;

lib/Controller/API/V2/UrlsController.php

@@ -9,8 +9,8 @@
 namespace API\V2;
 
 use API\Commons\KleinController;
-use API\Commons\Validators\ProjectPasswordValidator;
 use API\Commons\Validators\LoginValidator;
+use API\Commons\Validators\ProjectPasswordValidator;
 use API\V2\Json\ProjectUrls;
 use DataAccess\ShapelessConcreteStruct;
 

lib/Controller/API/V3/ChunkController.php

@@ -12,9 +12,9 @@
 use API\Commons\Validators\LoginValidator;
 use API\V2\BaseChunkController;
 use API\V3\Json\Chunk;
-use Jobs_JobStruct;
 use Exception;
 use Exceptions\NotFoundException;
+use Jobs_JobStruct;
 use Projects_ProjectStruct;
 
 class ChunkController extends BaseChunkController {

lib/Controller/API/V3/CountWordController.php

@@ -9,8 +9,8 @@
 namespace API\V3;
 
 use API\Commons\Exceptions\ValidationError;
-use API\Commons\Validators\LoginValidator;
 use API\Commons\KleinController;
+use API\Commons\Validators\LoginValidator;
 use CatUtils;
 use Langs\Languages;
 use LQA\SizeRestriction\SizeRestriction;

lib/Controller/API/V3/FileInfoController.php

@@ -13,9 +13,9 @@
 use API\Commons\Validators\ChunkPasswordValidator;
 use API\Commons\Validators\LoginValidator;
 use API\V2\BaseChunkController;
-use Jobs_JobStruct;
 use Exceptions\ValidationError;
 use Files\FilesInfoUtility;
+use Jobs_JobStruct;
 use Projects_ProjectStruct;
 use TaskRunner\Exceptions\EndQueueException;
 use TaskRunner\Exceptions\ReQueueException;

lib/Controller/API/V3/PayableRateController.php

@@ -9,7 +9,6 @@
 use Klein\Response;
 use PayableRates\CustomPayableRateDao;
 use PayableRates\CustomPayableRateStruct;
-use ReflectionException;
 use Swaggest\JsonSchema\InvalidValue;
 use Validator\Errors\JSONValidatorException;
 use Validator\Errors\JsonValidatorGenericException;

lib/Controller/API/V3/SegmentAnalysisController.php

@@ -8,16 +8,12 @@
 use CatUtils;
 use Chunks_ChunkDao;
 use DataAccess_IDaoStruct;
-use Database;
 use Exception;
 use Exceptions\NotFoundException;
 use Features\ReviewExtended\ReviewUtils;
 use Jobs_JobDao;
 use Jobs_JobStruct;
 use LQA\EntryDao;
-use Pagination\Pager;
-use Pagination\PaginationParameters;
-use Projects\ProjectTemplateStruct;
 use Projects_ProjectDao;
 use Projects_ProjectStruct;
 use ReflectionException;

lib/Controller/API/V3/StatusController.php

@@ -3,13 +3,10 @@
 namespace API\V3;
 
 use API\App\Json\Analysis\AnalysisProject;
-use API\Commons\Exceptions\AuthenticationError;
 use API\Commons\Exceptions\NotFoundException;
 use API\Commons\KleinController;
 use API\Commons\Validators\LoginValidator;
 use API\Commons\Validators\ProjectPasswordValidator;
-use Constants_JobStatus;
-use Exceptions\ValidationError;
 use Model\Analysis\Status;
 use Projects_ProjectDao;
 

lib/Model/Comments/CommentDao.php

@@ -1,7 +1,6 @@
 <?php
 
 use Comments\OpenThreadsStruct;
-use DataAccess\ShapelessConcreteStruct;
 
 class Comments_CommentDao extends DataAccess_AbstractDao {
 

lib/Model/Files/FilesJobDao.php

@@ -2,10 +2,10 @@
 
 namespace Files;
 
-use Jobs_JobStruct;
 use DataAccess_AbstractDao;
 use Database;
 use Files_FileStruct;
+use Jobs_JobStruct;
 use PDO;
 
 class FilesJobDao extends DataAccess_AbstractDao {

lib/Model/FilesStorage/IFilesStorage.php

@@ -2,7 +2,6 @@
 
 namespace FilesStorage;
 
-use Jobs_JobStruct;
 use Exception;
 use FilesStorage\Exceptions\FileSystemException;