@@ -808,7 +808,9 @@ |
||
808 | 808 | $stmt = $query->execute(); |
809 | 809 | $row = $stmt->fetch(\PDO::FETCH_ASSOC); |
810 | 810 | |
811 | - if(!$row) return null; |
|
811 | + if(!$row) { |
|
812 | + return null; |
|
813 | + } |
|
812 | 814 | |
813 | 815 | return [ |
814 | 816 | 'id' => $row['id'], |
@@ -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, |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | if(OCA\Files_Versions\Storage::rollback( $file, $revision )) { |
37 | 37 | OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); |
38 | -}else{ |
|
38 | +} else{ |
|
39 | 39 | $l = \OC::$server->getL10N('files_versions'); |
40 | 40 | OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) )))); |
41 | 41 | } |
@@ -412,7 +412,7 @@ |
||
412 | 412 | $appDir = OC_App::getInstallPath() . '/' . $appId; |
413 | 413 | OC_Helper::rmdirr($appDir); |
414 | 414 | return true; |
415 | - }else{ |
|
415 | + } else{ |
|
416 | 416 | \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR); |
417 | 417 | |
418 | 418 | return false; |
@@ -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 | } |
@@ -51,13 +51,11 @@ discard block |
||
51 | 51 | if ($cache_time > 0) { |
52 | 52 | self::setExpiresHeader('PT'.$cache_time.'S'); |
53 | 53 | header('Cache-Control: max-age='.$cache_time.', must-revalidate'); |
54 | - } |
|
55 | - else { |
|
54 | + } else { |
|
56 | 55 | self::setExpiresHeader(0); |
57 | 56 | header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); |
58 | 57 | } |
59 | - } |
|
60 | - else { |
|
58 | + } else { |
|
61 | 59 | header('Cache-Control: cache'); |
62 | 60 | header('Pragma: cache'); |
63 | 61 | } |
@@ -228,8 +226,7 @@ discard block |
||
228 | 226 | |
229 | 227 | self::setContentLengthHeader(filesize($filepath)); |
230 | 228 | fpassthru($fp); |
231 | - } |
|
232 | - else { |
|
229 | + } else { |
|
233 | 230 | self::setStatus(self::STATUS_NOT_FOUND); |
234 | 231 | } |
235 | 232 | } |
@@ -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 | } |