fabarea / media

Classes/TypeConverter/ContentToFileConverter.php

Indentation +26 added lines, -26 removed lines

@@ -19,30 +19,30 @@
 class ContentToFileConverter implements SingletonInterface
 {
 
-    /**
-     * Convert a file representation to File Resource.
-     *
-     * @param Content|int $fileRepresentation
-     * @throws \RuntimeException
-     * @return File
-     */
-    public function convert($fileRepresentation)
-    {
-
-        if ($fileRepresentation instanceof Content) {
-
-            $fileData = $fileRepresentation->toArray();
-            $fileData['modification_date'] = $fileData['tstamp'];
-
-            if (!isset($fileData['storage']) && $fileData['storage'] === null) {
-                throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
-            }
-
-            $fileUid = $fileData['uid'];
-        } else {
-            $fileData = [];
-            $fileUid = (int)$fileRepresentation;
-        }
-        return ResourceFactory::getInstance()->getFileObject($fileUid, $fileData);
-    }
+	/**
+	 * Convert a file representation to File Resource.
+	 *
+	 * @param Content|int $fileRepresentation
+	 * @throws \RuntimeException
+	 * @return File
+	 */
+	public function convert($fileRepresentation)
+	{
+
+		if ($fileRepresentation instanceof Content) {
+
+			$fileData = $fileRepresentation->toArray();
+			$fileData['modification_date'] = $fileData['tstamp'];
+
+			if (!isset($fileData['storage']) && $fileData['storage'] === null) {
+				throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
+			}
+
+			$fileUid = $fileData['uid'];
+		} else {
+			$fileData = [];
+			$fileUid = (int)$fileRepresentation;
+		}
+		return ResourceFactory::getInstance()->getFileObject($fileUid, $fileData);
+	}
 }
\ No newline at end of file

Classes/ViewHelpers/ReportToViewHelper.php

Indentation +14 added lines, -14 removed lines

