x-systems / epesi-filestorage

src/FileStorageCore.php

Indentation +4 added lines, -4 removed lines

@@ -31,10 +31,10 @@
 	
 	public function install()
 	{
-	    Models\File::migrate();
-	    Models\FileAccessLog::migrate();
-	    Models\FileContent::migrate();
-	    Models\FileRemoteAccess::migrate();
+		Models\File::migrate();
+		Models\FileAccessLog::migrate();
+		Models\FileContent::migrate();
+		Models\FileRemoteAccess::migrate();
 	    
 		$downloadFiles = Permission::create(['name' => 'download files']);
 		

src/Models/File.php

Indentation +175 added lines, -175 removed lines

@@ -13,228 +13,228 @@
 
 class File extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	public $table = 'filestorage_files';
 
-    function init() {
-    	parent::init();
-    	
-    	$this->addFields([
-    	        'created_at' => ['caption' => __('Stored At')],
-    			'name' => ['caption' => __('File Name')],
-    			'link' => ['caption' => __('Link')],
-    			'backref'
-    	]);
+	function init() {
+		parent::init();
+    	
+		$this->addFields([
+				'created_at' => ['caption' => __('Stored At')],
+				'name' => ['caption' => __('File Name')],
+				'link' => ['caption' => __('Link')],
+				'backref'
+		]);
     	    	
-    	$this->hasOne('created_by', [User::class, 'our_field' => 'created_by'])->addTitle(['field' => 'created_by_user', 'caption' => __('Stored By')]);
+		$this->hasOne('created_by', [User::class, 'our_field' => 'created_by'])->addTitle(['field' => 'created_by_user', 'caption' => __('Stored By')]);
     	
-    	$this->hasOne('content', [FileContent::class, 'our_field' => 'content_id']);
+		$this->hasOne('content', [FileContent::class, 'our_field' => 'content_id']);
     	
-    	$this->hasMany('links', [FileRemoteAccess::class, 'their_field' => 'file_id']);
+		$this->hasMany('links', [FileRemoteAccess::class, 'their_field' => 'file_id']);
     	
-    	$this->addCalculatedField('thumbnail', [[__CLASS__, 'getThumbnailField']]);
-    }
+		$this->addCalculatedField('thumbnail', [[__CLASS__, 'getThumbnailField']]);
+	}
 
-    public function userActiveLinks()
-    {
-    	return $this->ref('links')->addCrits([
-    			['created_by', Auth::id()],
-    			['expires_at', '>', date('Y-m-d H:i:s')]
-    	]);
-    }
+	public function userActiveLinks()
+	{
+		return $this->ref('links')->addCrits([
+				['created_by', Auth::id()],
+				['expires_at', '>', date('Y-m-d H:i:s')]
+		]);
+	}
         
-    /**
-     * Retrieve the file
-     *
-     * @param int|string $idOrLink Filestorage ID or unique link string
-     * @param bool $useCache Use cache or not
-     *
-     * @return static
-     * 
-     * @throws FileNotFound
-     */
-    public static function retrieve($idOrLink)
-    {
-    	$id = self::getIdByLink($idOrLink, true, true);
+	/**
+	 * Retrieve the file
+	 *
+	 * @param int|string $idOrLink Filestorage ID or unique link string
+	 * @param bool $useCache Use cache or not
+	 *
+	 * @return static
+	 * 
+	 * @throws FileNotFound
+	 */
+	public static function retrieve($idOrLink)
+	{
+		$id = self::getIdByLink($idOrLink, true, true);
 
-    	$file = self::create()->tryLoad($id);
+		$file = self::create()->tryLoad($id);
     	
-    	if (! $file->ref('content')['hash']) {
-    		throw new FileNotFound('File object does not have corresponding content');
-    	}
+		if (! $file->ref('content')['hash']) {
+			throw new FileNotFound('File object does not have corresponding content');
+		}
 
-    	return $file;
-    }
+		return $file;
+	}
     
-    /**
-     * Get Filestorage ID by link
-     *
-     * @param string $link            Unique link
-     * @param bool   $useCache       Use cache or not
-     * @param bool   $throwException Throw exception if link is not found
-     *
-     * @return int Filestorage ID
-     * @throws LinkNotFound
-     */
-    public static function getIdByLink($link, $useCache = true, $throwException = false)
-    {
-    	static $cache = [];
-    	
-    	if (is_numeric($link) || is_null($link)) return $link;
-    	
-    	if (is_object($link)) return $link['id'];
-    	
-    	if (!$useCache || !isset($cache[$link])) {
-    		$file = self::create()->tryLoadBy('link', $link);
+	/**
+	 * Get Filestorage ID by link
+	 *
+	 * @param string $link            Unique link
+	 * @param bool   $useCache       Use cache or not
+	 * @param bool   $throwException Throw exception if link is not found
+	 *
+	 * @return int Filestorage ID
+	 * @throws LinkNotFound
+	 */
+	public static function getIdByLink($link, $useCache = true, $throwException = false)
+	{
+		static $cache = [];
+    	
+		if (is_numeric($link) || is_null($link)) return $link;
+    	
+		if (is_object($link)) return $link['id'];
+    	
+		if (!$useCache || !isset($cache[$link])) {
+			$file = self::create()->tryLoadBy('link', $link);
     		
-    		$cache[$link] = $file? $file->get('id'): null;
+			$cache[$link] = $file? $file->get('id'): null;
     		
-    		if (!$cache[$link] && $throwException) {
-    			throw new LinkNotFound($link);
-    		}
-    	}
+			if (!$cache[$link] && $throwException) {
+				throw new LinkNotFound($link);
+			}
+		}
     	
-    	return $cache[$link];
-    }
+		return $cache[$link];
+	}
 
-    /**
-     * Mark file as deleted. Does not remove any content!
-     *
-     * @param int|string $idOrLink Filestorage ID or unique link
-     */
-    public static function unlink($idOrLink)
-    {
+	/**
+	 * Mark file as deleted. Does not remove any content!
+	 *
+	 * @param int|string $idOrLink Filestorage ID or unique link
+	 */
+	public static function unlink($idOrLink)
+	{
    		if ($id = self::getIdByLink($idOrLink, false)) {
    			self::create()->delete($id);
-    	}
-    }
+		}
+	}
     
