handle encrypted images files in oc_image

diff --git a/lib/image.php b/lib/image.php
index 5a2e82024887b02ee10cc96911877dd84fcc0121..41e8c744d8c06bed0c922d8f5b53d003a0389122 100644 (file)
--- a/lib/image.php
+++ b/lib/image.php
@@ -407,11 +407,14 @@ class OC_Image {
                                break;
                        */
                        default:
-                       error_log($imagepath);
-                       error_log(\OC_Filesystem::getInternalPath($imagepath));
-                       error_log(\OC_Filesystem::getLocalFile($imagepath));
+                       
                                // this is mostly file created from encrypted file
-                               $this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getInternalPath($imagepath)));
+                               $datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
+                               $newimgpath = $imagepath;
+                               if (strncmp($newimgpath, $datadir, strlen($datadir)) == 0) {
+                                       $newimgpath = substr($imagepath, strlen($datadir));
+                               }
+                               $this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents($newimgpath));
                                $itype = IMAGETYPE_PNG;
                                OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
                                break;