wip #6611 @0.25

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 897baa7eda5c1492049336d62951f4ca63f29125..8993858864669b1d1309e1ebf412865f903e130d 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="toolbox.fluidbook.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="alphaville.cubedesigners.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
-      <paths name="alphaville.cubedesigners.com">
+      <paths name="alpha.toolbox.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="alpha.toolbox.fluidbook.com (Host)">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
+      <paths name="alphaville.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/app/vendor/fluidbook/tools" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+          <excludedPaths>
+            <excludedPath local="true" path="$PROJECT_DIR$/vendor" />
+          </excludedPaths>
+        </serverdata>
+      </paths>
       <paths name="demo1.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -24,6 +41,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.ccgm.fr">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.cubedesigners.fr">
         <serverdata>
           <mappings>
@@ -201,13 +225,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="pro.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="simeox.dev.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -267,13 +284,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.animeland.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="www.ccgm.fr">
         <serverdata>
           <mappings>
@@ -302,13 +312,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="www.detouteslescouleurs.com">
         <serverdata>
           <mappings>
@@ -316,13 +319,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.enko-running-shoes.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="www.eurofinsadmebioanalyses.com">
         <serverdata>
           <mappings>
@@ -344,13 +340,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.kadreo.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="www.mdryvescouzy.com">
         <serverdata>
           <mappings>
@@ -400,34 +389,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.preventicom.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.rbcmobilier.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.renversez.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.sycomore-am.com (1)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>

diff --git a/src/Jobs/ProcessFile.php b/src/Jobs/ProcessFile.php
index 5ee4824234b333e3925303d5268ff343cbe2f372..e987400d7506d1ca5b30dee4f9699a0b8fdc043c 100644 (file)
--- a/src/Jobs/ProcessFile.php
+++ b/src/Jobs/ProcessFile.php
@@ -28,6 +28,8 @@ class ProcessFile
 
     protected $quality = 85;
 
+    protected $localBuffer = false;
+
     /**
      * @var ProcessPage
      */
@@ -302,6 +304,8 @@ class ProcessFile
         return $res;
     }
 
+
+
     /**
      * @return int
      */

diff --git a/src/Jobs/ProcessPage.php b/src/Jobs/ProcessPage.php
index 6e11ae9d27a5945269d1444fd64b8b41c9539a48..ab8fdf8515a7f4469145f916603bfccf5abb7465 100644 (file)
--- a/src/Jobs/ProcessPage.php
+++ b/src/Jobs/ProcessPage.php
@@ -3,15 +3,12 @@
 namespace Fluidbook\Tools\Jobs;
 
 use Cubist\PDF\PDFTools;
-use Cubist\Util\Files\Files;
 use Fluidbook\Tools\Document;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Cubist\Util\CommandLine;
-
 
 class ProcessPage implements ShouldQueue
 {

diff --git a/src/Links/HTMLMultimediaLink.php b/src/Links/HTMLMultimediaLink.php
index 0dfafe525a757ce2eab5c676fa9b1f617ad04c38..81578094585ae0cf80a1c02457db40cb6f34e96e 100644 (file)
--- a/src/Links/HTMLMultimediaLink.php
+++ b/src/Links/HTMLMultimediaLink.php
@@ -40,9 +40,9 @@ class HTMLMultimediaLink extends Link
                 $dir = $fdir;
 
                 $d = array('fdir' => $fdir, 'dir' => $dir);
-                $this->compiler->getVirtualDirectory()->copy( $this->compiler->working_path($this->to), $d['dir'] . '/' . $this->to);
+                $this->compiler->getVirtualDirectory()->copy($this->compiler->working_path($this->to), $d['dir'] . '/' . $this->to);
                 $this->_config = $this->getConfigHTML($d['dir'], $this->to);
-                if(empty($this->_config)){
+                if (empty($this->_config)) {
                     return '';
                 }
                 $this->copyExternalFile($d['dir'] . '/' . $this->to);
@@ -147,7 +147,12 @@ class HTMLMultimediaLink extends Link
 
         $css = '#l_' . $this->id . '{';
         $css .= 'left:' . $this->left * $this->getCssScale() . 'px;top:' . $this->top * $this->getCssScale() . 'px;';
-        $css .= 'width:' . $this->_config['width'] . 'px;height:' . $this->_config['height'] . 'px;';
+        if (isset($this->_config['width'])) {
+            $css .= 'width:' . $this->_config['width'] . 'px;';
+        }
+        if (isset($this->_config['height'])) {
+            $css .= 'height:' . $this->_config['height'] . 'px;';
+        }
         $css .= $this->getCSSZIndex();
         $css .= $this->getCSSTransform();
         $css .= $this->getCSSClipPath();