@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | <div class="section"> |
4 | 4 | <h2><?php p($l->t('File handling')); ?></h2> |
5 | - <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label> |
|
5 | + <label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label> |
|
6 | 6 | <span id="maxUploadSizeSettingsMsg" class="msg"></span> |
7 | 7 | <br /> |
8 | - <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
9 | - <?php if($_['displayMaxPossibleUploadSize']):?> |
|
8 | + <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
9 | + <?php if ($_['displayMaxPossibleUploadSize']):?> |
|
10 | 10 | (<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) |
11 | - <?php endif;?> |
|
11 | + <?php endif; ?> |
|
12 | 12 | <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" /> |
13 | - <?php if($_['uploadChangable']): ?> |
|
13 | + <?php if ($_['uploadChangable']): ?> |
|
14 | 14 | <input type="submit" id="submitMaxUpload" |
15 | - value="<?php p($l->t( 'Save' )); ?>"/> |
|
15 | + value="<?php p($l->t('Save')); ?>"/> |
|
16 | 16 | <p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> |
17 | 17 | <?php else: ?> |
18 | 18 | <p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> |
@@ -19,14 +19,14 @@ |
||
19 | 19 | <tr> |
20 | 20 | <th id='headerName' class="hidden column-name"> |
21 | 21 | <div id="headerName-container"> |
22 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
22 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
23 | 23 | </div> |
24 | 24 | </th> |
25 | 25 | <th id="headerSize" class="hidden column-size"> |
26 | 26 | <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> |
27 | 27 | </th> |
28 | 28 | <th id="headerDate" class="hidden column-mtime"> |
29 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> |
|
29 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a> |
|
30 | 30 | <span class="selectedActions"><a href="" class="delete-selected"> |
31 | 31 | <?php p($l->t('Delete'))?> |
32 | 32 | <img class="svg" alt="<?php p($l->t('Delete'))?>" |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>"> |
5 | 5 | <a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>" |
6 | 6 | class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg"> |
7 | - <?php p($item['name']);?> |
|
7 | + <?php p($item['name']); ?> |
|
8 | 8 | </a> |
9 | 9 | </li> |
10 | 10 | <?php } ?> |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | <div id="app-settings"> |
13 | 13 | <div id="app-settings-header"> |
14 | 14 | <button class="settings-button" data-apps-slide-toggle="#app-settings-content"> |
15 | - <?php p($l->t('Settings'));?> |
|
15 | + <?php p($l->t('Settings')); ?> |
|
16 | 16 | </button> |
17 | 17 | </div> |
18 | 18 | <div id="app-settings-content"> |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | <input class="checkbox" id="showhiddenfilesToggle" checked="checked" type="checkbox"> |
21 | 21 | <label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label> |
22 | 22 | </div> |
23 | - <label for="webdavurl"><?php p($l->t('WebDAV'));?></label> |
|
23 | + <label for="webdavurl"><?php p($l->t('WebDAV')); ?></label> |
|
24 | 24 | <input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" /> |
25 | - <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em> |
|
25 | + <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer">access your Files via WebDAV</a>', array(link_to_docs('user-webdav')))); ?></em> |
|
26 | 26 | </div> |
27 | 27 | </div> |
28 | 28 | </div> |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $dir = '/'; |
27 | 27 | |
28 | 28 | if (isset($_GET['dir'])) { |
29 | - $dir = (string)$_GET['dir']; |
|
29 | + $dir = (string)$_GET['dir']; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | OCP\JSON::checkLoggedIn(); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | // send back json |
36 | 36 | try { |
37 | - OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir))); |
|
37 | + OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir))); |
|
38 | 38 | } catch (\OCP\Files\NotFoundException $e) { |
39 | - OCP\JSON::error(['data' => ['message' => 'Folder not found']]); |
|
39 | + OCP\JSON::error(['data' => ['message' => 'Folder not found']]); |
|
40 | 40 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $dir = '/'; |
27 | 27 | |
28 | 28 | if (isset($_GET['dir'])) { |
29 | - $dir = (string)$_GET['dir']; |
|
29 | + $dir = (string) $_GET['dir']; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | OCP\JSON::checkLoggedIn(); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $l = \OC::$server->getL10N('files'); |
29 | 29 | |
30 | 30 | // Load the files |
31 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
31 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
32 | 32 | $dir = \OC\Files\Filesystem::normalizePath($dir); |
33 | 33 | |
34 | 34 | try { |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | $data = array(); |
42 | - $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
42 | + $baseUrl = OCP\Util::linkTo('files', 'index.php').'?dir='; |
|
43 | 43 | |
44 | 44 | $permissions = $dirInfo->getPermissions(); |
45 | 45 | |
46 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
46 | + $sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; |
|
47 | 47 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
48 | 48 | $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
49 | 49 |
@@ -32,73 +32,73 @@ |
||
32 | 32 | $dir = \OC\Files\Filesystem::normalizePath($dir); |
33 | 33 | |
34 | 34 | try { |
35 | - $dirInfo = \OC\Files\Filesystem::getFileInfo($dir); |
|
36 | - if (!$dirInfo || !$dirInfo->getType() === 'dir') { |
|
37 | - header("HTTP/1.0 404 Not Found"); |
|
38 | - exit(); |
|
39 | - } |
|
35 | + $dirInfo = \OC\Files\Filesystem::getFileInfo($dir); |
|
36 | + if (!$dirInfo || !$dirInfo->getType() === 'dir') { |
|
37 | + header("HTTP/1.0 404 Not Found"); |
|
38 | + exit(); |
|
39 | + } |
|
40 | 40 | |
41 | - $data = array(); |
|
42 | - $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
41 | + $data = array(); |
|
42 | + $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; |
|
43 | 43 | |
44 | - $permissions = $dirInfo->getPermissions(); |
|
44 | + $permissions = $dirInfo->getPermissions(); |
|
45 | 45 | |
46 | - $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
47 | - $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
|
48 | - $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
|
46 | + $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
47 | + $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
|
48 | + $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : ''; |
|
49 | 49 | |
50 | - $files = []; |
|
51 | - // Clean up duplicates from array |
|
52 | - if (is_array($mimetypeFilters) && count($mimetypeFilters)) { |
|
53 | - $mimetypeFilters = array_unique($mimetypeFilters); |
|
50 | + $files = []; |
|
51 | + // Clean up duplicates from array |
|
52 | + if (is_array($mimetypeFilters) && count($mimetypeFilters)) { |
|
53 | + $mimetypeFilters = array_unique($mimetypeFilters); |
|
54 | 54 | |
55 | - if (!in_array('httpd/unix-directory', $mimetypeFilters)) { |
|
56 | - // append folder filter to be able to browse folders |
|
57 | - $mimetypeFilters[] = 'httpd/unix-directory'; |
|
58 | - } |
|
55 | + if (!in_array('httpd/unix-directory', $mimetypeFilters)) { |
|
56 | + // append folder filter to be able to browse folders |
|
57 | + $mimetypeFilters[] = 'httpd/unix-directory'; |
|
58 | + } |
|
59 | 59 | |
60 | - // create filelist with mimetype filter - as getFiles only supports on |
|
61 | - // mimetype filter at once we will filter this folder for each |
|
62 | - // mimetypeFilter |
|
63 | - foreach ($mimetypeFilters as $mimetypeFilter) { |
|
64 | - $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter)); |
|
65 | - } |
|
60 | + // create filelist with mimetype filter - as getFiles only supports on |
|
61 | + // mimetype filter at once we will filter this folder for each |
|
62 | + // mimetypeFilter |
|
63 | + foreach ($mimetypeFilters as $mimetypeFilter) { |
|
64 | + $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter)); |
|
65 | + } |
|
66 | 66 | |
67 | - // sort the files accordingly |
|
68 | - $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection); |
|
69 | - } else { |
|
70 | - // create file list without mimetype filter |
|
71 | - $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); |
|
72 | - } |
|
67 | + // sort the files accordingly |
|
68 | + $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection); |
|
69 | + } else { |
|
70 | + // create file list without mimetype filter |
|
71 | + $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); |
|
72 | + } |
|
73 | 73 | |
74 | - $files = \OCA\Files\Helper::populateTags($files); |
|
75 | - $data['directory'] = $dir; |
|
76 | - $data['files'] = \OCA\Files\Helper::formatFileInfos($files); |
|
77 | - $data['permissions'] = $permissions; |
|
74 | + $files = \OCA\Files\Helper::populateTags($files); |
|
75 | + $data['directory'] = $dir; |
|
76 | + $data['files'] = \OCA\Files\Helper::formatFileInfos($files); |
|
77 | + $data['permissions'] = $permissions; |
|
78 | 78 | |
79 | - OCP\JSON::success(array('data' => $data)); |
|
79 | + OCP\JSON::success(array('data' => $data)); |
|
80 | 80 | } catch (\OCP\Files\StorageNotAvailableException $e) { |
81 | - \OCP\Util::logException('files', $e); |
|
82 | - OCP\JSON::error(array( |
|
83 | - 'data' => array( |
|
84 | - 'exception' => '\OCP\Files\StorageNotAvailableException', |
|
85 | - 'message' => $l->t('Storage not available') |
|
86 | - ) |
|
87 | - )); |
|
81 | + \OCP\Util::logException('files', $e); |
|
82 | + OCP\JSON::error(array( |
|
83 | + 'data' => array( |
|
84 | + 'exception' => '\OCP\Files\StorageNotAvailableException', |
|
85 | + 'message' => $l->t('Storage not available') |
|
86 | + ) |
|
87 | + )); |
|
88 | 88 | } catch (\OCP\Files\StorageInvalidException $e) { |
89 | - \OCP\Util::logException('files', $e); |
|
90 | - OCP\JSON::error(array( |
|
91 | - 'data' => array( |
|
92 | - 'exception' => '\OCP\Files\StorageInvalidException', |
|
93 | - 'message' => $l->t('Storage invalid') |
|
94 | - ) |
|
95 | - )); |
|
89 | + \OCP\Util::logException('files', $e); |
|
90 | + OCP\JSON::error(array( |
|
91 | + 'data' => array( |
|
92 | + 'exception' => '\OCP\Files\StorageInvalidException', |
|
93 | + 'message' => $l->t('Storage invalid') |
|
94 | + ) |
|
95 | + )); |
|
96 | 96 | } catch (\Exception $e) { |
97 | - \OCP\Util::logException('files', $e); |
|
98 | - OCP\JSON::error(array( |
|
99 | - 'data' => array( |
|
100 | - 'exception' => '\Exception', |
|
101 | - 'message' => $l->t('Unknown error') |
|
102 | - ) |
|
103 | - )); |
|
97 | + \OCP\Util::logException('files', $e); |
|
98 | + OCP\JSON::error(array( |
|
99 | + 'data' => array( |
|
100 | + 'exception' => '\Exception', |
|
101 | + 'message' => $l->t('Unknown error') |
|
102 | + ) |
|
103 | + )); |
|
104 | 104 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $files_list = json_decode($files); |
38 | 38 | // in case we get only a single file |
39 | 39 | if (!is_array($files_list)) { |
40 | - $files_list = array($files); |
|
40 | + $files_list = array($files); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | * alphanumeric characters |
47 | 47 | */ |
48 | 48 | if(isset($_GET['downloadStartSecret']) |
49 | - && !isset($_GET['downloadStartSecret'][32]) |
|
50 | - && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) { |
|
51 | - setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/'); |
|
49 | + && !isset($_GET['downloadStartSecret'][32]) |
|
50 | + && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) { |
|
51 | + setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | $server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' ); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * Http range requests support |
58 | 58 | */ |
59 | 59 | if (isset($_SERVER['HTTP_RANGE'])) { |
60 | - $server_params['range'] = \OC::$server->getRequest()->getHeader('Range'); |
|
60 | + $server_params['range'] = \OC::$server->getRequest()->getHeader('Range'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | OC_Files::get($dir, $files_list, $server_params); |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | OCP\User::checkLoggedIn(); |
32 | 32 | \OC::$server->getSession()->close(); |
33 | 33 | |
34 | -$files = isset($_GET['files']) ? (string)$_GET['files'] : ''; |
|
35 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
34 | +$files = isset($_GET['files']) ? (string) $_GET['files'] : ''; |
|
35 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
36 | 36 | |
37 | 37 | $files_list = json_decode($files); |
38 | 38 | // in case we get only a single file |
@@ -45,13 +45,13 @@ discard block |
||
45 | 45 | * the content must not be longer than 32 characters and must only contain |
46 | 46 | * alphanumeric characters |
47 | 47 | */ |
48 | -if(isset($_GET['downloadStartSecret']) |
|
48 | +if (isset($_GET['downloadStartSecret']) |
|
49 | 49 | && !isset($_GET['downloadStartSecret'][32]) |
50 | 50 | && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) { |
51 | 51 | setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/'); |
52 | 52 | } |
53 | 53 | |
54 | -$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() == 'HEAD' ); |
|
54 | +$server_params = array('head' => \OC::$server->getRequest()->getMethod() == 'HEAD'); |
|
55 | 55 | |
56 | 56 | /** |
57 | 57 | * Http range requests support |
@@ -27,22 +27,22 @@ |
||
27 | 27 | namespace OCA\Files; |
28 | 28 | |
29 | 29 | class App { |
30 | - /** |
|
31 | - * @var \OCP\INavigationManager |
|
32 | - */ |
|
33 | - private static $navigationManager; |
|
30 | + /** |
|
31 | + * @var \OCP\INavigationManager |
|
32 | + */ |
|
33 | + private static $navigationManager; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Returns the app's navigation manager |
|
37 | - * |
|
38 | - * @return \OCP\INavigationManager |
|
39 | - */ |
|
40 | - public static function getNavigationManager() { |
|
41 | - // TODO: move this into a service in the Application class |
|
42 | - if (self::$navigationManager === null) { |
|
43 | - self::$navigationManager = new \OC\NavigationManager(); |
|
44 | - } |
|
45 | - return self::$navigationManager; |
|
46 | - } |
|
35 | + /** |
|
36 | + * Returns the app's navigation manager |
|
37 | + * |
|
38 | + * @return \OCP\INavigationManager |
|
39 | + */ |
|
40 | + public static function getNavigationManager() { |
|
41 | + // TODO: move this into a service in the Application class |
|
42 | + if (self::$navigationManager === null) { |
|
43 | + self::$navigationManager = new \OC\NavigationManager(); |
|
44 | + } |
|
45 | + return self::$navigationManager; |
|
46 | + } |
|
47 | 47 | |
48 | 48 | } |
@@ -29,23 +29,23 @@ |
||
29 | 29 | use OCP\Util; |
30 | 30 | |
31 | 31 | class SettingsController extends Controller { |
32 | - public function __construct($appName, IRequest $request) { |
|
33 | - parent::__construct($appName, $request); |
|
34 | - } |
|
32 | + public function __construct($appName, IRequest $request) { |
|
33 | + parent::__construct($appName, $request); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $maxUploadSize |
|
38 | - * @return JSONResponse |
|
39 | - */ |
|
40 | - public function setMaxUploadSize($maxUploadSize) { |
|
41 | - $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); |
|
36 | + /** |
|
37 | + * @param string $maxUploadSize |
|
38 | + * @return JSONResponse |
|
39 | + */ |
|
40 | + public function setMaxUploadSize($maxUploadSize) { |
|
41 | + $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); |
|
42 | 42 | |
43 | - if ($setMaxSize === false) { |
|
44 | - return new JSONResponse([], Http::STATUS_BAD_REQUEST); |
|
45 | - } else { |
|
46 | - return new JSONResponse([ |
|
47 | - 'maxUploadSize' => Util::humanFileSize($setMaxSize) |
|
48 | - ]); |
|
49 | - } |
|
50 | - } |
|
43 | + if ($setMaxSize === false) { |
|
44 | + return new JSONResponse([], Http::STATUS_BAD_REQUEST); |
|
45 | + } else { |
|
46 | + return new JSONResponse([ |
|
47 | + 'maxUploadSize' => Util::humanFileSize($setMaxSize) |
|
48 | + ]); |
|
49 | + } |
|
50 | + } |
|
51 | 51 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | use OCA\Files\Controller\ViewController; |
32 | 32 | |
33 | 33 | class Application extends App { |
34 | - public function __construct(array $urlParams=array()) { |
|
34 | + public function __construct(array $urlParams = array()) { |
|
35 | 35 | parent::__construct('files', $urlParams); |
36 | 36 | $container = $this->getContainer(); |
37 | 37 | $server = $container->getServer(); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | /** |
40 | 40 | * Controllers |
41 | 41 | */ |
42 | - $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
42 | + $container->registerService('APIController', function(IContainer $c) use ($server) { |
|
43 | 43 | return new ApiController( |
44 | 44 | $c->query('AppName'), |
45 | 45 | $c->query('Request'), |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | ); |
53 | 53 | }); |
54 | 54 | |
55 | - $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
55 | + $container->registerService('ViewController', function(IContainer $c) use ($server) { |
|
56 | 56 | return new ViewController( |
57 | 57 | $c->query('AppName'), |
58 | 58 | $c->query('Request'), |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | /** |
77 | 77 | * Services |
78 | 78 | */ |
79 | - $container->registerService('Tagger', function(IContainer $c) { |
|
79 | + $container->registerService('Tagger', function(IContainer $c) { |
|
80 | 80 | return $c->query('ServerContainer')->getTagManager()->load('files'); |
81 | 81 | }); |
82 | - $container->registerService('TagService', function(IContainer $c) { |
|
82 | + $container->registerService('TagService', function(IContainer $c) { |
|
83 | 83 | $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
84 | 84 | return new TagService( |
85 | 85 | $c->query('ServerContainer')->getUserSession(), |
@@ -31,66 +31,66 @@ |
||
31 | 31 | use OCA\Files\Controller\ViewController; |
32 | 32 | |
33 | 33 | class Application extends App { |
34 | - public function __construct(array $urlParams=array()) { |
|
35 | - parent::__construct('files', $urlParams); |
|
36 | - $container = $this->getContainer(); |
|
37 | - $server = $container->getServer(); |
|
34 | + public function __construct(array $urlParams=array()) { |
|
35 | + parent::__construct('files', $urlParams); |
|
36 | + $container = $this->getContainer(); |
|
37 | + $server = $container->getServer(); |
|
38 | 38 | |
39 | - /** |
|
40 | - * Controllers |
|
41 | - */ |
|
42 | - $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
43 | - return new ApiController( |
|
44 | - $c->query('AppName'), |
|
45 | - $c->query('Request'), |
|
46 | - $server->getUserSession(), |
|
47 | - $c->query('TagService'), |
|
48 | - $server->getPreviewManager(), |
|
49 | - $server->getShareManager(), |
|
50 | - $server->getConfig() |
|
51 | - ); |
|
52 | - }); |
|
39 | + /** |
|
40 | + * Controllers |
|
41 | + */ |
|
42 | + $container->registerService('APIController', function (IContainer $c) use ($server) { |
|
43 | + return new ApiController( |
|
44 | + $c->query('AppName'), |
|
45 | + $c->query('Request'), |
|
46 | + $server->getUserSession(), |
|
47 | + $c->query('TagService'), |
|
48 | + $server->getPreviewManager(), |
|
49 | + $server->getShareManager(), |
|
50 | + $server->getConfig() |
|
51 | + ); |
|
52 | + }); |
|
53 | 53 | |
54 | - $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
55 | - return new ViewController( |
|
56 | - $c->query('AppName'), |
|
57 | - $c->query('Request'), |
|
58 | - $server->getURLGenerator(), |
|
59 | - $server->getNavigationManager(), |
|
60 | - $c->query('L10N'), |
|
61 | - $server->getConfig(), |
|
62 | - $server->getEventDispatcher(), |
|
63 | - $server->getUserSession(), |
|
64 | - $server->getAppManager(), |
|
65 | - $server->getRootFolder() |
|
66 | - ); |
|
67 | - }); |
|
54 | + $container->registerService('ViewController', function (IContainer $c) use ($server) { |
|
55 | + return new ViewController( |
|
56 | + $c->query('AppName'), |
|
57 | + $c->query('Request'), |
|
58 | + $server->getURLGenerator(), |
|
59 | + $server->getNavigationManager(), |
|
60 | + $c->query('L10N'), |
|
61 | + $server->getConfig(), |
|
62 | + $server->getEventDispatcher(), |
|
63 | + $server->getUserSession(), |
|
64 | + $server->getAppManager(), |
|
65 | + $server->getRootFolder() |
|
66 | + ); |
|
67 | + }); |
|
68 | 68 | |
69 | - /** |
|
70 | - * Core |
|
71 | - */ |
|
72 | - $container->registerService('L10N', function(IContainer $c) { |
|
73 | - return $c->query('ServerContainer')->getL10N($c->query('AppName')); |
|
74 | - }); |
|
69 | + /** |
|
70 | + * Core |
|
71 | + */ |
|
72 | + $container->registerService('L10N', function(IContainer $c) { |
|
73 | + return $c->query('ServerContainer')->getL10N($c->query('AppName')); |
|
74 | + }); |
|
75 | 75 | |
76 | - /** |
|
77 | - * Services |
|
78 | - */ |
|
79 | - $container->registerService('Tagger', function(IContainer $c) { |
|
80 | - return $c->query('ServerContainer')->getTagManager()->load('files'); |
|
81 | - }); |
|
82 | - $container->registerService('TagService', function(IContainer $c) { |
|
83 | - $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
|
84 | - return new TagService( |
|
85 | - $c->query('ServerContainer')->getUserSession(), |
|
86 | - $c->query('Tagger'), |
|
87 | - $homeFolder |
|
88 | - ); |
|
89 | - }); |
|
76 | + /** |
|
77 | + * Services |
|
78 | + */ |
|
79 | + $container->registerService('Tagger', function(IContainer $c) { |
|
80 | + return $c->query('ServerContainer')->getTagManager()->load('files'); |
|
81 | + }); |
|
82 | + $container->registerService('TagService', function(IContainer $c) { |
|
83 | + $homeFolder = $c->query('ServerContainer')->getUserFolder(); |
|
84 | + return new TagService( |
|
85 | + $c->query('ServerContainer')->getUserSession(), |
|
86 | + $c->query('Tagger'), |
|
87 | + $homeFolder |
|
88 | + ); |
|
89 | + }); |
|
90 | 90 | |
91 | - /* |
|
91 | + /* |
|
92 | 92 | * Register capabilities |
93 | 93 | */ |
94 | - $container->registerCapability('OCA\Files\Capabilities'); |
|
95 | - } |
|
94 | + $container->registerCapability('OCA\Files\Capabilities'); |
|
95 | + } |
|
96 | 96 | } |