fabarea / media

Classes/Utility/PermissionUtility.php

Indentation +60 added lines, -60 removed lines

@@ -20,72 +20,72 @@
 class PermissionUtility implements SingletonInterface
 {
 
-    /**
-     * Returns a class instance.
-     *
-     * @return PermissionUtility
-     * @throws \InvalidArgumentException
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(PermissionUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return PermissionUtility
+	 * @throws \InvalidArgumentException
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(PermissionUtility::class);
+	}
 
-    /**
-     * Returns allowed extensions given a possible storage.
-     *
-     * @param null|int|ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function getAllowedExtensions($storage = null)
-    {
+	/**
+	 * Returns allowed extensions given a possible storage.
+	 *
+	 * @param null|int|ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function getAllowedExtensions($storage = null)
+	{
 
-        $fieldNames = array(
-            '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',
-        );
+		$fieldNames = array(
+			'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',
+		);
 
-        if (!is_null($storage)) {
-            if (!$storage instanceof ResourceStorage) {
-                $storage = ResourceFactory::getInstance()->getStorageObject((int)$storage);
-            }
-        } else {
-            $storage = $this->getMediaModule()->getCurrentStorage();
-        }
+		if (!is_null($storage)) {
+			if (!$storage instanceof ResourceStorage) {
+				$storage = ResourceFactory::getInstance()->getStorageObject((int)$storage);
+			}
+		} else {
+			$storage = $this->getMediaModule()->getCurrentStorage();
+		}
 
-        $storageRecord = $storage->getStorageRecord();
-        $allowedExtensions = [];
-        foreach ($fieldNames as $fieldName) {
-            $_allowedExtensions = GeneralUtility::trimExplode(',', $storageRecord[$fieldName], true);
-            $allowedExtensions = array_merge($allowedExtensions, $_allowedExtensions);
-        }
+		$storageRecord = $storage->getStorageRecord();
+		$allowedExtensions = [];
+		foreach ($fieldNames as $fieldName) {
+			$_allowedExtensions = GeneralUtility::trimExplode(',', $storageRecord[$fieldName], true);
+			$allowedExtensions = array_merge($allowedExtensions, $_allowedExtensions);
+		}
 
-        $uniqueAllowedExtensions = array_unique($allowedExtensions);
-        return array_filter($uniqueAllowedExtensions, 'strlen');
-    }
+		$uniqueAllowedExtensions = array_unique($allowedExtensions);
+		return array_filter($uniqueAllowedExtensions, 'strlen');
+	}
 
-    /**
-     * Returns allowed extensions list.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function getAllowedExtensionList()
-    {
-        return implode(',', $this->getAllowedExtensions());
-    }
+	/**
+	 * Returns allowed extensions list.
+	 *
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function getAllowedExtensionList()
+	{
+		return implode(',', $this->getAllowedExtensions());
+	}
 
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
 }

Classes/Utility/DomElement.php

Indentation +47 added lines, -47 removed lines

@@ -16,57 +16,57 @@
 class DomElement implements SingletonInterface
 {
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\DomElement|object
-     */
-    static public function getInstance()
-    {
-        return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\DomElement::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\DomElement|object
+	 */
+	static public function getInstance()
+	{
+		return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\DomElement::class);
+	}
 
-    /**
-     * Format an id given an input string
-     *
-     * @param string $input
-     * @return string
-     */
-    public function formatId($input)
-    {
+	/**
+	 * Format an id given an input string
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	public function formatId($input)
+	{
 
-        // remove the capital letter from the id
-        $segments = preg_split('/(?=[A-Z])/', $input);
-        $segments = array_map('strtolower', $segments);
-        if ($segments[0] == '') {
-            array_shift($segments);
-        }
-        $result = implode('-', $segments);
+		// remove the capital letter from the id
+		$segments = preg_split('/(?=[A-Z])/', $input);
+		$segments = array_map('strtolower', $segments);
+		if ($segments[0] == '') {
+			array_shift($segments);
+		}
+		$result = implode('-', $segments);
 
-        return $this->sanitizeId($result);
-    }
+		return $this->sanitizeId($result);
+	}
 
-    /**
-     * Sanitize an id
-     *
-     * @param string $input
-     * @return mixed
-     */
-    protected function sanitizeId($input)
-    {
+	/**
+	 * Sanitize an id
+	 *
+	 * @param string $input
+	 * @return mixed
+	 */
+	protected function sanitizeId($input)
+	{
 
-        // remove the track of possible namespace
-        $searches[] = ' ';
-        $searches[] = '_';
-        $searches[] = '--';
-        $searches[] = '[';
-        $searches[] = ']';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '';
-        return str_replace($searches, $replaces, strtolower($input));
-    }
+		// remove the track of possible namespace
+		$searches[] = ' ';
+		$searches[] = '_';
+		$searches[] = '--';
+		$searches[] = '[';
+		$searches[] = ']';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '';
+		return str_replace($searches, $replaces, strtolower($input));
+	}
 
 }

Classes/Utility/ImagePresetUtility.php

Indentation +80 added lines, -80 removed lines

@@ -16,92 +16,92 @@
 class ImagePresetUtility implements \TYPO3\CMS\Core\SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $store = [];
+	/**
+	 * @var array
+	 */
+	protected $store = [];
 
-    /**
-     * @var string
-     */
-    protected $currentPreset = '';
+	/**
+	 * @var string
+	 */
+	protected $currentPreset = '';
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\ImagePresetUtility|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ImagePresetUtility|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
+	}
 
