fabarea / media

Classes/ViewHelpers/Uri/MoveViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         // Work around a bug in BackendUtility::getModuleUrl if matches is empty getModuleUrl() will not return the parameter.
         $matches = $this->templateVariableContainer->get('matches');
         if (empty($matches)) {
-            $moduleUrl .= '&' . urlencode(VidiModule::getParameterPrefix() . '[matches]=');
+            $moduleUrl .= '&'.urlencode(VidiModule::getParameterPrefix().'[matches]=');
         }
 
         return $moduleUrl;

Indentation +26 added lines, -26 removed lines

@@ -18,33 +18,33 @@
  */
 class MoveViewHelper extends AbstractViewHelper
 {
-    /**
-     * Render a move storage URI.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $urlParameters = array(
-            VidiModule::getParameterPrefix() => array(
-                'controller' => 'Content',
-                'action' => 'move',
-                'fieldNameAndPath' => $this->templateVariableContainer->get('fieldNameAndPath'),
-                'matches' => $this->templateVariableContainer->get('matches'),
-            ),
-        );
+	/**
+	 * Render a move storage URI.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$urlParameters = array(
+			VidiModule::getParameterPrefix() => array(
+				'controller' => 'Content',
+				'action' => 'move',
+				'fieldNameAndPath' => $this->templateVariableContainer->get('fieldNameAndPath'),
+				'matches' => $this->templateVariableContainer->get('matches'),
+			),
+		);
 
-        $moduleUrl = BackendUtility::getModuleUrl(
-            VidiModule::getSignature(),
-            $urlParameters
-        );
+		$moduleUrl = BackendUtility::getModuleUrl(
+			VidiModule::getSignature(),
+			$urlParameters
+		);
 
-        // Work around a bug in BackendUtility::getModuleUrl if matches is empty getModuleUrl() will not return the parameter.
-        $matches = $this->templateVariableContainer->get('matches');
-        if (empty($matches)) {
-            $moduleUrl .= '&' . urlencode(VidiModule::getParameterPrefix() . '[matches]=');
-        }
+		// Work around a bug in BackendUtility::getModuleUrl if matches is empty getModuleUrl() will not return the parameter.
+		$matches = $this->templateVariableContainer->get('matches');
+		if (empty($matches)) {
+			$moduleUrl .= '&' . urlencode(VidiModule::getParameterPrefix() . '[matches]=');
+		}
 
-        return $moduleUrl;
-    }
+		return $moduleUrl;
+	}
 }

Classes/Grid/ActionPermissionColumn.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             $permission .= 'W';
         }
 
-        return '<strong>' . $permission . '</strong>';
+        return '<strong>'.$permission.'</strong>';
     }
 
     /**

Indentation +25 added lines, -25 removed lines

@@ -17,32 +17,32 @@
  */
 class ActionPermissionColumn extends ColumnRendererAbstract
 {
-    /**
-     * Renders a configurable metadata property of a file in the Grid.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-        $file = $this->getFileConverter()->convert($this->object);
-        $permission = '';
+	/**
+	 * Renders a configurable metadata property of a file in the Grid.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+		$file = $this->getFileConverter()->convert($this->object);
+		$permission = '';
 
-        if ($file->checkActionPermission('read')) {
-            $permission = 'R';
-        }
-        if ($file->checkActionPermission('write')) {
-            $permission .= 'W';
-        }
+		if ($file->checkActionPermission('read')) {
+			$permission = 'R';
+		}
+		if ($file->checkActionPermission('write')) {
+			$permission .= 'W';
+		}
 
-        return '<strong>' . $permission . '</strong>';
-    }
+		return '<strong>' . $permission . '</strong>';
+	}
 
-    /**
-     * @return ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
+	/**
+	 * @return ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
 }

Classes/Form/AbstractFormField.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
             reset($attribute);
             $key = key($attribute);
             if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+                throw new InvalidStringException('Not an associative array. Is not a key: '.$key, 1356478742);
             }
 
             $this->attributes[$key] = $attribute[$key];

Indentation +264 added lines, -264 removed lines

@@ -18,268 +18,268 @@
  */
 abstract class AbstractFormField implements FormFieldInterface
 {
-    /**
-     * @var string
-     */
-    protected $template = '';
-
-    /**
-     * @var string
-     */
-    protected $value = '';
-
-    /**
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $prefix = '';
-
-    /**
-     * @var string
-     */
-    protected $label = '';
-
-    /**
-     * Store what child element will contain this element.
-     *
-     * @var array
-     */
-    protected $items = [];
-
-    /**
-     * Attributes in sense of DOM attribute, e.g. class, style, etc...
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * @return string
-     */
-    public function render(): string
-    {
-        return $this->template;
-    }
-
-    /**
-     * Render the label if possible. Otherwise return an empty string.
-     *
-     * @return string
-     */
-    public function renderLabel()
-    {
-        $result = '';
-        if ($this->label) {
-            $template = '<label class="control-label" for="%s">%s</label>';
-
-            if (strpos($this->label, 'LLL:') === 0) {
-                $this->label = LocalizationUtility::translate($this->label, '');
-            }
-
-            $result = sprintf(
-                $template,
-                $this->getId(),
-                $this->label
-            );
-        }
-        return $result;
-    }
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    public function renderAttributes()
-    {
-        $result = '';
-        if (!empty($this->attributes)) {
-            foreach ($this->attributes as $attribute => $value) {
-                $result .= sprintf(
-                    '%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Add an additional (DOM) attribute to be added to this template.
-     *
-     * @throws InvalidStringException
-     * @param array $attribute associative array that contains attribute => value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function addAttribute(array $attribute)
-    {
-        if (!empty($attribute)) {
-            reset($attribute);
-            $key = key($attribute);
-            if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
-            }
-
-            $this->attributes[$key] = $attribute[$key];
-        }
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setTemplate($template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * @param string $label
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * @param string $prefix
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getItems()
-    {
-        return $this->items;
-    }
-
-    /**
-     * @param array $items
-     */
-    public function setItems($items)
-    {
-        $this->items = $items;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return htmlspecialchars($this->value);
-    }
-
-    /**
-     * @param string $value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $result = $this->name;
-        if ($this->getPrefix()) {
-            $result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $name
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === '') {
-            $this->id = DomElement::getInstance()->formatId($this->getName());
-        }
-        return $this->id;
-    }
-
-    /**
-     * @param string $id
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
+	/**
+	 * @var string
+	 */
+	protected $template = '';
+
+	/**
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string
+	 */
+	protected $id = '';
+
+	/**
+	 * @var string
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var string
+	 */
+	protected $label = '';
+
+	/**
+	 * Store what child element will contain this element.
+	 *
+	 * @var array
+	 */
+	protected $items = [];
+
+	/**
+	 * Attributes in sense of DOM attribute, e.g. class, style, etc...
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * @return string
+	 */
+	public function render(): string
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Render the label if possible. Otherwise return an empty string.
+	 *
+	 * @return string
+	 */
+	public function renderLabel()
+	{
+		$result = '';
+		if ($this->label) {
+			$template = '<label class="control-label" for="%s">%s</label>';
+
+			if (strpos($this->label, 'LLL:') === 0) {
+				$this->label = LocalizationUtility::translate($this->label, '');
+			}
+
+			$result = sprintf(
+				$template,
+				$this->getId(),
+				$this->label
+			);
+		}
+		return $result;
+	}
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	public function renderAttributes()
+	{
+		$result = '';
+		if (!empty($this->attributes)) {
+			foreach ($this->attributes as $attribute => $value) {
+				$result .= sprintf(
+					'%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add an additional (DOM) attribute to be added to this template.
+	 *
+	 * @throws InvalidStringException
+	 * @param array $attribute associative array that contains attribute => value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function addAttribute(array $attribute)
+	{
+		if (!empty($attribute)) {
+			reset($attribute);
+			$key = key($attribute);
+			if (!is_string($key)) {
+				throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+			}
+
+			$this->attributes[$key] = $attribute[$key];
+		}
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setTemplate($template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setLabel($label)
+	{
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPrefix()
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * @param string $prefix
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setPrefix($prefix)
+	{
+		$this->prefix = $prefix;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getItems()
+	{
+		return $this->items;
+	}
+
+	/**
+	 * @param array $items
+	 */
+	public function setItems($items)
+	{
+		$this->items = $items;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return htmlspecialchars($this->value);
+	}
+
+	/**
+	 * @param string $value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		$result = $this->name;
+		if ($this->getPrefix()) {
+			$result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $name
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getId()
+	{
+		if ($this->id === '') {
+			$this->id = DomElement::getInstance()->formatId($this->getName());
+		}
+		return $this->id;
+	}
+
+	/**
+	 * @param string $id
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setId($id)
+	{
+		$this->id = $id;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @param array $attributes
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setAttributes($attributes)
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
 }

Classes/View/Button/NewFolder.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
                 ->render();
 
-            $output = '<div style="float: left;">' . $button . '</div>';
+            $output = '<div style="float: left;">'.$button.'</div>';
         }
         return $output;
     }

Indentation +85 added lines, -85 removed lines

@@ -21,98 +21,98 @@
  */
 class NewFolder extends AbstractComponentView
 {
-    /**
-     * Renders a button to create a new folder.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render($object = null)
-    {
-        $output = '';
-        if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getNewFolderUri())
-                ->setTitle($this->getLabel())
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
-                ->render();
+	/**
+	 * Renders a button to create a new folder.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render($object = null)
+	{
+		$output = '';
+		if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getNewFolderUri())
+				->setTitle($this->getLabel())
+				->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
+				->render();
 
-            $output = '<div style="float: left;">' . $button . '</div>';
-        }
-        return $output;
-    }
+			$output = '<div style="float: left;">' . $button . '</div>';
+		}
+		return $output;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getLabel()
-    {
-        return $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.new');
-    }
+	/**
+	 * @return string
+	 */
+	protected function getLabel()
+	{
+		return $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:cm.new');
+	}
 
-    /**
-     * @return string
-     */
-    protected function getNewFolderUri()
-    {
-        return BackendUtility::getModuleUrl(
-            'file_newfolder',
-            array(
-                'target' => $this->getCombineIdentifier(),
-                'returnUrl' => $this->getReturnUrl(),
-            )
-        );
-    }
+	/**
+	 * @return string
+	 */
+	protected function getNewFolderUri()
+	{
+		return BackendUtility::getModuleUrl(
+			'file_newfolder',
+			array(
+				'target' => $this->getCombineIdentifier(),
+				'returnUrl' => $this->getReturnUrl(),
+			)
+		);
+	}
 
 
-    /**
-     * @return string
-     */
-    protected function getCombineIdentifier()
-    {
-        $folder = $this->getMediaModule()->getCurrentFolder();
-        return $folder->getCombinedIdentifier();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getCombineIdentifier()
+	{
+		$folder = $this->getMediaModule()->getCurrentFolder();
+		return $folder->getCombinedIdentifier();
+	}
 
-    /**
-     * @return string
-     */
-    protected function getReturnUrl()
-    {
-        $returnUrl = BackendUtility::getModuleUrl(
-            GeneralUtility::_GP('route'),
-            $this->getAdditionalParameters()
-        );
-        return $returnUrl;
-    }
+	/**
+	 * @return string
+	 */
+	protected function getReturnUrl()
+	{
+		$returnUrl = BackendUtility::getModuleUrl(
+			GeneralUtility::_GP('route'),
+			$this->getAdditionalParameters()
+		);
+		return $returnUrl;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getAdditionalParameters()
-    {
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters = [
-                'id' => urldecode(GeneralUtility::_GP('id')),
-            ];
-        }
-        return $additionalParameters;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getAdditionalParameters()
+	{
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters = [
+				'id' => urldecode(GeneralUtility::_GP('id')),
+			];
+		}
+		return $additionalParameters;
+	}
 
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
-    /**
-     * @return LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
+	/**
+	 * @return LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
 }

Tests/Functional/Utility/ConfigurationUtilityTest.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 use Fab\Media\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php';
 
 /**
  * Test case for class \Fab\Media\Utility\Configuration.

Indentation +57 added lines, -57 removed lines

@@ -24,69 +24,69 @@
  */
 class ConfigurationUtilityTest extends AbstractFunctionalTestCase
 {
-    /**
-     * @var ConfigurationUtility
-     */
-    private $fixture;
+	/**
+	 * @var ConfigurationUtility
+	 */
+	private $fixture;
 
-    public function setUp()
-    {
-        parent::setUp();
-        $this->fixture = new ConfigurationUtility();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		$this->fixture = new ConfigurationUtility();
+	}
 
-    public function tearDown()
-    {
-        unset($this->fixture);
-    }
+	public function tearDown()
+	{
+		unset($this->fixture);
+	}
 
-    /**
-     * @test
-     */
-    public function getConfigurationReturnNotEmptyArrayByDefault()
-    {
-        $actual = $this->fixture->getConfiguration();
-        $this->assertTrue(is_array($actual));
-        $this->assertNotEmpty($actual);
-    }
+	/**
+	 * @test
+	 */
+	public function getConfigurationReturnNotEmptyArrayByDefault()
+	{
+		$actual = $this->fixture->getConfiguration();
+		$this->assertTrue(is_array($actual));
+		$this->assertNotEmpty($actual);
+	}
 
-    /**
-     * @test
-     */
-    public function thumbnailSizeSettingReturnsNotEmpty()
-    {
-        $actual = $this->fixture->get('image_thumbnail');
-        $this->assertTrue($actual > 1);
-    }
+	/**
+	 * @test
+	 */
+	public function thumbnailSizeSettingReturnsNotEmpty()
+	{
+		$actual = $this->fixture->get('image_thumbnail');
+		$this->assertTrue($actual > 1);
+	}
 
-    /**
-     * @test
-     */
-    public function getFooValueReturnsEmpty()
-    {
-        $expected = '';
-        $actual = $this->fixture->get(uniqid('foo'));
-        $this->assertEquals($expected, $actual);
-    }
+	/**
+	 * @test
+	 */
+	public function getFooValueReturnsEmpty()
+	{
+		$expected = '';
+		$actual = $this->fixture->get(uniqid('foo'));
+		$this->assertEquals($expected, $actual);
+	}
 
-    /**
-     * @test
-     */
-    public function configurationArrayNotEmptyAfterGetARandomValue()
-    {
-        $this->fixture->get(uniqid('foo'));
+	/**
+	 * @test
+	 */
+	public function configurationArrayNotEmptyAfterGetARandomValue()
+	{
+		$this->fixture->get(uniqid('foo'));
 
-        $actual = $this->fixture->getConfiguration();
-        $this->assertTrue(count($actual) > 0);
-    }
+		$actual = $this->fixture->getConfiguration();
+		$this->assertTrue(count($actual) > 0);
+	}
 
-    /**
-     * @test
-     */
-    public function setConfigurationValueAndCheckReturnedValueIsCorresponding()
-    {
-        $expected = 'bar';
-        $this->fixture->set('foo', $expected);
-        $this->assertSame($expected, $this->fixture->get('foo'));
-    }
+	/**
+	 * @test
+	 */
+	public function setConfigurationValueAndCheckReturnedValueIsCorresponding()
+	{
+		$expected = 'bar';
+		$this->fixture->set('foo', $expected);
+		$this->assertSame($expected, $this->fixture->get('foo'));
+	}
 }

Configuration/TCA/Overrides/sys_file_storage.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 $tca = [
     'types' => [
-        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.upload_settings,
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
@@ -81,7 +81,7 @@ 
     $tcaForHiddenFolderTree = [
 
         'types' => [
-            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.media_mount_point,
 			mount_point_file_type_1, mount_point_file_type_2, mount_point_file_type_3, mount_point_file_type_4, mount_point_file_type_5,

Indentation +180 added lines, -180 removed lines

@@ -5,86 +5,86 @@ 
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 
 if (!defined('TYPO3')) {
-    die('Access denied.');
+	die('Access denied.');
 }
 
 $configuration = GeneralUtility::makeInstance(
-    ExtensionConfiguration::class
+	ExtensionConfiguration::class
 )->get('media');
 
 $tca = [
-    'types' => [
-        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+	'types' => [
+		0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.upload_settings,
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
 				',
-        ],
-    ],
-    'columns' => [
-        'maximum_dimension_original_image' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.maximum_dimension_original_image',
-            'config' => [
-                'type' => 'input',
-                'size' => 24,
-                'default' => '1920x1920',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_1' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_1',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'txt, html',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_2' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_2',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'jpg, jpeg, bmp, png, tiff, tif, gif, eps',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_3' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_3',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'mp3, mp4, m4a, wma, f4a',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_4' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_4',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'mov, avi, mpeg, mpg, mp4, m4v, flv, f4v, webm, wmv, ogv, 3gp',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_5' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_5',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'pdf, zip, doc, docx, dotx, ppt, pptx, pps, ppsx, odt, xls, xlsx, xltx, rtf, xlt',
-                'eval' => 'trim',
-            ],
-        ],
-    ],
+		],
+	],
+	'columns' => [
+		'maximum_dimension_original_image' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.maximum_dimension_original_image',
+			'config' => [
+				'type' => 'input',
+				'size' => 24,
+				'default' => '1920x1920',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_1' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_1',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'txt, html',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_2' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_2',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'jpg, jpeg, bmp, png, tiff, tif, gif, eps',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_3' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_3',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'mp3, mp4, m4a, wma, f4a',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_4' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_4',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'mov, avi, mpeg, mpg, mp4, m4v, flv, f4v, webm, wmv, ogv, 3gp',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_5' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_5',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'pdf, zip, doc, docx, dotx, ppt, pptx, pps, ppsx, odt, xls, xlsx, xltx, rtf, xlt',
+				'eval' => 'trim',
+			],
+		],
+	],
 ];
 
 $tcaForHiddenFolderTree = [];
 if (!$configuration['has_folder_tree']) {
-    $tcaForHiddenFolderTree = [
+	$tcaForHiddenFolderTree = [
 
-        'types' => [
-            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+		'types' => [
+			0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.media_mount_point,
 			mount_point_file_type_1, mount_point_file_type_2, mount_point_file_type_3, mount_point_file_type_4, mount_point_file_type_5,
@@ -93,121 +93,121 @@ 
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
 				',
 
-            ],
-        ],
-        'columns' => [
-            'mount_point_file_type_1' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_1',
-                'config' => [
-                    'type' => 'group',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_2' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_2',
-                'config' => [
-                    'type' => 'group',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_3' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_3',
-                'config' => [
-                    'type' => 'group',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_4' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_4',
-                'config' => [
-                    'type' => 'group',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_5' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_5',
-                'config' => [
-                    'type' => 'group',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-        ],
-    ];
+			],
+		],
+		'columns' => [
+			'mount_point_file_type_1' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_1',
+				'config' => [
+					'type' => 'group',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_2' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_2',
+				'config' => [
+					'type' => 'group',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_3' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_3',
+				'config' => [
+					'type' => 'group',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_4' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_4',
+				'config' => [
+					'type' => 'group',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_5' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_5',
+				'config' => [
+					'type' => 'group',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+		],
+	];
 }
 
 // Merge first two possible TCA whether the folder tree is displayed or not.

Classes/FileUpload/Optimizer/JpegExifOrient.php

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;

Indentation +247 added lines, -247 removed lines

@@ -45,266 +45,266 @@
  */
 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));
+	}
 }

Classes/Thumbnail/ApplicationThumbnailProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getTimeStamp() : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()

Indentation +122 added lines, -122 removed lines

@@ -18,126 +18,126 @@
  */
 class ApplicationThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    /**
-     * Render a thumbnail of a resource of type application.
-     *
-     */
-    public function create(): string
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     */
-    public function renderUri(): string
-    {
-        if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
-            $this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
-            $uri = $this->processedFile->getPublicUrl(true);
-
-            // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-            if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-                $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-            }
-        } else {
-            $uri = $this->getIcon($this->getFile()->getExtension());
-        }
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagImage($result): string
-    {
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the time stamp.
-     *
-     * @return int
-     */
-    protected function getTimeStamp()
-    {
-        $result = $this->getFile()->getProperty('tstamp');
-        if ($this->processedFile) {
-            $result = $this->processedFile->getProperty('tstamp');
-        }
-        return $result;
-    }
-
-    /**
-     * Compute and return the title of the file.
-     */
-    protected function getTitle(): string
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (empty($result)) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagAnchor($result): string
-    {
-        $uri = $this->thumbnailService->getAnchorUri();
-        if (!$uri) {
-            $uri = $this->getUri();
-        }
-
-        return sprintf(
-            '<a href="%s" target="_blank" data-uid="%s">%s</a>',
-            $uri,
-            $this->getFile()->getUid(),
-            $result
-        );
-    }
-
-    protected function getUri(): string
-    {
-        $urlParameters = [
-            MediaModule::getParameterPrefix() => [
-                'controller' => 'Asset',
-                'action' => 'download',
-                'file' => $this->getFile()->getUid(),
-            ],
-        ];
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
-
-    public function getProcessingType(): string
-    {
-        if (!$this->thumbnailService->getProcessingType()) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	/**
+	 * Render a thumbnail of a resource of type application.
+	 *
+	 */
+	public function create(): string
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 */
+	public function renderUri(): string
+	{
+		if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
+			$this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
+			$uri = $this->processedFile->getPublicUrl(true);
+
+			// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+			if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+				$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+			}
+		} else {
+			$uri = $this->getIcon($this->getFile()->getExtension());
+		}
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagImage($result): string
+	{
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the time stamp.
+	 *
+	 * @return int
+	 */
+	protected function getTimeStamp()
+	{
+		$result = $this->getFile()->getProperty('tstamp');
+		if ($this->processedFile) {
+			$result = $this->processedFile->getProperty('tstamp');
+		}
+		return $result;
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 */
+	protected function getTitle(): string
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (empty($result)) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagAnchor($result): string
+	{
+		$uri = $this->thumbnailService->getAnchorUri();
+		if (!$uri) {
+			$uri = $this->getUri();
+		}
+
+		return sprintf(
+			'<a href="%s" target="_blank" data-uid="%s">%s</a>',
+			$uri,
+			$this->getFile()->getUid(),
+			$result
+		);
+	}
+
+	protected function getUri(): string
+	{
+		$urlParameters = [
+			MediaModule::getParameterPrefix() => [
+				'controller' => 'Asset',
+				'action' => 'download',
+				'file' => $this->getFile()->getUid(),
+			],
+		];
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
+
+	public function getProcessingType(): string
+	{
+		if (!$this->thumbnailService->getProcessingType()) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 }

Classes/FileUpload/Base64File.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             return false;
         }
 
-        $this->setName(uniqid() . '.' . $this->extension);
+        $this->setName(uniqid().'.'.$this->extension);
     }
 
     /**

Indentation +111 added lines, -111 removed lines

@@ -16,115 +16,115 @@
  */
 class Base64File extends UploadedFileAbstract
 {
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $image;
-
-    /**
-     * @var string
-     */
-    protected $extension;
-
-    /**
-     * @return \Fab\Media\FileUpload\Base64File
-     */
-    public function __construct()
-    {
-        // Processes the encoded image data and returns the decoded image
-        $encodedImage = GeneralUtility::_POST($this->inputName);
-        if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
-            $this->extension = $matches[1];
-        } else {
-            return false;
-        }
-
-        // Remove the mime-type header
-        $data = reset(array_reverse(explode('base64,', $encodedImage)));
-
-        // Use strict mode to prevent characters from outside the base64 range
-        $this->image = base64_decode($data, true);
-
-        if (!$this->image) {
-            return false;
-        }
-
-        $this->setName(uniqid() . '.' . $this->extension);
-    }
-
-    /**
-     * Save the file to the specified path
-     *
-     * @throws EmptyPropertyException
-     * @return boolean true on success
-     */
-    public function save()
-    {
-        if (is_null($this->uploadFolder)) {
-            throw new EmptyPropertyException('Upload folder is not defined', 1362587741);
-        }
-
-        if (is_null($this->name)) {
-            throw new EmptyPropertyException('File name is not defined', 1362587742);
-        }
-
-        return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
-    }
-
-    /**
-     * Get the original file name.
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Get the file size
-     *
-     * @throws \Exception
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
-            return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
-        } else {
-            throw new \Exception('Getting content length is not supported.');
-        }
-    }
-
-    /**
-     * Get MIME type of file.
-     *
-     * @return string|boolean MIME type. eg, text/html, false on error
-     */
-    public function getMimeType()
-    {
-        $this->checkFileExistence();
-        if (function_exists('finfo_file')) {
-            $fileInfo = new \finfo();
-            return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
-        } elseif (function_exists('mime_content_type')) {
-            return mime_content_type($this->getFileWithAbsolutePath());
-        }
-        return false;
-    }
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * @var string
+	 */
+	protected $image;
+
+	/**
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Base64File
+	 */
+	public function __construct()
+	{
+		// Processes the encoded image data and returns the decoded image
+		$encodedImage = GeneralUtility::_POST($this->inputName);
+		if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
+			$this->extension = $matches[1];
+		} else {
+			return false;
+		}
+
+		// Remove the mime-type header
+		$data = reset(array_reverse(explode('base64,', $encodedImage)));
+
+		// Use strict mode to prevent characters from outside the base64 range
+		$this->image = base64_decode($data, true);
+
+		if (!$this->image) {
+			return false;
+		}
+
+		$this->setName(uniqid() . '.' . $this->extension);
+	}
+
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @throws EmptyPropertyException
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+		if (is_null($this->uploadFolder)) {
+			throw new EmptyPropertyException('Upload folder is not defined', 1362587741);
+		}
+
+		if (is_null($this->name)) {
+			throw new EmptyPropertyException('File name is not defined', 1362587742);
+		}
+
+		return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
+	}
+
+	/**
+	 * Get the original file name.
+	 *
+	 * @return string
+	 */
+	public function getOriginalName()
+	{
+		return $this->getName();
+	}
+
+	/**
+	 * Get the file size
+	 *
+	 * @throws \Exception
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
+			return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
+		} else {
+			throw new \Exception('Getting content length is not supported.');
+		}
+	}
+
+	/**
+	 * Get MIME type of file.
+	 *
+	 * @return string|boolean MIME type. eg, text/html, false on error
+	 */
+	public function getMimeType()
+	{
+		$this->checkFileExistence();
+		if (function_exists('finfo_file')) {
+			$fileInfo = new \finfo();
+			return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
+		} elseif (function_exists('mime_content_type')) {
+			return mime_content_type($this->getFileWithAbsolutePath());
+		}
+		return false;
+	}
 }