handle encrypted images files in oc_image

remotes/origin/stable4
Bartek Przybylski 14 years ago
parent 7ee722e0da
commit e7d1af48fb
  1. 11
      lib/image.php

@ -400,11 +400,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;

Loading…
Cancel
Save