nextcloud / server

lib/private/Preview/XBitmap.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class XBitmap extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/x-xbitmap/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/x-xbitmap/';
+    }
 }

lib/private/Preview/PNG.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class PNG extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/png/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/png/';
+    }
 }

lib/private/Preview/HEIC.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 			$bp->setFormat('jpg');
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+				'message' => 'File: '.$file->getPath().' Imagick says:',
 				'level' => ILogger::ERROR,
 				'app' => 'core',
 			]);
@@ -93,7 +93,7 @@ 
 		$bp = new \Imagick();
 
 		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+		$bp->readImage($tmpPath.'[0]');
 
 		$bp->setImageFormat('jpg');
 

Indentation +105 added lines, -105 removed lines

@@ -40,110 +40,110 @@
  * @package OC\Preview
  */
 class HEIC extends ProviderV2 {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/hei(f|c)/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(FileInfo $file): bool {
-		return in_array('HEIC', \Imagick::queryFormats("HEI*"));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		if (!$this->isAvailable($file)) {
-			return null;
-		}
-
-		$tmpPath = $this->getLocalFile($file);
-
-		// Creates \Imagick object from the heic file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-			$bp->setFormat('jpg');
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
-
-		$this->cleanTmpFiles();
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData((string) $bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
-
-	/**
-	 * Returns a preview of maxX times maxY dimensions in JPG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new \Imagick();
-
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
-
-		$bp->setImageFormat('jpg');
-
-		$bp = $this->resize($bp, $maxX, $maxY);
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/hei(f|c)/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(FileInfo $file): bool {
+        return in_array('HEIC', \Imagick::queryFormats("HEI*"));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        if (!$this->isAvailable($file)) {
+            return null;
+        }
+
+        $tmpPath = $this->getLocalFile($file);
+
+        // Creates \Imagick object from the heic file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+            $bp->setFormat('jpg');
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
+
+        $this->cleanTmpFiles();
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData((string) $bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
+
+    /**
+     * Returns a preview of maxX times maxY dimensions in JPG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new \Imagick();
+
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
+
+        $bp->setImageFormat('jpg');
+
+        $bp = $this->resize($bp, $maxX, $maxY);
 		
-		return $bp;
-	}
-
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		[$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
-
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// If we want a small image (thumbnail) let's be most space- and time-efficient
-			if ($maxX <= 500 && $maxY <= 500) {
-				$bp->thumbnailImage($maxY, $maxX, true);
-				$bp->stripImage();
-			} else {
-				// A bigger image calls for some better resizing algorithm
-				// According to http://www.imagemagick.org/Usage/filter/#lanczos
-				// the catrom filter is almost identical to Lanczos2, but according
-				// to https://www.php.net/manual/en/imagick.resizeimage.php it is
-				// significantly faster
-				$bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
-			}
-		}
-
-		return $bp;
-	}
+        return $bp;
+    }
+
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        [$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
+
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // If we want a small image (thumbnail) let's be most space- and time-efficient
+            if ($maxX <= 500 && $maxY <= 500) {
+                $bp->thumbnailImage($maxY, $maxX, true);
+                $bp->stripImage();
+            } else {
+                // A bigger image calls for some better resizing algorithm
+                // According to http://www.imagemagick.org/Usage/filter/#lanczos
+                // the catrom filter is almost identical to Lanczos2, but according
+                // to https://www.php.net/manual/en/imagick.resizeimage.php it is
+                // significantly faster
+                $bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
+            }
+        }
+
+        return $bp;
+    }
 }

lib/private/Preview/MSOffice2003.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 
 //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
 class MSOffice2003 extends Office {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/vnd.ms-.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/vnd.ms-.*/';
+    }
 }

lib/private/Preview/Bitmap.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+				'message' => 'File: '.$file->getPath().' Imagick says:',
 				'level' => ILogger::ERROR,
 				'app' => 'core',
 			]);
@@ -83,7 +83,7 @@ 
 		$bp = new Imagick();
 
 		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+		$bp->readImage($tmpPath.'[0]');
 
 		$bp = $this->resize($bp, $maxX, $maxY);
 

Indentation +66 added lines, -66 removed lines

