clean getRealFSReference usages

pydio · Sep 12, 2016 · cfd28f2 · cfd28f2
1 parent 4009ea1
commit cfd28f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/core/src/plugins/editor.pixlr/PixlrEditor.php b/core/src/plugins/editor.pixlr/PixlrEditor.php
@@ -98,8 +98,6 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
             }
 
             $target = rtrim(base64_decode($httpVars["parent_url"]), '/') ."/plugins/editor.pixlr";
-            $tmp = MetaStreamWrapper::getRealFSReference($selectedNodeUrl);
-            //$tmp = TextEncoder::fromUTF8($tmp);
             $this->logInfo('Preview', 'Sending content of '.$selectedNodeUrl.' to Pixlr server.', array("files" => $selectedNodeUrl));
             Controller::applyHook("node.read", array($selectedNode));
 
@@ -108,8 +106,8 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                 $saveTarget = $target."/fake_save_pixlr_".md5($httpVars["secure_token"]).".php";
             }
 
-            $type = pathinfo($tmp, PATHINFO_EXTENSION);
-            $data = file_get_contents($tmp);
+            $type = pathinfo($selectedNodeUrl, PATHINFO_EXTENSION);
+            $data = file_get_contents($selectedNodeUrl);
             $rawData = 'data:image/' . $type . ';base64,' . base64_encode($data);
 
             $params = [

diff --git a/core/src/plugins/editor.zoho/ZohoEditor.php b/core/src/plugins/editor.zoho/ZohoEditor.php
@@ -175,7 +175,6 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
             }
 
             $target = base64_decode($httpVars["parent_url"]);
-            $tmp = MetaStreamWrapper::getRealFSReference($nodeUrl);
 
             $node = new AJXP_Node($nodeUrl);
             Controller::applyHook("node.read", array($node));
@@ -203,6 +202,8 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                 $service = "exportwriter";
             }
 
+            $contentHandle = fopen($nodeUrl, 'r');
+
             $postResponse = $this->client->post("https://".$service.".zoho.com/remotedoc.im", [
                 'headers' => [
                     'User-Agent' => $request->getHeader('User-Agent')
@@ -217,7 +218,7 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                     'format'        => $extension,
                     'mode'          => $repoWriteable && is_writeable($nodeUrl) ? 'normaledit' : 'view',
                     'saveurl'       => $saveUrl."?signature=".$b64Sig."&XDEBUG_SESSION_START=phpstorm",
-                    'content'       => fopen($tmp, 'r')
+                    'content'       => fopen($nodeUrl, 'r')
                 ]
             ]);
 
@@ -236,6 +237,8 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                 throw new FileNotFoundException("Could not open file");
             }
 
+            fclose($contentHandle);
+
             $response = $response
                 ->withStatus(302)
                 ->withHeader("Location", $result["URL"]);

diff --git a/core/src/plugins/meta.exif/ExifMetaManager.php b/core/src/plugins/meta.exif/ExifMetaManager.php
@@ -135,7 +135,7 @@ public function extractExif(\Psr\Http\Message\ServerRequestInterface $requestInt
         $ctx            = $requestInterface->getAttribute("ctx");
         $userSelection  = UserSelection::fromContext($ctx, $httpVars);
         $selectedNode   = $userSelection->getUniqueNode();
-        $realFile       = MetaStreamWrapper::getRealFSReference($selectedNode->getUrl());
+        $realFile       = $selectedNode->getRealFile();
 
         ApplicationState::safeIniSet('exif.encode_unicode', 'UTF-8');
         $exifData = @exif_read_data($realFile, 0, TRUE);