@@ -25,36 +25,36 @@ |
||
25 | 25 | * @since 12.0.0 |
26 | 26 | */ |
27 | 27 | interface ISearchComparison extends ISearchOperator { |
28 | - const COMPARE_EQUAL = 'eq'; |
|
29 | - const COMPARE_GREATER_THAN = 'gt'; |
|
30 | - const COMPARE_GREATER_THAN_EQUAL = 'gte'; |
|
31 | - const COMPARE_LESS_THAN = 'lt'; |
|
32 | - const COMPARE_LESS_THAN_EQUAL = 'lte'; |
|
33 | - const COMPARE_LIKE = 'like'; |
|
28 | + const COMPARE_EQUAL = 'eq'; |
|
29 | + const COMPARE_GREATER_THAN = 'gt'; |
|
30 | + const COMPARE_GREATER_THAN_EQUAL = 'gte'; |
|
31 | + const COMPARE_LESS_THAN = 'lt'; |
|
32 | + const COMPARE_LESS_THAN_EQUAL = 'lte'; |
|
33 | + const COMPARE_LIKE = 'like'; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants |
|
37 | - * |
|
38 | - * @return string |
|
39 | - * @since 12.0.0 |
|
40 | - */ |
|
41 | - public function getType(); |
|
35 | + /** |
|
36 | + * Get the type of comparison, one of the ISearchComparison::COMPARE_* constants |
|
37 | + * |
|
38 | + * @return string |
|
39 | + * @since 12.0.0 |
|
40 | + */ |
|
41 | + public function getType(); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Get the name of the field to compare with |
|
45 | - * |
|
46 | - * i.e. 'size', 'name' or 'mimetype' |
|
47 | - * |
|
48 | - * @return string |
|
49 | - * @since 12.0.0 |
|
50 | - */ |
|
51 | - public function getField(); |
|
43 | + /** |
|
44 | + * Get the name of the field to compare with |
|
45 | + * |
|
46 | + * i.e. 'size', 'name' or 'mimetype' |
|
47 | + * |
|
48 | + * @return string |
|
49 | + * @since 12.0.0 |
|
50 | + */ |
|
51 | + public function getField(); |
|
52 | 52 | |
53 | - /** |
|
54 | - * Get the value to compare the field with |
|
55 | - * |
|
56 | - * @return string|integer|\DateTime |
|
57 | - * @since 12.0.0 |
|
58 | - */ |
|
59 | - public function getValue(); |
|
53 | + /** |
|
54 | + * Get the value to compare the field with |
|
55 | + * |
|
56 | + * @return string|integer|\DateTime |
|
57 | + * @since 12.0.0 |
|
58 | + */ |
|
59 | + public function getValue(); |
|
60 | 60 | } |
@@ -25,27 +25,27 @@ |
||
25 | 25 | * @since 12.0.0 |
26 | 26 | */ |
27 | 27 | interface ISearchBinaryOperator extends ISearchOperator { |
28 | - const OPERATOR_AND = 'and'; |
|
29 | - const OPERATOR_OR = 'or'; |
|
30 | - const OPERATOR_NOT = 'not'; |
|
28 | + const OPERATOR_AND = 'and'; |
|
29 | + const OPERATOR_OR = 'or'; |
|
30 | + const OPERATOR_NOT = 'not'; |
|
31 | 31 | |
32 | - /** |
|
33 | - * The type of binary operator |
|
34 | - * |
|
35 | - * One of the ISearchBinaryOperator::OPERATOR_* constants |
|
36 | - * |
|
37 | - * @return string |
|
38 | - * @since 12.0.0 |
|
39 | - */ |
|
40 | - public function getType(); |
|
32 | + /** |
|
33 | + * The type of binary operator |
|
34 | + * |
|
35 | + * One of the ISearchBinaryOperator::OPERATOR_* constants |
|
36 | + * |
|
37 | + * @return string |
|
38 | + * @since 12.0.0 |
|
39 | + */ |
|
40 | + public function getType(); |
|
41 | 41 | |
42 | - /** |
|
43 | - * The arguments for the binary operator |
|
44 | - * |
|
45 | - * One argument for the 'not' operator and two for 'and' and 'or' |
|
46 | - * |
|
47 | - * @return ISearchOperator[] |
|
48 | - * @since 12.0.0 |
|
49 | - */ |
|
50 | - public function getArguments(); |
|
42 | + /** |
|
43 | + * The arguments for the binary operator |
|
44 | + * |
|
45 | + * One argument for the 'not' operator and two for 'and' and 'or' |
|
46 | + * |
|
47 | + * @return ISearchOperator[] |
|
48 | + * @since 12.0.0 |
|
49 | + */ |
|
50 | + public function getArguments(); |
|
51 | 51 | } |
@@ -24,44 +24,44 @@ |
||
24 | 24 | use OCP\Files\Search\ISearchComparison; |
25 | 25 | |
26 | 26 | class SearchComparison implements ISearchComparison { |
27 | - /** @var string */ |
|
28 | - private $type; |
|
29 | - /** @var string */ |
|
30 | - private $field; |
|
31 | - /** @var string|integer|\DateTime */ |
|
32 | - private $value; |
|
27 | + /** @var string */ |
|
28 | + private $type; |
|
29 | + /** @var string */ |
|
30 | + private $field; |
|
31 | + /** @var string|integer|\DateTime */ |
|
32 | + private $value; |
|
33 | 33 | |
34 | - /** |
|
35 | - * SearchComparison constructor. |
|
36 | - * |
|
37 | - * @param string $type |
|
38 | - * @param string $field |
|
39 | - * @param \DateTime|int|string $value |
|
40 | - */ |
|
41 | - public function __construct($type, $field, $value) { |
|
42 | - $this->type = $type; |
|
43 | - $this->field = $field; |
|
44 | - $this->value = $value; |
|
45 | - } |
|
34 | + /** |
|
35 | + * SearchComparison constructor. |
|
36 | + * |
|
37 | + * @param string $type |
|
38 | + * @param string $field |
|
39 | + * @param \DateTime|int|string $value |
|
40 | + */ |
|
41 | + public function __construct($type, $field, $value) { |
|
42 | + $this->type = $type; |
|
43 | + $this->field = $field; |
|
44 | + $this->value = $value; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * @return string |
|
49 | - */ |
|
50 | - public function getType() { |
|
51 | - return $this->type; |
|
52 | - } |
|
47 | + /** |
|
48 | + * @return string |
|
49 | + */ |
|
50 | + public function getType() { |
|
51 | + return $this->type; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @return string |
|
56 | - */ |
|
57 | - public function getField() { |
|
58 | - return $this->field; |
|
59 | - } |
|
54 | + /** |
|
55 | + * @return string |
|
56 | + */ |
|
57 | + public function getField() { |
|
58 | + return $this->field; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * @return \DateTime|int|string |
|
63 | - */ |
|
64 | - public function getValue() { |
|
65 | - return $this->value; |
|
66 | - } |
|
61 | + /** |
|
62 | + * @return \DateTime|int|string |
|
63 | + */ |
|
64 | + public function getValue() { |
|
65 | + return $this->value; |
|
66 | + } |
|
67 | 67 | } |
@@ -25,33 +25,33 @@ |
||
25 | 25 | use OCP\Files\Search\ISearchOrder; |
26 | 26 | |
27 | 27 | class SearchOrder implements ISearchOrder { |
28 | - /** @var string */ |
|
29 | - private $direction; |
|
30 | - /** @var string */ |
|
31 | - private $field; |
|
28 | + /** @var string */ |
|
29 | + private $direction; |
|
30 | + /** @var string */ |
|
31 | + private $field; |
|
32 | 32 | |
33 | - /** |
|
34 | - * SearchOrder constructor. |
|
35 | - * |
|
36 | - * @param string $direction |
|
37 | - * @param string $field |
|
38 | - */ |
|
39 | - public function __construct($direction, $field) { |
|
40 | - $this->direction = $direction; |
|
41 | - $this->field = $field; |
|
42 | - } |
|
33 | + /** |
|
34 | + * SearchOrder constructor. |
|
35 | + * |
|
36 | + * @param string $direction |
|
37 | + * @param string $field |
|
38 | + */ |
|
39 | + public function __construct($direction, $field) { |
|
40 | + $this->direction = $direction; |
|
41 | + $this->field = $field; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function getDirection() { |
|
48 | - return $this->direction; |
|
49 | - } |
|
44 | + /** |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function getDirection() { |
|
48 | + return $this->direction; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @return string |
|
53 | - */ |
|
54 | - public function getField() { |
|
55 | - return $this->field; |
|
56 | - } |
|
51 | + /** |
|
52 | + * @return string |
|
53 | + */ |
|
54 | + public function getField() { |
|
55 | + return $this->field; |
|
56 | + } |
|
57 | 57 | } |
@@ -25,33 +25,33 @@ |
||
25 | 25 | use OCP\Files\Search\ISearchOperator; |
26 | 26 | |
27 | 27 | class SearchBinaryOperator implements ISearchBinaryOperator { |
28 | - /** @var string */ |
|
29 | - private $type; |
|
30 | - /** @var ISearchOperator[] */ |
|
31 | - private $arguments; |
|
28 | + /** @var string */ |
|
29 | + private $type; |
|
30 | + /** @var ISearchOperator[] */ |
|
31 | + private $arguments; |
|
32 | 32 | |
33 | - /** |
|
34 | - * SearchBinaryOperator constructor. |
|
35 | - * |
|
36 | - * @param string $type |
|
37 | - * @param ISearchOperator[] $arguments |
|
38 | - */ |
|
39 | - public function __construct($type, array $arguments) { |
|
40 | - $this->type = $type; |
|
41 | - $this->arguments = $arguments; |
|
42 | - } |
|
33 | + /** |
|
34 | + * SearchBinaryOperator constructor. |
|
35 | + * |
|
36 | + * @param string $type |
|
37 | + * @param ISearchOperator[] $arguments |
|
38 | + */ |
|
39 | + public function __construct($type, array $arguments) { |
|
40 | + $this->type = $type; |
|
41 | + $this->arguments = $arguments; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function getType() { |
|
48 | - return $this->type; |
|
49 | - } |
|
44 | + /** |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function getType() { |
|
48 | + return $this->type; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @return ISearchOperator[] |
|
53 | - */ |
|
54 | - public function getArguments() { |
|
55 | - return $this->arguments; |
|
56 | - } |
|
51 | + /** |
|
52 | + * @return ISearchOperator[] |
|
53 | + */ |
|
54 | + public function getArguments() { |
|
55 | + return $this->arguments; |
|
56 | + } |
|
57 | 57 | } |
@@ -45,114 +45,114 @@ |
||
45 | 45 | * @package OCA\DAV\Connector\Sabre |
46 | 46 | */ |
47 | 47 | class FakeLockerPlugin extends ServerPlugin { |
48 | - /** @var \Sabre\DAV\Server */ |
|
49 | - private $server; |
|
48 | + /** @var \Sabre\DAV\Server */ |
|
49 | + private $server; |
|
50 | 50 | |
51 | - /** {@inheritDoc} */ |
|
52 | - public function initialize(\Sabre\DAV\Server $server) { |
|
53 | - $this->server = $server; |
|
54 | - $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1); |
|
55 | - $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1); |
|
56 | - $server->on('propFind', [$this, 'propFind']); |
|
57 | - $server->on('validateTokens', [$this, 'validateTokens']); |
|
58 | - } |
|
51 | + /** {@inheritDoc} */ |
|
52 | + public function initialize(\Sabre\DAV\Server $server) { |
|
53 | + $this->server = $server; |
|
54 | + $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1); |
|
55 | + $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1); |
|
56 | + $server->on('propFind', [$this, 'propFind']); |
|
57 | + $server->on('validateTokens', [$this, 'validateTokens']); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Indicate that we support LOCK and UNLOCK |
|
62 | - * |
|
63 | - * @param string $path |
|
64 | - * @return string[] |
|
65 | - */ |
|
66 | - public function getHTTPMethods($path) { |
|
67 | - return [ |
|
68 | - 'LOCK', |
|
69 | - 'UNLOCK', |
|
70 | - ]; |
|
71 | - } |
|
60 | + /** |
|
61 | + * Indicate that we support LOCK and UNLOCK |
|
62 | + * |
|
63 | + * @param string $path |
|
64 | + * @return string[] |
|
65 | + */ |
|
66 | + public function getHTTPMethods($path) { |
|
67 | + return [ |
|
68 | + 'LOCK', |
|
69 | + 'UNLOCK', |
|
70 | + ]; |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * Indicate that we support locking |
|
75 | - * |
|
76 | - * @return integer[] |
|
77 | - */ |
|
78 | - function getFeatures() { |
|
79 | - return [2]; |
|
80 | - } |
|
73 | + /** |
|
74 | + * Indicate that we support locking |
|
75 | + * |
|
76 | + * @return integer[] |
|
77 | + */ |
|
78 | + function getFeatures() { |
|
79 | + return [2]; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * Return some dummy response for PROPFIND requests with regard to locking |
|
84 | - * |
|
85 | - * @param PropFind $propFind |
|
86 | - * @param INode $node |
|
87 | - * @return void |
|
88 | - */ |
|
89 | - function propFind(PropFind $propFind, INode $node) { |
|
90 | - $propFind->handle('{DAV:}supportedlock', function() { |
|
91 | - return new SupportedLock(true); |
|
92 | - }); |
|
93 | - $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) { |
|
94 | - return new LockDiscovery([]); |
|
95 | - }); |
|
96 | - } |
|
82 | + /** |
|
83 | + * Return some dummy response for PROPFIND requests with regard to locking |
|
84 | + * |
|
85 | + * @param PropFind $propFind |
|
86 | + * @param INode $node |
|
87 | + * @return void |
|
88 | + */ |
|
89 | + function propFind(PropFind $propFind, INode $node) { |
|
90 | + $propFind->handle('{DAV:}supportedlock', function() { |
|
91 | + return new SupportedLock(true); |
|
92 | + }); |
|
93 | + $propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) { |
|
94 | + return new LockDiscovery([]); |
|
95 | + }); |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * Mark a locking token always as valid |
|
100 | - * |
|
101 | - * @param RequestInterface $request |
|
102 | - * @param array $conditions |
|
103 | - */ |
|
104 | - public function validateTokens(RequestInterface $request, &$conditions) { |
|
105 | - foreach($conditions as &$fileCondition) { |
|
106 | - if(isset($fileCondition['tokens'])) { |
|
107 | - foreach($fileCondition['tokens'] as &$token) { |
|
108 | - if(isset($token['token'])) { |
|
109 | - if(substr($token['token'], 0, 16) === 'opaquelocktoken:') { |
|
110 | - $token['validToken'] = true; |
|
111 | - } |
|
112 | - } |
|
113 | - } |
|
114 | - } |
|
115 | - } |
|
116 | - } |
|
98 | + /** |
|
99 | + * Mark a locking token always as valid |
|
100 | + * |
|
101 | + * @param RequestInterface $request |
|
102 | + * @param array $conditions |
|
103 | + */ |
|
104 | + public function validateTokens(RequestInterface $request, &$conditions) { |
|
105 | + foreach($conditions as &$fileCondition) { |
|
106 | + if(isset($fileCondition['tokens'])) { |
|
107 | + foreach($fileCondition['tokens'] as &$token) { |
|
108 | + if(isset($token['token'])) { |
|
109 | + if(substr($token['token'], 0, 16) === 'opaquelocktoken:') { |
|
110 | + $token['validToken'] = true; |
|
111 | + } |
|
112 | + } |
|
113 | + } |
|
114 | + } |
|
115 | + } |
|
116 | + } |
|
117 | 117 | |
118 | - /** |
|
119 | - * Fakes a successful LOCK |
|
120 | - * |
|
121 | - * @param RequestInterface $request |
|
122 | - * @param ResponseInterface $response |
|
123 | - * @return bool |
|
124 | - */ |
|
125 | - public function fakeLockProvider(RequestInterface $request, |
|
126 | - ResponseInterface $response) { |
|
118 | + /** |
|
119 | + * Fakes a successful LOCK |
|
120 | + * |
|
121 | + * @param RequestInterface $request |
|
122 | + * @param ResponseInterface $response |
|
123 | + * @return bool |
|
124 | + */ |
|
125 | + public function fakeLockProvider(RequestInterface $request, |
|
126 | + ResponseInterface $response) { |
|
127 | 127 | |
128 | - $lockInfo = new LockInfo(); |
|
129 | - $lockInfo->token = md5($request->getPath()); |
|
130 | - $lockInfo->uri = $request->getPath(); |
|
131 | - $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY; |
|
132 | - $lockInfo->timeout = 1800; |
|
128 | + $lockInfo = new LockInfo(); |
|
129 | + $lockInfo->token = md5($request->getPath()); |
|
130 | + $lockInfo->uri = $request->getPath(); |
|
131 | + $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY; |
|
132 | + $lockInfo->timeout = 1800; |
|
133 | 133 | |
134 | - $body = $this->server->xml->write('{DAV:}prop', [ |
|
135 | - '{DAV:}lockdiscovery' => |
|
136 | - new LockDiscovery([$lockInfo]) |
|
137 | - ]); |
|
134 | + $body = $this->server->xml->write('{DAV:}prop', [ |
|
135 | + '{DAV:}lockdiscovery' => |
|
136 | + new LockDiscovery([$lockInfo]) |
|
137 | + ]); |
|
138 | 138 | |
139 | - $response->setStatus(200); |
|
140 | - $response->setBody($body); |
|
139 | + $response->setStatus(200); |
|
140 | + $response->setBody($body); |
|
141 | 141 | |
142 | - return false; |
|
143 | - } |
|
142 | + return false; |
|
143 | + } |
|
144 | 144 | |
145 | - /** |
|
146 | - * Fakes a successful LOCK |
|
147 | - * |
|
148 | - * @param RequestInterface $request |
|
149 | - * @param ResponseInterface $response |
|
150 | - * @return bool |
|
151 | - */ |
|
152 | - public function fakeUnlockProvider(RequestInterface $request, |
|
153 | - ResponseInterface $response) { |
|
154 | - $response->setStatus(204); |
|
155 | - $response->setHeader('Content-Length', '0'); |
|
156 | - return false; |
|
157 | - } |
|
145 | + /** |
|
146 | + * Fakes a successful LOCK |
|
147 | + * |
|
148 | + * @param RequestInterface $request |
|
149 | + * @param ResponseInterface $response |
|
150 | + * @return bool |
|
151 | + */ |
|
152 | + public function fakeUnlockProvider(RequestInterface $request, |
|
153 | + ResponseInterface $response) { |
|
154 | + $response->setStatus(204); |
|
155 | + $response->setHeader('Content-Length', '0'); |
|
156 | + return false; |
|
157 | + } |
|
158 | 158 | } |
@@ -24,92 +24,92 @@ |
||
24 | 24 | namespace OC\OCS; |
25 | 25 | |
26 | 26 | class Provider extends \OCP\AppFramework\Controller { |
27 | - /** @var \OCP\App\IAppManager */ |
|
28 | - private $appManager; |
|
27 | + /** @var \OCP\App\IAppManager */ |
|
28 | + private $appManager; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param string $appName |
|
32 | - * @param \OCP\IRequest $request |
|
33 | - * @param \OCP\App\IAppManager $appManager |
|
34 | - */ |
|
35 | - public function __construct($appName, |
|
36 | - \OCP\IRequest $request, |
|
37 | - \OCP\App\IAppManager $appManager) { |
|
38 | - parent::__construct($appName, $request); |
|
39 | - $this->appManager = $appManager; |
|
40 | - } |
|
30 | + /** |
|
31 | + * @param string $appName |
|
32 | + * @param \OCP\IRequest $request |
|
33 | + * @param \OCP\App\IAppManager $appManager |
|
34 | + */ |
|
35 | + public function __construct($appName, |
|
36 | + \OCP\IRequest $request, |
|
37 | + \OCP\App\IAppManager $appManager) { |
|
38 | + parent::__construct($appName, $request); |
|
39 | + $this->appManager = $appManager; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return \OCP\AppFramework\Http\JSONResponse |
|
44 | - */ |
|
45 | - public function buildProviderList() { |
|
46 | - $services = [ |
|
47 | - 'PRIVATE_DATA' => [ |
|
48 | - 'version' => 1, |
|
49 | - 'endpoints' => [ |
|
50 | - 'store' => '/ocs/v2.php/privatedata/setattribute', |
|
51 | - 'read' => '/ocs/v2.php/privatedata/getattribute', |
|
52 | - 'delete' => '/ocs/v2.php/privatedata/deleteattribute', |
|
53 | - ], |
|
54 | - ], |
|
55 | - ]; |
|
42 | + /** |
|
43 | + * @return \OCP\AppFramework\Http\JSONResponse |
|
44 | + */ |
|
45 | + public function buildProviderList() { |
|
46 | + $services = [ |
|
47 | + 'PRIVATE_DATA' => [ |
|
48 | + 'version' => 1, |
|
49 | + 'endpoints' => [ |
|
50 | + 'store' => '/ocs/v2.php/privatedata/setattribute', |
|
51 | + 'read' => '/ocs/v2.php/privatedata/getattribute', |
|
52 | + 'delete' => '/ocs/v2.php/privatedata/deleteattribute', |
|
53 | + ], |
|
54 | + ], |
|
55 | + ]; |
|
56 | 56 | |
57 | - if($this->appManager->isEnabledForUser('files_sharing')) { |
|
58 | - $services['SHARING'] = [ |
|
59 | - 'version' => 1, |
|
60 | - 'endpoints' => [ |
|
61 | - 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', |
|
62 | - ], |
|
63 | - ]; |
|
64 | - $services['FEDERATED_SHARING'] = [ |
|
65 | - 'version' => 1, |
|
66 | - 'endpoints' => [ |
|
67 | - 'share' => '/ocs/v2.php/cloud/shares', |
|
68 | - 'webdav' => '/public.php/webdav/', |
|
69 | - ], |
|
70 | - ]; |
|
71 | - } |
|
57 | + if($this->appManager->isEnabledForUser('files_sharing')) { |
|
58 | + $services['SHARING'] = [ |
|
59 | + 'version' => 1, |
|
60 | + 'endpoints' => [ |
|
61 | + 'share' => '/ocs/v2.php/apps/files_sharing/api/v1/shares', |
|
62 | + ], |
|
63 | + ]; |
|
64 | + $services['FEDERATED_SHARING'] = [ |
|
65 | + 'version' => 1, |
|
66 | + 'endpoints' => [ |
|
67 | + 'share' => '/ocs/v2.php/cloud/shares', |
|
68 | + 'webdav' => '/public.php/webdav/', |
|
69 | + ], |
|
70 | + ]; |
|
71 | + } |
|
72 | 72 | |
73 | - if ($this->appManager->isEnabledForUser('federation')) { |
|
74 | - if (isset($services['FEDERATED_SHARING'])) { |
|
75 | - $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret'; |
|
76 | - $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system'; |
|
77 | - $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system'; |
|
78 | - } else { |
|
79 | - $services['FEDERATED_SHARING'] = [ |
|
80 | - 'version' => 1, |
|
81 | - 'endpoints' => [ |
|
82 | - 'shared-secret' => '/ocs/v2.php/cloud/shared-secret', |
|
83 | - 'system-address-book' => '/remote.php/dav/addressbooks/system/system/system', |
|
84 | - 'carddav-user' => 'system' |
|
85 | - ], |
|
86 | - ]; |
|
87 | - } |
|
88 | - } |
|
73 | + if ($this->appManager->isEnabledForUser('federation')) { |
|
74 | + if (isset($services['FEDERATED_SHARING'])) { |
|
75 | + $services['FEDERATED_SHARING']['endpoints']['shared-secret'] = '/ocs/v2.php/cloud/shared-secret'; |
|
76 | + $services['FEDERATED_SHARING']['endpoints']['system-address-book'] = '/remote.php/dav/addressbooks/system/system/system'; |
|
77 | + $services['FEDERATED_SHARING']['endpoints']['carddav-user'] = 'system'; |
|
78 | + } else { |
|
79 | + $services['FEDERATED_SHARING'] = [ |
|
80 | + 'version' => 1, |
|
81 | + 'endpoints' => [ |
|
82 | + 'shared-secret' => '/ocs/v2.php/cloud/shared-secret', |
|
83 | + 'system-address-book' => '/remote.php/dav/addressbooks/system/system/system', |
|
84 | + 'carddav-user' => 'system' |
|
85 | + ], |
|
86 | + ]; |
|
87 | + } |
|
88 | + } |
|
89 | 89 | |
90 | - if($this->appManager->isEnabledForUser('activity')) { |
|
91 | - $services['ACTIVITY'] = [ |
|
92 | - 'version' => 1, |
|
93 | - 'endpoints' => [ |
|
94 | - 'list' => '/ocs/v2.php/cloud/activity', |
|
95 | - ], |
|
96 | - ]; |
|
97 | - } |
|
90 | + if($this->appManager->isEnabledForUser('activity')) { |
|
91 | + $services['ACTIVITY'] = [ |
|
92 | + 'version' => 1, |
|
93 | + 'endpoints' => [ |
|
94 | + 'list' => '/ocs/v2.php/cloud/activity', |
|
95 | + ], |
|
96 | + ]; |
|
97 | + } |
|
98 | 98 | |
99 | - if($this->appManager->isEnabledForUser('provisioning_api')) { |
|
100 | - $services['PROVISIONING'] = [ |
|
101 | - 'version' => 1, |
|
102 | - 'endpoints' => [ |
|
103 | - 'user' => '/ocs/v2.php/cloud/users', |
|
104 | - 'groups' => '/ocs/v2.php/cloud/groups', |
|
105 | - 'apps' => '/ocs/v2.php/cloud/apps', |
|
106 | - ], |
|
107 | - ]; |
|
108 | - } |
|
99 | + if($this->appManager->isEnabledForUser('provisioning_api')) { |
|
100 | + $services['PROVISIONING'] = [ |
|
101 | + 'version' => 1, |
|
102 | + 'endpoints' => [ |
|
103 | + 'user' => '/ocs/v2.php/cloud/users', |
|
104 | + 'groups' => '/ocs/v2.php/cloud/groups', |
|
105 | + 'apps' => '/ocs/v2.php/cloud/apps', |
|
106 | + ], |
|
107 | + ]; |
|
108 | + } |
|
109 | 109 | |
110 | - return new \OCP\AppFramework\Http\JSONResponse([ |
|
111 | - 'version' => 2, |
|
112 | - 'services' => $services, |
|
113 | - ]); |
|
114 | - } |
|
110 | + return new \OCP\AppFramework\Http\JSONResponse([ |
|
111 | + 'version' => 2, |
|
112 | + 'services' => $services, |
|
113 | + ]); |
|
114 | + } |
|
115 | 115 | } |
@@ -23,18 +23,18 @@ |
||
23 | 23 | */ |
24 | 24 | |
25 | 25 | return [ |
26 | - 'routes' => [ |
|
27 | - ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'], |
|
28 | - ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'], |
|
29 | - ], |
|
30 | - 'ocs' => [ |
|
31 | - ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'], |
|
32 | - ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'], |
|
33 | - ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'], |
|
34 | - ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'], |
|
35 | - ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'], |
|
36 | - ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'], |
|
37 | - ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'], |
|
38 | - ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'], |
|
39 | - ], |
|
26 | + 'routes' => [ |
|
27 | + ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'], |
|
28 | + ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'], |
|
29 | + ], |
|
30 | + 'ocs' => [ |
|
31 | + ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'], |
|
32 | + ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'], |
|
33 | + ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'], |
|
34 | + ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'], |
|
35 | + ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'], |
|
36 | + ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'], |
|
37 | + ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'], |
|
38 | + ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'], |
|
39 | + ], |
|
40 | 40 | ]; |
@@ -21,7 +21,7 @@ |
||
21 | 21 | */ |
22 | 22 | // no php execution timeout for webdav |
23 | 23 | if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { |
24 | - @set_time_limit(0); |
|
24 | + @set_time_limit(0); |
|
25 | 25 | } |
26 | 26 | ignore_user_abort(true); |
27 | 27 |