-    /**
-     * Set the current preset value. Preset values come from the settings and can be:
-     * image_thumbnail, image_mini, image_small, image_medium, image_large
-     *
-     * @throws \Fab\Media\Exception\EmptyValueException
-     * @param string $preset image_thumbnail, image_mini, ...
-     * @return \Fab\Media\Utility\ImagePresetUtility
-     */
-    public function preset($preset)
-    {
-        $size = ConfigurationUtility::getInstance()->get($preset);
-        if (is_null($size)) {
-            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
-        }
+	/**
+	 * Set the current preset value. Preset values come from the settings and can be:
+	 * image_thumbnail, image_mini, image_small, image_medium, image_large
+	 *
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 * @param string $preset image_thumbnail, image_mini, ...
+	 * @return \Fab\Media\Utility\ImagePresetUtility
+	 */
+	public function preset($preset)
+	{
+		$size = ConfigurationUtility::getInstance()->get($preset);
+		if (is_null($size)) {
+			throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
+		}
 
-        $this->currentPreset = $preset;
-        if (!isset($this->store[$this->currentPreset])) {
-            // @todo use object Dimension instead
-            $dimensions = GeneralUtility::trimExplode('x', $size);
-            $this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
-            $this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
-        }
-        return $this;
-    }
+		$this->currentPreset = $preset;
+		if (!isset($this->store[$this->currentPreset])) {
+			// @todo use object Dimension instead
+			$dimensions = GeneralUtility::trimExplode('x', $size);
+			$this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
+			$this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function getStore()
-    {
-        return $this->store;
-    }
+	/**
+	 * @return array
+	 */
+	public function getStore()
+	{
+		return $this->store;
+	}
 
-    /**
-     * @param array $store
-     */
-    public function setStore($store)
-    {
-        $this->store = $store;
-    }
+	/**
+	 * @param array $store
+	 */
+	public function setStore($store)
+	{
+		$this->store = $store;
+	}
 
-    /**
-     * Returns width of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getWidth()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['width'];
-    }
+	/**
+	 * Returns width of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['width'];
+	}
 
-    /**
-     * Returns height of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getHeight()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['height'];
-    }
+	/**
+	 * Returns height of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['height'];
+	}
 }

Classes/Utility/ConfigurationUtility.php

Indentation +63 added lines, -63 removed lines

@@ -18,75 +18,75 @@
 class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $extensionKey = 'media';
+	/**
+	 * @var string
+	 */
+	protected $extensionKey = 'media';
 
-    /**
-     * @var array
-     */
-    protected $configuration = [];
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
 
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\Utility\ConfigurationUtility|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ConfigurationUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\Utility\ConfigurationUtility|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ConfigurationUtility::class);
+	}
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
 
-        // Fill up configuration array with relevant values.
-        foreach ($configuration as $key => $value) {
-            $this->configuration[$key] = $value;
-        }
-    }
+		// Fill up configuration array with relevant values.
+		foreach ($configuration as $key => $value) {
+			$this->configuration[$key] = $value;
+		}
+	}
 
-    /**
-     * @return ObjectManager|object
-     */
-    protected function getObjectManager()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-    }
+	/**
+	 * @return ObjectManager|object
+	 */
+	protected function getObjectManager()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+	}
 
