@@ -28,61 +28,61 @@ |
||
28 | 28 | |
29 | 29 | class Api { |
30 | 30 | |
31 | - /** |
|
32 | - * Formats the given mount config to a mount entry. |
|
33 | - * |
|
34 | - * @param string $mountPoint mount point name, relative to the data dir |
|
35 | - * @param array $mountConfig mount config to format |
|
36 | - * |
|
37 | - * @return array entry |
|
38 | - */ |
|
39 | - private static function formatMount($mountPoint, $mountConfig) { |
|
40 | - // strip "/$user/files" from mount point |
|
41 | - $mountPoint = explode('/', trim($mountPoint, '/'), 3); |
|
42 | - $mountPoint = $mountPoint[2]; |
|
31 | + /** |
|
32 | + * Formats the given mount config to a mount entry. |
|
33 | + * |
|
34 | + * @param string $mountPoint mount point name, relative to the data dir |
|
35 | + * @param array $mountConfig mount config to format |
|
36 | + * |
|
37 | + * @return array entry |
|
38 | + */ |
|
39 | + private static function formatMount($mountPoint, $mountConfig) { |
|
40 | + // strip "/$user/files" from mount point |
|
41 | + $mountPoint = explode('/', trim($mountPoint, '/'), 3); |
|
42 | + $mountPoint = $mountPoint[2]; |
|
43 | 43 | |
44 | - // split path from mount point |
|
45 | - $path = dirname($mountPoint); |
|
46 | - if ($path === '.') { |
|
47 | - $path = ''; |
|
48 | - } |
|
44 | + // split path from mount point |
|
45 | + $path = dirname($mountPoint); |
|
46 | + if ($path === '.') { |
|
47 | + $path = ''; |
|
48 | + } |
|
49 | 49 | |
50 | - $isSystemMount = !$mountConfig['personal']; |
|
50 | + $isSystemMount = !$mountConfig['personal']; |
|
51 | 51 | |
52 | - $permissions = \OCP\Constants::PERMISSION_READ; |
|
53 | - // personal mounts can be deleted |
|
54 | - if (!$isSystemMount) { |
|
55 | - $permissions |= \OCP\Constants::PERMISSION_DELETE; |
|
56 | - } |
|
52 | + $permissions = \OCP\Constants::PERMISSION_READ; |
|
53 | + // personal mounts can be deleted |
|
54 | + if (!$isSystemMount) { |
|
55 | + $permissions |= \OCP\Constants::PERMISSION_DELETE; |
|
56 | + } |
|
57 | 57 | |
58 | - $entry = array( |
|
59 | - 'name' => basename($mountPoint), |
|
60 | - 'path' => $path, |
|
61 | - 'type' => 'dir', |
|
62 | - 'backend' => $mountConfig['backend'], |
|
63 | - 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
64 | - 'permissions' => $permissions, |
|
65 | - 'id' => $mountConfig['id'], |
|
66 | - 'class' => $mountConfig['class'] |
|
67 | - ); |
|
68 | - return $entry; |
|
69 | - } |
|
58 | + $entry = array( |
|
59 | + 'name' => basename($mountPoint), |
|
60 | + 'path' => $path, |
|
61 | + 'type' => 'dir', |
|
62 | + 'backend' => $mountConfig['backend'], |
|
63 | + 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
64 | + 'permissions' => $permissions, |
|
65 | + 'id' => $mountConfig['id'], |
|
66 | + 'class' => $mountConfig['class'] |
|
67 | + ); |
|
68 | + return $entry; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Returns the mount points visible for this user. |
|
73 | - * |
|
74 | - * @param array $params |
|
75 | - * @return \OC_OCS_Result share information |
|
76 | - */ |
|
77 | - public static function getUserMounts($params) { |
|
78 | - $entries = array(); |
|
79 | - $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
71 | + /** |
|
72 | + * Returns the mount points visible for this user. |
|
73 | + * |
|
74 | + * @param array $params |
|
75 | + * @return \OC_OCS_Result share information |
|
76 | + */ |
|
77 | + public static function getUserMounts($params) { |
|
78 | + $entries = array(); |
|
79 | + $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
80 | 80 | |
81 | - $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
|
82 | - foreach($mounts as $mountPoint => $mount) { |
|
83 | - $entries[] = self::formatMount($mountPoint, $mount); |
|
84 | - } |
|
81 | + $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
|
82 | + foreach($mounts as $mountPoint => $mount) { |
|
83 | + $entries[] = self::formatMount($mountPoint, $mount); |
|
84 | + } |
|
85 | 85 | |
86 | - return new \OC_OCS_Result($entries); |
|
87 | - } |
|
86 | + return new \OC_OCS_Result($entries); |
|
87 | + } |
|
88 | 88 | } |
@@ -28,76 +28,76 @@ |
||
28 | 28 | */ |
29 | 29 | trait IdentifierTrait { |
30 | 30 | |
31 | - /** @var string */ |
|
32 | - protected $identifier; |
|
31 | + /** @var string */ |
|
32 | + protected $identifier; |
|
33 | 33 | |
34 | - /** @var string[] */ |
|
35 | - protected $identifierAliases = []; |
|
34 | + /** @var string[] */ |
|
35 | + protected $identifierAliases = []; |
|
36 | 36 | |
37 | - /** @var IdentifierTrait */ |
|
38 | - protected $deprecateTo = null; |
|
37 | + /** @var IdentifierTrait */ |
|
38 | + protected $deprecateTo = null; |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - public function getIdentifier() { |
|
44 | - return $this->identifier; |
|
45 | - } |
|
40 | + /** |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + public function getIdentifier() { |
|
44 | + return $this->identifier; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * @param string $identifier |
|
49 | - * @return self |
|
50 | - */ |
|
51 | - public function setIdentifier($identifier) { |
|
52 | - $this->identifier = $identifier; |
|
53 | - $this->identifierAliases[] = $identifier; |
|
54 | - return $this; |
|
55 | - } |
|
47 | + /** |
|
48 | + * @param string $identifier |
|
49 | + * @return self |
|
50 | + */ |
|
51 | + public function setIdentifier($identifier) { |
|
52 | + $this->identifier = $identifier; |
|
53 | + $this->identifierAliases[] = $identifier; |
|
54 | + return $this; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @return string[] |
|
59 | - */ |
|
60 | - public function getIdentifierAliases() { |
|
61 | - return $this->identifierAliases; |
|
62 | - } |
|
57 | + /** |
|
58 | + * @return string[] |
|
59 | + */ |
|
60 | + public function getIdentifierAliases() { |
|
61 | + return $this->identifierAliases; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * @param string $alias |
|
66 | - * @return self |
|
67 | - */ |
|
68 | - public function addIdentifierAlias($alias) { |
|
69 | - $this->identifierAliases[] = $alias; |
|
70 | - return $this; |
|
71 | - } |
|
64 | + /** |
|
65 | + * @param string $alias |
|
66 | + * @return self |
|
67 | + */ |
|
68 | + public function addIdentifierAlias($alias) { |
|
69 | + $this->identifierAliases[] = $alias; |
|
70 | + return $this; |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * @return object|null |
|
75 | - */ |
|
76 | - public function getDeprecateTo() { |
|
77 | - return $this->deprecateTo; |
|
78 | - } |
|
73 | + /** |
|
74 | + * @return object|null |
|
75 | + */ |
|
76 | + public function getDeprecateTo() { |
|
77 | + return $this->deprecateTo; |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * @param object $destinationObject |
|
82 | - * @return self |
|
83 | - */ |
|
84 | - public function deprecateTo($destinationObject) { |
|
85 | - $this->deprecateTo = $destinationObject; |
|
86 | - return $this; |
|
87 | - } |
|
80 | + /** |
|
81 | + * @param object $destinationObject |
|
82 | + * @return self |
|
83 | + */ |
|
84 | + public function deprecateTo($destinationObject) { |
|
85 | + $this->deprecateTo = $destinationObject; |
|
86 | + return $this; |
|
87 | + } |
|
88 | 88 | |
89 | - /** |
|
90 | - * @return array |
|
91 | - */ |
|
92 | - public function jsonSerializeIdentifier() { |
|
93 | - $data = [ |
|
94 | - 'identifier' => $this->identifier, |
|
95 | - 'identifierAliases' => $this->identifierAliases, |
|
96 | - ]; |
|
97 | - if ($this->deprecateTo) { |
|
98 | - $data['deprecateTo'] = $this->deprecateTo->getIdentifier(); |
|
99 | - } |
|
100 | - return $data; |
|
101 | - } |
|
89 | + /** |
|
90 | + * @return array |
|
91 | + */ |
|
92 | + public function jsonSerializeIdentifier() { |
|
93 | + $data = [ |
|
94 | + 'identifier' => $this->identifier, |
|
95 | + 'identifierAliases' => $this->identifierAliases, |
|
96 | + ]; |
|
97 | + if ($this->deprecateTo) { |
|
98 | + $data['deprecateTo'] = $this->deprecateTo->getIdentifier(); |
|
99 | + } |
|
100 | + return $data; |
|
101 | + } |
|
102 | 102 | |
103 | 103 | } |
@@ -30,40 +30,40 @@ |
||
30 | 30 | * @var $this \OCP\Route\IRouter |
31 | 31 | **/ |
32 | 32 | \OC_Mount_Config::$app->registerRoutes( |
33 | - $this, |
|
34 | - array( |
|
35 | - 'resources' => array( |
|
36 | - 'global_storages' => array('url' => '/globalstorages'), |
|
37 | - 'user_storages' => array('url' => '/userstorages'), |
|
38 | - 'user_global_storages' => array('url' => '/userglobalstorages'), |
|
39 | - ), |
|
40 | - 'routes' => array( |
|
41 | - array( |
|
42 | - 'name' => 'Ajax#getSshKeys', |
|
43 | - 'url' => '/ajax/public_key.php', |
|
44 | - 'verb' => 'POST', |
|
45 | - 'requirements' => array() |
|
46 | - ), |
|
47 | - [ |
|
48 | - 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | - 'url' => '/globalcredentials', |
|
50 | - 'verb' => 'POST', |
|
51 | - ], |
|
52 | - ) |
|
53 | - ) |
|
33 | + $this, |
|
34 | + array( |
|
35 | + 'resources' => array( |
|
36 | + 'global_storages' => array('url' => '/globalstorages'), |
|
37 | + 'user_storages' => array('url' => '/userstorages'), |
|
38 | + 'user_global_storages' => array('url' => '/userglobalstorages'), |
|
39 | + ), |
|
40 | + 'routes' => array( |
|
41 | + array( |
|
42 | + 'name' => 'Ajax#getSshKeys', |
|
43 | + 'url' => '/ajax/public_key.php', |
|
44 | + 'verb' => 'POST', |
|
45 | + 'requirements' => array() |
|
46 | + ), |
|
47 | + [ |
|
48 | + 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | + 'url' => '/globalcredentials', |
|
50 | + 'verb' => 'POST', |
|
51 | + ], |
|
52 | + ) |
|
53 | + ) |
|
54 | 54 | ); |
55 | 55 | |
56 | 56 | $this->create('files_external_oauth1', 'ajax/oauth1.php') |
57 | - ->actionInclude('files_external/ajax/oauth1.php'); |
|
57 | + ->actionInclude('files_external/ajax/oauth1.php'); |
|
58 | 58 | $this->create('files_external_oauth2', 'ajax/oauth2.php') |
59 | - ->actionInclude('files_external/ajax/oauth2.php'); |
|
59 | + ->actionInclude('files_external/ajax/oauth2.php'); |
|
60 | 60 | |
61 | 61 | |
62 | 62 | $this->create('files_external_list_applicable', '/applicable') |
63 | - ->actionInclude('files_external/ajax/applicable.php'); |
|
63 | + ->actionInclude('files_external/ajax/applicable.php'); |
|
64 | 64 | |
65 | 65 | \OCP\API::register('get', |
66 | - '/apps/files_external/api/v1/mounts', |
|
67 | - array('\OCA\Files_External\Lib\Api', 'getUserMounts'), |
|
68 | - 'files_external'); |
|
66 | + '/apps/files_external/api/v1/mounts', |
|
67 | + array('\OCA\Files_External\Lib\Api', 'getUserMounts'), |
|
68 | + 'files_external'); |
|
69 | 69 |
@@ -20,10 +20,10 @@ |
||
20 | 20 | */ |
21 | 21 | |
22 | 22 | script('core', [ |
23 | - 'oc-backbone-webdav', |
|
24 | - 'systemtags/systemtags', |
|
25 | - 'systemtags/systemtagmodel', |
|
26 | - 'systemtags/systemtagscollection', |
|
23 | + 'oc-backbone-webdav', |
|
24 | + 'systemtags/systemtags', |
|
25 | + 'systemtags/systemtagmodel', |
|
26 | + 'systemtags/systemtagscollection', |
|
27 | 27 | ]); |
28 | 28 | |
29 | 29 | script('systemtags', 'admin'); |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class Setting 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 'systemtags'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'systemtags'; |
|
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('<strong>System tags</strong> for a file have been modified'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('<strong>System tags</strong> for a file have been modified'); |
|
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 50; |
|
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 50; |
|
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 |
@@ -30,30 +30,30 @@ |
||
30 | 30 | |
31 | 31 | class LastUsedController extends Controller { |
32 | 32 | |
33 | - /** @var IConfig */ |
|
34 | - protected $config; |
|
35 | - |
|
36 | - /** @var IUserSession */ |
|
37 | - protected $userSession; |
|
38 | - |
|
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param IConfig $config |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->config = $config; |
|
48 | - $this->userSession = $userSession; |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - */ |
|
54 | - public function getLastUsedTagIds() { |
|
55 | - $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | - $tagIds = json_decode($lastUsed, true); |
|
57 | - return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | - } |
|
33 | + /** @var IConfig */ |
|
34 | + protected $config; |
|
35 | + |
|
36 | + /** @var IUserSession */ |
|
37 | + protected $userSession; |
|
38 | + |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param IConfig $config |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->config = $config; |
|
48 | + $this->userSession = $userSession; |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + */ |
|
54 | + public function getLastUsedTagIds() { |
|
55 | + $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | + $tagIds = json_decode($lastUsed, true); |
|
57 | + return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | + } |
|
59 | 59 | } |
@@ -28,29 +28,29 @@ |
||
28 | 28 | |
29 | 29 | class Admin implements ISettings { |
30 | 30 | |
31 | - /** |
|
32 | - * @return TemplateResponse |
|
33 | - */ |
|
34 | - public function getForm() { |
|
35 | - return new TemplateResponse('systemtags', 'admin', [], ''); |
|
36 | - } |
|
31 | + /** |
|
32 | + * @return TemplateResponse |
|
33 | + */ |
|
34 | + public function getForm() { |
|
35 | + return new TemplateResponse('systemtags', 'admin', [], ''); |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * @return string the section ID, e.g. 'sharing' |
|
40 | - */ |
|
41 | - public function getSection() { |
|
42 | - return 'workflow'; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @return string the section ID, e.g. 'sharing' |
|
40 | + */ |
|
41 | + public function getSection() { |
|
42 | + return 'workflow'; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @return int whether the form should be rather on the top or bottom of |
|
47 | - * the admin section. The forms are arranged in ascending order of the |
|
48 | - * priority values. It is required to return a value between 0 and 100. |
|
49 | - * |
|
50 | - * E.g.: 70 |
|
51 | - */ |
|
52 | - public function getPriority() { |
|
53 | - return 70; |
|
54 | - } |
|
45 | + /** |
|
46 | + * @return int whether the form should be rather on the top or bottom of |
|
47 | + * the admin section. The forms are arranged in ascending order of the |
|
48 | + * priority values. It is required to return a value between 0 and 100. |
|
49 | + * |
|
50 | + * E.g.: 70 |
|
51 | + */ |
|
52 | + public function getPriority() { |
|
53 | + return 70; |
|
54 | + } |
|
55 | 55 | |
56 | 56 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | return [ |
25 | - 'routes' => [ |
|
26 | - ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'], |
|
27 | - ] |
|
25 | + 'routes' => [ |
|
26 | + ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'], |
|
27 | + ] |
|
28 | 28 | ]; |
@@ -48,8 +48,8 @@ |
||
48 | 48 | <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> |
49 | 49 | <div id="header-right"> |
50 | 50 | <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { |
51 | - if ($_['server2serversharing']) { |
|
52 | - ?> |
|
51 | + if ($_['server2serversharing']) { |
|
52 | + ?> |
|
53 | 53 | <span id="save" data-protected="<?php p($_['protected']) ?>" |
54 | 54 | data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>"> |
55 | 55 | <button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button> |