nextcloud / server

lib/private/Preview/Generator.php

Spacing +12 added lines, -12 removed lines

@@ -133,7 +133,7 @@ 
 
 		$previewVersion = '';
 		if ($file instanceof IVersionedPreviewFile) {
-			$previewVersion = $file->getPreviewVersion() . '-';
+			$previewVersion = $file->getPreviewVersion().'-';
 		}
 
 		// Get the max preview and infer the max preview sizes from that
@@ -228,8 +228,8 @@ 
 					continue;
 				}
 
-				$maxWidth = (int)$this->config->getSystemValue('preview_max_x', 4096);
-				$maxHeight = (int)$this->config->getSystemValue('preview_max_y', 4096);
+				$maxWidth = (int) $this->config->getSystemValue('preview_max_x', 4096);
+				$maxHeight = (int) $this->config->getSystemValue('preview_max_y', 4096);
 
 				$preview = $this->helper->getThumbnail($provider, $file, $maxWidth, $maxHeight);
 
@@ -245,7 +245,7 @@ 
 					continue;
 				}
 
-				$path = $prefix . (string)$preview->width() . '-' . (string)$preview->height() . '-max.' . $ext;
+				$path = $prefix.(string) $preview->width().'-'.(string) $preview->height().'-max.'.$ext;
 				try {
 					$file = $previewFolder->newFile($path);
 					$file->putContent($preview->data());
@@ -267,7 +267,7 @@ 
 	 */
 	private function getPreviewSize(ISimpleFile $file, string $prefix = '') {
 		$size = explode('-', substr($file->getName(), strlen($prefix)));
-		return [(int)$size[0], (int)$size[1]];
+		return [(int) $size[0], (int) $size[1]];
 	}
 
 	/**
@@ -279,13 +279,13 @@ 
 	 * @return string
 	 */
 	private function generatePath($width, $height, $crop, $mimeType, $prefix) {
-		$path = $prefix . (string)$width . '-' . (string)$height;
+		$path = $prefix.(string) $width.'-'.(string) $height;
 		if ($crop) {
 			$path .= '-crop';
 		}
 
 		$ext = $this->getExtention($mimeType);
-		$path .= '.' . $ext;
+		$path .= '.'.$ext;
 		return $path;
 	}
 
@@ -375,7 +375,7 @@ 
 			$height /= $ratio;
 		}
 
-		return [(int)round($width), (int)round($height)];
+		return [(int) round($width), (int) round($height)];
 	}
 
 	/**
@@ -410,10 +410,10 @@ 
 					$scaleH = $maxHeight / $widthR;
 					$scaleW = $width;
 				}
-				$preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
+				$preview = $preview->preciseResizeCopy((int) round($scaleW), (int) round($scaleH));
 			}
-			$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
-			$cropY = (int)floor(abs($height - $preview->height()) * 0.5);
+			$cropX = (int) floor(abs($width - $preview->width()) * 0.5);
+			$cropY = (int) floor(abs($height - $preview->height()) * 0.5);
 			$preview = $preview->cropCopy($cropX, $cropY, $width, $height);
 		} else {
 			$preview = $maxPreview->resizeCopy(max($width, $height));
@@ -478,7 +478,7 @@ 
 			case 'image/gif':
 				return 'gif';
 			default:
-				throw new \InvalidArgumentException('Not a valid mimetype: "' . $mimeType . '"');
+				throw new \InvalidArgumentException('Not a valid mimetype: "'.$mimeType.'"');
 		}
 	}
 }

lib/private/legacy/OC_Image.php

Spacing +44 added lines, -44 removed lines

@@ -135,7 +135,7 @@ 
 	 */
 	public function widthTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, ['app' => 'core']);
+		$this->logger->debug('OC_Image->widthTopLeft() Orientation: '.$o, ['app' => 'core']);
 		switch ($o) {
 			case -1:
 			case 1:
@@ -159,7 +159,7 @@ 
 	 */
 	public function heightTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, ['app' => 'core']);
+		$this->logger->debug('OC_Image->heightTopLeft() Orientation: '.$o, ['app' => 'core']);
 		switch ($o) {
 			case -1:
 			case 1:
@@ -186,7 +186,7 @@ 
 		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		header('Content-Type: ' . $mimeType);
+		header('Content-Type: '.$mimeType);
 		return $this->_output(null, $mimeType);
 	}
 
