wip #5524 @0.25

diff --git a/app/bin/mount b/app/bin/mount
index a28be439ca68f9afa79206f94c4414c423028c07..5b5a04d1225ff20dd667482951899fd1031f4709 100755 (executable)
--- a/app/bin/mount
+++ b/app/bin/mount
@@ -13,9 +13,9 @@ else
     sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o uid=33 -o gid=33 -o allow_other fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data/docs /usfiles
 fi
 
-mkdir -p /toolbox
-if mountpoint -q "/toolbox"; then
+mkdir -p /application/protected/fluidbookpublication
+if mountpoint -q "/application/protected/fluidbookpublication"; then
     :
 else
-    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -p 58745 -o uid=33 -o gid=33 -o allow_other toolbox@toolbox.fluidbook.com:/application/protected/fluidbookpublication /toolbox
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -p 58745 -o uid=33 -o gid=33 -o allow_other toolbox@toolbox.fluidbook.com:/application/protected/fluidbookpublication /application/protected/fluidbookpublication
 fi
\ No newline at end of file

diff --git a/app/ping.php b/app/ping.php
index 07583b4dd0b9c5d2df735cbef94848dc2a31ebdd..9733643727fdba882636b73957626fd3a20265dc 100644 (file)
--- a/app/ping.php
+++ b/app/ping.php
@@ -1,2 +1,2 @@
 <?php
-die(file_exists('/files/status') && file_exists('/usfiles/status') && file_exists('/toolbox/stats') ? '1' : '0');
\ No newline at end of file
+die(file_exists('/files/status') && file_exists('/usfiles/status') && file_exists('/toolbox/status') ? '1' : '0');
\ No newline at end of file

diff --git a/app/process.php b/app/process.php
index 7dbde923349d9d0a97b0ba2c82442a3107d913ed..87ab21cdc5455318ef8f3a1e43b3a8f2836b6cdc 100644 (file)
--- a/app/process.php
+++ b/app/process.php
@@ -1,8 +1,15 @@
 <?php
 
 use Fluidbook\Farmer\ProcessFile;
+use Fluidbook\Farmer\ProcessFileNoMapping;
 
 require_once __DIR__ . "/vendor/autoload.php";
 
-$p = new ProcessFile($_POST['out'], $_POST['page'], $_POST['resolutionRatio'], $_POST['mobileRatio'], $_POST['format'], $_POST['resolution'], $_POST['withGraphics'], $_POST['withText'], $_POST['version'], $_POST['force']);
+
+if (isset($_POST['toolbox'])) {
+       $class = ProcessFileNoMapping::class;
+} else {
+       $class = ProcessFile::class;
+}
+$p = new $class($_POST['out'], $_POST['page'], $_POST['resolutionRatio'], $_POST['mobileRatio'], $_POST['format'], $_POST['resolution'], $_POST['withGraphics'], $_POST['withText'], $_POST['version'], $_POST['force']);
 die($p->process());
\ No newline at end of file

diff --git a/app/src/ProcessFileNoMapping.php b/app/src/ProcessFileNoMapping.php
new file mode 100644 (file)
index 0000000..d48c05e
--- /dev/null
+++ b/app/src/ProcessFileNoMapping.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Fluidbook\Farmer;
+
+
+class ProcessFileNoMapping extends ProcessFile{
+       public function getOut() {
+               $this->getDistantOut();
+       }
+
+       public function process() {
+               $this->getPath($this->isForce());
+       }
+}
\ No newline at end of file