@@ -16,18 +16,18 @@
 class ReportToViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns the people who will receive a report.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-        $reportTo = 'null (Missing value in $GLOBALS[TYPO3_CONF_VARS][MAIL][defaultMailFromAddress])';
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $reportTo = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-        }
-        return $reportTo;
-    }
+	/**
+	 * Returns the people who will receive a report.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+		$reportTo = 'null (Missing value in $GLOBALS[TYPO3_CONF_VARS][MAIL][defaultMailFromAddress])';
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$reportTo = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+		}
+		return $reportTo;
+	}
 }

Classes/ViewHelpers/MetadataViewHelper.php

Indentation +39 added lines, -39 removed lines

@@ -21,50 +21,50 @@
 class MetadataViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns metadata according to a template.
-     *
-     * @param File $file
-     * @param string $template
-     * @param array $metadataProperties
-     * @param array $configuration
-     * @return string
-     */
-    public function render(File $file, $template = '', array $metadataProperties = array('size', 'width', 'height'), $configuration = [])
-    {
+	/**
+	 * Returns metadata according to a template.
+	 *
+	 * @param File $file
+	 * @param string $template
+	 * @param array $metadataProperties
+	 * @param array $configuration
+	 * @return string
+	 */
+	public function render(File $file, $template = '', array $metadataProperties = array('size', 'width', 'height'), $configuration = [])
+	{
 
-        if (empty($template)) {
-            $template = $this->getDefaultTemplate($file);
-        }
+		if (empty($template)) {
+			$template = $this->getDefaultTemplate($file);
+		}
 
-        $result = $template;
-        foreach ($metadataProperties as $metadataProperty) {
-            $value = $file->getProperty($metadataProperty);
-            if ($metadataProperty === 'size') {
-                $sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
-                $value = round($file->getSize() / $sizeUnit);
-            }
-            $result = str_replace('%' . $metadataProperty, $value, $result);
-        }
+		$result = $template;
+		foreach ($metadataProperties as $metadataProperty) {
+			$value = $file->getProperty($metadataProperty);
+			if ($metadataProperty === 'size') {
+				$sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
+				$value = round($file->getSize() / $sizeUnit);
+			}
+			$result = str_replace('%' . $metadataProperty, $value, $result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns a default template.
-     *
-     * @param File $file
-     * @return string
-     */
-    protected function getDefaultTemplate(File $file)
-    {
+	/**
+	 * Returns a default template.
+	 *
+	 * @param File $file
+	 * @return string
+	 */
+	protected function getDefaultTemplate(File $file)
+	{
 
-        $template = '%size KB';
+		$template = '%size KB';
 
-        if ($file->getType() == File::FILETYPE_IMAGE) {
-            $template = '%width x %height - ' . $template;
-        }
+		if ($file->getType() == File::FILETYPE_IMAGE) {
+			$template = '%width x %height - ' . $template;
+		}
 
-        return $template;
-    }
+		return $template;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
                 $sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
                 $value = round($file->getSize() / $sizeUnit);
             }
-            $result = str_replace('%' . $metadataProperty, $value, $result);
+            $result = str_replace('%'.$metadataProperty, $value, $result);
         }
 
         return $result;
@@ -62,7 +62,7 @@ 
         $template = '%size KB';
 
         if ($file->getType() == File::FILETYPE_IMAGE) {
-            $template = '%width x %height - ' . $template;
+            $template = '%width x %height - '.$template;
         }
 
         return $template;

Classes/Index/TitleMetadataExtractor.php

Indentation +111 added lines, -111 removed lines

@@ -20,124 +20,124 @@
 class TitleMetadataExtractor implements ExtractorInterface
 {
 
-    /**
-     * Returns an array of supported file types;
-     * An empty array indicates all filetypes
-     *
-     * @return array
-     */
-    public function getFileTypeRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Returns an array of supported file types;
+	 * An empty array indicates all filetypes
+	 *
+	 * @return array
+	 */
+	public function getFileTypeRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Get all supported DriverClasses
-     * Since some extractors may only work for local files, and other extractors
-     * are especially made for grabbing data from remote.
-     * Returns array of string with driver names of Drivers which are supported,
-     * If the driver did not register a name, it's the classname.
-     * empty array indicates no restrictions
-     *
-     * @return array
-     */
-    public function getDriverRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Get all supported DriverClasses
+	 * Since some extractors may only work for local files, and other extractors
+	 * are especially made for grabbing data from remote.
+	 * Returns array of string with driver names of Drivers which are supported,
+	 * If the driver did not register a name, it's the classname.
+	 * empty array indicates no restrictions
+	 *
+	 * @return array
+	 */
+	public function getDriverRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Returns the data priority of the extraction Service.
-     * Defines the precedence of Data if several extractors
-     * extracted the same property.
-     * Should be between 1 and 100, 100 is more important than 1
-     *
-     * @return integer
-     */
-    public function getPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the data priority of the extraction Service.
+	 * Defines the precedence of Data if several extractors
+	 * extracted the same property.
+	 * Should be between 1 and 100, 100 is more important than 1
+	 *
+	 * @return integer
+	 */
+	public function getPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Returns the execution priority of the extraction Service
-     * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
-     *
-     * @return integer
-     */
-    public function getExecutionPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the execution priority of the extraction Service
+	 * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
+	 *
+	 * @return integer
+	 */
+	public function getExecutionPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Checks if the given file can be processed by this Extractor
-     *
-     * @param File $file
-     * @return boolean
-     */
-    public function canProcess(File $file)
-    {
-        return true;
-    }
+	/**
+	 * Checks if the given file can be processed by this Extractor
+	 *
+	 * @param File $file
+	 * @return boolean
+	 */
+	public function canProcess(File $file)
+	{
+		return true;
+	}
 
-    /**
-     * The actual processing TASK
-     * Should return an array with database properties for sys_file_metadata to write
-     *
-     * @param File $file
-     * @param array $previousExtractedData optional, contains the array of already extracted data
-     * @return array
-     */
-    public function extractMetaData(File $file, array $previousExtractedData = [])
-    {
-        $metadata = [];
-        $title = $file->getProperty('title');
-        if (empty($title)) {
-            $metadata = array('title' => $this->guessTitle($file->getName()));
-        }
-        return $metadata;
-    }
+	/**
+	 * The actual processing TASK
+	 * Should return an array with database properties for sys_file_metadata to write
+	 *
+	 * @param File $file
+	 * @param array $previousExtractedData optional, contains the array of already extracted data
+	 * @return array
+	 */
+	public function extractMetaData(File $file, array $previousExtractedData = [])
+	{
+		$metadata = [];
+		$title = $file->getProperty('title');
+		if (empty($title)) {
+			$metadata = array('title' => $this->guessTitle($file->getName()));
+		}
+		return $metadata;
+	}
 
-    /**
-     * Guess a title given a file name. Examples:
-     * name: my-file-name.jpg -> title: My file name
-     * name: myFileName.jpg -> title: My file name
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function guessTitle($fileName)
-    {
-        $fileNameWithoutExtension = $this->removeExtension($fileName);
+	/**
+	 * Guess a title given a file name. Examples:
+	 * name: my-file-name.jpg -> title: My file name
+	 * name: myFileName.jpg -> title: My file name
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function guessTitle($fileName)
+	{
+		$fileNameWithoutExtension = $this->removeExtension($fileName);
 
-        $title = $fileNameWithoutExtension;
-        // first case: the name is separated by _ or -
-        // second case: this is an upper camel case name
-        if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
-            $title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
-        } elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
-            $parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
-            $title = implode(' ', $parts);
-        }
+		$title = $fileNameWithoutExtension;
+		// first case: the name is separated by _ or -
+		// second case: this is an upper camel case name
+		if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
+			$title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
+		} elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
+			$parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
+			$title = implode(' ', $parts);
+		}
 
-        // Remove double space.
-        $title = preg_replace('/\s+/', ' ', $title);
-        return ucfirst($title);
-    }
+		// Remove double space.
+		$title = preg_replace('/\s+/', ' ', $title);
+		return ucfirst($title);
+	}
 
-    /**
-     * Remove extension of a file.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function removeExtension($fileName)
-    {
-        $parts = explode('.', $fileName);
-        if (!empty($parts)) {
-            array_pop($parts);
-        }
-        return implode('.', $parts);
-    }
+	/**
+	 * Remove extension of a file.
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function removeExtension($fileName)
+	{
+		$parts = explode('.', $fileName);
+		if (!empty($parts)) {
+			array_pop($parts);
+		}
+		return implode('.', $parts);
+	}
 }

Classes/FileUpload/ImageOptimizer.php

Indentation +70 added lines, -70 removed lines

@@ -17,83 +17,83 @@
 class ImageOptimizer implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $optimizers = [];
+	/**
+	 * @var array
+	 */
+	protected $optimizers = [];
 
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Returns a class instance.
-     *
-     * @return ImageOptimizer
-     * @throws \InvalidArgumentException
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     */
-    static public function getInstance($storage = null)
-    {
-        return GeneralUtility::makeInstance(self::class, $storage);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return ImageOptimizer
+	 * @throws \InvalidArgumentException
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 */
+	static public function getInstance($storage = null)
+	{
+		return GeneralUtility::makeInstance(self::class, $storage);
+	}
 
-    /**
-     * Constructor
-     *
-     * @return ImageOptimizer
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->add('Fab\Media\FileUpload\Optimizer\Resize');
-        $this->add('Fab\Media\FileUpload\Optimizer\Rotate');
-    }
+	/**
+	 * Constructor
+	 *
+	 * @return ImageOptimizer
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->add('Fab\Media\FileUpload\Optimizer\Resize');
+		$this->add('Fab\Media\FileUpload\Optimizer\Rotate');
+	}
 
-    /**
-     * Register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function add($className)
-    {
-        $this->optimizers[] = $className;
-    }
+	/**
+	 * Register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function add($className)
+	{
+		$this->optimizers[] = $className;
+	}
 
-    /**
-     * Un-register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function remove($className)
-    {
-        if (in_array($className, $this->optimizers)) {
-            $key = array_search($className, $this->optimizers);
-            unset($this->optimizers[$key]);
-        }
-    }
+	/**
+	 * Un-register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function remove($className)
+	{
+		if (in_array($className, $this->optimizers)) {
+			$key = array_search($className, $this->optimizers);
+			unset($this->optimizers[$key]);
+		}
+	}
 
-    /**
-     * Optimize an image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     * @throws \InvalidArgumentException
-     */
-    public function optimize(UploadedFileInterface $uploadedFile)
-    {
+	/**
+	 * Optimize an image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 * @throws \InvalidArgumentException
+	 */
+	public function optimize(UploadedFileInterface $uploadedFile)
+	{
 
-        foreach ($this->optimizers as $optimizer) {
+		foreach ($this->optimizers as $optimizer) {
 
-            /** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
-            $optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
-            $uploadedFile = $optimizer->optimize($uploadedFile);
-        }
+			/** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
+			$optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
+			$uploadedFile = $optimizer->optimize($uploadedFile);
+		}
 
-        return $uploadedFile;
-    }
+		return $uploadedFile;
+	}
 }

Classes/FileUpload/UploadedFileInterface.php

Indentation +69 added lines, -69 removed lines

@@ -14,83 +14,83 @@
 interface UploadedFileInterface
 {
 
-    /**
-     * Save the file to the specified path.
-     *
-     * @return boolean true on success
-     */
-    public function save();
+	/**
+	 * Save the file to the specified path.
+	 *
+	 * @return boolean true on success
+	 */
+	public function save();
 
-    /**
-     * Get the original filename.
-     *
-     * @return string filename
-     */
-    public function getOriginalName();
+	/**
+	 * Get the original filename.
+	 *
+	 * @return string filename
+	 */
+	public function getOriginalName();
 
-    /**
-     * Get the file size.
-     *
-     * @return int
-     */
-    public function getSize();
+	/**
+	 * Get the file size.
+	 *
+	 * @return int
+	 */
+	public function getSize();
 
-    /**
-     * Get the file name.
-     *
-     * @return int
-     */
-    public function getName();
+	/**
+	 * Get the file name.
+	 *
+	 * @return int
+	 */
+	public function getName();
 
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType();
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType();
 
-    /**
-     * Get the mime type of the file.
-     *
-     * @return int
-     */
-    public function getMimeType();
+	/**
+	 * Get the mime type of the file.
+	 *
+	 * @return int
+	 */
+	public function getMimeType();
 
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath();
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath();
 
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl();
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl();
 
-    /**
-     * Set the file input name from the DOM.
-     *
-     * @param string $inputName
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setInputName($inputName);
+	/**
+	 * Set the file input name from the DOM.
+	 *
+	 * @param string $inputName
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setInputName($inputName);
 
-    /**
-     * Set the upload folder
-     *
-     * @param string $uploadFolder
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder);
+	/**
+	 * Set the upload folder
+	 *
+	 * @param string $uploadFolder
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder);
 
-    /**
-     * Set the file name to be saved
-     *
-     * @param string $name
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setName($name);
+	/**
+	 * Set the file name to be saved
+	 *
+	 * @param string $name
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setName($name);
 }

Classes/FileUpload/MultipartedFile.php

Indentation +40 added lines, -40 removed lines

@@ -16,48 +16,48 @@
 class MultipartedFile extends UploadedFileAbstract
 {
 
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
 
-    /**
-     * Save the file to the specified path
-     *
-     * @return boolean true on success
-     */
-    public function save()
-    {
-        return move_uploaded_file($_FILES[$this->inputName]['tmp_name'], $this->getFileWithAbsolutePath());
-    }
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+		return move_uploaded_file($_FILES[$this->inputName]['tmp_name'], $this->getFileWithAbsolutePath());
+	}
 
-    /**
-     * Get the original filename
-     *
-     * @return string filename
-     */
-    public function getOriginalName()
-    {
-        return $_FILES[$this->inputName]['name'];
-    }
+	/**
+	 * Get the original filename
+	 *
+	 * @return string filename
+	 */
+	public function getOriginalName()
+	{
+		return $_FILES[$this->inputName]['name'];
+	}
 
-    /**
-     * Get the file size
-     *
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        return $_FILES[$this->inputName]['size'];
-    }
+	/**
+	 * Get the file size
+	 *
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		return $_FILES[$this->inputName]['size'];
+	}
 
-    /**
-     * Get the mime type of the file.
-     *
-     * @return int
-     */
-    public function getMimeType()
-    {
-        return $_FILES[$this->inputName]['type'];
-    }
+	/**
+	 * Get the mime type of the file.
+	 *
+	 * @return int
+	 */
+	public function getMimeType()
+	{
+		return $_FILES[$this->inputName]['type'];
+	}
 }

Classes/FileUpload/Optimizer/JpegExifOrient.php

Indentation +211 added lines, -211 removed lines

@@ -45,231 +45,231 @@
 class JpegExifOrient
 {
 
-    /**
-     * Sets the Exif Orientation for a given JPG file.
-     *
-     * @param string $filename
-     * @param integer $orientation
-     * @return void
-     * @throws \RuntimeException
-     */
-    public static function setOrientation($filename, $orientation)
-    {
-        $exif_data = [];    // Buffer
-        $offsetJfif = 0;
+	/**
+	 * Sets the Exif Orientation for a given JPG file.
+	 *
+	 * @param string $filename
+	 * @param integer $orientation
+	 * @return void
+	 * @throws \RuntimeException
+	 */
+	public static function setOrientation($filename, $orientation)
+	{
+		$exif_data = [];    // Buffer
+		$offsetJfif = 0;
 
-        if (($fh = fopen($filename, 'rb+')) === false) {
-            throw new \RuntimeException('Can\'t open ' . $filename, 1363533724);
-        }
+		if (($fh = fopen($filename, 'rb+')) === false) {
+			throw new \RuntimeException('Can\'t open ' . $filename, 1363533724);
+		}
 
-        // Read file head, check for JPEG SOI + JFIF/Exif APP1
-        for ($i = 0; $i < 4; $i++) $exif_data[$i] = self::read_1_byte($fh);
-        if ($exif_data[0] !== 0xFF ||
-            $exif_data[1] !== 0xD8
-        ) {
-        }
+		// Read file head, check for JPEG SOI + JFIF/Exif APP1
+		for ($i = 0; $i < 4; $i++) $exif_data[$i] = self::read_1_byte($fh);
+		if ($exif_data[0] !== 0xFF ||
+			$exif_data[1] !== 0xD8
+		) {
+		}
 
-        // JFIF segment: http://en.wikipedia.org/wiki/JPEG_File_Interchange_Format#JFIF_segment_format
-        if ($exif_data[2] === 0xFF && $exif_data[3] === 0xE0) {
-            // Get the marker parameter length count
-            $length = self::read_2_bytes($fh);
-            $offsetJfif = $length + 2;    // "+ 2" to skip the 2 bytes introducing this additional segment
-            // Length includes itself, so must be at least 2
-            // Following JFIF data length must be at least 6
-            if ($length < 8) {
-                return;
-            }
-            $length -= 8;
-            // Read JFIF head, check for "JFIF"
-            for ($i = 0; $i < 5; $i++) $exif_data[$i] = self::read_1_byte($fh);
-            if ($exif_data[0] !== 0x4A ||
-                $exif_data[1] !== 0x46 ||
-                $exif_data[2] !== 0x49 ||
-                $exif_data[3] !== 0x46 ||
-                $exif_data[4] !== 0
-            ) {
-                return;
-            }
-            // Read JFIF body
-            for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
+		// JFIF segment: http://en.wikipedia.org/wiki/JPEG_File_Interchange_Format#JFIF_segment_format
+		if ($exif_data[2] === 0xFF && $exif_data[3] === 0xE0) {
+			// Get the marker parameter length count
+			$length = self::read_2_bytes($fh);
+			$offsetJfif = $length + 2;    // "+ 2" to skip the 2 bytes introducing this additional segment
+			// Length includes itself, so must be at least 2
+			// Following JFIF data length must be at least 6
+			if ($length < 8) {
+				return;
+			}
+			$length -= 8;
+			// Read JFIF head, check for "JFIF"
+			for ($i = 0; $i < 5; $i++) $exif_data[$i] = self::read_1_byte($fh);
+			if ($exif_data[0] !== 0x4A ||
+				$exif_data[1] !== 0x46 ||
+				$exif_data[2] !== 0x49 ||
+				$exif_data[3] !== 0x46 ||
+				$exif_data[4] !== 0
+			) {
+				return;
+			}
+			// Read JFIF body
+			for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
 
-            if (self::read_1_byte($fh) !== 0) {
-                // Seems there is a 0 byte to separate segments...
-                return;
-            }
-            // Read next 2 bytes in $exif_data[2] and $exif_data[3] as Exif APP1 segment
-            // is now expected
-            $exif_data[2] = self::read_1_byte($fh);
-            $exif_data[3] = self::read_1_byte($fh);
-        }
+			if (self::read_1_byte($fh) !== 0) {
+				// Seems there is a 0 byte to separate segments...
+				return;
+			}
+			// Read next 2 bytes in $exif_data[2] and $exif_data[3] as Exif APP1 segment
+			// is now expected
+			$exif_data[2] = self::read_1_byte($fh);
+			$exif_data[3] = self::read_1_byte($fh);
+		}
 
-        // Exif APP1
-        if ($exif_data[2] !== 0xFF || $exif_data[3] !== 0xE1) {
-            return;
-        }
+		// Exif APP1
+		if ($exif_data[2] !== 0xFF || $exif_data[3] !== 0xE1) {
+			return;
+		}
 
-        // Get the marker parameter length count
-        $length = self::read_2_bytes($fh);
-        // Length includes itself, so must be at least 2
-        // Following Exif data length must be at least 6
-        if ($length < 8) {
-            return;
-        }
-        $length -= 8;
-        // Read Exif head, check for "Exif"
-        for ($i = 0; $i < 6; $i++) $exif_data[$i] = self::read_1_byte($fh);
-        if ($exif_data[0] !== 0x45 ||
-            $exif_data[1] !== 0x78 ||
-            $exif_data[2] !== 0x69 ||
-            $exif_data[3] !== 0x66 ||
-            $exif_data[4] !== 0 ||
-            $exif_data[5] !== 0
-        ) {
-            return;
-        }
-        // Read Exif body
-        for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
+		// Get the marker parameter length count
+		$length = self::read_2_bytes($fh);
+		// Length includes itself, so must be at least 2
+		// Following Exif data length must be at least 6
+		if ($length < 8) {
+			return;
+		}
+		$length -= 8;
+		// Read Exif head, check for "Exif"
+		for ($i = 0; $i < 6; $i++) $exif_data[$i] = self::read_1_byte($fh);
+		if ($exif_data[0] !== 0x45 ||
+			$exif_data[1] !== 0x78 ||
+			$exif_data[2] !== 0x69 ||
+			$exif_data[3] !== 0x66 ||
+			$exif_data[4] !== 0 ||
+			$exif_data[5] !== 0
+		) {
+			return;
+		}
+		// Read Exif body
+		for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
 
-        if ($length < 12) {    // Length of an IFD entry
-            return;
-        }
+		if ($length < 12) {    // Length of an IFD entry
+			return;
+		}
 
-        // Discover byte order
-        if ($exif_data[0] === 0x49 && $exif_data[1] === 0x49) {
-            $is_motorola = false;
-        } elseif ($exif_data[0] === 0x4D && $exif_data[1] === 0x4D) {
-            $is_motorola = true;
-        } else {
-            return;
-        }
+		// Discover byte order
+		if ($exif_data[0] === 0x49 && $exif_data[1] === 0x49) {
+			$is_motorola = false;
+		} elseif ($exif_data[0] === 0x4D && $exif_data[1] === 0x4D) {
+			$is_motorola = true;
+		} else {
+			return;
+		}
 
-        // Check Tag mark
-        if ($is_motorola) {
-            if ($exif_data[2] !== 0) return;
-            if ($exif_data[3] !== 0x2A) return;
-        } else {
-            if ($exif_data[3] !== 0) return;
-            if ($exif_data[2] !== 0x2A) return;
-        }
+		// Check Tag mark
+		if ($is_motorola) {
+			if ($exif_data[2] !== 0) return;
+			if ($exif_data[3] !== 0x2A) return;
+		} else {
+			if ($exif_data[3] !== 0) return;
+			if ($exif_data[2] !== 0x2A) return;
+		}
 
-        // Get first IFD offset (offset to IFD0)
-        if ($is_motorola) {
-            if ($exif_data[4] !== 0) return;
-            if ($exif_data[5] !== 0) return;
-            $offset = $exif_data[6];
-            $offset <<= 8;
-            $offset += $exif_data[7];
-        } else {
-            if ($exif_data[7] !== 0) return;
-            if ($exif_data[6] !== 0) return;
-            $offset = $exif_data[5];
-            $offset <<= 8;
-            $offset += $exif_data[4];
-        }
-        // Check end of data segment
-        if ($offset > $length - 2) return;
+		// Get first IFD offset (offset to IFD0)
+		if ($is_motorola) {
+			if ($exif_data[4] !== 0) return;
+			if ($exif_data[5] !== 0) return;
+			$offset = $exif_data[6];
+			$offset <<= 8;
+			$offset += $exif_data[7];
+		} else {
+			if ($exif_data[7] !== 0) return;
+			if ($exif_data[6] !== 0) return;
+			$offset = $exif_data[5];
+			$offset <<= 8;
+			$offset += $exif_data[4];
+		}
+		// Check end of data segment
+		if ($offset > $length - 2) return;
 
-        // Get the number of directory entries contained in this IFD
-        if ($is_motorola) {
-            $number_of_tags = $exif_data[$offset];
-            $number_of_tags <<= 8;
-            $number_of_tags += $exif_data[$offset + 1];
-        } else {
-            $number_of_tags = $exif_data[$offset + 1];
-            $number_of_tags <<= 8;
-            $number_of_tags += $exif_data[$offset];
-        }
-        if ($number_of_tags === 0) return;
-        $offset += 2;
+		// Get the number of directory entries contained in this IFD
+		if ($is_motorola) {
+			$number_of_tags = $exif_data[$offset];
+			$number_of_tags <<= 8;
+			$number_of_tags += $exif_data[$offset + 1];
+		} else {
+			$number_of_tags = $exif_data[$offset + 1];
+			$number_of_tags <<= 8;
+			$number_of_tags += $exif_data[$offset];
+		}
+		if ($number_of_tags === 0) return;
+		$offset += 2;
 
-        // Search for Orientation Tag in IFD0
-        while (true) {
-            // Check end of data segment
-            if ($offset > $length - 12) return;
-            // Get Tag number
-            if ($is_motorola) {
-                $tagnum = $exif_data[$offset];
-                $tagnum <<= 8;
-                $tagnum += $exif_data[$offset + 1];
-            } else {
-                $tagnum = $exif_data[$offset + 1];
-                $tagnum <<= 8;
-                $tagnum += $exif_data[$offset];
-            }
-            // Found Orientation Tag
-            if ($tagnum === 0x0112) break;
-            if (--$number_of_tags === 0) return;
-            $offset += 12;
-        }
+		// Search for Orientation Tag in IFD0
+		while (true) {
+			// Check end of data segment
+			if ($offset > $length - 12) return;
+			// Get Tag number
+			if ($is_motorola) {
+				$tagnum = $exif_data[$offset];
+				$tagnum <<= 8;
+				$tagnum += $exif_data[$offset + 1];
+			} else {
+				$tagnum = $exif_data[$offset + 1];
+				$tagnum <<= 8;
+				$tagnum += $exif_data[$offset];
+			}
+			// Found Orientation Tag
+			if ($tagnum === 0x0112) break;
+			if (--$number_of_tags === 0) return;
+			$offset += 12;
+		}
 
-        // Set the Orientation value
-        if ($is_motorola) {
-            $exif_data[$offset + 2] = 0;    // Format = unsigned short (2 octets)
-            $exif_data[$offset + 3] = 3;
-            $exif_data[$offset + 4] = 0;    // Number of Components = 1
-            $exif_data[$offset + 5] = 0;
-            $exif_data[$offset + 6] = 0;
-            $exif_data[$offset + 7] = 1;
-            $exif_data[$offset + 8] = 0;
-            $exif_data[$offset + 9] = $orientation;
-            $exif_data[$offset + 10] = 0;
-            $exif_data[$offset + 11] = 0;
-        } else {
-            $exif_data[$offset + 2] = 3;    // Format = unsigned short (2 octets)
-            $exif_data[$offset + 3] = 0;
-            $exif_data[$offset + 4] = 1;    // Number of Components = 1
-            $exif_data[$offset + 5] = 0;
-            $exif_data[$offset + 6] = 0;
-            $exif_data[$offset + 7] = 0;
-            $exif_data[$offset + 8] = $orientation;
-            $exif_data[$offset + 9] = 0;
-            $exif_data[$offset + 10] = 0;
-            $exif_data[$offset + 11] = 0;
-        }
-        fseek($fh, (4 + 2 + 6 + 2) + $offsetJfif + $offset, SEEK_SET);
-        $data = '';
-        for ($i = 0; $i < 10; $i++) {
-            $data .= chr($exif_data[$i + $offset + 2]);
-        }
-        fwrite($fh, $data);
-        fclose($fh);
-    }
+		// Set the Orientation value
+		if ($is_motorola) {
+			$exif_data[$offset + 2] = 0;    // Format = unsigned short (2 octets)
+			$exif_data[$offset + 3] = 3;
+			$exif_data[$offset + 4] = 0;    // Number of Components = 1
+			$exif_data[$offset + 5] = 0;
+			$exif_data[$offset + 6] = 0;
+			$exif_data[$offset + 7] = 1;
+			$exif_data[$offset + 8] = 0;
+			$exif_data[$offset + 9] = $orientation;
+			$exif_data[$offset + 10] = 0;
+			$exif_data[$offset + 11] = 0;
+		} else {
+			$exif_data[$offset + 2] = 3;    // Format = unsigned short (2 octets)
+			$exif_data[$offset + 3] = 0;
+			$exif_data[$offset + 4] = 1;    // Number of Components = 1
+			$exif_data[$offset + 5] = 0;
+			$exif_data[$offset + 6] = 0;
+			$exif_data[$offset + 7] = 0;
+			$exif_data[$offset + 8] = $orientation;
+			$exif_data[$offset + 9] = 0;
+			$exif_data[$offset + 10] = 0;
+			$exif_data[$offset + 11] = 0;
+		}
+		fseek($fh, (4 + 2 + 6 + 2) + $offsetJfif + $offset, SEEK_SET);
+		$data = '';
+		for ($i = 0; $i < 10; $i++) {
+			$data .= chr($exif_data[$i + $offset + 2]);
+		}
+		fwrite($fh, $data);
+		fclose($fh);
+	}
 
-    /**
-     * Reads one byte, testing for EOF.
-     *
-     * @param resource $handle
-     * @return integer
-     * @throws \RuntimeException
-     */
-    protected static function read_1_byte($handle)
-    {
-        $c = fgetc($handle);
-        if ($c === false) {
-            throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
-        }
-        return ord($c);
-    }
+	/**
+	 * Reads one byte, testing for EOF.
+	 *
+	 * @param resource $handle
+	 * @return integer
+	 * @throws \RuntimeException
+	 */
+	protected static function read_1_byte($handle)
+	{
+		$c = fgetc($handle);
+		if ($c === false) {
+			throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
+		}
+		return ord($c);
+	}
 
-    /**
-     * Reads 2 bytes, converts them to unsigned int
-     * Remark: All 2-byte quantities in JPEG markers are MSB first.
-     *
-     * @param resource $handle
-     * @return integer
-     * @throws \RuntimeException
-     */
-    protected static function read_2_bytes($handle)
-    {
-        $c1 = fgetc($handle);
-        if ($c1 === false) {
-            throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
-        }
-        $c2 = fgetc($handle);
-        if ($c2 === false) {
-            throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
-        }
-        return (ord($c1) << 8) + (ord($c2));
-    }
+	/**
+	 * Reads 2 bytes, converts them to unsigned int
+	 * Remark: All 2-byte quantities in JPEG markers are MSB first.
+	 *
+	 * @param resource $handle
+	 * @return integer
+	 * @throws \RuntimeException
+	 */
+	protected static function read_2_bytes($handle)
+	{
+		$c1 = fgetc($handle);
+		if ($c1 === false) {
+			throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
+		}
+		$c2 = fgetc($handle);
+		if ($c2 === false) {
+			throw new \RuntimeException('Premature EOF in JPEG file', 1363533326);
+		}
+		return (ord($c1) << 8) + (ord($c2));
+	}
 
 }

Spacing +7 added lines, -7 removed lines

@@ -55,11 +55,11 @@ 
      */
     public static function setOrientation($filename, $orientation)
     {
-        $exif_data = [];    // Buffer
+        $exif_data = []; // Buffer
         $offsetJfif = 0;
 
         if (($fh = fopen($filename, 'rb+')) === false) {
-            throw new \RuntimeException('Can\'t open ' . $filename, 1363533724);
+            throw new \RuntimeException('Can\'t open '.$filename, 1363533724);
         }
 
         // Read file head, check for JPEG SOI + JFIF/Exif APP1
@@ -73,7 +73,7 @@ 
         if ($exif_data[2] === 0xFF && $exif_data[3] === 0xE0) {
             // Get the marker parameter length count
             $length = self::read_2_bytes($fh);
-            $offsetJfif = $length + 2;    // "+ 2" to skip the 2 bytes introducing this additional segment
+            $offsetJfif = $length + 2; // "+ 2" to skip the 2 bytes introducing this additional segment
             // Length includes itself, so must be at least 2
             // Following JFIF data length must be at least 6
             if ($length < 8) {
@@ -204,9 +204,9 @@ 
 
         // Set the Orientation value
         if ($is_motorola) {
-            $exif_data[$offset + 2] = 0;    // Format = unsigned short (2 octets)
+            $exif_data[$offset + 2] = 0; // Format = unsigned short (2 octets)
             $exif_data[$offset + 3] = 3;
-            $exif_data[$offset + 4] = 0;    // Number of Components = 1
+            $exif_data[$offset + 4] = 0; // Number of Components = 1
             $exif_data[$offset + 5] = 0;
             $exif_data[$offset + 6] = 0;
             $exif_data[$offset + 7] = 1;
@@ -215,9 +215,9 @@ 
             $exif_data[$offset + 10] = 0;
             $exif_data[$offset + 11] = 0;
         } else {
-            $exif_data[$offset + 2] = 3;    // Format = unsigned short (2 octets)
+            $exif_data[$offset + 2] = 3; // Format = unsigned short (2 octets)
             $exif_data[$offset + 3] = 0;
-            $exif_data[$offset + 4] = 1;    // Number of Components = 1
+            $exif_data[$offset + 4] = 1; // Number of Components = 1
             $exif_data[$offset + 5] = 0;
             $exif_data[$offset + 6] = 0;
             $exif_data[$offset + 7] = 0;

Braces +54 added lines, -18 removed lines

@@ -63,7 +63,9 @@ 
         }
 
         // Read file head, check for JPEG SOI + JFIF/Exif APP1
-        for ($i = 0; $i < 4; $i++) $exif_data[$i] = self::read_1_byte($fh);
+        for ($i = 0; $i < 4; $i++) {
+        	$exif_data[$i] = self::read_1_byte($fh);
+        }
         if ($exif_data[0] !== 0xFF ||
             $exif_data[1] !== 0xD8
         ) {
@@ -81,7 +83,9 @@ 
             }
             $length -= 8;
             // Read JFIF head, check for "JFIF"
-            for ($i = 0; $i < 5; $i++) $exif_data[$i] = self::read_1_byte($fh);
+            for ($i = 0; $i < 5; $i++) {
+            	$exif_data[$i] = self::read_1_byte($fh);
+            }
             if ($exif_data[0] !== 0x4A ||
                 $exif_data[1] !== 0x46 ||
                 $exif_data[2] !== 0x49 ||
@@ -91,7 +95,9 @@ 
                 return;
             }
             // Read JFIF body
-            for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
+            for ($i = 0; $i < $length; $i++) {
+            	$exif_data[$i] = self::read_1_byte($fh);
+            }
 
             if (self::read_1_byte($fh) !== 0) {
                 // Seems there is a 0 byte to separate segments...
@@ -117,7 +123,9 @@ 
         }
         $length -= 8;
         // Read Exif head, check for "Exif"
-        for ($i = 0; $i < 6; $i++) $exif_data[$i] = self::read_1_byte($fh);
+        for ($i = 0; $i < 6; $i++) {
+        	$exif_data[$i] = self::read_1_byte($fh);
+        }
         if ($exif_data[0] !== 0x45 ||
             $exif_data[1] !== 0x78 ||
             $exif_data[2] !== 0x69 ||
@@ -128,7 +136,9 @@ 
             return;
         }
         // Read Exif body
-        for ($i = 0; $i < $length; $i++) $exif_data[$i] = self::read_1_byte($fh);
+        for ($i = 0; $i < $length; $i++) {
+        	$exif_data[$i] = self::read_1_byte($fh);
+        }
 
         if ($length < 12) {    // Length of an IFD entry
             return;
@@ -145,29 +155,47 @@ 
 
         // Check Tag mark
         if ($is_motorola) {
-            if ($exif_data[2] !== 0) return;
-            if ($exif_data[3] !== 0x2A) return;
+            if ($exif_data[2] !== 0) {
+            	return;
+            }
+            if ($exif_data[3] !== 0x2A) {
+            	return;
+            }
         } else {
-            if ($exif_data[3] !== 0) return;
-            if ($exif_data[2] !== 0x2A) return;
+            if ($exif_data[3] !== 0) {
+            	return;
+            }
+            if ($exif_data[2] !== 0x2A) {
+            	return;
+            }
         }
 
         // Get first IFD offset (offset to IFD0)
         if ($is_motorola) {
-            if ($exif_data[4] !== 0) return;
-            if ($exif_data[5] !== 0) return;
+            if ($exif_data[4] !== 0) {
+            	return;
+            }
+            if ($exif_data[5] !== 0) {
+            	return;
+            }
             $offset = $exif_data[6];
             $offset <<= 8;
             $offset += $exif_data[7];
         } else {
-            if ($exif_data[7] !== 0) return;
-            if ($exif_data[6] !== 0) return;
+            if ($exif_data[7] !== 0) {
+            	return;
+            }
+            if ($exif_data[6] !== 0) {
+            	return;
+            }
             $offset = $exif_data[5];
             $offset <<= 8;
             $offset += $exif_data[4];
         }
         // Check end of data segment
-        if ($offset > $length - 2) return;
+        if ($offset > $length - 2) {
+        	return;
+        }
 
         // Get the number of directory entries contained in this IFD
         if ($is_motorola) {
@@ -179,13 +207,17 @@ 
             $number_of_tags <<= 8;
             $number_of_tags += $exif_data[$offset];
         }
-        if ($number_of_tags === 0) return;
+        if ($number_of_tags === 0) {
+        	return;
+        }
         $offset += 2;
 
         // Search for Orientation Tag in IFD0
         while (true) {
             // Check end of data segment
-            if ($offset > $length - 12) return;
+            if ($offset > $length - 12) {
+            	return;
+            }
             // Get Tag number
             if ($is_motorola) {
                 $tagnum = $exif_data[$offset];
@@ -197,8 +229,12 @@ 
                 $tagnum += $exif_data[$offset];
             }
             // Found Orientation Tag
-            if ($tagnum === 0x0112) break;
-            if (--$number_of_tags === 0) return;
+            if ($tagnum === 0x0112) {
+            	break;
+            }
+            if (--$number_of_tags === 0) {
+            	return;
+            }
             $offset += 12;
         }
 

Classes/View/Button/DownloadButton.php

Indentation +37 added lines, -37 removed lines

@@ -20,45 +20,45 @@
 class DownloadButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "download" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function render(Content $object = null)
-    {
+	/**
+	 * Renders a "download" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function render(Content $object = null)
+	{
 
-        $button = $this->makeLinkButton()
-            ->setHref($this->getDownloadUri($object))
-            ->setDataAttributes([
-                'uid' => $object->getUid(),
-                'toggle' => 'tooltip',
-            ])
-            ->setClasses('btn-download')
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:download'))
-            ->setIcon($this->getIconFactory()->getIcon('actions-system-extension-download', Icon::SIZE_SMALL))
-            ->render();
+		$button = $this->makeLinkButton()
+			->setHref($this->getDownloadUri($object))
+			->setDataAttributes([
+				'uid' => $object->getUid(),
+				'toggle' => 'tooltip',
+			])
+			->setClasses('btn-download')
+			->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:download'))
+			->setIcon($this->getIconFactory()->getIcon('actions-system-extension-download', Icon::SIZE_SMALL))
+			->render();
 
-        return $button;
-    }
+		return $button;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getDownloadUri(Content $object)
-    {
-        $urlParameters = [
-            MediaModule::getParameterPrefix() => [
-                'controller' => 'Asset',
-                'action' => 'download',
-                'forceDownload' => true,
-                'file' => $object->getUid(),
-            ],
-        ];
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getDownloadUri(Content $object)
+	{
+		$urlParameters = [
+			MediaModule::getParameterPrefix() => [
+				'controller' => 'Asset',
+				'action' => 'download',
+				'forceDownload' => true,
+				'file' => $object->getUid(),
+			],
+		];
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
 }