@@ -204,7 +204,7 @@ 
 		}
 		if ($filePath === null) {
 			if ($this->filePath === null) {
-				$this->logger->error(__METHOD__ . '(): called with no path.', ['app' => 'core']);
+				$this->logger->error(__METHOD__.'(): called with no path.', ['app' => 'core']);
 				return false;
 			} else {
 				$filePath = $this->filePath;
@@ -228,10 +228,10 @@ 
 			}
 			$isWritable = is_writable(dirname($filePath));
 			if (!$isWritable) {
-				$this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', ['app' => 'core']);
+				$this->logger->error(__METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.', ['app' => 'core']);
 				return false;
 			} elseif ($isWritable && file_exists($filePath) && !is_writable($filePath)) {
-				$this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', ['app' => 'core']);
+				$this->logger->error(__METHOD__.'(): File \''.$filePath.'\' is not writable.', ['app' => 'core']);
 				return false;
 			}
 		}
@@ -259,7 +259,7 @@ 
 					$imageType = IMAGETYPE_BMP;
 					break;
 				default:
-					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+					throw new Exception('\OC_Image::_output(): "'.$mimeType.'" is not supported when forcing a specific output format');
 			}
 		}
 
@@ -438,7 +438,7 @@ 
 			return;
 		}
 
-		$exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data));
+		$exif = @exif_read_data('data://image/jpeg;base64,'.base64_encode($data));
 		if (!$exif) {
 			return;
 		}
@@ -456,7 +456,7 @@ 
 	 */
 	public function fixOrientation() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, ['app' => 'core']);
+		$this->logger->debug('OC_Image->fixOrientation() Orientation: '.$o, ['app' => 'core']);
 		$rotate = 0;
 		$flip = false;
 		switch ($o) {
@@ -491,7 +491,7 @@ 
 				$rotate = 90;
 				break;
 		}
-		if($flip && function_exists('imageflip')) {
+		if ($flip && function_exists('imageflip')) {
 			imageflip($this->resource, IMG_FLIP_HORIZONTAL);
 		}
 		if ($rotate) {
@@ -553,7 +553,7 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']);
+					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: '.$imagePath, ['app' => 'core']);
 				}
 				break;
 			case IMAGETYPE_JPEG:
@@ -561,10 +561,10 @@ 
 					if (getimagesize($imagePath) !== false) {
 						$this->resource = @imagecreatefromjpeg($imagePath);
 					} else {
-						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']);
+						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: '.$imagePath, ['app' => 'core']);
 					}
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, ['app' => 'core']);
+					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: '.$imagePath, ['app' => 'core']);
 				}
 				break;
 			case IMAGETYPE_PNG:
@@ -574,21 +574,21 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']);
+					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: '.$imagePath, ['app' => 'core']);
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
 					$this->resource = @imagecreatefromxbm($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, ['app' => 'core']);
+					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath, ['app' => 'core']);
 				}
 				break;
 			case IMAGETYPE_WBMP:
 				if (imagetypes() & IMG_WBMP) {
 					$this->resource = @imagecreatefromwbmp($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']);
+					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: '.$imagePath, ['app' => 'core']);
 				}
 				break;
 			case IMAGETYPE_BMP:
@@ -698,7 +698,7 @@ 
 	 */
 	private function imagecreatefrombmp($fileName) {
 		if (!($fh = fopen($fileName, 'rb'))) {
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, ['app' => 'core']);
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName, ['app' => 'core']);
 			return false;
 		}
 		// read file header
@@ -706,7 +706,7 @@ 
 		// check for bitmap
 		if ($meta['type'] != 19778) {
 			fclose($fh);
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', ['app' => 'core']);
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName.' is not a bitmap!', ['app' => 'core']);
 			return false;
 		}
 		// read image header
@@ -730,7 +730,7 @@ 
 				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
 				if ($meta['imagesize'] < 1) {
 					fclose($fh);
-					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', ['app' => 'core']);
+					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of '.$fileName.' is not a bitmap!', ['app' => 'core']);
 					return false;
 				}
 			}
