DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix inconsistent validation bug

Browse Source
This commit is contained in:
Henry Castro 2016-03-17 09:58:11 -04:00
parent 3a8b677bfd
commit 119e5ca38c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
controller/documentcontroller.php
View File

@ -110,23 +110,24 @@ class DocumentController extends Controller{
try { try {
$wopiClient = \OC::$server->getHTTPClientService()->newClient(); $wopiClient = \OC::$server->getHTTPClientService()->newClient();
$xmlBody = $wopiClient->get($wopiDiscovery)->getBody(); $xmlBody = $wopiClient->get($wopiDiscovery)->getBody();
if (!$xmlBody) {
return $this->responseError('failure body content', $wopiRemote);
}
} }
catch (\Exception $e) { catch (\Exception $e) {
return $this->responseError($e->getMessage(), $wopiRemote); return $this->responseError($e->getMessage(), $wopiRemote);
} }
}
$loadEntities = libxml_disable_entity_loader(true); if (!$xmlBody) {
$data = simplexml_load_string($xmlBody); return $this->responseError('failure body content', $wopiRemote);
libxml_disable_entity_loader($loadEntities); }
if ($data !== false) {
$this->cache->set('discovery.xml', $xmlBody, 3600); $loadEntities = libxml_disable_entity_loader(true);
} $data = simplexml_load_string($xmlBody);
else { libxml_disable_entity_loader($loadEntities);
return $this->responseError('failure discovery.xml not well-formed XML string', $wopiRemote); if ($data !== false) {
$this->cache->set('discovery.xml', $xmlBody, 3600);
}
else {
return $this->responseError('failure discovery.xml not well-formed XML string', $wopiRemote);
}
} }
\OC::$server->getNavigationManager()->setActiveEntry( 'richdocuments_index' ); \OC::$server->getNavigationManager()->setActiveEntry( 'richdocuments_index' );