-    /**
-     * Check if file exists
-     *
-     * @param int|static $idOrMeta              Filestorage ID or file object
-     * @param bool      $throwException Throw exception on missing file or return false
-     *
-     * @return bool True if file exists, false otherwise
-     * @throws FileNotFound May be thrown if $throwException set to true
-     */
-    public static function exists($idOrMeta, $throwException = false)
-    {
-    	try {
-    		$file = is_numeric($idOrMeta) ? self::retrieve($idOrMeta) : $idOrMeta;
+	/**
+	 * Check if file exists
+	 *
+	 * @param int|static $idOrMeta              Filestorage ID or file object
+	 * @param bool      $throwException Throw exception on missing file or return false
+	 *
+	 * @return bool True if file exists, false otherwise
+	 * @throws FileNotFound May be thrown if $throwException set to true
+	 */
+	public static function exists($idOrMeta, $throwException = false)
+	{
+		try {
+			$file = is_numeric($idOrMeta) ? self::retrieve($idOrMeta) : $idOrMeta;
     		
-    		if (! file_exists($file->ref('content')['path'])) {
-    			throw new FileNotFound('Exception - file not found: ' . $file->ref('content')['path']);
-    		}
-    	} catch (\Exception $exception) {
-    		if ($throwException)
-    			throw $exception;
-    		else
-    			return false;
-    	}
-    	
-    	return true;
-    }
+			if (! file_exists($file->ref('content')['path'])) {
+				throw new FileNotFound('Exception - file not found: ' . $file->ref('content')['path']);
+			}
+		} catch (\Exception $exception) {
+			if ($throwException)
+				throw $exception;
+			else
+				return false;
+		}
+    	
+		return true;
+	}
     