@@ -38,81 +38,81 @@
  */
 abstract class Bitmap extends ProviderV2 {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$tmpPath = $this->getLocalFile($file);
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $tmpPath = $this->getLocalFile($file);
 
-		// Creates \Imagick object from bitmap or vector file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
+        // Creates \Imagick object from bitmap or vector file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
 
-		$this->cleanTmpFiles();
+        $this->cleanTmpFiles();
 
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData((string) $bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData((string) $bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
 
-	/**
-	 * Returns a preview of maxX times maxY dimensions in PNG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new Imagick();
+    /**
+     * Returns a preview of maxX times maxY dimensions in PNG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new Imagick();
 
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
 
-		$bp = $this->resize($bp, $maxX, $maxY);
+        $bp = $this->resize($bp, $maxX, $maxY);
 
-		$bp->setImageFormat('png');
+        $bp->setImageFormat('png');
 
-		return $bp;
-	}
+        return $bp;
+    }
 
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		[$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        [$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
 
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// TODO: LANCZOS is the default filter, CATROM could bring similar results faster
-			$bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
-		}
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // TODO: LANCZOS is the default filter, CATROM could bring similar results faster
+            $bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
+        }
 
-		return $bp;
-	}
+        return $bp;
+    }
 }

lib/private/Preview/JPEG.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class JPEG extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/jpeg/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/jpeg/';
+    }
 }

apps/files/templates/appnavigation.php

Braces +5 added lines, -2 removed lines

@@ -15,9 +15,12 @@
 					<p><?php p($l->t('%s used', [$_['usage']])); ?></p>
 				</a>
 			</li>
-		<?php else: ?>
+		<?php else {
+    : ?>
 			<li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
-				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
+				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']]));
+}
+?>">
 				<a href="#" class="icon-quota svg">
 					<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
 					<div class="quota-container">

Indentation +19 added lines, -19 removed lines

@@ -6,11 +6,11 @@ 
 
 		<?php
 
-		$pinned = 0;
-		foreach ($_['navigationItems'] as $item) {
-			$pinned = NavigationListElements($item, $l, $pinned);
-		}
-		?>
+        $pinned = 0;
+        foreach ($_['navigationItems'] as $item) {
+            $pinned = NavigationListElements($item, $l, $pinned);
+        }
+        ?>
 
 		<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 			<li id="quota" class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>">
@@ -71,7 +71,7 @@ 
  * @return int Returns the pinned value
  */
 function NavigationListElements($item, $l, $pinned) {
-	strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?>
+    strpos($item['classes'] ?? '', 'pinned') !== false ? $pinned++ : ''; ?>
 	<li
 		data-id="<?php p($item['id']) ?>"
 		<?php if (isset($item['dir'])) { ?> data-dir="<?php p($item['dir']); ?>" <?php } ?>
@@ -79,8 +79,8 @@ 
 		<?php if (isset($item['expandedState'])) { ?> data-expandedstate="<?php p($item['expandedState']); ?>" <?php } ?>
 		class="nav-<?php p($item['id']) ?>
 		<?php if (isset($item['classes'])) {
-		p($item['classes']);
-	} ?>
+        p($item['classes']);
+    } ?>
 		<?php p($pinned === 1 ? 'first-pinned' : '') ?>
 		<?php if (isset($item['defaultExpandedState']) && $item['defaultExpandedState']) { ?> open<?php } ?>"
 		<?php if (isset($item['folderPosition'])) { ?> folderposition="<?php p($item['folderPosition']); ?>" <?php } ?>>
@@ -90,26 +90,26 @@ 
 
 
 		<?php
-		NavigationElementMenu($item);
-	if (isset($item['sublist'])) {
-		?>
+        NavigationElementMenu($item);
+    if (isset($item['sublist'])) {
+        ?>
 			<button class="collapse app-navigation-noclose"
 				aria-label="<?php p($l->t('Toggle %1$s sublist', $item['name'])) ?>"
 				<?php if (sizeof($item['sublist']) == 0) { ?> style="display: none" <?php } ?>>
 			</button>
 			<ul id="sublist-<?php p($item['id']); ?>">
 				<?php
-				foreach ($item['sublist'] as $item) {
-					$pinned = NavigationListElements($item, $l, $pinned);
-				} ?>
+                foreach ($item['sublist'] as $item) {
+                    $pinned = NavigationListElements($item, $l, $pinned);
+                } ?>
 			</ul>
 		<?php
-	} ?>
+    } ?>
 	</li>
 
 
 	<?php
-	return $pinned;
+    return $pinned;
 }
 
 /**
@@ -120,8 +120,8 @@ 
  * @return void
  */
 function NavigationElementMenu($item) {
-	if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') {
-		?>
+    if (isset($item['menubuttons']) && $item['menubuttons'] === 'true') {
+        ?>
 		<div id="dotmenu-<?php p($item['id']); ?>"
 			 class="app-navigation-entry-utils" <?php if (isset($item['enableMenuButton']) && $item['enableMenuButton'] === 0) { ?> style="display: none"<?php } ?>>
 			<ul>
@@ -137,5 +137,5 @@ 
 			</ul>
 		</div>
 	<?php
-	}
+    }
 }

lib/private/Authentication/Events/ARemoteWipeEvent.php

Indentation +9 added lines, -9 removed lines

@@ -31,16 +31,16 @@
 
 abstract class ARemoteWipeEvent extends Event {
 
-	/** @var IToken */
-	private $token;
+    /** @var IToken */
+    private $token;
 
-	public function __construct(IToken $token) {
-		parent::__construct();
-		$this->token = $token;
-	}
+    public function __construct(IToken $token) {
+        parent::__construct();
+        $this->token = $token;
+    }
 
-	public function getToken(): IToken {
-		return $this->token;
-	}
+    public function getToken(): IToken {
+        return $this->token;
+    }
 
 }

apps/cloud_federation_api/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }