diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-12 01:32:25 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-12 01:32:25 -0700 |
| commit | bff6ca212ae2201649a52fb3258239962281d8aa (patch) | |
| tree | 8a50007e6e404384d8de136fde95457ba252cc03 | |
| parent | 22bb9762fdf0502c6fe60eb12fa102d231bd5a71 (diff) | |
| parent | 9baedb410218f0af7df5b53a7c108a0eefdbce9f (diff) | |
| download | nextcloud-server-bff6ca212ae2201649a52fb3258239962281d8aa.tar.gz nextcloud-server-bff6ca212ae2201649a52fb3258239962281d8aa.zip | |
Merge pull request #5301 from owncloud/versioning_preview_shared
versioning preview also for shared files
| -rw-r--r-- | apps/files_versions/ajax/preview.php | 13 | ||||
| -rw-r--r-- | apps/files_versions/lib/versions.php | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index c24134df534..62bcc03f522 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -12,25 +12,32 @@ if(!\OC_App::isEnabled('files_versions')){ } $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; +$user = array_key_exists('user', $_GET) ? $_GET['user'] : ''; $maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : 44; $maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : 44; $version = array_key_exists('version', $_GET) ? $_GET['version'] : ''; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; +if($user === '') { + \OC_Response::setStatus(400); //400 Bad Request + \OC_Log::write('versions-preview', 'No user parameter was passed', \OC_Log::DEBUG); + exit; +} + if($file === '' && $version === '') { \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'No file parameter was passed', \OC_Log::DEBUG); + \OC_Log::write('versions-preview', 'No file parameter was passed', \OC_Log::DEBUG); exit; } if($maxX === 0 || $maxY === 0) { \OC_Response::setStatus(400); //400 Bad Request - \OC_Log::write('core-preview', 'x and/or y set to 0', \OC_Log::DEBUG); + \OC_Log::write('versions-preview', 'x and/or y set to 0', \OC_Log::DEBUG); exit; } try{ - $preview = new \OC\Preview(\OC_User::getUser(), 'files_versions'); + $preview = new \OC\Preview($user, 'files_versions'); $preview->setFile($file.'.v'.$version); $preview->setMaxX($maxX); $preview->setMaxY($maxY); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index dae2de83b81..225611374a6 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -260,7 +260,7 @@ class Storage { $versions[$key]['cur'] = 0; $versions[$key]['version'] = $version; $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version); - $versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $filename, 'version' => $version)); + $versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $filename, 'version' => $version, 'user' => $uid)); $versions[$key]['path'] = $filename; $versions[$key]['size'] = $file['size']; } |