-    /**
-     * Add multiple files, clone file if file id is provided.
-     * May be used to update backref for all files.
-     *
-     * @param array $files array of existing filestorage ids or array with values for the new file
-     * @param string|null $backref Backref for all files
-     * @return array Newly created Meta Ids sorted in ascending order
-     */
-    public static function storeMany($files, $backref = null)
-    {
-    	$ids = [];
-    	foreach ((array) $files as $filePath) {
-    		if (! is_numeric($filePath)) {
-    			$ids[] = self::store($filePath);
+	/**
+	 * Add multiple files, clone file if file id is provided.
+	 * May be used to update backref for all files.
+	 *
+	 * @param array $files array of existing filestorage ids or array with values for the new file
+	 * @param string|null $backref Backref for all files
+	 * @return array Newly created Meta Ids sorted in ascending order
+	 */
+	public static function storeMany($files, $backref = null)
+	{
+		$ids = [];
+		foreach ((array) $files as $filePath) {
+			if (! is_numeric($filePath)) {
+				$ids[] = self::store($filePath);
     			
-    			continue;
-    		}
+				continue;
+			}
     		
-    		$file = self::retrieve($filePath, false);
+			$file = self::retrieve($filePath, false);
     			
-    		if ($backref && $file['backref'] != $backref) {
-    			$file->save(compact('backref'));
-    		}
+			if ($backref && $file['backref'] != $backref) {
+				$file->save(compact('backref'));
+			}
     			
-    		$ids[] = $file['id'];
-    	}
+			$ids[] = $file['id'];
+		}
     	
-    	sort($ids);
+		sort($ids);
     	
-    	return $ids;
-    }
+		return $ids;
+	}
         
-    /**
-     * @param string|array     $fileOrPath
-     * @param string     $content    Content of the file
-     * 
-     * @return int Filestorage ID
-     * @throws LinkDuplicate
-     */
-    public static function store($fileOrPath, $content = null) 
-    {
-    	$file = $fileOrPath;
-    	
-    	if (is_object($file)) {
-    		$file->action('update', [
-    				'content_id' => FileContent::store($content)
-    		]);
+	/**
+	 * @param string|array     $fileOrPath
+	 * @param string     $content    Content of the file
+	 * 
+	 * @return int Filestorage ID
+	 * @throws LinkDuplicate
+	 */
+	public static function store($fileOrPath, $content = null) 
+	{
+		$file = $fileOrPath;
+    	
+		if (is_object($file)) {
+			$file->action('update', [
+					'content_id' => FileContent::store($content)
+			]);
     		
-    		return $file['id'];
-    	}
+			return $file['id'];
+		}
     	    	
-    	if (! $content && is_string($fileOrPath)) {
-    		$content = file_get_contents($fileOrPath);
+		if (! $content && is_string($fileOrPath)) {
+			$content = file_get_contents($fileOrPath);
     		
-    		$file = [
-    				'name' => basename($fileOrPath)
-    		];
-    	}
+			$file = [
+					'name' => basename($fileOrPath)
+			];
+		}
     	
-    	if (! empty($file['link']) && self::getIdByLink($file['link'], false)) {
-    		throw new LinkDuplicate($file['link']);
-    	}
+		if (! empty($file['link']) && self::getIdByLink($file['link'], false)) {
+			throw new LinkDuplicate($file['link']);
+		}
     	
-    	$content = $file['content']?? $content;
+		$content = $file['content']?? $content;
     	
-    	if (is_array($content)) {
-    		$path = $content['path'];
+		if (is_array($content)) {
+			$path = $content['path'];
     			
-    		$file['name'] = $file['name']?? basename($path);
+			$file['name'] = $file['name']?? basename($path);
     			
-    		$content = file_get_contents($path);
-    	}
+			$content = file_get_contents($path);
+		}
 
-    	unset($file['content']);
+		unset($file['content']);
 
    		return self::create()->insert(array_merge([
    				'created_at' => date('Y-m-d H:i:s'),
    				'created_by' => Auth::id(),
    				'content_id' => FileContent::store($content)
    		], $file));
-    }
+	}
     
-    public static function getThumbnailField($model)
-    {
-    	if (! $model->thumbnailPossible()) return false;
+	public static function getThumbnailField($model)
+	{
+		if (! $model->thumbnailPossible()) return false;
     	
-    	$image = new \Imagick($model->ref('content')['path']  . '[0]');
+		$image = new \Imagick($model->ref('content')['path']  . '[0]');
     	
-    	$image->setImageFormat('jpg');
+		$image->setImageFormat('jpg');
     	
-    	return collect([
-    			'mime' => 'image/jpeg',
-    			'name' => 'preview.jpeg',
-    			'contents' => $image . ''
-    	]);
-    }
+		return collect([
+				'mime' => 'image/jpeg',
+				'name' => 'preview.jpeg',
+				'contents' => $image . ''
+		]);
+	}
     
-    public function thumbnailPossible() {
-    	return $this->ref('content')['type'] == 'application/pdf' && class_exists('Imagick');
-    }
+	public function thumbnailPossible() {
+		return $this->ref('content')['type'] == 'application/pdf' && class_exists('Imagick');
+	}
 }
\ No newline at end of file

src/Models/FileAccessLog.php

Indentation +13 added lines, -13 removed lines

@@ -8,21 +8,21 @@
 
 class FileAccessLog extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'filestorage_access_log';
+	public $table = 'filestorage_access_log';
 
-    function init() {
-    	parent::init();
+	function init() {
+		parent::init();
     	
-    	$this->addFields([
-    			'file_id',
-    			'accessed_at' => ['caption' => __('Accessed At'), 'type' => 'datetime'],
-    			'action' => ['caption' => __('Action'), 'type' => 'enum', 'values' => ['download' => __('Download'), 'preview' => __('Preview'), 'inline' => __('Inline')]],
-    			'ip_address' => ['caption' => __('IP Address')],
-    			'host_name' => ['caption' => __('Host Name')]
-    	]);
+		$this->addFields([
+				'file_id',
+				'accessed_at' => ['caption' => __('Accessed At'), 'type' => 'datetime'],
+				'action' => ['caption' => __('Action'), 'type' => 'enum', 'values' => ['download' => __('Download'), 'preview' => __('Preview'), 'inline' => __('Inline')]],
+				'ip_address' => ['caption' => __('IP Address')],
+				'host_name' => ['caption' => __('Host Name')]
+		]);
     	
-    	$this->hasOne('accessed_by', [User::class, 'our_field' => 'accessed_by'])->addTitle(['field' => 'accessed_by_user', 'caption' => __('Accessed By')]);
-    }
+		$this->hasOne('accessed_by', [User::class, 'our_field' => 'accessed_by'])->addTitle(['field' => 'accessed_by_user', 'caption' => __('Accessed By')]);
+	}
 }
\ No newline at end of file

src/Models/FileRemoteAccess.php

Indentation +31 added lines, -31 removed lines

@@ -9,50 +9,50 @@
 
 class FileRemoteAccess extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    const DEFAULT_PERIOD = '1 week';
+	const DEFAULT_PERIOD = '1 week';
     
-    public $table = 'filestorage_remote_access';
+	public $table = 'filestorage_remote_access';
     
-    public function init()
-    {
-    	parent::init();
+	public function init()
+	{
+		parent::init();
     	
-    	$this->addFields([
-    			'token',
-    			'expires_at' => ['type' => 'datetime'],    			
-    	]);
+		$this->addFields([
+				'token',
+				'expires_at' => ['type' => 'datetime'],    			
+		]);
     	
-    	$this->hasOne('file_id', File::class)->addTitle(['field' => 'file', 'caption' => __('File Name')]);
-    	$this->hasOne('created_by', User::class)->addTitle(['field' => 'created_by_user', 'caption' => __('Created By')]);
+		$this->hasOne('file_id', File::class)->addTitle(['field' => 'file', 'caption' => __('File Name')]);
+		$this->hasOne('created_by', User::class)->addTitle(['field' => 'created_by_user', 'caption' => __('Created By')]);
     	
-    	$this->addCalculatedField('href', [[__CLASS__, 'getHrefField']]);
-    }
+		$this->addCalculatedField('href', [[__CLASS__, 'getHrefField']]);
+	}
 
-    public static function check($fileId, $token)
-    {
-    	return (bool) self::create()
-    	->addCrits([
-    			['file_id', $fileId],
-    			['token', $token],
-    			['expires_at', '>', date('Y-m-d H:i:s')]
-    	])
-    	->action('count')->getOne();
-    }
+	public static function check($fileId, $token)
+	{
+		return (bool) self::create()
+		->addCrits([
+				['file_id', $fileId],
+				['token', $token],
+				['expires_at', '>', date('Y-m-d H:i:s')]
+		])
+		->action('count')->getOne();
+	}
     
