@@ -33,36 +33,36 @@ |
||
33 | 33 | */ |
34 | 34 | interface ISearch { |
35 | 35 | |
36 | - /** |
|
37 | - * Search all providers for $query |
|
38 | - * @param string $query |
|
39 | - * @param string[] $inApps optionally limit results to the given apps |
|
40 | - * @param int $page pages start at page 1 |
|
41 | - * @param int $size |
|
42 | - * @return array An array of OCP\Search\Result's |
|
43 | - * @since 8.0.0 |
|
44 | - */ |
|
45 | - public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30); |
|
36 | + /** |
|
37 | + * Search all providers for $query |
|
38 | + * @param string $query |
|
39 | + * @param string[] $inApps optionally limit results to the given apps |
|
40 | + * @param int $page pages start at page 1 |
|
41 | + * @param int $size |
|
42 | + * @return array An array of OCP\Search\Result's |
|
43 | + * @since 8.0.0 |
|
44 | + */ |
|
45 | + public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30); |
|
46 | 46 | |
47 | - /** |
|
48 | - * Register a new search provider to search with |
|
49 | - * @param string $class class name of a OCP\Search\Provider |
|
50 | - * @param array $options optional |
|
51 | - * @since 7.0.0 |
|
52 | - */ |
|
53 | - public function registerProvider($class, array $options = array()); |
|
47 | + /** |
|
48 | + * Register a new search provider to search with |
|
49 | + * @param string $class class name of a OCP\Search\Provider |
|
50 | + * @param array $options optional |
|
51 | + * @since 7.0.0 |
|
52 | + */ |
|
53 | + public function registerProvider($class, array $options = array()); |
|
54 | 54 | |
55 | - /** |
|
56 | - * Remove one existing search provider |
|
57 | - * @param string $provider class name of a OCP\Search\Provider |
|
58 | - * @since 7.0.0 |
|
59 | - */ |
|
60 | - public function removeProvider($provider); |
|
55 | + /** |
|
56 | + * Remove one existing search provider |
|
57 | + * @param string $provider class name of a OCP\Search\Provider |
|
58 | + * @since 7.0.0 |
|
59 | + */ |
|
60 | + public function removeProvider($provider); |
|
61 | 61 | |
62 | - /** |
|
63 | - * Remove all registered search providers |
|
64 | - * @since 7.0.0 |
|
65 | - */ |
|
66 | - public function clearProviders(); |
|
62 | + /** |
|
63 | + * Remove all registered search providers |
|
64 | + * @since 7.0.0 |
|
65 | + */ |
|
66 | + public function clearProviders(); |
|
67 | 67 | |
68 | 68 | } |
@@ -34,86 +34,86 @@ |
||
34 | 34 | */ |
35 | 35 | class Search implements ISearch { |
36 | 36 | |
37 | - private $providers = array(); |
|
38 | - private $registeredProviders = array(); |
|
37 | + private $providers = array(); |
|
38 | + private $registeredProviders = array(); |
|
39 | 39 | |
40 | - /** |
|
41 | - * Search all providers for $query |
|
42 | - * @param string $query |
|
43 | - * @param string[] $inApps optionally limit results to the given apps |
|
44 | - * @param int $page pages start at page 1 |
|
45 | - * @param int $size, 0 = all |
|
46 | - * @return array An array of OC\Search\Result's |
|
47 | - */ |
|
48 | - public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) { |
|
49 | - $this->initProviders(); |
|
50 | - $results = array(); |
|
51 | - foreach($this->providers as $provider) { |
|
52 | - /** @var $provider Provider */ |
|
53 | - if ( ! $provider->providesResultsFor($inApps) ) { |
|
54 | - continue; |
|
55 | - } |
|
56 | - if ($provider instanceof PagedProvider) { |
|
57 | - $results = array_merge($results, $provider->searchPaged($query, $page, $size)); |
|
58 | - } else if ($provider instanceof Provider) { |
|
59 | - $providerResults = $provider->search($query); |
|
60 | - if ($size > 0) { |
|
61 | - $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size); |
|
62 | - $results = array_merge($results, $slicedResults); |
|
63 | - } else { |
|
64 | - $results = array_merge($results, $providerResults); |
|
65 | - } |
|
66 | - } else { |
|
67 | - \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider)); |
|
68 | - } |
|
69 | - } |
|
70 | - return $results; |
|
71 | - } |
|
40 | + /** |
|
41 | + * Search all providers for $query |
|
42 | + * @param string $query |
|
43 | + * @param string[] $inApps optionally limit results to the given apps |
|
44 | + * @param int $page pages start at page 1 |
|
45 | + * @param int $size, 0 = all |
|
46 | + * @return array An array of OC\Search\Result's |
|
47 | + */ |
|
48 | + public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) { |
|
49 | + $this->initProviders(); |
|
50 | + $results = array(); |
|
51 | + foreach($this->providers as $provider) { |
|
52 | + /** @var $provider Provider */ |
|
53 | + if ( ! $provider->providesResultsFor($inApps) ) { |
|
54 | + continue; |
|
55 | + } |
|
56 | + if ($provider instanceof PagedProvider) { |
|
57 | + $results = array_merge($results, $provider->searchPaged($query, $page, $size)); |
|
58 | + } else if ($provider instanceof Provider) { |
|
59 | + $providerResults = $provider->search($query); |
|
60 | + if ($size > 0) { |
|
61 | + $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size); |
|
62 | + $results = array_merge($results, $slicedResults); |
|
63 | + } else { |
|
64 | + $results = array_merge($results, $providerResults); |
|
65 | + } |
|
66 | + } else { |
|
67 | + \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider)); |
|
68 | + } |
|
69 | + } |
|
70 | + return $results; |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * Remove all registered search providers |
|
75 | - */ |
|
76 | - public function clearProviders() { |
|
77 | - $this->providers = array(); |
|
78 | - $this->registeredProviders = array(); |
|
79 | - } |
|
73 | + /** |
|
74 | + * Remove all registered search providers |
|
75 | + */ |
|
76 | + public function clearProviders() { |
|
77 | + $this->providers = array(); |
|
78 | + $this->registeredProviders = array(); |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * Remove one existing search provider |
|
83 | - * @param string $provider class name of a OC\Search\Provider |
|
84 | - */ |
|
85 | - public function removeProvider($provider) { |
|
86 | - $this->registeredProviders = array_filter( |
|
87 | - $this->registeredProviders, |
|
88 | - function ($element) use ($provider) { |
|
89 | - return ($element['class'] != $provider); |
|
90 | - } |
|
91 | - ); |
|
92 | - // force regeneration of providers on next search |
|
93 | - $this->providers = array(); |
|
94 | - } |
|
81 | + /** |
|
82 | + * Remove one existing search provider |
|
83 | + * @param string $provider class name of a OC\Search\Provider |
|
84 | + */ |
|
85 | + public function removeProvider($provider) { |
|
86 | + $this->registeredProviders = array_filter( |
|
87 | + $this->registeredProviders, |
|
88 | + function ($element) use ($provider) { |
|
89 | + return ($element['class'] != $provider); |
|
90 | + } |
|
91 | + ); |
|
92 | + // force regeneration of providers on next search |
|
93 | + $this->providers = array(); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * Register a new search provider to search with |
|
98 | - * @param string $class class name of a OC\Search\Provider |
|
99 | - * @param array $options optional |
|
100 | - */ |
|
101 | - public function registerProvider($class, array $options = array()) { |
|
102 | - $this->registeredProviders[] = array('class' => $class, 'options' => $options); |
|
103 | - } |
|
96 | + /** |
|
97 | + * Register a new search provider to search with |
|
98 | + * @param string $class class name of a OC\Search\Provider |
|
99 | + * @param array $options optional |
|
100 | + */ |
|
101 | + public function registerProvider($class, array $options = array()) { |
|
102 | + $this->registeredProviders[] = array('class' => $class, 'options' => $options); |
|
103 | + } |
|
104 | 104 | |
105 | - /** |
|
106 | - * Create instances of all the registered search providers |
|
107 | - */ |
|
108 | - private function initProviders() { |
|
109 | - if( ! empty($this->providers) ) { |
|
110 | - return; |
|
111 | - } |
|
112 | - foreach($this->registeredProviders as $provider) { |
|
113 | - $class = $provider['class']; |
|
114 | - $options = $provider['options']; |
|
115 | - $this->providers[] = new $class($options); |
|
116 | - } |
|
117 | - } |
|
105 | + /** |
|
106 | + * Create instances of all the registered search providers |
|
107 | + */ |
|
108 | + private function initProviders() { |
|
109 | + if( ! empty($this->providers) ) { |
|
110 | + return; |
|
111 | + } |
|
112 | + foreach($this->registeredProviders as $provider) { |
|
113 | + $class = $provider['class']; |
|
114 | + $options = $provider['options']; |
|
115 | + $this->providers[] = new $class($options); |
|
116 | + } |
|
117 | + } |
|
118 | 118 | |
119 | 119 | } |
@@ -33,26 +33,26 @@ |
||
33 | 33 | * @package OC\Security\RateLimiting\Backend |
34 | 34 | */ |
35 | 35 | interface IBackend { |
36 | - /** |
|
37 | - * Gets the amount of attempts within the last specified seconds |
|
38 | - * |
|
39 | - * @param string $methodIdentifier Identifier for the method |
|
40 | - * @param string $userIdentifier Identifier for the user |
|
41 | - * @param int $seconds Seconds to look back at |
|
42 | - * @return int |
|
43 | - */ |
|
44 | - public function getAttempts(string $methodIdentifier, |
|
45 | - string $userIdentifier, |
|
46 | - int $seconds): int; |
|
36 | + /** |
|
37 | + * Gets the amount of attempts within the last specified seconds |
|
38 | + * |
|
39 | + * @param string $methodIdentifier Identifier for the method |
|
40 | + * @param string $userIdentifier Identifier for the user |
|
41 | + * @param int $seconds Seconds to look back at |
|
42 | + * @return int |
|
43 | + */ |
|
44 | + public function getAttempts(string $methodIdentifier, |
|
45 | + string $userIdentifier, |
|
46 | + int $seconds): int; |
|
47 | 47 | |
48 | - /** |
|
49 | - * Registers an attempt |
|
50 | - * |
|
51 | - * @param string $methodIdentifier Identifier for the method |
|
52 | - * @param string $userIdentifier Identifier for the user |
|
53 | - * @param int $period Period in seconds how long this attempt should be stored |
|
54 | - */ |
|
55 | - public function registerAttempt(string $methodIdentifier, |
|
56 | - string $userIdentifier, |
|
57 | - int $period); |
|
48 | + /** |
|
49 | + * Registers an attempt |
|
50 | + * |
|
51 | + * @param string $methodIdentifier Identifier for the method |
|
52 | + * @param string $userIdentifier Identifier for the user |
|
53 | + * @param int $period Period in seconds how long this attempt should be stored |
|
54 | + */ |
|
55 | + public function registerAttempt(string $methodIdentifier, |
|
56 | + string $userIdentifier, |
|
57 | + int $period); |
|
58 | 58 | } |
@@ -37,98 +37,98 @@ |
||
37 | 37 | * @since 8.0.0 |
38 | 38 | */ |
39 | 39 | class Template extends \OC_Template { |
40 | - /** |
|
41 | - * Make OC_Helper::imagePath available as a simple function |
|
42 | - * |
|
43 | - * @see \OCP\IURLGenerator::imagePath |
|
44 | - * |
|
45 | - * @param string $app |
|
46 | - * @param string $image |
|
47 | - * @return string to the image |
|
48 | - * @since 8.0.0 |
|
49 | - * @suppress PhanDeprecatedFunction |
|
50 | - */ |
|
51 | - public static function image_path($app, $image) { |
|
52 | - return \image_path($app, $image); |
|
53 | - } |
|
40 | + /** |
|
41 | + * Make OC_Helper::imagePath available as a simple function |
|
42 | + * |
|
43 | + * @see \OCP\IURLGenerator::imagePath |
|
44 | + * |
|
45 | + * @param string $app |
|
46 | + * @param string $image |
|
47 | + * @return string to the image |
|
48 | + * @since 8.0.0 |
|
49 | + * @suppress PhanDeprecatedFunction |
|
50 | + */ |
|
51 | + public static function image_path($app, $image) { |
|
52 | + return \image_path($app, $image); |
|
53 | + } |
|
54 | 54 | |
55 | 55 | |
56 | - /** |
|
57 | - * Make OC_Helper::mimetypeIcon available as a simple function |
|
58 | - * |
|
59 | - * @param string $mimetype |
|
60 | - * @return string to the image of this file type. |
|
61 | - * @since 8.0.0 |
|
62 | - * @suppress PhanDeprecatedFunction |
|
63 | - */ |
|
64 | - public static function mimetype_icon($mimetype) { |
|
65 | - return \mimetype_icon($mimetype); |
|
66 | - } |
|
56 | + /** |
|
57 | + * Make OC_Helper::mimetypeIcon available as a simple function |
|
58 | + * |
|
59 | + * @param string $mimetype |
|
60 | + * @return string to the image of this file type. |
|
61 | + * @since 8.0.0 |
|
62 | + * @suppress PhanDeprecatedFunction |
|
63 | + */ |
|
64 | + public static function mimetype_icon($mimetype) { |
|
65 | + return \mimetype_icon($mimetype); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Make preview_icon available as a simple function |
|
70 | - * |
|
71 | - * @param string $path path to file |
|
72 | - * @return string to the preview of the image |
|
73 | - * @since 8.0.0 |
|
74 | - * @suppress PhanDeprecatedFunction |
|
75 | - */ |
|
76 | - public static function preview_icon($path) { |
|
77 | - return \preview_icon($path); |
|
78 | - } |
|
68 | + /** |
|
69 | + * Make preview_icon available as a simple function |
|
70 | + * |
|
71 | + * @param string $path path to file |
|
72 | + * @return string to the preview of the image |
|
73 | + * @since 8.0.0 |
|
74 | + * @suppress PhanDeprecatedFunction |
|
75 | + */ |
|
76 | + public static function preview_icon($path) { |
|
77 | + return \preview_icon($path); |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * Make publicpreview_icon available as a simple function |
|
82 | - * Returns the path to the preview of the image. |
|
83 | - * |
|
84 | - * @param string $path of file |
|
85 | - * @param string $token |
|
86 | - * @return string link to the preview |
|
87 | - * @since 8.0.0 |
|
88 | - * @suppress PhanDeprecatedFunction |
|
89 | - */ |
|
90 | - public static function publicPreview_icon($path, $token) { |
|
91 | - return \publicPreview_icon($path, $token); |
|
92 | - } |
|
80 | + /** |
|
81 | + * Make publicpreview_icon available as a simple function |
|
82 | + * Returns the path to the preview of the image. |
|
83 | + * |
|
84 | + * @param string $path of file |
|
85 | + * @param string $token |
|
86 | + * @return string link to the preview |
|
87 | + * @since 8.0.0 |
|
88 | + * @suppress PhanDeprecatedFunction |
|
89 | + */ |
|
90 | + public static function publicPreview_icon($path, $token) { |
|
91 | + return \publicPreview_icon($path, $token); |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Make OC_Helper::humanFileSize available as a simple function |
|
96 | - * Example: 2048 to 2 kB. |
|
97 | - * |
|
98 | - * @param int $bytes in bytes |
|
99 | - * @return string size as string |
|
100 | - * @since 8.0.0 |
|
101 | - * @suppress PhanDeprecatedFunction |
|
102 | - */ |
|
103 | - public static function human_file_size($bytes) { |
|
104 | - return \human_file_size($bytes); |
|
105 | - } |
|
94 | + /** |
|
95 | + * Make OC_Helper::humanFileSize available as a simple function |
|
96 | + * Example: 2048 to 2 kB. |
|
97 | + * |
|
98 | + * @param int $bytes in bytes |
|
99 | + * @return string size as string |
|
100 | + * @since 8.0.0 |
|
101 | + * @suppress PhanDeprecatedFunction |
|
102 | + */ |
|
103 | + public static function human_file_size($bytes) { |
|
104 | + return \human_file_size($bytes); |
|
105 | + } |
|
106 | 106 | |
107 | - /** |
|
108 | - * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" |
|
109 | - * |
|
110 | - * @param int $timestamp unix timestamp |
|
111 | - * @param boolean $dateOnly |
|
112 | - * @return string human readable interpretation of the timestamp |
|
113 | - * @since 8.0.0 |
|
114 | - * @suppress PhanDeprecatedFunction |
|
115 | - * @suppress PhanTypeMismatchArgument |
|
116 | - */ |
|
117 | - public static function relative_modified_date($timestamp, $dateOnly = false) { |
|
118 | - return \relative_modified_date($timestamp, null, $dateOnly); |
|
119 | - } |
|
107 | + /** |
|
108 | + * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" |
|
109 | + * |
|
110 | + * @param int $timestamp unix timestamp |
|
111 | + * @param boolean $dateOnly |
|
112 | + * @return string human readable interpretation of the timestamp |
|
113 | + * @since 8.0.0 |
|
114 | + * @suppress PhanDeprecatedFunction |
|
115 | + * @suppress PhanTypeMismatchArgument |
|
116 | + */ |
|
117 | + public static function relative_modified_date($timestamp, $dateOnly = false) { |
|
118 | + return \relative_modified_date($timestamp, null, $dateOnly); |
|
119 | + } |
|
120 | 120 | |
121 | - /** |
|
122 | - * Generate html code for an options block. |
|
123 | - * |
|
124 | - * @param array $options the options |
|
125 | - * @param mixed $selected which one is selected? |
|
126 | - * @param array $params the parameters |
|
127 | - * @return string html options |
|
128 | - * @since 8.0.0 |
|
129 | - * @suppress PhanDeprecatedFunction |
|
130 | - */ |
|
131 | - public static function html_select_options($options, $selected, $params=array()) { |
|
132 | - return \html_select_options($options, $selected, $params); |
|
133 | - } |
|
121 | + /** |
|
122 | + * Generate html code for an options block. |
|
123 | + * |
|
124 | + * @param array $options the options |
|
125 | + * @param mixed $selected which one is selected? |
|
126 | + * @param array $params the parameters |
|
127 | + * @return string html options |
|
128 | + * @since 8.0.0 |
|
129 | + * @suppress PhanDeprecatedFunction |
|
130 | + */ |
|
131 | + public static function html_select_options($options, $selected, $params=array()) { |
|
132 | + return \html_select_options($options, $selected, $params); |
|
133 | + } |
|
134 | 134 | } |
@@ -33,31 +33,31 @@ |
||
33 | 33 | * @package OCA\UpdateNotification |
34 | 34 | */ |
35 | 35 | class ResetTokenBackgroundJob extends TimedJob { |
36 | - /** @var IConfig */ |
|
37 | - private $config; |
|
38 | - /** @var ITimeFactory */ |
|
39 | - private $timeFactory; |
|
36 | + /** @var IConfig */ |
|
37 | + private $config; |
|
38 | + /** @var ITimeFactory */ |
|
39 | + private $timeFactory; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IConfig $config |
|
43 | - * @param ITimeFactory $timeFactory |
|
44 | - */ |
|
45 | - public function __construct(IConfig $config, |
|
46 | - ITimeFactory $timeFactory) { |
|
47 | - // Run all 10 minutes |
|
48 | - $this->setInterval(60 * 10); |
|
49 | - $this->config = $config; |
|
50 | - $this->timeFactory = $timeFactory; |
|
51 | - } |
|
41 | + /** |
|
42 | + * @param IConfig $config |
|
43 | + * @param ITimeFactory $timeFactory |
|
44 | + */ |
|
45 | + public function __construct(IConfig $config, |
|
46 | + ITimeFactory $timeFactory) { |
|
47 | + // Run all 10 minutes |
|
48 | + $this->setInterval(60 * 10); |
|
49 | + $this->config = $config; |
|
50 | + $this->timeFactory = $timeFactory; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param $argument |
|
55 | - */ |
|
56 | - protected function run($argument) { |
|
57 | - // Delete old tokens after 2 days |
|
58 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
59 | - $this->config->deleteSystemValue('updater.secret'); |
|
60 | - } |
|
61 | - } |
|
53 | + /** |
|
54 | + * @param $argument |
|
55 | + */ |
|
56 | + protected function run($argument) { |
|
57 | + // Delete old tokens after 2 days |
|
58 | + if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
59 | + $this->config->deleteSystemValue('updater.secret'); |
|
60 | + } |
|
61 | + } |
|
62 | 62 | |
63 | 63 | } |
@@ -35,89 +35,89 @@ |
||
35 | 35 | |
36 | 36 | class AvatarHome implements ICollection { |
37 | 37 | |
38 | - /** @var array */ |
|
39 | - private $principalInfo; |
|
40 | - /** @var IAvatarManager */ |
|
41 | - private $avatarManager; |
|
42 | - |
|
43 | - /** |
|
44 | - * AvatarHome constructor. |
|
45 | - * |
|
46 | - * @param array $principalInfo |
|
47 | - * @param IAvatarManager $avatarManager |
|
48 | - */ |
|
49 | - public function __construct($principalInfo, IAvatarManager $avatarManager) { |
|
50 | - $this->principalInfo = $principalInfo; |
|
51 | - $this->avatarManager = $avatarManager; |
|
52 | - } |
|
53 | - |
|
54 | - public function createFile($name, $data = null) { |
|
55 | - throw new Forbidden('Permission denied to create a file'); |
|
56 | - } |
|
57 | - |
|
58 | - public function createDirectory($name) { |
|
59 | - throw new Forbidden('Permission denied to create a folder'); |
|
60 | - } |
|
61 | - |
|
62 | - public function getChild($name) { |
|
63 | - $elements = pathinfo($name); |
|
64 | - $ext = isset($elements['extension']) ? $elements['extension'] : ''; |
|
65 | - $size = (int)(isset($elements['filename']) ? $elements['filename'] : '64'); |
|
66 | - if (!in_array($ext, ['jpeg', 'png'], true)) { |
|
67 | - throw new MethodNotAllowed('File format not allowed'); |
|
68 | - } |
|
69 | - if ($size <= 0 || $size > 1024) { |
|
70 | - throw new MethodNotAllowed('Invalid image size'); |
|
71 | - } |
|
72 | - $avatar = $this->avatarManager->getAvatar($this->getName()); |
|
73 | - if (!$avatar->exists()) { |
|
74 | - throw new NotFound(); |
|
75 | - } |
|
76 | - return new AvatarNode($size, $ext, $avatar); |
|
77 | - } |
|
78 | - |
|
79 | - public function getChildren() { |
|
80 | - try { |
|
81 | - return [ |
|
82 | - $this->getChild('96.jpeg') |
|
83 | - ]; |
|
84 | - } catch(NotFound $exception) { |
|
85 | - return []; |
|
86 | - } |
|
87 | - } |
|
88 | - |
|
89 | - public function childExists($name) { |
|
90 | - try { |
|
91 | - $ret = $this->getChild($name); |
|
92 | - return $ret !== null; |
|
93 | - } catch (NotFound $ex) { |
|
94 | - return false; |
|
95 | - } catch (MethodNotAllowed $ex) { |
|
96 | - return false; |
|
97 | - } |
|
98 | - } |
|
99 | - |
|
100 | - public function delete() { |
|
101 | - throw new Forbidden('Permission denied to delete this folder'); |
|
102 | - } |
|
103 | - |
|
104 | - public function getName() { |
|
105 | - list(,$name) = Uri\split($this->principalInfo['uri']); |
|
106 | - return $name; |
|
107 | - } |
|
108 | - |
|
109 | - public function setName($name) { |
|
110 | - throw new Forbidden('Permission denied to rename this folder'); |
|
111 | - } |
|
112 | - |
|
113 | - /** |
|
114 | - * Returns the last modification time, as a unix timestamp |
|
115 | - * |
|
116 | - * @return int|null |
|
117 | - */ |
|
118 | - public function getLastModified() { |
|
119 | - return null; |
|
120 | - } |
|
38 | + /** @var array */ |
|
39 | + private $principalInfo; |
|
40 | + /** @var IAvatarManager */ |
|
41 | + private $avatarManager; |
|
42 | + |
|
43 | + /** |
|
44 | + * AvatarHome constructor. |
|
45 | + * |
|
46 | + * @param array $principalInfo |
|
47 | + * @param IAvatarManager $avatarManager |
|
48 | + */ |
|
49 | + public function __construct($principalInfo, IAvatarManager $avatarManager) { |
|
50 | + $this->principalInfo = $principalInfo; |
|
51 | + $this->avatarManager = $avatarManager; |
|
52 | + } |
|
53 | + |
|
54 | + public function createFile($name, $data = null) { |
|
55 | + throw new Forbidden('Permission denied to create a file'); |
|
56 | + } |
|
57 | + |
|
58 | + public function createDirectory($name) { |
|
59 | + throw new Forbidden('Permission denied to create a folder'); |
|
60 | + } |
|
61 | + |
|
62 | + public function getChild($name) { |
|
63 | + $elements = pathinfo($name); |
|
64 | + $ext = isset($elements['extension']) ? $elements['extension'] : ''; |
|
65 | + $size = (int)(isset($elements['filename']) ? $elements['filename'] : '64'); |
|
66 | + if (!in_array($ext, ['jpeg', 'png'], true)) { |
|
67 | + throw new MethodNotAllowed('File format not allowed'); |
|
68 | + } |
|
69 | + if ($size <= 0 || $size > 1024) { |
|
70 | + throw new MethodNotAllowed('Invalid image size'); |
|
71 | + } |
|
72 | + $avatar = $this->avatarManager->getAvatar($this->getName()); |
|
73 | + if (!$avatar->exists()) { |
|
74 | + throw new NotFound(); |
|
75 | + } |
|
76 | + return new AvatarNode($size, $ext, $avatar); |
|
77 | + } |
|
78 | + |
|
79 | + public function getChildren() { |
|
80 | + try { |
|
81 | + return [ |
|
82 | + $this->getChild('96.jpeg') |
|
83 | + ]; |
|
84 | + } catch(NotFound $exception) { |
|
85 | + return []; |
|
86 | + } |
|
87 | + } |
|
88 | + |
|
89 | + public function childExists($name) { |
|
90 | + try { |
|
91 | + $ret = $this->getChild($name); |
|
92 | + return $ret !== null; |
|
93 | + } catch (NotFound $ex) { |
|
94 | + return false; |
|
95 | + } catch (MethodNotAllowed $ex) { |
|
96 | + return false; |
|
97 | + } |
|
98 | + } |
|
99 | + |
|
100 | + public function delete() { |
|
101 | + throw new Forbidden('Permission denied to delete this folder'); |
|
102 | + } |
|
103 | + |
|
104 | + public function getName() { |
|
105 | + list(,$name) = Uri\split($this->principalInfo['uri']); |
|
106 | + return $name; |
|
107 | + } |
|
108 | + |
|
109 | + public function setName($name) { |
|
110 | + throw new Forbidden('Permission denied to rename this folder'); |
|
111 | + } |
|
112 | + |
|
113 | + /** |
|
114 | + * Returns the last modification time, as a unix timestamp |
|
115 | + * |
|
116 | + * @return int|null |
|
117 | + */ |
|
118 | + public function getLastModified() { |
|
119 | + return null; |
|
120 | + } |
|
121 | 121 | |
122 | 122 | |
123 | 123 | } |
@@ -23,19 +23,19 @@ |
||
23 | 23 | // WARNING: this should be moved to proper AppFramework handling |
24 | 24 | // Check if we are a user |
25 | 25 | if (!\OC::$server->getUserSession()->isLoggedIn()) { |
26 | - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( |
|
27 | - 'core.login.showLoginForm', |
|
28 | - [ |
|
29 | - 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), |
|
30 | - ] |
|
31 | - ) |
|
32 | - ); |
|
33 | - exit(); |
|
26 | + header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( |
|
27 | + 'core.login.showLoginForm', |
|
28 | + [ |
|
29 | + 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), |
|
30 | + ] |
|
31 | + ) |
|
32 | + ); |
|
33 | + exit(); |
|
34 | 34 | } |
35 | 35 | // Redirect to 2FA challenge selection if 2FA challenge was not solved yet |
36 | 36 | if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) { |
37 | - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); |
|
38 | - exit(); |
|
37 | + header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge')); |
|
38 | + exit(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $tmpl = new OCP\Template('systemtags', 'list', ''); |
@@ -30,35 +30,35 @@ |
||
30 | 30 | * @since 12.0.0 |
31 | 31 | */ |
32 | 32 | interface ICloudId { |
33 | - /** |
|
34 | - * The remote cloud id |
|
35 | - * |
|
36 | - * @return string |
|
37 | - * @since 12.0.0 |
|
38 | - */ |
|
39 | - public function getId(): string; |
|
33 | + /** |
|
34 | + * The remote cloud id |
|
35 | + * |
|
36 | + * @return string |
|
37 | + * @since 12.0.0 |
|
38 | + */ |
|
39 | + public function getId(): string; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Get a clean representation of the cloud id for display |
|
43 | - * |
|
44 | - * @return string |
|
45 | - * @since 12.0.0 |
|
46 | - */ |
|
47 | - public function getDisplayId(): string; |
|
41 | + /** |
|
42 | + * Get a clean representation of the cloud id for display |
|
43 | + * |
|
44 | + * @return string |
|
45 | + * @since 12.0.0 |
|
46 | + */ |
|
47 | + public function getDisplayId(): string; |
|
48 | 48 | |
49 | - /** |
|
50 | - * The username on the remote server |
|
51 | - * |
|
52 | - * @return string |
|
53 | - * @since 12.0.0 |
|
54 | - */ |
|
55 | - public function getUser(): string; |
|
49 | + /** |
|
50 | + * The username on the remote server |
|
51 | + * |
|
52 | + * @return string |
|
53 | + * @since 12.0.0 |
|
54 | + */ |
|
55 | + public function getUser(): string; |
|
56 | 56 | |
57 | - /** |
|
58 | - * The base address of the remote server |
|
59 | - * |
|
60 | - * @return string |
|
61 | - * @since 12.0.0 |
|
62 | - */ |
|
63 | - public function getRemote(): string; |
|
57 | + /** |
|
58 | + * The base address of the remote server |
|
59 | + * |
|
60 | + * @return string |
|
61 | + * @since 12.0.0 |
|
62 | + */ |
|
63 | + public function getRemote(): string; |
|
64 | 64 | } |
@@ -31,33 +31,33 @@ |
||
31 | 31 | * @since 12.0.0 |
32 | 32 | */ |
33 | 33 | interface ICloudIdManager { |
34 | - /** |
|
35 | - * @param string $cloudId |
|
36 | - * @return ICloudId |
|
37 | - * @throws \InvalidArgumentException |
|
38 | - * |
|
39 | - * @since 12.0.0 |
|
40 | - */ |
|
41 | - public function resolveCloudId(string $cloudId): ICloudId; |
|
34 | + /** |
|
35 | + * @param string $cloudId |
|
36 | + * @return ICloudId |
|
37 | + * @throws \InvalidArgumentException |
|
38 | + * |
|
39 | + * @since 12.0.0 |
|
40 | + */ |
|
41 | + public function resolveCloudId(string $cloudId): ICloudId; |
|
42 | 42 | |
43 | - /** |
|
44 | - * Get the cloud id for a remote user |
|
45 | - * |
|
46 | - * @param string $user |
|
47 | - * @param string $remote |
|
48 | - * @return ICloudId |
|
49 | - * |
|
50 | - * @since 12.0.0 |
|
51 | - */ |
|
52 | - public function getCloudId(string $user, string $remote): ICloudId; |
|
43 | + /** |
|
44 | + * Get the cloud id for a remote user |
|
45 | + * |
|
46 | + * @param string $user |
|
47 | + * @param string $remote |
|
48 | + * @return ICloudId |
|
49 | + * |
|
50 | + * @since 12.0.0 |
|
51 | + */ |
|
52 | + public function getCloudId(string $user, string $remote): ICloudId; |
|
53 | 53 | |
54 | - /** |
|
55 | - * Check if the input is a correctly formatted cloud id |
|
56 | - * |
|
57 | - * @param string $cloudId |
|
58 | - * @return bool |
|
59 | - * |
|
60 | - * @since 12.0.0 |
|
61 | - */ |
|
62 | - public function isValidCloudId(string $cloudId): bool; |
|
54 | + /** |
|
55 | + * Check if the input is a correctly formatted cloud id |
|
56 | + * |
|
57 | + * @param string $cloudId |
|
58 | + * @return bool |
|
59 | + * |
|
60 | + * @since 12.0.0 |
|
61 | + */ |
|
62 | + public function isValidCloudId(string $cloudId): bool; |
|
63 | 63 | } |