From 120997112c7acf490171d07ec32cdd6d091db9c2 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sat, 9 Jun 2012 15:22:02 +0200 Subject: [PATCH] handle encrypted images files in oc_image --- lib/image.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/image.php b/lib/image.php index 5a2e820248..41e8c744d8 100644 --- 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;