-    public static function grant($file, $expires = self::DEFAULT_PERIOD)
-    {
+	public static function grant($file, $expires = self::DEFAULT_PERIOD)
+	{
 		return self::create()->insert([
 				'file_id' => is_numeric($file)? $file: $file->id,
 				'token' => md5(uniqid(rand(), true)),
 				'created_by' => Auth::id()?: 0,
 				'expires_at' => date('Y-m-d H:i:s', strtotime($expires)),
 		]);
-    }
+	}
     
-    public static function getHrefField($model)
-    {		
-    	return url('file') . '?' . http_build_query(['id' => $model['file_id'], 'token' => $model['token']]);
-    }
+	public static function getHrefField($model)
+	{		
+		return url('file') . '?' . http_build_query(['id' => $model['file_id'], 'token' => $model['token']]);
+	}
 }
\ No newline at end of file

src/Models/FileContent.php

Indentation +109 added lines, -109 removed lines

@@ -10,135 +10,135 @@
 
 class FileContent extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	const HASH_METHOD = 'sha512';
 
 	public $table = 'filestorage_contents';
 
-    protected $appends = ['path'];
+	protected $appends = ['path'];
     
-    function init(){
-    	parent::init();
+	function init(){
+		parent::init();
     	
-    	$this->addFields([
-    			'hash',
-    			'size',
-    			'type'
-    	]);
+		$this->addFields([
+				'hash',
+				'size',
+				'type'
+		]);
     	
-    	$this->hasMany('files', [File::class, 'their_field' => 'content_id']);
-    	$this->addCalculatedField('storage_path', [[__CLASS__, 'getStoragePathField']]);
-    	$this->addCalculatedField('path', [[__CLASS__, 'getPathField']]);
-    	$this->addCalculatedField('data', [[__CLASS__, 'getDataField']]);    	
-    }
+		$this->hasMany('files', [File::class, 'their_field' => 'content_id']);
+		$this->addCalculatedField('storage_path', [[__CLASS__, 'getStoragePathField']]);
+		$this->addCalculatedField('path', [[__CLASS__, 'getPathField']]);
+		$this->addCalculatedField('data', [[__CLASS__, 'getDataField']]);    	
+	}
     
-    /**
-     * One content can have many files associated with
-     * The actual content is stored only once based on the content hash
-     * 
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function files()
-    {
-    	return $this->ref('files');
-    }
+	/**
+	 * One content can have many files associated with
+	 * The actual content is stored only once based on the content hash
+	 * 
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function files()
+	{
+		return $this->ref('files');
+	}
     
-    /**
-     * Accessor method for retrieving of file content path when using the model
-     * Having the $appends property in the File model listing the 'path' makes sure the value is also exported to arrays
-     * 
-     * @return string
-     */
-    public static function getPathField($model)
-    {
-    	return self::storage()->path($model->getStoragePath($model->get('hash')));
-    }
+	/**
+	 * Accessor method for retrieving of file content path when using the model
+	 * Having the $appends property in the File model listing the 'path' makes sure the value is also exported to arrays
+	 * 
+	 * @return string
+	 */
+	public static function getPathField($model)
+	{
+		return self::storage()->path($model->getStoragePath($model->get('hash')));
+	}
     
-    /**
-     * Accessor method for retrieving of file contents
-     * 
-     * @return string
-     */
-    public static function getDataField($model)
-    {
-    	return self::storage()->get($model->get('storage_path'));
-    }
+	/**
+	 * Accessor method for retrieving of file contents
+	 * 
+	 * @return string
+	 */
+	public static function getDataField($model)
+	{
+		return self::storage()->get($model->get('storage_path'));
+	}
     
-    /**
-     * Accessor method for file relative storage path
-     * 
-     * @return string
-     */
-    public static function getStoragePathField($model)
-    {
-    	return $model->getStoragePath($model->get('hash'));
-    }
+	/**
+	 * Accessor method for file relative storage path
+	 * 
+	 * @return string
+	 */
+	public static function getStoragePathField($model)
+	{
+		return $model->getStoragePath($model->get('hash'));
+	}
     
