Skip to content
Snippets Groups Projects
Unverified Commit 575875e8 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Allow OCS routes in Core and Settings

parent 5214b62d
No related branches found
No related tags found
No related merge requests found
<?php
namespace OC\Core\Controller;
use OC\CapabilitiesManager;
use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest;
class OCSController extends \OCP\AppFramework\OCSController {
/** @var CapabilitiesManager */
private $capabilitiesManager;
/**
* OCSController constructor.
*
* @param string $appName
* @param IRequest $request
* @param CapabilitiesManager $capabilitiesManager
*/
public function __construct($appName,
IRequest $request,
CapabilitiesManager $capabilitiesManager) {
parent::__construct($appName, $request);
$this->capabilitiesManager = $capabilitiesManager;
}
public function getCapabilities() {
$result = [];
list($major, $minor, $micro) = \OCP\Util::getVersion();
$result['version'] = array(
'major' => $major,
'minor' => $minor,
'micro' => $micro,
'string' => \OC_Util::getVersionString(),
'edition' => \OC_Util::getEditionString(),
);
$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
return new DataResponse(['data' => $result]);
}
}
\ No newline at end of file
...@@ -163,6 +163,11 @@ class Router implements IRouter { ...@@ -163,6 +163,11 @@ class Router implements IRouter {
$this->useCollection('root'); $this->useCollection('root');
require_once __DIR__ . '/../../../settings/routes.php'; require_once __DIR__ . '/../../../settings/routes.php';
require_once __DIR__ . '/../../../core/routes.php'; require_once __DIR__ . '/../../../core/routes.php';
// Also add the OCS collection
$collection = $this->getCollection('root.ocs');
$collection->addPrefix('/ocsapp');
$this->root->addCollection($collection);
} }
if ($this->loaded) { if ($this->loaded) {
// include ocs routes, must be loaded last for /ocs prefix // include ocs routes, must be loaded last for /ocs prefix
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment