handle encrypted images files in oc_image
This commit is contained in:
parent
531132d64f
commit
120997112c
|
@ -407,11 +407,14 @@ class OC_Image {
|
||||||
break;
|
break;
|
||||||
*/
|
*/
|
||||||
default:
|
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 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;
|
$itype = IMAGETYPE_PNG;
|
||||||
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
|
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue