Lara

composer.json

@@ -26,6 +26,7 @@
         "stevenmaguire/oauth2-microsoft": "^2.2",
         "league/oauth2-github": "^3.1",
         "league/oauth2-facebook": "^2.2",
+        "translated/lara-sdk":"^1.0.1",
         "psr/log": "~1.0",
         "ext-curl": "*",
         "ext-pcntl": "*",

inc/INIT.php

@@ -155,7 +155,6 @@ class INIT {
      * @var int Interval in seconds
      */
     public static $COPY_SOURCE_INTERVAL = 300;
-    public static $MAX_NUM_SEGMENTS     = 500;
 
     /**
      * Default Matecat user agent string
@@ -205,6 +204,11 @@ class INIT {
      */
     public static $DEFAULT_TM_KEY = '';
 
+    /**
+     * @var string The default MMT license is applied when Lara falls back for unsupported languages and the user does not add their personal MMT license.
+     */
+    public static $DEFAULT_MMT_KEY = '';
+
     public static $ENABLED_BROWSERS = [ 'applewebkit', 'chrome', 'safari', 'edge', 'firefox' ]; 
 
     /**

lib/Controller/catController.php

@@ -186,16 +186,17 @@ public function doAction() {
 
         $active_mt_engine_array = [];
         if ( !empty( $active_mt_engine ) ) {
+            $engine_type = explode("\\", $active_mt_engine[ 0 ]->class_load);
             $active_mt_engine_array = [
                     "id"          => $active_mt_engine[ 0 ]->id,
                     "name"        => $active_mt_engine[ 0 ]->name,
                     "type"        => $active_mt_engine[ 0 ]->type,
                     "description" => $active_mt_engine[ 0 ]->description,
-                    'engine_type' => ( $active_mt_engine[ 0 ]->class_load === 'MyMemory' ? 'MMTLite' : $active_mt_engine[ 0 ]->class_load ),
+                    'engine_type' => ( $active_mt_engine[ 0 ]->class_load === 'MyMemory' ? 'MMTLite' : array_pop($engine_type) ),
             ];
         }
 
-        $this->template->active_engine = Utils::escapeJsonEncode( $active_mt_engine_array );
+        $this->template->active_engine = $active_mt_engine_array;
 
         /*
          * array_unique cast EnginesModel_EngineStruct to string
@@ -380,7 +381,6 @@ public function setTemplateVars() {
 
         $this->template->mt_engines                            = $this->translation_engines;
         $this->template->translation_engines_intento_providers = Intento::getProviderList();
-        $this->template->translation_engines_intento_prov_json = Utils::escapeJsonEncode( Intento::getProviderList() );
 
         $this->template->not_empty_default_tm_key = !empty( INIT::$DEFAULT_TM_KEY );
 
@@ -412,7 +412,6 @@ public function setTemplateVars() {
         $this->template->maxTMXFileSize = INIT::$MAX_UPLOAD_TMX_FILE_SIZE;
 
         $this->template->tagLockCustomizable = ( INIT::$UNLOCKABLE_TAGS == true ) ? true : false;
-        $this->template->maxNumSegments      = INIT::$MAX_NUM_SEGMENTS;
         $this->template->copySourceInterval  = INIT::$COPY_SOURCE_INTERVAL;
 
         /*

lib/Controller/engineController.php

@@ -1,6 +1,10 @@
 <?php
 
 use EnginesModel\DeepLStruct;
+use EnginesModel\LaraStruct;
+use Lara\LaraException;
+use Users\MetadataDao;
+use Utils\Engines\Lara;
 use Validator\DeepLValidator;
 
 /**
@@ -21,7 +25,7 @@ class engineController extends ajaxController {
             'add', 'delete', 'execute'
     ];
     private static $allowed_execute_functions = [
-            // 'letsmt' => [ 'getTermList' ] // letsmt no longer requires this function. it's left as an example
+        // 'letsmt' => [ 'getTermList' ] // letsmt no longer requires this function. it's left as an example
     ];
 
     public function __construct() {
@@ -126,7 +130,7 @@ private function add() {
                 $newEngineStruct->extra_parameters[ 'DeepL-Auth-Key' ] = $this->engineData[ 'client_id' ];
 
                 try {
-                    DeepLValidator::validate($newEngineStruct);
+                    DeepLValidator::validate( $newEngineStruct );
                 } catch ( Exception $e ) {
                     $this->result[ 'errors' ][] = [ 'code' => $e->getCode(), 'message' => $e->getMessage() ];
 
@@ -143,11 +147,11 @@ private function add() {
                  */
                 $newEngineStruct = EnginesModel_MicrosoftHubStruct::getStruct();
 
-                $newEngineStruct->name                                = $this->name;
-                $newEngineStruct->uid                                 = $this->user->uid;
-                $newEngineStruct->type                                = Constants_Engines::MT;
-                $newEngineStruct->extra_parameters[ 'client_id' ]     = $this->engineData[ 'client_id' ];
-                $newEngineStruct->extra_parameters[ 'category' ]      = $this->engineData[ 'category' ];
+                $newEngineStruct->name                            = $this->name;
+                $newEngineStruct->uid                             = $this->user->uid;
+                $newEngineStruct->type                            = Constants_Engines::MT;
+                $newEngineStruct->extra_parameters[ 'client_id' ] = $this->engineData[ 'client_id' ];
+                $newEngineStruct->extra_parameters[ 'category' ]  = $this->engineData[ 'category' ];
                 break;
 
             case strtolower( Constants_Engines::APERTIUM ):
@@ -221,28 +225,42 @@ private function add() {
 
                 break;
 
-            case strtolower(Constants_Engines::INTENTO):
+            case strtolower( Constants_Engines::INTENTO ):
                 /**
                  * Create a record of type Intento
                  */
-                $newEngineStruct = EnginesModel_IntentoStruct::getStruct();
-                $newEngineStruct->name                                 = $this->name;
-                $newEngineStruct->uid                                  = $this->user->uid;
-                $newEngineStruct->type                                 = Constants_Engines::MT;
-                $newEngineStruct->extra_parameters['apikey']           = $this->engineData['secret'];
-                $newEngineStruct->extra_parameters['provider']         = $this->engineData['provider'];
-                $newEngineStruct->extra_parameters['providerkey']      = $this->engineData['providerkey'];
-                $newEngineStruct->extra_parameters['providercategory'] = $this->engineData['providercategory'];
+                $newEngineStruct                                         = EnginesModel_IntentoStruct::getStruct();
+                $newEngineStruct->name                                   = $this->name;
+                $newEngineStruct->uid                                    = $this->user->uid;
+                $newEngineStruct->type                                   = Constants_Engines::MT;
+                $newEngineStruct->extra_parameters[ 'apikey' ]           = $this->engineData[ 'secret' ];
+                $newEngineStruct->extra_parameters[ 'provider' ]         = $this->engineData[ 'provider' ];
+                $newEngineStruct->extra_parameters[ 'providerkey' ]      = $this->engineData[ 'providerkey' ];
+                $newEngineStruct->extra_parameters[ 'providercategory' ] = $this->engineData[ 'providercategory' ];
+                break;
+
+            case strtolower( Constants_Engines::LARA ):
+                /**
+                 * Create a record of type Lara
+                 */
+                $newEngineStruct = LaraStruct::getStruct();
+
+                $newEngineStruct->uid                                        = $this->user->uid;
+                $newEngineStruct->type                                       = Constants_Engines::MT;
+                $newEngineStruct->extra_parameters[ 'Lara-AccessKeyId' ]     = $this->engineData[ 'lara-access-key-id' ];
+                $newEngineStruct->extra_parameters[ 'Lara-AccessKeySecret' ] = $this->engineData[ 'secret' ];
+                $newEngineStruct->extra_parameters[ 'MMT-License' ]          = $this->engineData[ 'mmt-license' ];
+
                 break;
 
             default:
 
                 // MMT
                 $validEngine = $newEngineStruct = $this->featureSet->filter( 'buildNewEngineStruct', false, (object)[
-                    'featureSet'   => $this->featureSet,
-                    'providerName' => $this->provider,
-                    'logged_user'  => $this->user,
-                    'engineData'   => $this->engineData
+                        'featureSet'   => $this->featureSet,
+                        'providerName' => $this->provider,
+                        'logged_user'  => $this->user,
+                        'engineData'   => $this->engineData
                 ] );
                 break;
 
@@ -254,14 +272,20 @@ private function add() {
             return;
         }
 
-        $engineList = $this->featureSet->filter( 'getAvailableEnginesListForUser', Constants_Engines::getAvailableEnginesList(), $this->user );
+        $engineList      = Constants_Engines::getAvailableEnginesList();
+        $UserMetadataDao = new MetadataDao();
+        $engineEnabled   = $UserMetadataDao->get( $this->user->uid, $newEngineStruct->class_load );
+
+        if ( !empty( $engineEnabled ) ) {
+            unset( $engineList[ $newEngineStruct->class_load ] );
+        }
 
         $engineDAO             = new EnginesModel_EngineDAO( Database::obtain() );
         $newCreatedDbRowStruct = null;
 
         if ( array_search( $newEngineStruct->class_load, $engineList ) ) {
             $newEngineStruct->active = true;
-            $newCreatedDbRowStruct = $engineDAO->create( $newEngineStruct );
+            $newCreatedDbRowStruct   = $engineDAO->create( $newEngineStruct );
             $this->destroyUserEnginesCache();
         }
 
@@ -311,6 +335,26 @@ private function add() {
 
                 return;
             }
+        } elseif ( $newEngineStruct instanceof LaraStruct ) {
+
+            /**
+             * @var $newTestCreatedMT Lara
+             */
+            $newTestCreatedMT = Engine::createTempInstance( $newCreatedDbRowStruct );
+
+            try {
+                $newTestCreatedMT->getAvailableLanguages();
+            } catch ( LaraException $e ) {
+                $this->result[ 'errors' ][] = $e->getMessage();
+                $engineDAO->delete( $newCreatedDbRowStruct );
+                $this->destroyUserEnginesCache();
+
+                return;
+            }
+
+            $UserMetadataDao = new MetadataDao();
+            $UserMetadataDao->set( $this->user->uid, $newCreatedDbRowStruct->class_load, $newCreatedDbRowStruct->id );
+
         } else {
 
             try {
@@ -325,11 +369,12 @@ private function add() {
 
         }
 
+        $engine_type                             = explode( "\\", $newCreatedDbRowStruct->class_load );
         $this->result[ 'data' ][ 'id' ]          = $newCreatedDbRowStruct->id;
         $this->result[ 'data' ][ 'name' ]        = $newCreatedDbRowStruct->name;
         $this->result[ 'data' ][ 'description' ] = $newCreatedDbRowStruct->description;
         $this->result[ 'data' ][ 'type' ]        = $newCreatedDbRowStruct->type;
-        $this->result[ 'data' ][ 'engine_type' ] = $newCreatedDbRowStruct->class_load;
+        $this->result[ 'data' ][ 'engine_type' ] = array_pop( $engine_type );
     }
 
     /**
@@ -359,7 +404,12 @@ private function disable() {
             return;
         }
 
-        $this->featureSet->run( 'postEngineDeletion', $result );
+        $engine = Engine::createTempInstance( $result );
+
+        if ( $engine->isAdaptive() ) {
+            //retrieve OWNER Engine License
+            ( new MetadataDao() )->delete( $this->user->uid, $result->class_load ); // engine_id
+        }
 
         $this->result[ 'data' ][ 'id' ] = $result->id;