-    /**
-     * Returns a setting key.
-     *
-     * @param string $key
-     * @return array
-     */
-    public function get($key)
-    {
-        return isset($this->configuration[$key]) ? trim($this->configuration[$key]) : null;
-    }
+	/**
+	 * Returns a setting key.
+	 *
+	 * @param string $key
+	 * @return array
+	 */
+	public function get($key)
+	{
+		return isset($this->configuration[$key]) ? trim($this->configuration[$key]) : null;
+	}
 
-    /**
-     * Set a setting key.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->configuration[$key] = $value;
-    }
+	/**
+	 * Set a setting key.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->configuration[$key] = $value;
+	}
 
-    /**
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
+	/**
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
 }

Classes/Utility/SessionUtility.php

Indentation +52 added lines, -52 removed lines

@@ -16,62 +16,62 @@
 class SessionUtility implements \TYPO3\CMS\Core\SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $moduleKey = 'media';
+	/**
+	 * @var string
+	 */
+	protected $moduleKey = 'media';
 
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\Utility\SessionUtility|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\SessionUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\Utility\SessionUtility|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\SessionUtility::class);
+	}
 
-    public function __construct()
-    {
+	public function __construct()
+	{
 
-        // Initialize storage from the current
-        if (!is_array($this->getBackendUser()->uc['moduleData'][$this->moduleKey])) {
-            $this->getBackendUser()->uc['moduleData'][$this->moduleKey] = [];
-            $this->getBackendUser()->writeUC();
-        }
-    }
+		// Initialize storage from the current
+		if (!is_array($this->getBackendUser()->uc['moduleData'][$this->moduleKey])) {
+			$this->getBackendUser()->uc['moduleData'][$this->moduleKey] = [];
+			$this->getBackendUser()->writeUC();
+		}
+	}
 
-    /**
-     * Return a value from the Session according to the key
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key];
-    }
+	/**
+	 * Return a value from the Session according to the key
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		return $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key];
+	}
 
-    /**
-     * Set a key to the Session.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key] = $value;
-        $this->getBackendUser()->writeUC();
-    }
+	/**
+	 * Set a key to the Session.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key] = $value;
+		$this->getBackendUser()->writeUC();
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/DataHandler/FileDataHandler.php

Indentation +122 added lines, -122 removed lines

@@ -21,127 +21,127 @@
 class FileDataHandler extends AbstractDataHandler
 {
 
-    /**
-     * Process File with action "update".
-     *
-     * @param Content $content
-     * @throws \Exception
-     * @return bool
-     */
-    public function processUpdate(Content $content)
-    {
-        throw new \Exception('Not yet implemented', 1409988673);
-    }
-
-    /**
-     * Process File with action "remove".
-     *
-     * @param Content $content
-     * @return bool|void
-     */
-    public function processRemove(Content $content)
-    {
-        $file = ResourceFactory::getInstance()->getFileObject($content->getUid());
-
-        $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-        if ($numberOfReferences === 0) {
-            $file->delete();
-        } else {
-            $message = sprintf('I could not delete file "%s" as it is has %s reference(s).', $file->getUid(), $numberOfReferences);
-            $this->errorMessages = $message;
-        }
-    }
-
-    /**
-     * Process File with action "copy".
-     *
-     * @param Content $content
-     * @param string $target
-     * @throws \Exception
-     * @return bool
-     */
-    public function processCopy(Content $content, $target)
-    {
-        $file = ResourceFactory::getInstance()->getFileObject($content->getUid());
-
-        if ($this->getMediaModule()->hasFolderTree()) {
-
-            $targetFolder = $this->getMediaModule()->getCurrentFolder();
-
-            // Move file
-            $file->copyTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-        }
-        return true;
-    }
-
-    /**
-     * Process File with action "move".
-     *
-     * @param Content $content
-     * @param string $target
-     * @throws \Exception
-     * @return bool
-     */
-    public function processMove(Content $content, $target)
-    {
-        $file = ResourceFactory::getInstance()->getFileObject($content->getUid());
-
-        if ($this->getMediaModule()->hasFolderTree()) {
-
-            $targetFolder = $this->getMediaModule()->getCurrentFolder();
-            if ($targetFolder->getIdentifier() !== $file->getParentFolder()->getIdentifier()) {
-
-                // Move file
-                $file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-            }
-        } else {
-
-            // Only process if the storage is different.
-            if ((int)$file->getStorage()->getUid() !== (int)$target) {
-
-                $targetStorage = ResourceFactory::getInstance()->getStorageObject((int)$target);
-
-                // Retrieve target directory in the new storage. The folder will only be returned if the User has the correct permission.
-                $targetFolder = $this->getMediaModule()->getDefaultFolderInStorage($targetStorage, $file);
-
-                try {
-                    // Move file
-                    $file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-                } catch (\Exception $e) {
-                    $this->errorMessages = $e->getMessage();
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * Process Content with action "localize".
-     *
-     * @param Content $content
-     * @param int $language
-     * @throws \Exception
-     * @return bool
-     */
-    public function processLocalize(Content $content, $language)
-    {
-        throw new \Exception('Nothing to implement here. Localization is done by the Core DataHandler', 1412760788);
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * Process File with action "update".
+	 *
+	 * @param Content $content
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processUpdate(Content $content)
+	{
+		throw new \Exception('Not yet implemented', 1409988673);
+	}
+
+	/**
+	 * Process File with action "remove".
+	 *
+	 * @param Content $content
+	 * @return bool|void
+	 */
+	public function processRemove(Content $content)
+	{
+		$file = ResourceFactory::getInstance()->getFileObject($content->getUid());
+
+		$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+		if ($numberOfReferences === 0) {
+			$file->delete();
+		} else {
+			$message = sprintf('I could not delete file "%s" as it is has %s reference(s).', $file->getUid(), $numberOfReferences);
+			$this->errorMessages = $message;
+		}
+	}
+
+	/**
+	 * Process File with action "copy".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processCopy(Content $content, $target)
+	{
+		$file = ResourceFactory::getInstance()->getFileObject($content->getUid());
+
+		if ($this->getMediaModule()->hasFolderTree()) {
+
+			$targetFolder = $this->getMediaModule()->getCurrentFolder();
+
+			// Move file
+			$file->copyTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+		}
+		return true;
+	}
+
+	/**
+	 * Process File with action "move".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processMove(Content $content, $target)
+	{
+		$file = ResourceFactory::getInstance()->getFileObject($content->getUid());
+
+		if ($this->getMediaModule()->hasFolderTree()) {
+
+			$targetFolder = $this->getMediaModule()->getCurrentFolder();
+			if ($targetFolder->getIdentifier() !== $file->getParentFolder()->getIdentifier()) {
+
+				// Move file
+				$file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+			}
+		} else {
+
+			// Only process if the storage is different.
+			if ((int)$file->getStorage()->getUid() !== (int)$target) {
+
+				$targetStorage = ResourceFactory::getInstance()->getStorageObject((int)$target);
+
+				// Retrieve target directory in the new storage. The folder will only be returned if the User has the correct permission.
+				$targetFolder = $this->getMediaModule()->getDefaultFolderInStorage($targetStorage, $file);
+
+				try {
+					// Move file
+					$file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+				} catch (\Exception $e) {
+					$this->errorMessages = $e->getMessage();
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * Process Content with action "localize".
+	 *
+	 * @param Content $content
+	 * @param int $language
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processLocalize(Content $content, $language)
+	{
+		throw new \Exception('Nothing to implement here. Localization is done by the Core DataHandler', 1412760788);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/ViewHelpers/File/ExistsViewHelper.php

Indentation +32 added lines, -32 removed lines

@@ -19,36 +19,36 @@
 class ExistsViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('file', 'mixed', '', true);
-    }
-
-    /**
-     * Returns a property value of a file given by the context.
-     *
-     * @return bool
-     */
-    public function render()
-    {
-        /** @var File|Content|int $file $file */
-        $file = $this->arguments['file'];
-
-        if (!$file instanceof File) {
-            $file = $this->getFileConverter()->convert($file);
-        }
-
-        return $file->exists();
-    }
-
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('file', 'mixed', '', true);
+	}
+
+	/**
+	 * Returns a property value of a file given by the context.
+	 *
+	 * @return bool
+	 */
+	public function render()
+	{
+		/** @var File|Content|int $file $file */
+		$file = $this->arguments['file'];
+
+		if (!$file instanceof File) {
+			$file = $this->getFileConverter()->convert($file);
+		}
+
+		return $file->exists();
+	}
+
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 }

Classes/ViewHelpers/File/PropertyViewHelper.php

Indentation +19 added lines, -19 removed lines

@@ -17,25 +17,25 @@
 class PropertyViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('name', 'string', '', true);
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('name', 'string', '', true);
+	}
 
-    /**
-     * Returns a property value of a file given by the context.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $name = $this->arguments['name'];
+	/**
+	 * Returns a property value of a file given by the context.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$name = $this->arguments['name'];
 
-        /** @var File $file */
-        $file = $this->templateVariableContainer->get('file');
-        return $file->getProperty($name);
-    }
+		/** @var File $file */
+		$file = $this->templateVariableContainer->get('file');
+		return $file->getProperty($name);
+	}
 }

Classes/ViewHelpers/File/ThumbnailViewHelper.php

Indentation +55 added lines, -55 removed lines

@@ -21,65 +21,65 @@
 class ThumbnailViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('file', 'mixed', 'The source file', false, null);
-        $this->registerArgument('configuration', 'array', 'Configuration to be given for the thumbnail processing.', false, []);
-        $this->registerArgument('attributes', 'array', 'DOM attributes to add to the thumbnail image', false, '');
-        $this->registerArgument('preset', 'string', 'Image dimension preset', false, '');
-        $this->registerArgument('output', 'string', 'Can be: uri, image, imageWrapped', false, 'image');
-        $this->registerArgument('configurationWrap', 'array', 'The configuration given to the wrap.', false, '');
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('file', 'mixed', 'The source file', false, null);
+		$this->registerArgument('configuration', 'array', 'Configuration to be given for the thumbnail processing.', false, []);
+		$this->registerArgument('attributes', 'array', 'DOM attributes to add to the thumbnail image', false, '');
+		$this->registerArgument('preset', 'string', 'Image dimension preset', false, '');
+		$this->registerArgument('output', 'string', 'Can be: uri, image, imageWrapped', false, 'image');
+		$this->registerArgument('configurationWrap', 'array', 'The configuration given to the wrap.', false, '');
+	}
 
-    /**
-     * Returns a configurable thumbnail of an asset
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Returns a configurable thumbnail of an asset
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $file = $this->arguments['file'];
-        $preset = $this->arguments['preset'];
-        $configuration = $this->arguments['configuration'];
-        if (!is_array($configuration)) {
-            $configuration = array();
-        }
-        $configurationWrap = $this->arguments['configurationWrap'];
-        $attributes = $this->arguments['attributes'];
-        $output = $this->arguments['output'];
+		$file = $this->arguments['file'];
+		$preset = $this->arguments['preset'];
+		$configuration = $this->arguments['configuration'];
+		if (!is_array($configuration)) {
+			$configuration = array();
+		}
+		$configurationWrap = $this->arguments['configurationWrap'];
+		$attributes = $this->arguments['attributes'];
+		$output = $this->arguments['output'];
 
-        if ($file instanceof Content) {
-            $file = $this->getFileConverter()->convert($file);
-        } elseif (!($file instanceof File)) {
-            $file = ResourceFactory::getInstance()->getFileObject((int)$file);
-        }
-        if ($preset) {
-            $imageDimension = ImagePresetUtility::getInstance()->preset($preset);
-            $configuration['width'] = $imageDimension->getWidth();
-            $configuration['height'] = $imageDimension->getHeight();
-        }
-        /** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
-        $thumbnailService = GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $file);
-        $thumbnail = $thumbnailService->setConfiguration($configuration)
-            ->setConfigurationWrap($configurationWrap)
-            ->setAttributes($attributes)
-            ->setOutputType($output)
-            ->create();
+		if ($file instanceof Content) {
+			$file = $this->getFileConverter()->convert($file);
+		} elseif (!($file instanceof File)) {
+			$file = ResourceFactory::getInstance()->getFileObject((int)$file);
+		}
+		if ($preset) {
+			$imageDimension = ImagePresetUtility::getInstance()->preset($preset);
+			$configuration['width'] = $imageDimension->getWidth();
+			$configuration['height'] = $imageDimension->getHeight();
+		}
+		/** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
+		$thumbnailService = GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $file);
+		$thumbnail = $thumbnailService->setConfiguration($configuration)
+			->setConfigurationWrap($configurationWrap)
+			->setAttributes($attributes)
+			->setOutputType($output)
+			->create();
 
-        return $thumbnail;
-    }
+		return $thumbnail;
+	}
 
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 
 }