@@ -740,7 +740,7 @@ 
 		// read color palette
 		$palette = [];
 		if ($meta['bits'] < 16) {
-			$palette = unpack('l' . $meta['colors'], fread($fh, $meta['colors'] * 4));
+			$palette = unpack('l'.$meta['colors'], fread($fh, $meta['colors'] * 4));
 			// in rare cases the color value is signed
 			if ($palette[1] < 0) {
 				foreach ($palette as $i => $color) {
@@ -753,7 +753,7 @@ 
 		if ($im == false) {
 			fclose($fh);
 			$this->logger->warning(
-				'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
+				'imagecreatefrombmp: imagecreatetruecolor failed for file "'.$fileName.'" with dimensions '.$meta['width'].'x'.$meta['height'],
 				['app' => 'core']);
 			return false;
 		}
@@ -762,7 +762,7 @@ 
 		$p = 0;
 		$vide = chr(0);
 		$y = $meta['height'] - 1;
-		$error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
+		$error = 'imagecreatefrombmp: '.$fileName.' has not enough data!';
 		// loop through the image data beginning with the lower left corner
 		while ($y >= 0) {
 			$x = 0;
@@ -774,7 +774,7 @@ 
 							$this->logger->warning($error, ['app' => 'core']);
 							return $im;
 						}
-						$color = @unpack('V', $part . $vide);
+						$color = @unpack('V', $part.$vide);
 						break;
 					case 16:
 						if (!($part = substr($data, $p, 2))) {
@@ -786,16 +786,16 @@ 
 						$color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
 						break;
 					case 8:
-						$color = @unpack('n', $vide . ($data[$p] ?? ''));
+						$color = @unpack('n', $vide.($data[$p] ?? ''));
 						$color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 4:
-						$color = @unpack('n', $vide . ($data[floor($p)] ?? ''));
+						$color = @unpack('n', $vide.($data[floor($p)] ?? ''));
 						$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
 						$color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 1:
-						$color = @unpack('n', $vide . ($data[floor($p)] ?? ''));
+						$color = @unpack('n', $vide.($data[floor($p)] ?? ''));
 						switch (($p * 8) % 8) {
 							case 0:
 								$color[1] = $color[1] >> 7;
@@ -826,7 +826,7 @@ 
 						break;
 					default:
 						fclose($fh);
-						$this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', ['app' => 'core']);
+						$this->logger->warning('imagecreatefrombmp: '.$fileName.' has '.$meta['bits'].' bits and this is not supported!', ['app' => 'core']);
 						return false;
 				}
 				imagesetpixel($im, $x, $y, $color[1]);
@@ -859,7 +859,7 @@ 
 	 */
 	private function resizeNew($maxSize) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): No image loaded', ['app' => 'core']);
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -874,7 +874,7 @@ 
 			$newHeight = $maxSize;
 		}
 
-		return $this->preciseResizeNew((int)round($newWidth), (int)round($newHeight));
+		return $this->preciseResizeNew((int) round($newWidth), (int) round($newHeight));
 	}
 
 	/**
@@ -897,14 +897,14 @@ 
 	 */
 	public function preciseResizeNew(int $width, int $height) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): No image loaded', ['app' => 'core']);
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
 		$heightOrig = imagesy($this->resource);
 		$process = imagecreatetruecolor($width, $height);
 		if ($process === false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): Error creating true color image', ['app' => 'core']);
 			return false;
 		}
 
@@ -917,7 +917,7 @@ 
 
 		$res = imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
 		if ($res === false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image', ['app' => 'core']);
 			imagedestroy($process);
 			return false;
 		}
@@ -973,7 +973,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
 		if ($process == false) {
-			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']);
+			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image '.$width.'x'.$height, ['app' => 'core']);
 			imagedestroy($process);
 			return false;
 		}
@@ -1009,12 +1009,12 @@ 
 	 */
 	public function cropNew(int $x, int $y, int $w, int $h) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): No image loaded', ['app' => 'core']);
 			return false;
 		}
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): Error creating true color image', ['app' => 'core']);
 			imagedestroy($process);
 			return false;
 		}
@@ -1028,7 +1028,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image '.$w.'x'.$h, ['app' => 'core']);
 			imagedestroy($process);
 			return false;
 		}
@@ -1046,7 +1046,7 @@ 
 	 */
 	public function fitIn($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): No image loaded', ['app' => 'core']);
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1056,7 +1056,7 @@ 
 		$newWidth = min($maxWidth, $ratio * $maxHeight);
 		$newHeight = min($maxHeight, $maxWidth / $ratio);
 
-		$this->preciseResize((int)round($newWidth), (int)round($newHeight));
+		$this->preciseResize((int) round($newWidth), (int) round($newHeight));
 		return true;
 	}
 
@@ -1069,7 +1069,7 @@ 
 	 */
 	public function scaleDownToFit($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', ['app' => 'core']);
+			$this->logger->error(__METHOD__.'(): No image loaded', ['app' => 'core']);
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1176,7 +1176,7 @@ 
 		if ($bit <= 8) {
 			for ($i = 0; $i < $colorsNum; $i++) {
 				$colors = imagecolorsforindex($im, $i);
-				$rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
+				$rgbQuad .= chr($colors['blue']).chr($colors['green']).chr($colors['red'])."\0";
 			}
 			$bmpData = '';
 			if ($compression == 0 || $bit < 8) {
@@ -1209,7 +1209,7 @@ 
 						$index = imagecolorat($im, $i, $j);
 						if ($index !== $lastIndex || $sameNum > 255) {
 							if ($sameNum != 0) {
-								$bmpData .= chr($sameNum) . chr($lastIndex);
+								$bmpData .= chr($sameNum).chr($lastIndex);
 							}
 							$lastIndex = $index;
 							$sameNum = 1;
@@ -1250,15 +1250,15 @@ 
 			$sizeData = strlen($bmpData);
 			$colorsNum = 0;
 		}
-		$fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
+		$fileHeader = 'BM'.pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
 		$infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
 		if ($fileName != '') {
 			$fp = fopen($fileName, 'wb');
-			fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
+			fwrite($fp, $fileHeader.$infoHeader.$rgbQuad.$bmpData);
 			fclose($fp);
 			return true;
 		}
-		echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
+		echo $fileHeader.$infoHeader.$rgbQuad.$bmpData;
 		return true;
 	}
 }