summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartek Przybylski <bart.p.pl@gmail.com>2012-06-09 15:12:28 +0200
committerBartek Przybylski <bart.p.pl@gmail.com>2012-06-09 15:12:50 +0200
commit001293a702be1373c327bc8d5222df3924a7f66a (patch)
treee26d352ef9b8b7ea5a6ad0bd0108c0b608e46a09
parentcfe219fbb9f2f734b063041ae420400044f90000 (diff)
downloadnextcloud-server-001293a702be1373c327bc8d5222df3924a7f66a.tar.gz
nextcloud-server-001293a702be1373c327bc8d5222df3924a7f66a.zip
removing app access check, fix title for links in tiles
-rw-r--r--apps/gallery/lib/managers.php3
-rw-r--r--apps/gallery/lib/tiles.php2
-rw-r--r--lib/image.php6
3 files changed, 6 insertions, 5 deletions
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index 41300058936..f9a67b8b117 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -4,9 +4,6 @@ namespace OC\Pictures;
require_once('lib/base.php');
-\OCP\JSON::checkLoggedIn();
-\OCP\JSON::checkAppEnabled('gallery');
-
class DatabaseManager {
private static $instance = null;
const TAG = 'DatabaseManager';
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index f1961cb72e5..e43c99bb76a 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -95,7 +95,7 @@ class TileSingle extends TileBase {
public function get($extra = '') {
// !HACK! file path needs to be encoded twice because files app decode twice url, so any special chars like + or & in filename
// !HACK! will result in failing of opening them
- return '<a rel="images" title="'.basename($this->getPath()).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
+ return '<a rel="images" title="'.htmlentities(basename($this->getPath())).'" href="'.\OCP\Util::linkTo('files', 'download.php').'?file='.urlencode(urlencode($this->getPath())).'"><img rel="images" src="'.\OCP\Util::linkTo('gallery', 'ajax/thumbnail.php').'&filepath='.urlencode($this->getPath()).'" '.$extra.'></a>';
}
public function getMiniatureSrc() {
diff --git a/lib/image.php b/lib/image.php
index af61f9424e9..5a2e8202488 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -407,7 +407,11 @@ class OC_Image {
break;
*/
default:
- $this->resource = imagecreatefromstring(file_get_contents($imagepath));
+ 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)));
$itype = IMAGETYPE_PNG;
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
break;