-    protected static function getStoragePath($hash)
-    {
-    	return implode(DIRECTORY_SEPARATOR, array_merge(str_split(substr($hash, 0, 5)), [substr($hash, 5)]));
-    }
+	protected static function getStoragePath($hash)
+	{
+		return implode(DIRECTORY_SEPARATOR, array_merge(str_split(substr($hash, 0, 5)), [substr($hash, 5)]));
+	}
     
-    /**
-     * Returns the storage where file contents are saved based on config settings
-     * 
-     * @return \Illuminate\Contracts\Filesystem\Filesystem
-     */
-    public static function storage()
-    {
-    	return Storage::disk(config('epesi.filestorage', 'local'));
-    }
+	/**
+	 * Returns the storage where file contents are saved based on config settings
+	 * 
+	 * @return \Illuminate\Contracts\Filesystem\Filesystem
+	 */
+	public static function storage()
+	{
+		return Storage::disk(config('epesi.filestorage', 'local'));
+	}
         
-    /**
-     * Add file to the filestorage
-     *
-     * @param string $file File path to save
-     *
-     * @return int File id in the database
-     */
-    public static function storeFromFile($file)
-    {
-    	return self::store(file_get_contents($file));
-    }
+	/**
+	 * Add file to the filestorage
+	 *
+	 * @param string $file File path to save
+	 *
+	 * @return int File id in the database
+	 */
+	public static function storeFromFile($file)
+	{
+		return self::store(file_get_contents($file));
+	}
     
-    /**
-     * Add content to the filestorage
-     *
-     * @param string $content Content to save
-     *
-     * @return int File id in the database
-     */
-    public static function store($content)
-    {
-    	$hash = self::hash($content);
+	/**
+	 * Add content to the filestorage
+	 *
+	 * @param string $content Content to save
+	 *
+	 * @return int File id in the database
+	 */
+	public static function store($content)
+	{
+		$hash = self::hash($content);
     	
-    	$path = self::getStoragePath($hash);
+		$path = self::getStoragePath($hash);
     	
-    	if (! self::storage()->exists($path)) {
-    		self::storage()->put($path, $content);
-    	}
+		if (! self::storage()->exists($path)) {
+			self::storage()->put($path, $content);
+		}
     	
-    	$content = self::create()->addCondition('hash', $hash);
+		$content = self::create()->addCondition('hash', $hash);
 
-    	if (! $content->action('count')->getOne()) {  
-    		return $content->insert([
-    				'size' => self::storage()->size($path),
-    				'type' => self::storage()->mimeType($path)
-    		]);
-    	}
+		if (! $content->action('count')->getOne()) {  
+			return $content->insert([
+					'size' => self::storage()->size($path),
+					'type' => self::storage()->mimeType($path)
+			]);
+		}
     	
-    	return $content->loadAny()->get('id');
-    }
+		return $content->loadAny()->get('id');
+	}
     
-    /**
-     * Get the hash of the content using hash method defined as constant to the class
-     * 
-     * @param string $content
-     * @return string
-     */
-    public static function hash($content)
-    {
-    	return hash(self::HASH_METHOD, $content);
-    }
+	/**
+	 * Get the hash of the content using hash method defined as constant to the class
+	 * 
+	 * @param string $content
+	 * @return string
+	 */
+	public static function hash($content)
+	{
+		return hash(self::HASH_METHOD, $content);
+	}
 }
\ No newline at end of file

src/FileStorageAccess.php

Indentation +22 added lines, -22 removed lines

