@@ -93,8 +93,7 @@ |
||
93 | 93 | public function unlink($path) { |
94 | 94 | if ($this->is_dir($path)) { |
95 | 95 | return $this->rmdir($path); |
96 | - } |
|
97 | - else { |
|
96 | + } else { |
|
98 | 97 | $url = $this->constructUrl($path); |
99 | 98 | $result = unlink($url); |
100 | 99 | clearstatcache(true, $url); |
@@ -119,8 +119,9 @@ |
||
119 | 119 | |
120 | 120 | // Only handling xml |
121 | 121 | $contentType = $request->getHeader('Content-Type'); |
122 | - if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) |
|
123 | - return; |
|
122 | + if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) { |
|
123 | + return; |
|
124 | + } |
|
124 | 125 | |
125 | 126 | // Making sure the node exists |
126 | 127 | try { |
@@ -245,7 +245,9 @@ |
||
245 | 245 | function httpGet(RequestInterface $request, ResponseInterface $response) { |
246 | 246 | // Only handle valid files |
247 | 247 | $node = $this->tree->getNodeForPath($request->getPath()); |
248 | - if (!($node instanceof IFile)) return; |
|
248 | + if (!($node instanceof IFile)) { |
|
249 | + return; |
|
250 | + } |
|
249 | 251 | |
250 | 252 | // adds a 'Content-Disposition: attachment' header in case no disposition |
251 | 253 | // header has been set before |
@@ -38,7 +38,9 @@ |
||
38 | 38 | public function getCurrentUserPrincipals() { |
39 | 39 | $principalV2 = $this->getCurrentUserPrincipal(); |
40 | 40 | |
41 | - if (is_null($principalV2)) return []; |
|
41 | + if (is_null($principalV2)) { |
|
42 | + return []; |
|
43 | + } |
|
42 | 44 | |
43 | 45 | $principalV1 = $this->convertPrincipal($principalV2, false); |
44 | 46 | return array_merge( |
@@ -745,7 +745,9 @@ |
||
745 | 745 | $stmt->execute([ $addressBookId ]); |
746 | 746 | $currentToken = $stmt->fetchColumn(0); |
747 | 747 | |
748 | - if (is_null($currentToken)) return null; |
|
748 | + if (is_null($currentToken)) { |
|
749 | + return null; |
|
750 | + } |
|
749 | 751 | |
750 | 752 | $result = [ |
751 | 753 | 'syncToken' => $currentToken, |
@@ -134,7 +134,7 @@ |
||
134 | 134 | } |
135 | 135 | if(is_dir($source.'/'.$file)) { |
136 | 136 | $this->addRecursive($path.'/'.$file, $source.'/'.$file); |
137 | - }else{ |
|
137 | + } else{ |
|
138 | 138 | $this->addFile($path.'/'.$file, $source.'/'.$file); |
139 | 139 | } |
140 | 140 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | parent::__construct( 'core', 'layout.user' ); |
62 | 62 | if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { |
63 | 63 | $this->assign('bodyid', 'body-settings'); |
64 | - }else{ |
|
64 | + } else{ |
|
65 | 65 | $this->assign('bodyid', 'body-user'); |
66 | 66 | } |
67 | 67 |
@@ -114,8 +114,7 @@ discard block |
||
114 | 114 | public function append( $key, $value ) { |
115 | 115 | if( array_key_exists( $key, $this->vars )) { |
116 | 116 | $this->vars[$key][] = $value; |
117 | - } |
|
118 | - else{ |
|
117 | + } else{ |
|
119 | 118 | $this->vars[$key] = array( $value ); |
120 | 119 | } |
121 | 120 | } |
@@ -130,8 +129,7 @@ discard block |
||
130 | 129 | $data = $this->fetchPage(); |
131 | 130 | if( $data === false ) { |
132 | 131 | return false; |
133 | - } |
|
134 | - else{ |
|
132 | + } else{ |
|
135 | 133 | print $data; |
136 | 134 | return true; |
137 | 135 | } |
@@ -83,13 +83,11 @@ discard block |
||
83 | 83 | if (count($rangeArray) > 1) { |
84 | 84 | $type = 'multipart/byteranges; boundary='.self::getBoundary(); |
85 | 85 | // no Content-Length header here |
86 | - } |
|
87 | - else { |
|
86 | + } else { |
|
88 | 87 | header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true); |
89 | 88 | OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1); |
90 | 89 | } |
91 | - } |
|
92 | - else { |
|
90 | + } else { |
|
93 | 91 | OC_Response::setContentLengthHeader($fileSize); |
94 | 92 | } |
95 | 93 | } |
@@ -223,13 +221,11 @@ discard block |
||
223 | 221 | if ($minOffset >= $fileSize) { |
224 | 222 | break; |
225 | 223 | } |
226 | - } |
|
227 | - elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) { |
|
224 | + } elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) { |
|
228 | 225 | // case: x- |
229 | 226 | $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize ); |
230 | 227 | break; |
231 | - } |
|
232 | - elseif (is_numeric($ranges[1])) { |
|
228 | + } elseif (is_numeric($ranges[1])) { |
|
233 | 229 | // case: -x |
234 | 230 | if ($ranges[1] > $fileSize) { |
235 | 231 | $ranges[1] = $fileSize; |
@@ -277,8 +273,7 @@ discard block |
||
277 | 273 | try { |
278 | 274 | if (count($rangeArray) == 1) { |
279 | 275 | $view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']); |
280 | - } |
|
281 | - else { |
|
276 | + } else { |
|
282 | 277 | // check if file is seekable (if not throw UnseekableException) |
283 | 278 | // we have to check it before body contents |
284 | 279 | $view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']); |
@@ -301,8 +296,7 @@ discard block |
||
301 | 296 | self::sendHeaders($filename, $name, array()); |
302 | 297 | $view->readfile($filename); |
303 | 298 | } |
304 | - } |
|
305 | - else { |
|
299 | + } else { |
|
306 | 300 | $view->readfile($filename); |
307 | 301 | } |
308 | 302 | } |