diff options
| -rw-r--r-- | apps/files_versions/ajax/preview.php | 18 | ||||
| -rw-r--r-- | ocs/providers.php | 43 |
2 files changed, 37 insertions, 24 deletions
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index bd9b7366ab0..105616911cf 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -31,14 +31,18 @@ if($maxX === 0 || $maxY === 0) { try { list($user, $file) = \OCA\Files_Versions\Storage::getUidAndFilename($file); - $preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version); - $mimetype = \OC_Helper::getFileNameMimeType($file); - $preview->setMimetype($mimetype); - $preview->setMaxX($maxX); - $preview->setMaxY($maxY); - $preview->setScalingUp($scalingUp); + if (is_null($file)) { + \OC_Response::setStatus(404); + } else { + $preview = new \OC\Preview($user, 'files_versions', $file . '.v' . $version); + $mimetype = \OC_Helper::getFileNameMimeType($file); + $preview->setMimetype($mimetype); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); - $preview->showPreview(); + $preview->showPreview(); + } }catch(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); diff --git a/ocs/providers.php b/ocs/providers.php index 2c62f767ad3..769d210e087 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -27,20 +27,29 @@ header('Content-type: application/xml'); $url=OCP\Util::getServerProtocol().'://'.substr(OCP\Util::getServerHost().OCP\Util::getRequestUri(), 0, -17).'ocs/v1.php/'; -echo(' -<providers> -<provider> - <id>ownCloud</id> - <location>'.$url.'</location> - <name>ownCloud</name> - <icon></icon> - <termsofuse></termsofuse> - <register></register> - <services> - <config ocsversion="1.7" /> - <activity ocsversion="1.7" /> - <cloud ocsversion="1.7" /> - </services> -</provider> -</providers> -'); +$writer = new XMLWriter(); +$writer->openURI('php://output'); +$writer->startDocument('1.0','UTF-8'); +$writer->setIndent(4); +$writer->startElement('providers'); +$writer->startElement('provider'); +$writer->writeElement('id', 'ownCloud'); +$writer->writeElement('location', $url); +$writer->writeElement('name', 'ownCloud'); +$writer->writeElement('icon', ''); +$writer->writeElement('termsofuse', ''); +$writer->writeElement('register', ''); +$writer->startElement('services'); +$writer->startElement('config'); +$writer->writeAttribute('ocsversion', '1.7'); +$writer->endElement(); +$writer->startElement('activity'); +$writer->writeAttribute('ocsversion', '1.7'); +$writer->endElement(); +$writer->startElement('cloud'); +$writer->writeAttribute('ocsversion', '1.7'); +$writer->endElement(); +$writer->endElement(); +$writer->endElement(); +$writer->endDocument(); +$writer->flush(); |