wait #7266 @2.5

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 8ed2e85d3b471df2c9989931cafb907e65b306ef..5fb35827e130198303612d387b64bc7267a99dac 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -3,6 +3,7 @@
 namespace App\Fluidbook\Compiler;
 
 use App\Fields\FluidbookFont;
+use App\Fluidbook\Region;
 use App\Fluidbook\SEO\Page;
 use App\Fluidbook\SocialImage;
 use App\Http\Controllers\Admin\Operations\Tools\Favicon;
@@ -13,7 +14,6 @@ use App\Jobs\FluidbookImagesPreprocess;
 use App\Jobs\QuizDownload;
 use App\Models\ELearningMedia;
 use App\Models\ELearningPackage;
-use App\Models\File;
 use App\Models\FluidbookHealthIssues;
 use App\Models\FluidbookPublication;
 use App\Models\FluidbookTheme;
@@ -343,6 +343,11 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
         $this->vdir->setErrorListener($this);
 
         $this->wdir = $this->getFluidbook()->getAssetDir();
+        if ($this->getFluidbook()->getRegion() === 'US') {
+            $eu = $this->getFluidbook()->getAssetDir(Region::EUROPE);
+            $cmd = "cp -a -v -n $eu* $this->wdir";
+            `$cmd`;
+        }
 
         $this->widget = false;
 

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index e132ca6a7111d7cd223e7852bc7566a7d6d314f1..62f8148376e2d8851e4d8bbcf60f8f76cef58d4e 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -596,6 +596,11 @@ class FluidbookPublication extends ToolboxStatusModel
         }
     }
 
+    public function getRegion()
+    {
+        return $this->region;
+    }
+
     public function getFinalPath($theme = null, $scormVariant = false)
     {
         $dir = $this->id;
@@ -617,9 +622,9 @@ class FluidbookPublication extends ToolboxStatusModel
         return Files::mkdir($this->protected_path('fluidbookpublication/working/'));
     }
 
-    public function getAssetDir()
+    public function getAssetDir($forceRegion = null)
     {
-        return Files::mkdir($this->protected_path('fluidbookpublication/working/' . $this->getAssetDirId()));
+        return Files::mkdir($this->protected_path('fluidbookpublication/working/' . $this->getAssetDirId(), $forceRegion));
     }
 
     public function getPDFDir()