@@ -30,23 +30,23 @@ |
||
30 | 30 | $limit = null; |
31 | 31 | $offset = null; |
32 | 32 | if (isset($_GET['pattern'])) { |
33 | - $pattern = (string)$_GET['pattern']; |
|
33 | + $pattern = (string)$_GET['pattern']; |
|
34 | 34 | } |
35 | 35 | if (isset($_GET['limit'])) { |
36 | - $limit = (int)$_GET['limit']; |
|
36 | + $limit = (int)$_GET['limit']; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['offset'])) { |
39 | - $offset = (int)$_GET['offset']; |
|
39 | + $offset = (int)$_GET['offset']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $groups = []; |
43 | 43 | foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) { |
44 | - $groups[$group->getGID()] = $group->getGID(); |
|
44 | + $groups[$group->getGID()] = $group->getGID(); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $users = []; |
48 | 48 | foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) { |
49 | - $users[$user->getUID()] = $user->getDisplayName(); |
|
49 | + $users[$user->getUID()] = $user->getDisplayName(); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | $results = array('groups' => $groups, 'users' => $users); |
@@ -30,13 +30,13 @@ |
||
30 | 30 | $limit = null; |
31 | 31 | $offset = null; |
32 | 32 | if (isset($_GET['pattern'])) { |
33 | - $pattern = (string)$_GET['pattern']; |
|
33 | + $pattern = (string) $_GET['pattern']; |
|
34 | 34 | } |
35 | 35 | if (isset($_GET['limit'])) { |
36 | - $limit = (int)$_GET['limit']; |
|
36 | + $limit = (int) $_GET['limit']; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['offset'])) { |
39 | - $offset = (int)$_GET['offset']; |
|
39 | + $offset = (int) $_GET['offset']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $groups = []; |
@@ -40,11 +40,11 @@ |
||
40 | 40 | $l = \OC::$server->getL10N('files_external'); |
41 | 41 | |
42 | 42 | \OCA\Files\App::getNavigationManager()->add([ |
43 | - "id" => 'extstoragemounts', |
|
44 | - "appname" => 'files_external', |
|
45 | - "script" => 'list.php', |
|
46 | - "order" => 30, |
|
47 | - "name" => $l->t('External storage') |
|
43 | + "id" => 'extstoragemounts', |
|
44 | + "appname" => 'files_external', |
|
45 | + "script" => 'list.php', |
|
46 | + "order" => 30, |
|
47 | + "name" => $l->t('External storage') |
|
48 | 48 | ]); |
49 | 49 | |
50 | 50 | $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter'); |
@@ -39,7 +39,7 @@ |
||
39 | 39 | OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; |
40 | 40 | OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php'; |
41 | 41 | |
42 | -require_once __DIR__ . '/../3rdparty/autoload.php'; |
|
42 | +require_once __DIR__.'/../3rdparty/autoload.php'; |
|
43 | 43 | |
44 | 44 | // register Application object singleton |
45 | 45 | \OC_Mount_Config::$app = new \OCA\Files_external\Appinfo\Application(); |
@@ -18,14 +18,14 @@ |
||
18 | 18 | <tr> |
19 | 19 | <th id='headerName' class="hidden column-name"> |
20 | 20 | <div id="headerName-container"> |
21 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
21 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
22 | 22 | </div> |
23 | 23 | </th> |
24 | 24 | <th id="headerSize" class="hidden column-size"> |
25 | 25 | <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> |
26 | 26 | </th> |
27 | 27 | <th id="headerDate" class="hidden column-mtime"> |
28 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> |
|
28 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a> |
|
29 | 29 | </th> |
30 | 30 | </tr> |
31 | 31 | </thead> |
@@ -28,9 +28,9 @@ |
||
28 | 28 | $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare'; |
29 | 29 | |
30 | 30 | if($token !== '') { |
31 | - OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token))); |
|
31 | + OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token))); |
|
32 | 32 | } else { |
33 | - header('HTTP/1.0 404 Not Found'); |
|
34 | - $tmpl = new OCP\Template('', '404', 'guest'); |
|
35 | - print_unescaped($tmpl->fetchPage()); |
|
33 | + header('HTTP/1.0 404 Not Found'); |
|
34 | + $tmpl = new OCP\Template('', '404', 'guest'); |
|
35 | + print_unescaped($tmpl->fetchPage()); |
|
36 | 36 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $token = isset($_GET['t']) ? $_GET['t'] : ''; |
28 | 28 | $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare'; |
29 | 29 | |
30 | -if($token !== '') { |
|
30 | +if ($token !== '') { |
|
31 | 31 | OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token))); |
32 | 32 | } else { |
33 | 33 | header('HTTP/1.0 404 Not Found'); |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | $application = new Application(); |
27 | 27 | $application->registerRoutes($this, ['routes' => [ |
28 | - ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | - ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
28 | + ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], |
|
29 | + ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], |
|
30 | 30 | ]]); |
@@ -26,36 +26,36 @@ |
||
26 | 26 | |
27 | 27 | (new Application())->registerRoutes($this, array('routes' => array( |
28 | 28 | |
29 | - [ |
|
30 | - 'name' => 'Recovery#adminRecovery', |
|
31 | - 'url' => '/ajax/adminRecovery', |
|
32 | - 'verb' => 'POST' |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'Settings#updatePrivateKeyPassword', |
|
36 | - 'url' => '/ajax/updatePrivateKeyPassword', |
|
37 | - 'verb' => 'POST' |
|
38 | - ], |
|
39 | - [ |
|
40 | - 'name' => 'Settings#setEncryptHomeStorage', |
|
41 | - 'url' => '/ajax/setEncryptHomeStorage', |
|
42 | - 'verb' => 'POST' |
|
43 | - ], |
|
44 | - [ |
|
45 | - 'name' => 'Recovery#changeRecoveryPassword', |
|
46 | - 'url' => '/ajax/changeRecoveryPassword', |
|
47 | - 'verb' => 'POST' |
|
48 | - ], |
|
49 | - [ |
|
50 | - 'name' => 'Recovery#userSetRecovery', |
|
51 | - 'url' => '/ajax/userSetRecovery', |
|
52 | - 'verb' => 'POST' |
|
53 | - ], |
|
54 | - [ |
|
55 | - 'name' => 'Status#getStatus', |
|
56 | - 'url' => '/ajax/getStatus', |
|
57 | - 'verb' => 'GET' |
|
58 | - ] |
|
29 | + [ |
|
30 | + 'name' => 'Recovery#adminRecovery', |
|
31 | + 'url' => '/ajax/adminRecovery', |
|
32 | + 'verb' => 'POST' |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'Settings#updatePrivateKeyPassword', |
|
36 | + 'url' => '/ajax/updatePrivateKeyPassword', |
|
37 | + 'verb' => 'POST' |
|
38 | + ], |
|
39 | + [ |
|
40 | + 'name' => 'Settings#setEncryptHomeStorage', |
|
41 | + 'url' => '/ajax/setEncryptHomeStorage', |
|
42 | + 'verb' => 'POST' |
|
43 | + ], |
|
44 | + [ |
|
45 | + 'name' => 'Recovery#changeRecoveryPassword', |
|
46 | + 'url' => '/ajax/changeRecoveryPassword', |
|
47 | + 'verb' => 'POST' |
|
48 | + ], |
|
49 | + [ |
|
50 | + 'name' => 'Recovery#userSetRecovery', |
|
51 | + 'url' => '/ajax/userSetRecovery', |
|
52 | + 'verb' => 'POST' |
|
53 | + ], |
|
54 | + [ |
|
55 | + 'name' => 'Status#getStatus', |
|
56 | + 'url' => '/ajax/getStatus', |
|
57 | + 'verb' => 'GET' |
|
58 | + ] |
|
59 | 59 | |
60 | 60 | |
61 | 61 | ))); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | $app = new Application([], $encryptionSystemReady); |
31 | 31 | if ($encryptionSystemReady) { |
32 | - $app->registerEncryptionModule(); |
|
33 | - $app->registerHooks(); |
|
34 | - $app->registerSettings(); |
|
32 | + $app->registerEncryptionModule(); |
|
33 | + $app->registerHooks(); |
|
34 | + $app->registerSettings(); |
|
35 | 35 | } |
@@ -27,26 +27,26 @@ discard block |
||
27 | 27 | |
28 | 28 | $template = new OCP\Template('encryption', 'settings-personal'); |
29 | 29 | $crypt = new \OCA\Encryption\Crypto\Crypt( |
30 | - \OC::$server->getLogger(), |
|
31 | - $userSession, |
|
32 | - \OC::$server->getConfig(), |
|
33 | - \OC::$server->getL10N('encryption')); |
|
30 | + \OC::$server->getLogger(), |
|
31 | + $userSession, |
|
32 | + \OC::$server->getConfig(), |
|
33 | + \OC::$server->getL10N('encryption')); |
|
34 | 34 | |
35 | 35 | $util = new \OCA\Encryption\Util( |
36 | - new \OC\Files\View(), |
|
37 | - $crypt, |
|
38 | - \OC::$server->getLogger(), |
|
39 | - $userSession, |
|
40 | - \OC::$server->getConfig(), |
|
41 | - \OC::$server->getUserManager()); |
|
36 | + new \OC\Files\View(), |
|
37 | + $crypt, |
|
38 | + \OC::$server->getLogger(), |
|
39 | + $userSession, |
|
40 | + \OC::$server->getConfig(), |
|
41 | + \OC::$server->getUserManager()); |
|
42 | 42 | |
43 | 43 | $keyManager = new \OCA\Encryption\KeyManager( |
44 | - \OC::$server->getEncryptionKeyStorage(), |
|
45 | - $crypt, |
|
46 | - \OC::$server->getConfig(), |
|
47 | - $userSession, |
|
48 | - $session, |
|
49 | - \OC::$server->getLogger(), $util); |
|
44 | + \OC::$server->getEncryptionKeyStorage(), |
|
45 | + $crypt, |
|
46 | + \OC::$server->getConfig(), |
|
47 | + $userSession, |
|
48 | + $session, |
|
49 | + \OC::$server->getLogger(), $util); |
|
50 | 50 | |
51 | 51 | $user = $userSession->getUser()->getUID(); |
52 | 52 | |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | $result = false; |
65 | 65 | |
66 | 66 | if ($recoveryAdminEnabled || !$privateKeySet) { |
67 | - $template->assign('recoveryEnabled', $recoveryAdminEnabled); |
|
68 | - $template->assign('recoveryEnabledForUser', $recoveryEnabledForUser); |
|
69 | - $template->assign('privateKeySet', $privateKeySet); |
|
70 | - $template->assign('initialized', $initialized); |
|
67 | + $template->assign('recoveryEnabled', $recoveryAdminEnabled); |
|
68 | + $template->assign('recoveryEnabledForUser', $recoveryEnabledForUser); |
|
69 | + $template->assign('privateKeySet', $privateKeySet); |
|
70 | + $template->assign('initialized', $initialized); |
|
71 | 71 | |
72 | - $result = $template->fetchPage(); |
|
72 | + $result = $template->fetchPage(); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | return $result; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | <label for="select_all_trash"> |
28 | 28 | <span class="hidden-visually"><?php p($l->t('Select all'))?></span> |
29 | 29 | </label> |
30 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
30 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
31 | 31 | <span id="selectedActionsList" class='selectedActions'> |
32 | 32 | <a href="" class="undelete"> |
33 | 33 | <span class="icon icon-history"></span> |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | </div> |
38 | 38 | </th> |
39 | 39 | <th id="headerDate" class="hidden column-mtime"> |
40 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Deleted' )); ?></span><span class="sort-indicator"></span></a> |
|
40 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a> |
|
41 | 41 | <span class="selectedActions"> |
42 | 42 | <a href="" class="delete-selected"> |
43 | 43 | <span><?php p($l->t('Delete'))?></span> |