@@ -6,30 +6,30 @@
 
 class FileStorageAccess
 {
-    public function handle($request, \Closure $next)
-    {
-    	foreach (Integration\Joints\FileStorageAccessJoint::collect() as $joint) {
-    		if ($joint->accessGranted($request)) {    			
-    			$this->logFileAccess($request->get('id'), $request->get('action', 'download'));
+	public function handle($request, \Closure $next)
+	{
+		foreach (Integration\Joints\FileStorageAccessJoint::collect() as $joint) {
+			if ($joint->accessGranted($request)) {    			
+				$this->logFileAccess($request->get('id'), $request->get('action', 'download'));
     			
-    			return $next($request);
-    		}
-    	}
+				return $next($request);
+			}
+		}
     	
-    	return response('No access to file', 401);
-    }
+		return response('No access to file', 401);
+	}
         
-    protected function logFileAccess($fileId, $action, $time = null)
-    {
-    	$ip_address = request()->ip();
+	protected function logFileAccess($fileId, $action, $time = null)
+	{
+		$ip_address = request()->ip();
 
-    	Models\FileAccessLog::create()->insert([
-    			'file_id' => $fileId,
-    			'accessed_at' => date('Y-m-d H:i:s', $time ?: time()),
-    			'accessed_by' => Auth::id() ?: 0,
-    			'action' => $action,
-    			'ip_address' => $ip_address,
-    			'host_name' => gethostbyaddr($ip_address)
-    	]);
-    }
+		Models\FileAccessLog::create()->insert([
+				'file_id' => $fileId,
+				'accessed_at' => date('Y-m-d H:i:s', $time ?: time()),
+				'accessed_by' => Auth::id() ?: 0,
+				'action' => $action,
+				'ip_address' => $ip_address,
+				'host_name' => gethostbyaddr($ip_address)
+		]);
+	}
 }

src/FileStorageController.php

Indentation +41 added lines, -41 removed lines

@@ -7,52 +7,52 @@
 
 class FileStorageController extends Controller
 {
-    public function get(Request $request)
-    {
-    	try {
-    		$file = Models\File::retrieve($request->get('id'));
-    	} catch (\Exception $e) {
-    		abort(404);
-    	}
+	public function get(Request $request)
+	{
+		try {
+			$file = Models\File::retrieve($request->get('id'));
+		} catch (\Exception $e) {
+			abort(404);
+		}
 
-    	$useThumbnail = false;
-    	$disposition = 'attachment';
-    	switch ($request->get('action')) {	
-    		case 'preview':
-    			$useThumbnail = true;
-    			// intended fallthrough
-    		case 'inline':
-    			$disposition = 'inline';
-    			break;
+		$useThumbnail = false;
+		$disposition = 'attachment';
+		switch ($request->get('action')) {	
+			case 'preview':
+				$useThumbnail = true;
+				// intended fallthrough
+			case 'inline':
+				$disposition = 'inline';
+				break;
     			
-    		default:
-    			break;
-    	}
+			default:
+				break;
+		}
 
-    	if ($useThumbnail && $request->get('thumbnail', 1) && ($thumbnail = $file['thumbnail'])) {
-    		$mime = $thumbnail['mime'];
-    		$filename = $thumbnail['name'];
-    		$contents = $thumbnail['contents'];
-    	}
-    	else {
-    		$content = $file->ref('content');
+		if ($useThumbnail && $request->get('thumbnail', 1) && ($thumbnail = $file['thumbnail'])) {
+			$mime = $thumbnail['mime'];
+			$filename = $thumbnail['name'];
+			$contents = $thumbnail['contents'];
+		}
+		else {
+			$content = $file->ref('content');
     		
-    		$mime = $content['type'];
-    		$filename = $file['name'];
-    		$contents = $content['data'];
-    	}
+			$mime = $content['type'];
+			$filename = $file['name'];
+			$contents = $content['data'];
+		}
     	
-    	$headers = [
-    			'Content-Type' => $mime,
-    			'Content-Length' => strlen($contents),
-    			'Content-Disposition' => "$disposition; filename=\"$filename\"",
-    	];
+		$headers = [
+				'Content-Type' => $mime,
+				'Content-Length' => strlen($contents),
+				'Content-Disposition' => "$disposition; filename=\"$filename\"",
+		];
 
-    	if ($request->get('nocache')) {
-    		$headers['Pragma'] = 'no-cache';
-    		$headers['Expires'] = '0';
-    	}
+		if ($request->get('nocache')) {
+			$headers['Pragma'] = 'no-cache';
+			$headers['Expires'] = '0';
+		}
     	
-    	return response($contents, 200, $headers);
-    }
+		return response($contents, 200, $headers);
+	}
 }