@@ -25,7 +25,7 @@ |
||
25 | 25 | use OCP\IUser; |
26 | 26 | |
27 | 27 | trait FileAccess { |
28 | - protected function setupFS(IUser $user){ |
|
28 | + protected function setupFS(IUser $user) { |
|
29 | 29 | \OC_Util::setupFS($user->getUID()); |
30 | 30 | } |
31 | 31 |
@@ -41,6 +41,6 @@ |
||
41 | 41 | * @return string |
42 | 42 | */ |
43 | 43 | public function getResourcePath() { |
44 | - return $this->webPath . '/' . $this->resource; |
|
44 | + return $this->webPath.'/'.$this->resource; |
|
45 | 45 | } |
46 | 46 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | /** |
33 | 33 | * @param string[] $dirs |
34 | 34 | */ |
35 | - public function __construct( $dirs ) { |
|
35 | + public function __construct($dirs) { |
|
36 | 36 | $this->dirs = $dirs; |
37 | 37 | } |
38 | 38 | |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | * @return string |
42 | 42 | * @throws \Exception |
43 | 43 | */ |
44 | - public function find( $template ) { |
|
44 | + public function find($template) { |
|
45 | 45 | if ($template === '') { |
46 | 46 | throw new \InvalidArgumentException('Empty template name'); |
47 | 47 | } |
48 | 48 | |
49 | - foreach($this->dirs as $dir) { |
|
49 | + foreach ($this->dirs as $dir) { |
|
50 | 50 | $file = $dir.$template.'.php'; |
51 | 51 | if (is_file($file)) { |
52 | 52 | $this->path = $dir; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @param callable $callback |
36 | 36 | */ |
37 | 37 | public function listen($scope, $method, callable $callback) { |
38 | - $eventName = $scope . '::' . $method; |
|
38 | + $eventName = $scope.'::'.$method; |
|
39 | 39 | if (!isset($this->listeners[$eventName])) { |
40 | 40 | $this->listeners[$eventName] = array(); |
41 | 41 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $names = array(); |
54 | 54 | $allNames = array_keys($this->listeners); |
55 | 55 | if ($scope and $method) { |
56 | - $name = $scope . '::' . $method; |
|
56 | + $name = $scope.'::'.$method; |
|
57 | 57 | if (isset($this->listeners[$name])) { |
58 | 58 | $names[] = $name; |
59 | 59 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param array $arguments optional |
94 | 94 | */ |
95 | 95 | protected function emit($scope, $method, array $arguments = array()) { |
96 | - $eventName = $scope . '::' . $method; |
|
96 | + $eventName = $scope.'::'.$method; |
|
97 | 97 | if (isset($this->listeners[$eventName])) { |
98 | 98 | foreach ($this->listeners[$eventName] as $callback) { |
99 | 99 | call_user_func_array($callback, $arguments); |
@@ -30,23 +30,23 @@ |
||
30 | 30 | * error code for functions not provided by the group backend |
31 | 31 | * @deprecated Use \OC_Group_Backend::NOT_IMPLEMENTED instead |
32 | 32 | */ |
33 | -define('OC_GROUP_BACKEND_NOT_IMPLEMENTED', -501); |
|
33 | +define('OC_GROUP_BACKEND_NOT_IMPLEMENTED', -501); |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * actions that user backends can define |
37 | 37 | */ |
38 | 38 | /** @deprecated Use \OC_Group_Backend::CREATE_GROUP instead */ |
39 | -define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); |
|
39 | +define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); |
|
40 | 40 | /** @deprecated Use \OC_Group_Backend::DELETE_GROUP instead */ |
41 | -define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); |
|
41 | +define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); |
|
42 | 42 | /** @deprecated Use \OC_Group_Backend::ADD_TO_GROUP instead */ |
43 | -define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); |
|
43 | +define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); |
|
44 | 44 | /** @deprecated Use \OC_Group_Backend::REMOVE_FROM_GOUP instead */ |
45 | -define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); |
|
45 | +define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); |
|
46 | 46 | /** @deprecated Obsolete */ |
47 | -define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); //OBSOLETE |
|
47 | +define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); //OBSOLETE |
|
48 | 48 | /** @deprecated Use \OC_Group_Backend::COUNT_USERS instead */ |
49 | -define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); |
|
49 | +define('OC_GROUP_BACKEND_COUNT_USERS', 0x00100000); |
|
50 | 50 | |
51 | 51 | /** |
52 | 52 | * Abstract base class for user management |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | header('X-Accel-Buffering: no'); |
61 | 61 | $this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true'; |
62 | 62 | if ($this->fallback) { |
63 | - $this->fallBackId = (int)$_GET['fallback_id']; |
|
63 | + $this->fallBackId = (int) $_GET['fallback_id']; |
|
64 | 64 | /** |
65 | 65 | * FIXME: The default content-security-policy of ownCloud forbids inline |
66 | 66 | * JavaScript for security reasons. IE starting on Windows 10 will |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | */ |
74 | 74 | header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'"); |
75 | 75 | header("Content-Type: text/html"); |
76 | - echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy |
|
76 | + echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy |
|
77 | 77 | } else { |
78 | 78 | header("Content-Type: text/event-stream"); |
79 | 79 | } |
80 | - if(!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
80 | + if (!\OC::$server->getRequest()->passesStrictCookieCheck()) { |
|
81 | 81 | header('Location: '.\OC::$WEBROOT); |
82 | 82 | exit(); |
83 | 83 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function send($type, $data = null) { |
102 | 102 | if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) { |
103 | - throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')'); |
|
103 | + throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')'); |
|
104 | 104 | } |
105 | 105 | $this->init(); |
106 | 106 | if (is_null($data)) { |
@@ -109,13 +109,13 @@ discard block |
||
109 | 109 | } |
110 | 110 | if ($this->fallback) { |
111 | 111 | $response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack(' |
112 | - . $this->fallBackId . ',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL; |
|
112 | + . $this->fallBackId.',"'.$type.'",'.OCP\JSON::encode($data).')</script>'.PHP_EOL; |
|
113 | 113 | echo $response; |
114 | 114 | } else { |
115 | 115 | if ($type) { |
116 | - echo 'event: ' . $type . PHP_EOL; |
|
116 | + echo 'event: '.$type.PHP_EOL; |
|
117 | 117 | } |
118 | - echo 'data: ' . OCP\JSON::encode($data) . PHP_EOL; |
|
118 | + echo 'data: '.OCP\JSON::encode($data).PHP_EOL; |
|
119 | 119 | } |
120 | 120 | echo PHP_EOL; |
121 | 121 | flush(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | if (!is_array($files)) { |
118 | - $filename = $dir . '/' . $files; |
|
118 | + $filename = $dir.'/'.$files; |
|
119 | 119 | if (!$view->is_dir($filename)) { |
120 | 120 | self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params); |
121 | 121 | return; |
@@ -130,9 +130,9 @@ discard block |
||
130 | 130 | $name = $basename; |
131 | 131 | } |
132 | 132 | |
133 | - $filename = $dir . '/' . $name; |
|
133 | + $filename = $dir.'/'.$name; |
|
134 | 134 | } else { |
135 | - $filename = $dir . '/' . $files; |
|
135 | + $filename = $dir.'/'.$files; |
|
136 | 136 | $getType = self::ZIP_DIR; |
137 | 137 | // downloading root ? |
138 | 138 | if ($files !== '') { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | ignore_user_abort(true); |
152 | 152 | if ($getType === self::ZIP_FILES) { |
153 | 153 | foreach ($files as $file) { |
154 | - $file = $dir . '/' . $file; |
|
154 | + $file = $dir.'/'.$file; |
|
155 | 155 | if (\OC\Files\Filesystem::is_file($file)) { |
156 | 156 | $fileSize = \OC\Files\Filesystem::filesize($file); |
157 | 157 | $fileTime = \OC\Files\Filesystem::filemtime($file); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | } |
164 | 164 | } |
165 | 165 | } elseif ($getType === self::ZIP_DIR) { |
166 | - $file = $dir . '/' . $files; |
|
166 | + $file = $dir.'/'.$files; |
|
167 | 167 | $streamer->addDirRecursive($file); |
168 | 168 | } |
169 | 169 | $streamer->finalize(); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * @return array $rangeArray ('from'=>int,'to'=>int), ... |
196 | 196 | */ |
197 | 197 | private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) { |
198 | - $rArray=explode(',', $rangeHeaderPos); |
|
198 | + $rArray = explode(',', $rangeHeaderPos); |
|
199 | 199 | $minOffset = 0; |
200 | 200 | $ind = 0; |
201 | 201 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999 |
208 | 208 | $ranges[0] = $minOffset; |
209 | 209 | } |
210 | - if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999 |
|
210 | + if ($ind > 0 && $rangeArray[$ind - 1]['to'] + 1 == $ranges[0]) { // case: bytes=500-600,601-999 |
|
211 | 211 | $ind--; |
212 | 212 | $ranges[0] = $rangeArray[$ind]['from']; |
213 | 213 | } |
@@ -216,9 +216,9 @@ discard block |
||
216 | 216 | if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) { |
217 | 217 | // case: x-x |
218 | 218 | if ($ranges[1] >= $fileSize) { |
219 | - $ranges[1] = $fileSize-1; |
|
219 | + $ranges[1] = $fileSize - 1; |
|
220 | 220 | } |
221 | - $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize ); |
|
221 | + $rangeArray[$ind++] = array('from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize); |
|
222 | 222 | $minOffset = $ranges[1] + 1; |
223 | 223 | if ($minOffset >= $fileSize) { |
224 | 224 | break; |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | } |
227 | 227 | elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) { |
228 | 228 | // case: x- |
229 | - $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize ); |
|
229 | + $rangeArray[$ind++] = array('from' => $ranges[0], 'to' => $fileSize - 1, 'size' => $fileSize); |
|
230 | 230 | break; |
231 | 231 | } |
232 | 232 | elseif (is_numeric($ranges[1])) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | if ($ranges[1] > $fileSize) { |
235 | 235 | $ranges[1] = $fileSize; |
236 | 236 | } |
237 | - $rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize ); |
|
237 | + $rangeArray[$ind++] = array('from' => $fileSize - $ranges[1], 'to' => $fileSize - 1, 'size' => $fileSize); |
|
238 | 238 | break; |
239 | 239 | } |
240 | 240 | } |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header |
249 | 249 | */ |
250 | 250 | private static function getSingleFile($view, $dir, $name, $params) { |
251 | - $filename = $dir . '/' . $name; |
|
251 | + $filename = $dir.'/'.$name; |
|
252 | 252 | OC_Util::obEnd(); |
253 | 253 | $view->lockFile($filename, ILockingProvider::LOCK_SHARED); |
254 | 254 | |
@@ -314,17 +314,17 @@ discard block |
||
314 | 314 | */ |
315 | 315 | public static function lockFiles($view, $dir, $files) { |
316 | 316 | if (!is_array($files)) { |
317 | - $file = $dir . '/' . $files; |
|
317 | + $file = $dir.'/'.$files; |
|
318 | 318 | $files = [$file]; |
319 | 319 | } |
320 | 320 | foreach ($files as $file) { |
321 | - $file = $dir . '/' . $file; |
|
321 | + $file = $dir.'/'.$file; |
|
322 | 322 | $view->lockFile($file, ILockingProvider::LOCK_SHARED); |
323 | 323 | if ($view->is_dir($file)) { |
324 | 324 | $contents = $view->getDirectoryContent($file); |
325 | 325 | $contents = array_map(function($fileInfo) use ($file) { |
326 | 326 | /** @var \OCP\Files\FileInfo $fileInfo */ |
327 | - return $file . '/' . $fileInfo->getName(); |
|
327 | + return $file.'/'.$fileInfo->getName(); |
|
328 | 328 | }, $contents); |
329 | 329 | self::lockFiles($view, $dir, $contents); |
330 | 330 | } |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | |
354 | 354 | // default locations if not overridden by $files |
355 | 355 | $files = array_merge([ |
356 | - '.htaccess' => OC::$SERVERROOT . '/.htaccess', |
|
357 | - '.user.ini' => OC::$SERVERROOT . '/.user.ini' |
|
356 | + '.htaccess' => OC::$SERVERROOT.'/.htaccess', |
|
357 | + '.user.ini' => OC::$SERVERROOT.'/.user.ini' |
|
358 | 358 | ], $files); |
359 | 359 | |
360 | 360 | $updateFiles = [ |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | $handle = @fopen($filename, 'r+'); |
376 | 376 | if (!$handle) { |
377 | 377 | \OCP\Util::writeLog('files', |
378 | - 'Can\'t write upload limit to ' . $filename . '. Please check the file permissions', |
|
378 | + 'Can\'t write upload limit to '.$filename.'. Please check the file permissions', |
|
379 | 379 | \OCP\Util::WARN); |
380 | 380 | $success = false; |
381 | 381 | continue; // try to update as many files as possible |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | $content = $newContent; |
396 | 396 | } |
397 | 397 | if ($hasReplaced === 0) { |
398 | - $content .= "\n" . $setting; |
|
398 | + $content .= "\n".$setting; |
|
399 | 399 | } |
400 | 400 | } |
401 | 401 | |
@@ -426,12 +426,12 @@ discard block |
||
426 | 426 | } |
427 | 427 | if ($getType === self::ZIP_FILES) { |
428 | 428 | foreach ($files as $file) { |
429 | - $file = $dir . '/' . $file; |
|
429 | + $file = $dir.'/'.$file; |
|
430 | 430 | $view->unlockFile($file, ILockingProvider::LOCK_SHARED); |
431 | 431 | } |
432 | 432 | } |
433 | 433 | if ($getType === self::ZIP_DIR) { |
434 | - $file = $dir . '/' . $files; |
|
434 | + $file = $dir.'/'.$files; |
|
435 | 435 | $view->unlockFile($file, ILockingProvider::LOCK_SHARED); |
436 | 436 | } |
437 | 437 | } |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | public function isComplete() { |
86 | 86 | $prefix = $this->getPrefix(); |
87 | 87 | $cache = $this->getCache(); |
88 | - $chunkcount = (int)$this->info['chunkcount']; |
|
88 | + $chunkcount = (int) $this->info['chunkcount']; |
|
89 | 89 | |
90 | - for($i=($chunkcount-1); $i >= 0; $i--) { |
|
90 | + for ($i = ($chunkcount - 1); $i >= 0; $i--) { |
|
91 | 91 | if (!$cache->hasKey($prefix.$i)) { |
92 | 92 | return false; |
93 | 93 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | public function cleanup() { |
144 | 144 | $cache = $this->getCache(); |
145 | 145 | $prefix = $this->getPrefix(); |
146 | - for($i=0; $i < $this->info['chunkcount']; $i++) { |
|
146 | + for ($i = 0; $i < $this->info['chunkcount']; $i++) { |
|
147 | 147 | $cache->remove($prefix.$i); |
148 | 148 | } |
149 | 149 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * along with this program. If not, see <http://www.gnu.org/licenses/> |
29 | 29 | * |
30 | 30 | */ |
31 | -class OC_Hook{ |
|
31 | +class OC_Hook { |
|
32 | 32 | public static $thrownExceptions = []; |
33 | 33 | |
34 | 34 | static private $registered = array(); |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | * |
47 | 47 | * TODO: write example |
48 | 48 | */ |
49 | - static public function connect($signalClass, $signalName, $slotClass, $slotName ) { |
|
49 | + static public function connect($signalClass, $signalName, $slotClass, $slotName) { |
|
50 | 50 | // If we're trying to connect to an emitting class that isn't |
51 | 51 | // yet registered, register it |
52 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
52 | + if (!array_key_exists($signalClass, self::$registered)) { |
|
53 | 53 | self::$registered[$signalClass] = array(); |
54 | 54 | } |
55 | 55 | // If we're trying to connect to an emitting method that isn't |
56 | 56 | // yet registered, register it with the emitting class |
57 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
57 | + if (!array_key_exists($signalName, self::$registered[$signalClass])) { |
|
58 | 58 | self::$registered[$signalClass][$signalName] = array(); |
59 | 59 | } |
60 | 60 | |
@@ -90,27 +90,27 @@ discard block |
||
90 | 90 | |
91 | 91 | // Return false if no hook handlers are listening to this |
92 | 92 | // emitting class |
93 | - if( !array_key_exists($signalClass, self::$registered )) { |
|
93 | + if (!array_key_exists($signalClass, self::$registered)) { |
|
94 | 94 | return false; |
95 | 95 | } |
96 | 96 | |
97 | 97 | // Return false if no hook handlers are listening to this |
98 | 98 | // emitting method |
99 | - if( !array_key_exists( $signalName, self::$registered[$signalClass] )) { |
|
99 | + if (!array_key_exists($signalName, self::$registered[$signalClass])) { |
|
100 | 100 | return false; |
101 | 101 | } |
102 | 102 | |
103 | 103 | // Call all slots |
104 | - foreach( self::$registered[$signalClass][$signalName] as $i ) { |
|
104 | + foreach (self::$registered[$signalClass][$signalName] as $i) { |
|
105 | 105 | try { |
106 | - call_user_func( array( $i["class"], $i["name"] ), $params ); |
|
107 | - } catch (Exception $e){ |
|
106 | + call_user_func(array($i["class"], $i["name"]), $params); |
|
107 | + } catch (Exception $e) { |
|
108 | 108 | self::$thrownExceptions[] = $e; |
109 | 109 | \OC::$server->getLogger()->logException($e); |
110 | - if($e instanceof \OC\HintException) { |
|
110 | + if ($e instanceof \OC\HintException) { |
|
111 | 111 | throw $e; |
112 | 112 | } |
113 | - if($e instanceof \OC\ServerNotAvailableException) { |
|
113 | + if ($e instanceof \OC\ServerNotAvailableException) { |
|
114 | 114 | throw $e; |
115 | 115 | } |
116 | 116 | } |
@@ -124,15 +124,15 @@ discard block |
||
124 | 124 | * @param string $signalClass |
125 | 125 | * @param string $signalName |
126 | 126 | */ |
127 | - static public function clear($signalClass='', $signalName='') { |
|
127 | + static public function clear($signalClass = '', $signalName = '') { |
|
128 | 128 | if ($signalClass) { |
129 | 129 | if ($signalName) { |
130 | - self::$registered[$signalClass][$signalName]=array(); |
|
131 | - }else{ |
|
132 | - self::$registered[$signalClass]=array(); |
|
130 | + self::$registered[$signalClass][$signalName] = array(); |
|
131 | + } else { |
|
132 | + self::$registered[$signalClass] = array(); |
|
133 | 133 | } |
134 | - }else{ |
|
135 | - self::$registered=array(); |
|
134 | + } else { |
|
135 | + self::$registered = array(); |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 |