@@ -29,12 +29,12 @@ |
||
29 | 29 | * Wrap a command in the background job interface |
30 | 30 | */ |
31 | 31 | class CommandJob extends QueuedJob { |
32 | - protected function run($serializedCommand) { |
|
33 | - $command = unserialize($serializedCommand); |
|
34 | - if ($command instanceof ICommand) { |
|
35 | - $command->handle(); |
|
36 | - } else { |
|
37 | - throw new \InvalidArgumentException('Invalid serialized command'); |
|
38 | - } |
|
39 | - } |
|
32 | + protected function run($serializedCommand) { |
|
33 | + $command = unserialize($serializedCommand); |
|
34 | + if ($command instanceof ICommand) { |
|
35 | + $command->handle(); |
|
36 | + } else { |
|
37 | + throw new \InvalidArgumentException('Invalid serialized command'); |
|
38 | + } |
|
39 | + } |
|
40 | 40 | } |
@@ -24,23 +24,23 @@ |
||
24 | 24 | namespace OC\Template; |
25 | 25 | |
26 | 26 | class ResourceNotFoundException extends \LogicException { |
27 | - protected $resource; |
|
28 | - protected $webPath; |
|
27 | + protected $resource; |
|
28 | + protected $webPath; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @param string $resource |
|
32 | - * @param string $webPath |
|
33 | - */ |
|
34 | - public function __construct($resource, $webPath) { |
|
35 | - parent::__construct('Resource not found'); |
|
36 | - $this->resource = $resource; |
|
37 | - $this->webPath = $webPath; |
|
38 | - } |
|
30 | + /** |
|
31 | + * @param string $resource |
|
32 | + * @param string $webPath |
|
33 | + */ |
|
34 | + public function __construct($resource, $webPath) { |
|
35 | + parent::__construct('Resource not found'); |
|
36 | + $this->resource = $resource; |
|
37 | + $this->webPath = $webPath; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string |
|
42 | - */ |
|
43 | - public function getResourcePath() { |
|
44 | - return $this->webPath . '/' . $this->resource; |
|
45 | - } |
|
40 | + /** |
|
41 | + * @return string |
|
42 | + */ |
|
43 | + public function getResourcePath() { |
|
44 | + return $this->webPath . '/' . $this->resource; |
|
45 | + } |
|
46 | 46 | } |
@@ -26,37 +26,37 @@ |
||
26 | 26 | namespace OC\Template; |
27 | 27 | |
28 | 28 | class TemplateFileLocator { |
29 | - protected $dirs; |
|
30 | - private $path; |
|
29 | + protected $dirs; |
|
30 | + private $path; |
|
31 | 31 | |
32 | - /** |
|
33 | - * @param string[] $dirs |
|
34 | - */ |
|
35 | - public function __construct( $dirs ) { |
|
36 | - $this->dirs = $dirs; |
|
37 | - } |
|
32 | + /** |
|
33 | + * @param string[] $dirs |
|
34 | + */ |
|
35 | + public function __construct( $dirs ) { |
|
36 | + $this->dirs = $dirs; |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $template |
|
41 | - * @return string |
|
42 | - * @throws \Exception |
|
43 | - */ |
|
44 | - public function find( $template ) { |
|
45 | - if ($template === '') { |
|
46 | - throw new \InvalidArgumentException('Empty template name'); |
|
47 | - } |
|
39 | + /** |
|
40 | + * @param string $template |
|
41 | + * @return string |
|
42 | + * @throws \Exception |
|
43 | + */ |
|
44 | + public function find( $template ) { |
|
45 | + if ($template === '') { |
|
46 | + throw new \InvalidArgumentException('Empty template name'); |
|
47 | + } |
|
48 | 48 | |
49 | - foreach($this->dirs as $dir) { |
|
50 | - $file = $dir.$template.'.php'; |
|
51 | - if (is_file($file)) { |
|
52 | - $this->path = $dir; |
|
53 | - return $file; |
|
54 | - } |
|
55 | - } |
|
56 | - throw new \Exception('template file not found: template:'.$template); |
|
57 | - } |
|
49 | + foreach($this->dirs as $dir) { |
|
50 | + $file = $dir.$template.'.php'; |
|
51 | + if (is_file($file)) { |
|
52 | + $this->path = $dir; |
|
53 | + return $file; |
|
54 | + } |
|
55 | + } |
|
56 | + throw new \Exception('template file not found: template:'.$template); |
|
57 | + } |
|
58 | 58 | |
59 | - public function getPath() { |
|
60 | - return $this->path; |
|
61 | - } |
|
59 | + public function getPath() { |
|
60 | + return $this->path; |
|
61 | + } |
|
62 | 62 | } |
@@ -31,35 +31,35 @@ |
||
31 | 31 | * @package OC\Hooks |
32 | 32 | */ |
33 | 33 | abstract class ForwardingEmitter extends BasicEmitter { |
34 | - /** |
|
35 | - * @var \OC\Hooks\Emitter[] array |
|
36 | - */ |
|
37 | - private $forwardEmitters = array(); |
|
34 | + /** |
|
35 | + * @var \OC\Hooks\Emitter[] array |
|
36 | + */ |
|
37 | + private $forwardEmitters = array(); |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $scope |
|
41 | - * @param string $method |
|
42 | - * @param callable $callback |
|
43 | - */ |
|
44 | - public function listen($scope, $method, callable $callback) { |
|
45 | - parent::listen($scope, $method, $callback); |
|
46 | - foreach ($this->forwardEmitters as $emitter) { |
|
47 | - $emitter->listen($scope, $method, $callback); |
|
48 | - } |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param string $scope |
|
41 | + * @param string $method |
|
42 | + * @param callable $callback |
|
43 | + */ |
|
44 | + public function listen($scope, $method, callable $callback) { |
|
45 | + parent::listen($scope, $method, $callback); |
|
46 | + foreach ($this->forwardEmitters as $emitter) { |
|
47 | + $emitter->listen($scope, $method, $callback); |
|
48 | + } |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param \OC\Hooks\Emitter $emitter |
|
53 | - */ |
|
54 | - protected function forward(Emitter $emitter) { |
|
55 | - $this->forwardEmitters[] = $emitter; |
|
51 | + /** |
|
52 | + * @param \OC\Hooks\Emitter $emitter |
|
53 | + */ |
|
54 | + protected function forward(Emitter $emitter) { |
|
55 | + $this->forwardEmitters[] = $emitter; |
|
56 | 56 | |
57 | - //forward all previously connected hooks |
|
58 | - foreach ($this->listeners as $key => $listeners) { |
|
59 | - list($scope, $method) = explode('::', $key, 2); |
|
60 | - foreach ($listeners as $listener) { |
|
61 | - $emitter->listen($scope, $method, $listener); |
|
62 | - } |
|
63 | - } |
|
64 | - } |
|
57 | + //forward all previously connected hooks |
|
58 | + foreach ($this->listeners as $key => $listeners) { |
|
59 | + list($scope, $method) = explode('::', $key, 2); |
|
60 | + foreach ($listeners as $listener) { |
|
61 | + $emitter->listen($scope, $method, $listener); |
|
62 | + } |
|
63 | + } |
|
64 | + } |
|
65 | 65 | } |
@@ -30,156 +30,156 @@ |
||
30 | 30 | |
31 | 31 | |
32 | 32 | class OC_FileChunking { |
33 | - protected $info; |
|
34 | - protected $cache; |
|
35 | - |
|
36 | - /** |
|
37 | - * TTL of chunks |
|
38 | - * |
|
39 | - * @var int |
|
40 | - */ |
|
41 | - protected $ttl; |
|
42 | - |
|
43 | - static public function decodeName($name) { |
|
44 | - preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches); |
|
45 | - return $matches; |
|
46 | - } |
|
47 | - |
|
48 | - /** |
|
49 | - * @param string[] $info |
|
50 | - */ |
|
51 | - public function __construct($info) { |
|
52 | - $this->info = $info; |
|
53 | - $this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400); |
|
54 | - } |
|
55 | - |
|
56 | - public function getPrefix() { |
|
57 | - $name = $this->info['name']; |
|
58 | - $transferid = $this->info['transferid']; |
|
59 | - |
|
60 | - return $name.'-chunking-'.$transferid.'-'; |
|
61 | - } |
|
62 | - |
|
63 | - protected function getCache() { |
|
64 | - if (!isset($this->cache)) { |
|
65 | - $this->cache = new \OC\Cache\File(); |
|
66 | - } |
|
67 | - return $this->cache; |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * Stores the given $data under the given $key - the number of stored bytes is returned |
|
72 | - * |
|
73 | - * @param string $index |
|
74 | - * @param resource $data |
|
75 | - * @return int |
|
76 | - */ |
|
77 | - public function store($index, $data) { |
|
78 | - $cache = $this->getCache(); |
|
79 | - $name = $this->getPrefix().$index; |
|
80 | - $cache->set($name, $data, $this->ttl); |
|
81 | - |
|
82 | - return $cache->size($name); |
|
83 | - } |
|
84 | - |
|
85 | - public function isComplete() { |
|
86 | - $prefix = $this->getPrefix(); |
|
87 | - $cache = $this->getCache(); |
|
88 | - $chunkcount = (int)$this->info['chunkcount']; |
|
89 | - |
|
90 | - for($i=($chunkcount-1); $i >= 0; $i--) { |
|
91 | - if (!$cache->hasKey($prefix.$i)) { |
|
92 | - return false; |
|
93 | - } |
|
94 | - } |
|
95 | - |
|
96 | - return true; |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * Assembles the chunks into the file specified by the path. |
|
101 | - * Chunks are deleted afterwards. |
|
102 | - * |
|
103 | - * @param resource $f target path |
|
104 | - * |
|
105 | - * @return integer assembled file size |
|
106 | - * |
|
107 | - * @throws \OC\InsufficientStorageException when file could not be fully |
|
108 | - * assembled due to lack of free space |
|
109 | - */ |
|
110 | - public function assemble($f) { |
|
111 | - $cache = $this->getCache(); |
|
112 | - $prefix = $this->getPrefix(); |
|
113 | - $count = 0; |
|
114 | - for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
115 | - $chunk = $cache->get($prefix.$i); |
|
116 | - // remove after reading to directly save space |
|
117 | - $cache->remove($prefix.$i); |
|
118 | - $count += fwrite($f, $chunk); |
|
119 | - // let php release the memory to work around memory exhausted error with php 5.6 |
|
120 | - $chunk = null; |
|
121 | - } |
|
122 | - |
|
123 | - return $count; |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * Returns the size of the chunks already present |
|
128 | - * @return integer size in bytes |
|
129 | - */ |
|
130 | - public function getCurrentSize() { |
|
131 | - $cache = $this->getCache(); |
|
132 | - $prefix = $this->getPrefix(); |
|
133 | - $total = 0; |
|
134 | - for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
135 | - $total += $cache->size($prefix.$i); |
|
136 | - } |
|
137 | - return $total; |
|
138 | - } |
|
139 | - |
|
140 | - /** |
|
141 | - * Removes all chunks which belong to this transmission |
|
142 | - */ |
|
143 | - public function cleanup() { |
|
144 | - $cache = $this->getCache(); |
|
145 | - $prefix = $this->getPrefix(); |
|
146 | - for($i=0; $i < $this->info['chunkcount']; $i++) { |
|
147 | - $cache->remove($prefix.$i); |
|
148 | - } |
|
149 | - } |
|
150 | - |
|
151 | - /** |
|
152 | - * Removes one specific chunk |
|
153 | - * @param string $index |
|
154 | - */ |
|
155 | - public function remove($index) { |
|
156 | - $cache = $this->getCache(); |
|
157 | - $prefix = $this->getPrefix(); |
|
158 | - $cache->remove($prefix.$index); |
|
159 | - } |
|
160 | - |
|
161 | - /** |
|
162 | - * Assembles the chunks into the file specified by the path. |
|
163 | - * Also triggers the relevant hooks and proxies. |
|
164 | - * |
|
165 | - * @param \OC\Files\Storage\Storage $storage storage |
|
166 | - * @param string $path target path relative to the storage |
|
167 | - * @return bool true on success or false if file could not be created |
|
168 | - * |
|
169 | - * @throws \OC\ServerNotAvailableException |
|
170 | - */ |
|
171 | - public function file_assemble($storage, $path) { |
|
172 | - // use file_put_contents as method because that best matches what this function does |
|
173 | - if (\OC\Files\Filesystem::isValidPath($path)) { |
|
174 | - $target = $storage->fopen($path, 'w'); |
|
175 | - if ($target) { |
|
176 | - $count = $this->assemble($target); |
|
177 | - fclose($target); |
|
178 | - return $count > 0; |
|
179 | - } else { |
|
180 | - return false; |
|
181 | - } |
|
182 | - } |
|
183 | - return false; |
|
184 | - } |
|
33 | + protected $info; |
|
34 | + protected $cache; |
|
35 | + |
|
36 | + /** |
|
37 | + * TTL of chunks |
|
38 | + * |
|
39 | + * @var int |
|
40 | + */ |
|
41 | + protected $ttl; |
|
42 | + |
|
43 | + static public function decodeName($name) { |
|
44 | + preg_match('/(?P<name>.*)-chunking-(?P<transferid>\d+)-(?P<chunkcount>\d+)-(?P<index>\d+)/', $name, $matches); |
|
45 | + return $matches; |
|
46 | + } |
|
47 | + |
|
48 | + /** |
|
49 | + * @param string[] $info |
|
50 | + */ |
|
51 | + public function __construct($info) { |
|
52 | + $this->info = $info; |
|
53 | + $this->ttl = \OC::$server->getConfig()->getSystemValue('cache_chunk_gc_ttl', 86400); |
|
54 | + } |
|
55 | + |
|
56 | + public function getPrefix() { |
|
57 | + $name = $this->info['name']; |
|
58 | + $transferid = $this->info['transferid']; |
|
59 | + |
|
60 | + return $name.'-chunking-'.$transferid.'-'; |
|
61 | + } |
|
62 | + |
|
63 | + protected function getCache() { |
|
64 | + if (!isset($this->cache)) { |
|
65 | + $this->cache = new \OC\Cache\File(); |
|
66 | + } |
|
67 | + return $this->cache; |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * Stores the given $data under the given $key - the number of stored bytes is returned |
|
72 | + * |
|
73 | + * @param string $index |
|
74 | + * @param resource $data |
|
75 | + * @return int |
|
76 | + */ |
|
77 | + public function store($index, $data) { |
|
78 | + $cache = $this->getCache(); |
|
79 | + $name = $this->getPrefix().$index; |
|
80 | + $cache->set($name, $data, $this->ttl); |
|
81 | + |
|
82 | + return $cache->size($name); |
|
83 | + } |
|
84 | + |
|
85 | + public function isComplete() { |
|
86 | + $prefix = $this->getPrefix(); |
|
87 | + $cache = $this->getCache(); |
|
88 | + $chunkcount = (int)$this->info['chunkcount']; |
|
89 | + |
|
90 | + for($i=($chunkcount-1); $i >= 0; $i--) { |
|
91 | + if (!$cache->hasKey($prefix.$i)) { |
|
92 | + return false; |
|
93 | + } |
|
94 | + } |
|
95 | + |
|
96 | + return true; |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * Assembles the chunks into the file specified by the path. |
|
101 | + * Chunks are deleted afterwards. |
|
102 | + * |
|
103 | + * @param resource $f target path |
|
104 | + * |
|
105 | + * @return integer assembled file size |
|
106 | + * |
|
107 | + * @throws \OC\InsufficientStorageException when file could not be fully |
|
108 | + * assembled due to lack of free space |
|
109 | + */ |
|
110 | + public function assemble($f) { |
|
111 | + $cache = $this->getCache(); |
|
112 | + $prefix = $this->getPrefix(); |
|
113 | + $count = 0; |
|
114 | + for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
115 | + $chunk = $cache->get($prefix.$i); |
|
116 | + // remove after reading to directly save space |
|
117 | + $cache->remove($prefix.$i); |
|
118 | + $count += fwrite($f, $chunk); |
|
119 | + // let php release the memory to work around memory exhausted error with php 5.6 |
|
120 | + $chunk = null; |
|
121 | + } |
|
122 | + |
|
123 | + return $count; |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * Returns the size of the chunks already present |
|
128 | + * @return integer size in bytes |
|
129 | + */ |
|
130 | + public function getCurrentSize() { |
|
131 | + $cache = $this->getCache(); |
|
132 | + $prefix = $this->getPrefix(); |
|
133 | + $total = 0; |
|
134 | + for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
135 | + $total += $cache->size($prefix.$i); |
|
136 | + } |
|
137 | + return $total; |
|
138 | + } |
|
139 | + |
|
140 | + /** |
|
141 | + * Removes all chunks which belong to this transmission |
|
142 | + */ |
|
143 | + public function cleanup() { |
|
144 | + $cache = $this->getCache(); |
|
145 | + $prefix = $this->getPrefix(); |
|
146 | + for($i=0; $i < $this->info['chunkcount']; $i++) { |
|
147 | + $cache->remove($prefix.$i); |
|
148 | + } |
|
149 | + } |
|
150 | + |
|
151 | + /** |
|
152 | + * Removes one specific chunk |
|
153 | + * @param string $index |
|
154 | + */ |
|
155 | + public function remove($index) { |
|
156 | + $cache = $this->getCache(); |
|
157 | + $prefix = $this->getPrefix(); |
|
158 | + $cache->remove($prefix.$index); |
|
159 | + } |
|
160 | + |
|
161 | + /** |
|
162 | + * Assembles the chunks into the file specified by the path. |
|
163 | + * Also triggers the relevant hooks and proxies. |
|
164 | + * |
|
165 | + * @param \OC\Files\Storage\Storage $storage storage |
|
166 | + * @param string $path target path relative to the storage |
|
167 | + * @return bool true on success or false if file could not be created |
|
168 | + * |
|
169 | + * @throws \OC\ServerNotAvailableException |
|
170 | + */ |
|
171 | + public function file_assemble($storage, $path) { |
|
172 | + // use file_put_contents as method because that best matches what this function does |
|
173 | + if (\OC\Files\Filesystem::isValidPath($path)) { |
|
174 | + $target = $storage->fopen($path, 'w'); |
|
175 | + if ($target) { |
|
176 | + $count = $this->assemble($target); |
|
177 | + fclose($target); |
|
178 | + return $count > 0; |
|
179 | + } else { |
|
180 | + return false; |
|
181 | + } |
|
182 | + } |
|
183 | + return false; |
|
184 | + } |
|
185 | 185 | } |
@@ -26,14 +26,14 @@ |
||
26 | 26 | use OCP\AutoloadNotAllowedException; |
27 | 27 | |
28 | 28 | class RegularJob extends \OC\BackgroundJob\Job { |
29 | - public function run($argument) { |
|
30 | - try { |
|
31 | - if (is_callable($argument)) { |
|
32 | - call_user_func($argument); |
|
33 | - } |
|
34 | - } catch (AutoloadNotAllowedException $e) { |
|
35 | - // job is from a disabled app, ignore |
|
36 | - return null; |
|
37 | - } |
|
38 | - } |
|
29 | + public function run($argument) { |
|
30 | + try { |
|
31 | + if (is_callable($argument)) { |
|
32 | + call_user_func($argument); |
|
33 | + } |
|
34 | + } catch (AutoloadNotAllowedException $e) { |
|
35 | + // job is from a disabled app, ignore |
|
36 | + return null; |
|
37 | + } |
|
38 | + } |
|
39 | 39 | } |
@@ -24,12 +24,12 @@ |
||
24 | 24 | namespace OC\BackgroundJob\Legacy; |
25 | 25 | |
26 | 26 | class QueuedJob extends \OC\BackgroundJob\QueuedJob { |
27 | - public function run($argument) { |
|
28 | - $class = $argument['klass']; |
|
29 | - $method = $argument['method']; |
|
30 | - $parameters = $argument['parameters']; |
|
31 | - if (is_callable(array($class, $method))) { |
|
32 | - call_user_func(array($class, $method), $parameters); |
|
33 | - } |
|
34 | - } |
|
27 | + public function run($argument) { |
|
28 | + $class = $argument['klass']; |
|
29 | + $method = $argument['method']; |
|
30 | + $parameters = $argument['parameters']; |
|
31 | + if (is_callable(array($class, $method))) { |
|
32 | + call_user_func(array($class, $method), $parameters); |
|
33 | + } |
|
34 | + } |
|
35 | 35 | } |
@@ -26,67 +26,67 @@ |
||
26 | 26 | use OCP\Settings\IIconSection; |
27 | 27 | |
28 | 28 | class Section implements IIconSection { |
29 | - /** @var string */ |
|
30 | - private $id; |
|
31 | - /** @var string */ |
|
32 | - private $name; |
|
33 | - /** @var int */ |
|
34 | - private $priority; |
|
35 | - /** @var string */ |
|
36 | - private $icon; |
|
29 | + /** @var string */ |
|
30 | + private $id; |
|
31 | + /** @var string */ |
|
32 | + private $name; |
|
33 | + /** @var int */ |
|
34 | + private $priority; |
|
35 | + /** @var string */ |
|
36 | + private $icon; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $id |
|
40 | - * @param string $name |
|
41 | - * @param int $priority |
|
42 | - * @param string $icon |
|
43 | - */ |
|
44 | - public function __construct($id, $name, $priority, $icon = '') { |
|
45 | - $this->id = $id; |
|
46 | - $this->name = $name; |
|
47 | - $this->priority = $priority; |
|
48 | - $this->icon = $icon; |
|
49 | - } |
|
38 | + /** |
|
39 | + * @param string $id |
|
40 | + * @param string $name |
|
41 | + * @param int $priority |
|
42 | + * @param string $icon |
|
43 | + */ |
|
44 | + public function __construct($id, $name, $priority, $icon = '') { |
|
45 | + $this->id = $id; |
|
46 | + $this->name = $name; |
|
47 | + $this->priority = $priority; |
|
48 | + $this->icon = $icon; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | - * e.g. 'ldap' |
|
54 | - * |
|
55 | - * @returns string |
|
56 | - */ |
|
57 | - public function getID() { |
|
58 | - return $this->id; |
|
59 | - } |
|
51 | + /** |
|
52 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
53 | + * e.g. 'ldap' |
|
54 | + * |
|
55 | + * @returns string |
|
56 | + */ |
|
57 | + public function getID() { |
|
58 | + return $this->id; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | - * integration'. Use the L10N service to translate it. |
|
64 | - * |
|
65 | - * @return string |
|
66 | - */ |
|
67 | - public function getName() { |
|
68 | - return $this->name; |
|
69 | - } |
|
61 | + /** |
|
62 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
63 | + * integration'. Use the L10N service to translate it. |
|
64 | + * |
|
65 | + * @return string |
|
66 | + */ |
|
67 | + public function getName() { |
|
68 | + return $this->name; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @return int whether the form should be rather on the top or bottom of |
|
73 | - * the settings navigation. The sections are arranged in ascending order of |
|
74 | - * the priority values. It is required to return a value between 0 and 99. |
|
75 | - * |
|
76 | - * E.g.: 70 |
|
77 | - */ |
|
78 | - public function getPriority() { |
|
79 | - return $this->priority; |
|
80 | - } |
|
71 | + /** |
|
72 | + * @return int whether the form should be rather on the top or bottom of |
|
73 | + * the settings navigation. The sections are arranged in ascending order of |
|
74 | + * the priority values. It is required to return a value between 0 and 99. |
|
75 | + * |
|
76 | + * E.g.: 70 |
|
77 | + */ |
|
78 | + public function getPriority() { |
|
79 | + return $this->priority; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * returns the relative path to an 16*16 icon describing the section. |
|
84 | - * e.g. '/core/img/places/files.svg' |
|
85 | - * |
|
86 | - * @returns string |
|
87 | - * @since 12 |
|
88 | - */ |
|
89 | - public function getIcon() { |
|
90 | - return $this->icon; |
|
91 | - } |
|
82 | + /** |
|
83 | + * returns the relative path to an 16*16 icon describing the section. |
|
84 | + * e.g. '/core/img/places/files.svg' |
|
85 | + * |
|
86 | + * @returns string |
|
87 | + * @since 12 |
|
88 | + */ |
|
89 | + public function getIcon() { |
|
90 | + return $this->icon; |
|
91 | + } |
|
92 | 92 | } |
@@ -23,35 +23,35 @@ |
||
23 | 23 | namespace OC\Memcache; |
24 | 24 | |
25 | 25 | trait CASTrait { |
26 | - abstract public function get($key); |
|
26 | + abstract public function get($key); |
|
27 | 27 | |
28 | - abstract public function set($key, $value, $ttl = 0); |
|
28 | + abstract public function set($key, $value, $ttl = 0); |
|
29 | 29 | |
30 | - abstract public function remove($key); |
|
30 | + abstract public function remove($key); |
|
31 | 31 | |
32 | - abstract public function add($key, $value, $ttl = 0); |
|
32 | + abstract public function add($key, $value, $ttl = 0); |
|
33 | 33 | |
34 | - /** |
|
35 | - * Compare and set |
|
36 | - * |
|
37 | - * @param string $key |
|
38 | - * @param mixed $old |
|
39 | - * @param mixed $new |
|
40 | - * @return bool |
|
41 | - */ |
|
42 | - public function cas($key, $old, $new) { |
|
43 | - //no native cas, emulate with locking |
|
44 | - if ($this->add($key . '_lock', true)) { |
|
45 | - if ($this->get($key) === $old) { |
|
46 | - $this->set($key, $new); |
|
47 | - $this->remove($key . '_lock'); |
|
48 | - return true; |
|
49 | - } else { |
|
50 | - $this->remove($key . '_lock'); |
|
51 | - return false; |
|
52 | - } |
|
53 | - } else { |
|
54 | - return false; |
|
55 | - } |
|
56 | - } |
|
34 | + /** |
|
35 | + * Compare and set |
|
36 | + * |
|
37 | + * @param string $key |
|
38 | + * @param mixed $old |
|
39 | + * @param mixed $new |
|
40 | + * @return bool |
|
41 | + */ |
|
42 | + public function cas($key, $old, $new) { |
|
43 | + //no native cas, emulate with locking |
|
44 | + if ($this->add($key . '_lock', true)) { |
|
45 | + if ($this->get($key) === $old) { |
|
46 | + $this->set($key, $new); |
|
47 | + $this->remove($key . '_lock'); |
|
48 | + return true; |
|
49 | + } else { |
|
50 | + $this->remove($key . '_lock'); |
|
51 | + return false; |
|
52 | + } |
|
53 | + } else { |
|
54 | + return false; |
|
55 | + } |
|
56 | + } |
|
57 | 57 | } |