@@ -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 | } |
@@ -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); |
@@ -30,11 +30,11 @@ |
||
30 | 30 | $filename = $_GET["file"]; |
31 | 31 | |
32 | 32 | if(!\OC\Files\Filesystem::file_exists($filename)) { |
33 | - header("HTTP/1.0 404 Not Found"); |
|
34 | - $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | - $tmpl->assign('file', $filename); |
|
36 | - $tmpl->printPage(); |
|
37 | - exit; |
|
33 | + header("HTTP/1.0 404 Not Found"); |
|
34 | + $tmpl = new OCP\Template( '', '404', 'guest' ); |
|
35 | + $tmpl->assign('file', $filename); |
|
36 | + $tmpl->printPage(); |
|
37 | + exit; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename )); |
@@ -9,19 +9,19 @@ |
||
9 | 9 | <p> |
10 | 10 | <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser"> |
11 | 11 | <?php if(count($_['serverConfigurationPrefixes']) === 0 ) { |
12 | - ?> |
|
12 | + ?> |
|
13 | 13 | <option value="" selected><?php p($l->t('1. Server'));?></option>'); |
14 | 14 | <?php |
15 | - } else { |
|
16 | - $i = 1; |
|
17 | - $sel = ' selected'; |
|
18 | - foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
19 | - ?> |
|
15 | + } else { |
|
16 | + $i = 1; |
|
17 | + $sel = ' selected'; |
|
18 | + foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
19 | + ?> |
|
20 | 20 | <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
21 | 21 | <?php |
22 | - } |
|
23 | - } |
|
24 | - ?> |
|
22 | + } |
|
23 | + } |
|
24 | + ?> |
|
25 | 25 | </select> |
26 | 26 | <button type="button" id="ldap_action_add_configuration" |
27 | 27 | name="ldap_action_add_configuration" class="icon-add icon-default-style" |
@@ -34,16 +34,16 @@ |
||
34 | 34 | $subject = (string)$_POST['ldap_clear_mapping']; |
35 | 35 | $mapping = null; |
36 | 36 | if($subject === 'user') { |
37 | - $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
37 | + $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
38 | 38 | } else if($subject === 'group') { |
39 | - $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
39 | + $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
40 | 40 | } |
41 | 41 | try { |
42 | - if(is_null($mapping) || !$mapping->clear()) { |
|
43 | - $l = \OC::$server->getL10N('user_ldap'); |
|
44 | - throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | - } |
|
46 | - OCP\JSON::success(); |
|
42 | + if(is_null($mapping) || !$mapping->clear()) { |
|
43 | + $l = \OC::$server->getL10N('user_ldap'); |
|
44 | + throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | + } |
|
46 | + OCP\JSON::success(); |
|
47 | 47 | } catch (\Exception $e) { |
48 | - OCP\JSON::error(array('message' => $e->getMessage())); |
|
48 | + OCP\JSON::error(array('message' => $e->getMessage())); |
|
49 | 49 | } |
@@ -33,42 +33,42 @@ |
||
33 | 33 | |
34 | 34 | // FIXME: currently hard-coded to Dropbox OAuth |
35 | 35 | if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { |
36 | - $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | - if (isset($_POST['step'])) { |
|
38 | - switch ($_POST['step']) { |
|
39 | - case 1: |
|
40 | - try { |
|
41 | - if (isset($_POST['callback'])) { |
|
42 | - $callback = (string)$_POST['callback']; |
|
43 | - } else { |
|
44 | - $callback = null; |
|
45 | - } |
|
46 | - $token = $oauth->getRequestToken(); |
|
47 | - OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | - 'request_token' => $token['token'], |
|
49 | - 'request_token_secret' => $token['token_secret']))); |
|
50 | - } catch (Exception $exception) { |
|
51 | - OCP\JSON::error(array('data' => array('message' => |
|
52 | - $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | - )); |
|
54 | - } |
|
55 | - break; |
|
56 | - case 2: |
|
57 | - if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | - try { |
|
59 | - $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | - $token = $oauth->getAccessToken(); |
|
61 | - OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | - 'access_token_secret' => $token['token_secret'])); |
|
63 | - } catch (Exception $exception) { |
|
64 | - OCP\JSON::error(array('data' => array('message' => |
|
65 | - $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | - )); |
|
67 | - } |
|
68 | - } |
|
69 | - break; |
|
70 | - } |
|
71 | - } |
|
36 | + $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | + if (isset($_POST['step'])) { |
|
38 | + switch ($_POST['step']) { |
|
39 | + case 1: |
|
40 | + try { |
|
41 | + if (isset($_POST['callback'])) { |
|
42 | + $callback = (string)$_POST['callback']; |
|
43 | + } else { |
|
44 | + $callback = null; |
|
45 | + } |
|
46 | + $token = $oauth->getRequestToken(); |
|
47 | + OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | + 'request_token' => $token['token'], |
|
49 | + 'request_token_secret' => $token['token_secret']))); |
|
50 | + } catch (Exception $exception) { |
|
51 | + OCP\JSON::error(array('data' => array('message' => |
|
52 | + $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | + )); |
|
54 | + } |
|
55 | + break; |
|
56 | + case 2: |
|
57 | + if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | + try { |
|
59 | + $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | + $token = $oauth->getAccessToken(); |
|
61 | + OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | + 'access_token_secret' => $token['token_secret'])); |
|
63 | + } catch (Exception $exception) { |
|
64 | + OCP\JSON::error(array('data' => array('message' => |
|
65 | + $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | + )); |
|
67 | + } |
|
68 | + } |
|
69 | + break; |
|
70 | + } |
|
71 | + } |
|
72 | 72 | } else { |
73 | - OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
73 | + OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
74 | 74 | } |
@@ -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); |
@@ -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'); |
@@ -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 | } |