@@ -27,7 +27,7 @@ |
||
27 | 27 | * {@inheritDoc} |
28 | 28 | */ |
29 | 29 | public function getName() { |
30 | - return (string)$this->l10n->t('Education Edition'); |
|
30 | + return (string) $this->l10n->t('Education Edition'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -23,28 +23,28 @@ |
||
23 | 23 | |
24 | 24 | class EducationBundle extends Bundle { |
25 | 25 | |
26 | - /** |
|
27 | - * {@inheritDoc} |
|
28 | - */ |
|
29 | - public function getName() { |
|
30 | - return (string)$this->l10n->t('Education Edition'); |
|
31 | - } |
|
26 | + /** |
|
27 | + * {@inheritDoc} |
|
28 | + */ |
|
29 | + public function getName() { |
|
30 | + return (string)$this->l10n->t('Education Edition'); |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * {@inheritDoc} |
|
35 | - */ |
|
36 | - public function getAppIdentifiers() { |
|
37 | - return [ |
|
38 | - 'zenodo', |
|
39 | - 'dashboard', |
|
40 | - 'circles', |
|
41 | - 'groupfolders', |
|
42 | - 'announcementcenter', |
|
43 | - 'admin_notifications', |
|
44 | - 'quota_warning', |
|
45 | - 'orcid', |
|
46 | - 'user_saml', |
|
47 | - ]; |
|
48 | - } |
|
33 | + /** |
|
34 | + * {@inheritDoc} |
|
35 | + */ |
|
36 | + public function getAppIdentifiers() { |
|
37 | + return [ |
|
38 | + 'zenodo', |
|
39 | + 'dashboard', |
|
40 | + 'circles', |
|
41 | + 'groupfolders', |
|
42 | + 'announcementcenter', |
|
43 | + 'admin_notifications', |
|
44 | + 'quota_warning', |
|
45 | + 'orcid', |
|
46 | + 'user_saml', |
|
47 | + ]; |
|
48 | + } |
|
49 | 49 | |
50 | 50 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * Controllers |
53 | 53 | */ |
54 | - $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { |
|
54 | + $container->registerService('ShareController', function(SimpleContainer $c) use ($server) { |
|
55 | 55 | $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
56 | 56 | return new ShareController( |
57 | 57 | $c->query('AppName'), |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $server->query(Defaults::class) |
72 | 72 | ); |
73 | 73 | }); |
74 | - $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |
|
74 | + $container->registerService('ExternalSharesController', function(SimpleContainer $c) { |
|
75 | 75 | return new ExternalSharesController( |
76 | 76 | $c->query('AppName'), |
77 | 77 | $c->query('Request'), |
@@ -83,13 +83,13 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * Core class wrappers |
85 | 85 | */ |
86 | - $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { |
|
86 | + $container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) { |
|
87 | 87 | return $server->getHTTPClientService(); |
88 | 88 | }); |
89 | - $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) { |
|
89 | + $container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) { |
|
90 | 90 | return $server->getCloudIdManager(); |
91 | 91 | }); |
92 | - $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { |
|
92 | + $container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) { |
|
93 | 93 | $user = $server->getUserSession()->getUser(); |
94 | 94 | $uid = $user ? $user->getUID() : null; |
95 | 95 | return new \OCA\Files_Sharing\External\Manager( |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | /** |
108 | 108 | * Middleware |
109 | 109 | */ |
110 | - $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { |
|
110 | + $container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) { |
|
111 | 111 | return new SharingCheckMiddleware( |
112 | 112 | $c->query('AppName'), |
113 | 113 | $server->getConfig(), |
@@ -118,14 +118,14 @@ discard block |
||
118 | 118 | ); |
119 | 119 | }); |
120 | 120 | |
121 | - $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { |
|
121 | + $container->registerService('OCSShareAPIMiddleware', function(SimpleContainer $c) use ($server) { |
|
122 | 122 | return new OCSShareAPIMiddleware( |
123 | 123 | $server->getShareManager(), |
124 | 124 | $server->getL10N($c->query('AppName')) |
125 | 125 | ); |
126 | 126 | }); |
127 | 127 | |
128 | - $container->registerService(ShareInfoMiddleware::class, function () use ($server) { |
|
128 | + $container->registerService(ShareInfoMiddleware::class, function() use ($server) { |
|
129 | 129 | return new ShareInfoMiddleware( |
130 | 130 | $server->getShareManager() |
131 | 131 | ); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $container->registerMiddleWare('OCSShareAPIMiddleware'); |
137 | 137 | $container->registerMiddleWare(ShareInfoMiddleware::class); |
138 | 138 | |
139 | - $container->registerService('MountProvider', function (IContainer $c) { |
|
139 | + $container->registerService('MountProvider', function(IContainer $c) { |
|
140 | 140 | /** @var \OCP\IServerContainer $server */ |
141 | 141 | $server = $c->query('ServerContainer'); |
142 | 142 | return new MountProvider( |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | ); |
147 | 147 | }); |
148 | 148 | |
149 | - $container->registerService('ExternalMountProvider', function (IContainer $c) { |
|
149 | + $container->registerService('ExternalMountProvider', function(IContainer $c) { |
|
150 | 150 | /** @var \OCP\IServerContainer $server */ |
151 | 151 | $server = $c->query('ServerContainer'); |
152 | 152 | return new \OCA\Files_Sharing\External\MountProvider( |
@@ -46,138 +46,138 @@ |
||
46 | 46 | use OCA\Files_Sharing\External\Manager; |
47 | 47 | |
48 | 48 | class Application extends App { |
49 | - public function __construct(array $urlParams = array()) { |
|
50 | - parent::__construct('files_sharing', $urlParams); |
|
49 | + public function __construct(array $urlParams = array()) { |
|
50 | + parent::__construct('files_sharing', $urlParams); |
|
51 | 51 | |
52 | - $container = $this->getContainer(); |
|
53 | - /** @var IServerContainer $server */ |
|
54 | - $server = $container->getServer(); |
|
52 | + $container = $this->getContainer(); |
|
53 | + /** @var IServerContainer $server */ |
|
54 | + $server = $container->getServer(); |
|
55 | 55 | |
56 | - /** |
|
57 | - * Controllers |
|
58 | - */ |
|
59 | - $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { |
|
60 | - $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
61 | - return new ShareController( |
|
62 | - $c->query('AppName'), |
|
63 | - $c->query('Request'), |
|
64 | - $server->getConfig(), |
|
65 | - $server->getURLGenerator(), |
|
66 | - $server->getUserManager(), |
|
67 | - $server->getLogger(), |
|
68 | - $server->getActivityManager(), |
|
69 | - $server->getShareManager(), |
|
70 | - $server->getSession(), |
|
71 | - $server->getPreviewManager(), |
|
72 | - $server->getRootFolder(), |
|
73 | - $federatedSharingApp->getFederatedShareProvider(), |
|
74 | - $server->getEventDispatcher(), |
|
75 | - $server->getL10N($c->query('AppName')), |
|
76 | - $server->query(Defaults::class) |
|
77 | - ); |
|
78 | - }); |
|
79 | - $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |
|
80 | - return new ExternalSharesController( |
|
81 | - $c->query('AppName'), |
|
82 | - $c->query('Request'), |
|
83 | - $c->query('ExternalManager'), |
|
84 | - $c->query('HttpClientService') |
|
85 | - ); |
|
86 | - }); |
|
56 | + /** |
|
57 | + * Controllers |
|
58 | + */ |
|
59 | + $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { |
|
60 | + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
61 | + return new ShareController( |
|
62 | + $c->query('AppName'), |
|
63 | + $c->query('Request'), |
|
64 | + $server->getConfig(), |
|
65 | + $server->getURLGenerator(), |
|
66 | + $server->getUserManager(), |
|
67 | + $server->getLogger(), |
|
68 | + $server->getActivityManager(), |
|
69 | + $server->getShareManager(), |
|
70 | + $server->getSession(), |
|
71 | + $server->getPreviewManager(), |
|
72 | + $server->getRootFolder(), |
|
73 | + $federatedSharingApp->getFederatedShareProvider(), |
|
74 | + $server->getEventDispatcher(), |
|
75 | + $server->getL10N($c->query('AppName')), |
|
76 | + $server->query(Defaults::class) |
|
77 | + ); |
|
78 | + }); |
|
79 | + $container->registerService('ExternalSharesController', function (SimpleContainer $c) { |
|
80 | + return new ExternalSharesController( |
|
81 | + $c->query('AppName'), |
|
82 | + $c->query('Request'), |
|
83 | + $c->query('ExternalManager'), |
|
84 | + $c->query('HttpClientService') |
|
85 | + ); |
|
86 | + }); |
|
87 | 87 | |
88 | - /** |
|
89 | - * Core class wrappers |
|
90 | - */ |
|
91 | - $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { |
|
92 | - return $server->getHTTPClientService(); |
|
93 | - }); |
|
94 | - $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) { |
|
95 | - return $server->getCloudIdManager(); |
|
96 | - }); |
|
97 | - $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { |
|
98 | - $user = $server->getUserSession()->getUser(); |
|
99 | - $uid = $user ? $user->getUID() : null; |
|
100 | - return new \OCA\Files_Sharing\External\Manager( |
|
101 | - $server->getDatabaseConnection(), |
|
102 | - \OC\Files\Filesystem::getMountManager(), |
|
103 | - \OC\Files\Filesystem::getLoader(), |
|
104 | - $server->getHTTPClientService(), |
|
105 | - $server->getNotificationManager(), |
|
106 | - $server->query(\OCP\OCS\IDiscoveryService::class), |
|
107 | - $server->getCloudFederationProviderManager(), |
|
108 | - $server->getCloudFederationFactory(), |
|
109 | - $server->getGroupManager(), |
|
110 | - $server->getUserManager(), |
|
111 | - $uid |
|
112 | - ); |
|
113 | - }); |
|
114 | - $container->registerAlias(Manager::class, 'ExternalManager'); |
|
88 | + /** |
|
89 | + * Core class wrappers |
|
90 | + */ |
|
91 | + $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) { |
|
92 | + return $server->getHTTPClientService(); |
|
93 | + }); |
|
94 | + $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) { |
|
95 | + return $server->getCloudIdManager(); |
|
96 | + }); |
|
97 | + $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) { |
|
98 | + $user = $server->getUserSession()->getUser(); |
|
99 | + $uid = $user ? $user->getUID() : null; |
|
100 | + return new \OCA\Files_Sharing\External\Manager( |
|
101 | + $server->getDatabaseConnection(), |
|
102 | + \OC\Files\Filesystem::getMountManager(), |
|
103 | + \OC\Files\Filesystem::getLoader(), |
|
104 | + $server->getHTTPClientService(), |
|
105 | + $server->getNotificationManager(), |
|
106 | + $server->query(\OCP\OCS\IDiscoveryService::class), |
|
107 | + $server->getCloudFederationProviderManager(), |
|
108 | + $server->getCloudFederationFactory(), |
|
109 | + $server->getGroupManager(), |
|
110 | + $server->getUserManager(), |
|
111 | + $uid |
|
112 | + ); |
|
113 | + }); |
|
114 | + $container->registerAlias(Manager::class, 'ExternalManager'); |
|
115 | 115 | |
116 | - /** |
|
117 | - * Middleware |
|
118 | - */ |
|
119 | - $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { |
|
120 | - return new SharingCheckMiddleware( |
|
121 | - $c->query('AppName'), |
|
122 | - $server->getConfig(), |
|
123 | - $server->getAppManager(), |
|
124 | - $server->query(IControllerMethodReflector::class), |
|
125 | - $server->getShareManager(), |
|
126 | - $server->getRequest() |
|
127 | - ); |
|
128 | - }); |
|
116 | + /** |
|
117 | + * Middleware |
|
118 | + */ |
|
119 | + $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) { |
|
120 | + return new SharingCheckMiddleware( |
|
121 | + $c->query('AppName'), |
|
122 | + $server->getConfig(), |
|
123 | + $server->getAppManager(), |
|
124 | + $server->query(IControllerMethodReflector::class), |
|
125 | + $server->getShareManager(), |
|
126 | + $server->getRequest() |
|
127 | + ); |
|
128 | + }); |
|
129 | 129 | |
130 | - $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { |
|
131 | - return new OCSShareAPIMiddleware( |
|
132 | - $server->getShareManager(), |
|
133 | - $server->getL10N($c->query('AppName')) |
|
134 | - ); |
|
135 | - }); |
|
130 | + $container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) { |
|
131 | + return new OCSShareAPIMiddleware( |
|
132 | + $server->getShareManager(), |
|
133 | + $server->getL10N($c->query('AppName')) |
|
134 | + ); |
|
135 | + }); |
|
136 | 136 | |
137 | - $container->registerService(ShareInfoMiddleware::class, function () use ($server) { |
|
138 | - return new ShareInfoMiddleware( |
|
139 | - $server->getShareManager() |
|
140 | - ); |
|
141 | - }); |
|
137 | + $container->registerService(ShareInfoMiddleware::class, function () use ($server) { |
|
138 | + return new ShareInfoMiddleware( |
|
139 | + $server->getShareManager() |
|
140 | + ); |
|
141 | + }); |
|
142 | 142 | |
143 | - // Execute middlewares |
|
144 | - $container->registerMiddleWare('SharingCheckMiddleware'); |
|
145 | - $container->registerMiddleWare('OCSShareAPIMiddleware'); |
|
146 | - $container->registerMiddleWare(ShareInfoMiddleware::class); |
|
143 | + // Execute middlewares |
|
144 | + $container->registerMiddleWare('SharingCheckMiddleware'); |
|
145 | + $container->registerMiddleWare('OCSShareAPIMiddleware'); |
|
146 | + $container->registerMiddleWare(ShareInfoMiddleware::class); |
|
147 | 147 | |
148 | - $container->registerService('MountProvider', function (IContainer $c) { |
|
149 | - /** @var \OCP\IServerContainer $server */ |
|
150 | - $server = $c->query('ServerContainer'); |
|
151 | - return new MountProvider( |
|
152 | - $server->getConfig(), |
|
153 | - $server->getShareManager(), |
|
154 | - $server->getLogger() |
|
155 | - ); |
|
156 | - }); |
|
148 | + $container->registerService('MountProvider', function (IContainer $c) { |
|
149 | + /** @var \OCP\IServerContainer $server */ |
|
150 | + $server = $c->query('ServerContainer'); |
|
151 | + return new MountProvider( |
|
152 | + $server->getConfig(), |
|
153 | + $server->getShareManager(), |
|
154 | + $server->getLogger() |
|
155 | + ); |
|
156 | + }); |
|
157 | 157 | |
158 | - $container->registerService('ExternalMountProvider', function (IContainer $c) { |
|
159 | - /** @var \OCP\IServerContainer $server */ |
|
160 | - $server = $c->query('ServerContainer'); |
|
161 | - return new \OCA\Files_Sharing\External\MountProvider( |
|
162 | - $server->getDatabaseConnection(), |
|
163 | - function() use ($c) { |
|
164 | - return $c->query('ExternalManager'); |
|
165 | - }, |
|
166 | - $server->getCloudIdManager() |
|
167 | - ); |
|
168 | - }); |
|
158 | + $container->registerService('ExternalMountProvider', function (IContainer $c) { |
|
159 | + /** @var \OCP\IServerContainer $server */ |
|
160 | + $server = $c->query('ServerContainer'); |
|
161 | + return new \OCA\Files_Sharing\External\MountProvider( |
|
162 | + $server->getDatabaseConnection(), |
|
163 | + function() use ($c) { |
|
164 | + return $c->query('ExternalManager'); |
|
165 | + }, |
|
166 | + $server->getCloudIdManager() |
|
167 | + ); |
|
168 | + }); |
|
169 | 169 | |
170 | - /* |
|
170 | + /* |
|
171 | 171 | * Register capabilities |
172 | 172 | */ |
173 | - $container->registerCapability(Capabilities::class); |
|
174 | - } |
|
173 | + $container->registerCapability(Capabilities::class); |
|
174 | + } |
|
175 | 175 | |
176 | - public function registerMountProviders() { |
|
177 | - /** @var \OCP\IServerContainer $server */ |
|
178 | - $server = $this->getContainer()->query('ServerContainer'); |
|
179 | - $mountProviderCollection = $server->getMountProviderCollection(); |
|
180 | - $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); |
|
181 | - $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider')); |
|
182 | - } |
|
176 | + public function registerMountProviders() { |
|
177 | + /** @var \OCP\IServerContainer $server */ |
|
178 | + $server = $this->getContainer()->query('ServerContainer'); |
|
179 | + $mountProviderCollection = $server->getMountProviderCollection(); |
|
180 | + $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider')); |
|
181 | + $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider')); |
|
182 | + } |
|
183 | 183 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | // @codeCoverageIgnoreStart |
3 | 3 | if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
4 | - require_once '../../lib/base.php'; |
|
4 | + require_once '../../lib/base.php'; |
|
5 | 5 | |
6 | - $urlGenerator = \OC::$server->getURLGenerator(); |
|
7 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
8 | - exit; |
|
6 | + $urlGenerator = \OC::$server->getURLGenerator(); |
|
7 | + header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
8 | + exit; |
|
9 | 9 | } |
10 | 10 | // @codeCoverageIgnoreEnd |
11 | 11 | ?> |
@@ -1,17 +1,17 @@ |
||
1 | 1 | <?php |
2 | 2 | // @codeCoverageIgnoreStart |
3 | -if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
3 | +if (!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
4 | 4 | require_once '../../lib/base.php'; |
5 | 5 | |
6 | 6 | $urlGenerator = \OC::$server->getURLGenerator(); |
7 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
7 | + header('Location: '.$urlGenerator->getAbsoluteURL('/')); |
|
8 | 8 | exit; |
9 | 9 | } |
10 | 10 | // @codeCoverageIgnoreEnd |
11 | 11 | ?> |
12 | 12 | <ul> |
13 | 13 | <li class='error'> |
14 | - <?php p($l->t( 'Access forbidden' )); ?><br> |
|
15 | - <p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p> |
|
14 | + <?php p($l->t('Access forbidden')); ?><br> |
|
15 | + <p class='hint'><?php if (isset($_['message'])) p($_['message'])?></p> |
|
16 | 16 | </li> |
17 | 17 | </ul> |
@@ -4,11 +4,11 @@ |
||
4 | 4 | /** @var $theme OCP\Defaults */ |
5 | 5 | // @codeCoverageIgnoreStart |
6 | 6 | if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
7 | - require_once '../../lib/base.php'; |
|
7 | + require_once '../../lib/base.php'; |
|
8 | 8 | |
9 | - $urlGenerator = \OC::$server->getURLGenerator(); |
|
10 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
11 | - exit; |
|
9 | + $urlGenerator = \OC::$server->getURLGenerator(); |
|
10 | + header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
11 | + exit; |
|
12 | 12 | } |
13 | 13 | // @codeCoverageIgnoreEnd |
14 | 14 | ?> |
@@ -3,11 +3,11 @@ |
||
3 | 3 | /** @var $l \OCP\IL10N */ |
4 | 4 | /** @var $theme OCP\Defaults */ |
5 | 5 | // @codeCoverageIgnoreStart |
6 | -if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
6 | +if (!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
7 | 7 | require_once '../../lib/base.php'; |
8 | 8 | |
9 | 9 | $urlGenerator = \OC::$server->getURLGenerator(); |
10 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
10 | + header('Location: '.$urlGenerator->getAbsoluteURL('/')); |
|
11 | 11 | exit; |
12 | 12 | } |
13 | 13 | // @codeCoverageIgnoreEnd |
@@ -14,10 +14,13 @@ |
||
14 | 14 | ?> |
15 | 15 | <?php if (isset($_['content'])): ?> |
16 | 16 | <?php print_unescaped($_['content']) ?> |
17 | -<?php else: ?> |
|
17 | +<?php else { |
|
18 | + : ?> |
|
18 | 19 | <div class="body-login-container update"> |
19 | 20 | <div class="icon-big icon-search icon-white"></div> |
20 | - <h2><?php p($l->t('File not found')); ?></h2> |
|
21 | + <h2><?php p($l->t('File not found')); |
|
22 | +} |
|
23 | +?></h2> |
|
21 | 24 | <p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p> |
22 | 25 | <p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"> |
23 | 26 | <?php p($l->t('Back to %s', array($theme->getName()))); ?> |
@@ -24,7 +24,7 @@ |
||
24 | 24 | use OC\DB\QueryBuilder\QueryFunction; |
25 | 25 | |
26 | 26 | class PgSqlFunctionBuilder extends FunctionBuilder { |
27 | - public function concat($x, $y) { |
|
28 | - return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
29 | - } |
|
27 | + public function concat($x, $y) { |
|
28 | + return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
29 | + } |
|
30 | 30 | } |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | class PgSqlFunctionBuilder extends FunctionBuilder { |
27 | 27 | public function concat($x, $y) { |
28 | - return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
28 | + return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')'); |
|
29 | 29 | } |
30 | 30 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | use OC\DB\QueryBuilder\QueryFunction; |
25 | 25 | |
26 | 26 | class SqliteFunctionBuilder extends FunctionBuilder { |
27 | - public function concat($x, $y) { |
|
28 | - return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
29 | - } |
|
27 | + public function concat($x, $y) { |
|
28 | + return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
29 | + } |
|
30 | 30 | } |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | class SqliteFunctionBuilder extends FunctionBuilder { |
27 | 27 | public function concat($x, $y) { |
28 | - return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
28 | + return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')'); |
|
29 | 29 | } |
30 | 30 | } |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class RemoteShare implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'remote_share'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'remote_share'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('A file or folder was shared from <strong>another server</strong>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('A file or folder was shared from <strong>another server</strong>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 11; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 11; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class Shared implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'shared'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'shared'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('A file or folder has been <strong>shared</strong>'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('A file or folder has been <strong>shared</strong>'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 10; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 10; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -24,18 +24,18 @@ |
||
24 | 24 | use OCP\Files\ObjectStore\IObjectStore; |
25 | 25 | |
26 | 26 | class S3 implements IObjectStore { |
27 | - use S3ConnectionTrait; |
|
28 | - use S3ObjectTrait; |
|
27 | + use S3ConnectionTrait; |
|
28 | + use S3ObjectTrait; |
|
29 | 29 | |
30 | - public function __construct($parameters) { |
|
31 | - $this->parseParams($parameters); |
|
32 | - } |
|
30 | + public function __construct($parameters) { |
|
31 | + $this->parseParams($parameters); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * @return string the container or bucket name where objects are stored |
|
36 | - * @since 7.0.0 |
|
37 | - */ |
|
38 | - public function getStorageId() { |
|
39 | - return $this->id; |
|
40 | - } |
|
34 | + /** |
|
35 | + * @return string the container or bucket name where objects are stored |
|
36 | + * @since 7.0.0 |
|
37 | + */ |
|
38 | + public function getStorageId() { |
|
39 | + return $this->id; |
|
40 | + } |
|
41 | 41 | } |