x-systems / epesi-filestorage

src/FileStorageCore.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	
 	public static function boot()
 	{
-		Route::group(['namespace' => 'Epesi\FileStorage'], function(){
+		Route::group(['namespace' => 'Epesi\FileStorage'], function() {
 			Route::get('file', 'FileStorageController@get')->middleware('web', FileStorageAccess::class);
 		});
 		

src/Database/Models/FileContent.php

Indentation +94 added lines, -94 removed lines

@@ -13,111 +13,111 @@
 	
 	public $timestamps = false;
 	
-    protected $table = 'filestorage_contents';
-    protected static $unguarded = true;    
+	protected $table = 'filestorage_contents';
+	protected static $unguarded = true;    
     
-    protected $appends = ['path'];
+	protected $appends = ['path'];
     
-    /**
-     * 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->hasMany(File::class, 'content_id');
-    }
+	/**
+	 * 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->hasMany(File::class, 'content_id');
+	}
     
-    /**
-     * 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 function getPathAttribute()
-    {
-    	return self::storage()->path($this->getStoragePath($this->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 function getPathAttribute()
+	{
+		return self::storage()->path($this->getStoragePath($this->hash));
+	}
     
-    /**
-     * Accessor method for retrieving of file contents
-     * 
-     * @return string
-     */
-    public function getDataAttribute()
-    {
-    	return self::storage()->get($this->storage_path);
-    }
+	/**
+	 * Accessor method for retrieving of file contents
+	 * 
+	 * @return string
+	 */
+	public function getDataAttribute()
+	{
+		return self::storage()->get($this->storage_path);
+	}
     
-    /**
-     * Accessor method for file relative storage path
-     * 
-     * @return string
-     */
-    public function getStoragePathAttribute()
-    {
-    	return $this->getStoragePath($this->hash);
-    }
+	/**
+	 * Accessor method for file relative storage path
+	 * 
+	 * @return string
+	 */
+	public function getStoragePathAttribute()
+	{
+		return $this->getStoragePath($this->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 putFromFile($file)
-    {
-    	return self::put(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 putFromFile($file)
+	{
+		return self::put(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 put($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 put($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);
+		}
     	
-    	return self::firstOrCreate(compact('hash'), [
-    			'size' => self::storage()->size($path),
-    			'type' => self::storage()->mimeType($path)
-    	])->id;
-    }
+		return self::firstOrCreate(compact('hash'), [
+				'size' => self::storage()->size($path),
+				'type' => self::storage()->mimeType($path)
+		])->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

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
     	
     	$path = self::getStoragePath($hash);
     	
-    	if (! self::storage()->exists($path)) {
+    	if (!self::storage()->exists($path)) {
     		self::storage()->put($path, $content);
     	}
     	

src/Database/Models/FileAccessLog.php

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@
     
 	public $timestamps = false;
 	
-    protected $table = 'filestorage_access_log';
-    protected static $unguarded = true;    
+	protected $table = 'filestorage_access_log';
+	protected static $unguarded = true;    
 
 }
\ No newline at end of file

src/Database/Models/File.php

Spacing +4 added lines, -4 removed lines

@@ -105,7 +105,7 @@ 
     	try {
     		$file = is_numeric($idOrMeta) ? self::get($idOrMeta) : $idOrMeta;
     		
-    		if (! file_exists($file->content->path)) {
+    		if (!file_exists($file->content->path)) {
     			throw new FileNotFound('Exception - file not found: ' . $file->content->path);
     		}
     	} catch (\Exception $exception) {
@@ -130,7 +130,7 @@ 
     {
     	$ids = [];
     	foreach ((array) $files as $filePath) {
-    		if (! is_numeric($filePath)) {
+    		if (!is_numeric($filePath)) {
     			$ids[] = self::put($filePath);
     			
     			continue;
@@ -163,7 +163,7 @@ 
     public static function put($fileOrPath, $content = null) 
     {
     	$file = $fileOrPath;
-    	if (! $content && is_string($fileOrPath)) {
+    	if (!$content && is_string($fileOrPath)) {
     		$content = file_get_contents($fileOrPath);
     		
     		$file = [
@@ -196,7 +196,7 @@ 
     
     public function getThumbnailAttribute()
     {
-    	if (! $this->thumbnailPossible()) return false;
+    	if (!$this->thumbnailPossible()) return false;
     	
     	$image = new \Imagick($this->content->path . '[0]');
     	

Braces +14 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
     {
     	static $cache = [];
     	
-    	if (is_object($idOrLink)) return $idOrLink;
+    	if (is_object($idOrLink)) {
+    		return $idOrLink;
+    	}
 
     	$id = self::getIdByLink($idOrLink, true, true);
 
@@ -73,7 +75,9 @@ 
     {
     	static $cache = [];
     	
-    	if (is_numeric($link)) return $link;
+    	if (is_numeric($link)) {
+    		return $link;
+    	}
     	
     	if (!$useCache || !isset($cache[$link])) {
     		$cache[$link] = self::where('link', $link)->value('id');
@@ -116,10 +120,11 @@ 
     			throw new FileNotFound('Exception - file not found: ' . $file->content->path);
     		}
     	} catch (\Exception $exception) {
-    		if ($throwException)
-    			throw $exception;
-    		else
-    			return false;
+    		if ($throwException) {
+    		    			throw $exception;
+    		} else {
+    		    			return false;
+    		}
     	}
     	
     	return true;
@@ -203,7 +208,9 @@ 
     
     public function getThumbnailAttribute()
     {
-    	if (! $this->thumbnailPossible()) return false;
+    	if (! $this->thumbnailPossible()) {
+    		return false;
+    	}
     	
     	$image = new \Imagick($this->content->path . '[0]');
     	

Indentation +170 added lines, -170 removed lines

@@ -14,215 +14,215 @@
 {
 	use SoftDeletes;
 	
-    protected $table = 'filestorage_files';
-    protected static $unguarded = true;
+	protected $table = 'filestorage_files';
+	protected static $unguarded = true;
 
-    public function content()
-    {
-    	return $this->belongsTo(FileContent::class, 'content_id');
-    }
+	public function content()
+	{
+		return $this->belongsTo(FileContent::class, 'content_id');
+	}
     
-    public function links()
-    {
-    	return $this->hasMany(FileRemoteAccess::class, 'file_id');
-    }
+	public function links()
+	{
+		return $this->hasMany(FileRemoteAccess::class, 'file_id');
+	}
     
-    public function userActiveLinks()
-    {
-    	return $this->links()->where('created_by', Auth::id())->where('expires_at', '>', date('Y-m-d H:i:s'));
-    }
+	public function userActiveLinks()
+	{
+		return $this->links()->where('created_by', Auth::id())->where('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 get($idOrLink, $useCache = true)
-    {
-    	static $cache = [];
-    	
-    	if (is_object($idOrLink)) return $idOrLink;
+	/**
+	 * 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 get($idOrLink, $useCache = true)
+	{
+		static $cache = [];
+    	
+		if (is_object($idOrLink)) return $idOrLink;
 
-    	$id = self::getIdByLink($idOrLink, true, true);
+		$id = self::getIdByLink($idOrLink, true, true);
 
-    	if ($useCache && isset($cache[$id])) {
-    		return $cache[$id];
-    	}
+		if ($useCache && isset($cache[$id])) {
+			return $cache[$id];
+		}
 
-    	$file = self::with('content')->findOrFail($id);
+		$file = self::with('content')->findOrFail($id);
     	
-    	if (empty($file->content['hash'])) {
-    		throw new FileNotFound('File object does not have corresponding content');
-    	}
+		if (empty($file->content['hash'])) {
+			throw new FileNotFound('File object does not have corresponding content');
+		}
 
-    	return $cache[$id] = $file;
-    }
+		return $cache[$id] = $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)) return $link;
-    	
-    	if (!$useCache || !isset($cache[$link])) {
-    		$cache[$link] = self::where('link', $link)->value('id');
+	/**
+	 * 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)) return $link;
+    	
+		if (!$useCache || !isset($cache[$link])) {
+			$cache[$link] = self::where('link', $link)->value('id');
     		
-    		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::find($id)->delete();
-    	}
-    }
+		}
+	}
     
-    /**
-     * 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::get($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::get($idOrMeta) : $idOrMeta;
     		
-    		if (! file_exists($file->content->path)) {
-    			throw new FileNotFound('Exception - file not found: ' . $file->content->path);
-    		}
-    	} catch (\Exception $exception) {
-    		if ($throwException)
-    			throw $exception;
-    		else
-    			return false;
-    	}
-    	
-    	return true;
-    }
+			if (! file_exists($file->content->path)) {
+				throw new FileNotFound('Exception - file not found: ' . $file->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 putMany($files, $backref = null)
-    {
-    	$ids = [];
-    	foreach ((array) $files as $filePath) {
-    		if (! is_numeric($filePath)) {
-    			$ids[] = self::put($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 putMany($files, $backref = null)
+	{
+		$ids = [];
+		foreach ((array) $files as $filePath) {
+			if (! is_numeric($filePath)) {
+				$ids[] = self::put($filePath);
     			
-    			continue;
-    		}
+				continue;
+			}
     		
-    		$file = self::get($filePath, false)->toArray();
+			$file = self::get($filePath, false)->toArray();
     			
-    		if ($backref && $file['backref'] != $backref) {
-    			$file['backref'] = $backref;
-    			unset($file['link']);
+			if ($backref && $file['backref'] != $backref) {
+				$file['backref'] = $backref;
+				unset($file['link']);
     			
-    			self::put($file);
-    		}
+				self::put($file);
+			}
     			
-    		$ids[] = $file;
-    	}
+			$ids[] = $file;
+		}
     	
-    	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 put($fileOrPath, $content = null) 
-    {
-    	$file = $fileOrPath;
-    	if (! $content && is_string($fileOrPath)) {
-    		$content = file_get_contents($fileOrPath);
+	/**
+	 * @param string|array     $fileOrPath
+	 * @param string     $content    Content of the file
+	 * 
+	 * @return int Filestorage ID
+	 * @throws LinkDuplicate
+	 */
+	public static function put($fileOrPath, $content = null) 
+	{
+		$file = $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']);
-    	
-    	return self::updateOrCreate(['id' => $file['id']?? null], array_merge([
-    			'created_at' => time(),
-    			'created_by' => Auth::id(),
-    			'content_id' => FileContent::put($content)
-    	], $file))->id;
-    }
+		unset($file['content']);
+    	
+		return self::updateOrCreate(['id' => $file['id']?? null], array_merge([
+				'created_at' => time(),
+				'created_by' => Auth::id(),
+				'content_id' => FileContent::put($content)
+		], $file))->id;
+	}
     
-    public function getThumbnailAttribute()
-    {
-    	if (! $this->thumbnailPossible()) return false;
+	public function getThumbnailAttribute()
+	{
+		if (! $this->thumbnailPossible()) return false;
     	
-    	$image = new \Imagick($this->content->path . '[0]');
+		$image = new \Imagick($this->content->path . '[0]');
     	
-    	$image->setImageFormat('jpg');
+		$image->setImageFormat('jpg');
     	
-    	$mime = 'image/jpeg';
+		$mime = 'image/jpeg';
     	
-    	$name = 'preview.jpeg';
+		$name = 'preview.jpeg';
     	
-    	$contents = $image . '';
+		$contents = $image . '';
     	
-    	return collect(compact('mime', 'name', 'contents'));
-    }
+		return collect(compact('mime', 'name', 'contents'));
+	}
     
-    protected function thumbnailPossible() {
-    	return $this->content->type == 'application/pdf' && class_exists('Imagick');
-    }
+	protected function thumbnailPossible() {
+		return $this->content->type == 'application/pdf' && class_exists('Imagick');
+	}
 }
\ No newline at end of file

src/Database/Migrations/2019_11_16_091615_create_filestorage_tables.php

Indentation +60 added lines, -60 removed lines

@@ -6,74 +6,74 @@
 
 class CreateFilestorageTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-        Schema::create('filestorage_contents', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('hash', 128);
-            $table->integer('size');
-            $table->string('type', 256);
+		Schema::create('filestorage_contents', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('hash', 128);
+			$table->integer('size');
+			$table->string('type', 256);
             
-            $table->softDeletes();
-        });
+			$table->softDeletes();
+		});
         
-        Schema::create('filestorage_files', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name', 256);
-            $table->string('link', 128)->nullable();
-            $table->string('backref', 128)->nullable();
-            $table->unsignedBigInteger('content_id');
-            $table->unsignedBigInteger('created_by')->nullable();
-            $table->timestamps();
+		Schema::create('filestorage_files', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('name', 256);
+			$table->string('link', 128)->nullable();
+			$table->string('backref', 128)->nullable();
+			$table->unsignedBigInteger('content_id');
+			$table->unsignedBigInteger('created_by')->nullable();
+			$table->timestamps();
             
-            $table->softDeletes();
+			$table->softDeletes();
             
-            $table->foreign('content_id')->references('id')->on('filestorage_contents');
-            $table->foreign('created_by')->references('id')->on('users');
-        });
+			$table->foreign('content_id')->references('id')->on('filestorage_contents');
+			$table->foreign('created_by')->references('id')->on('users');
+		});
         
-        Schema::create('filestorage_remote_access', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->unsignedBigInteger('file_id');            
-            $table->string('token', 128);
-            $table->unsignedBigInteger('created_by');
-            $table->timestamp('expires_at');
-            $table->timestamps();
+		Schema::create('filestorage_remote_access', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->unsignedBigInteger('file_id');            
+			$table->string('token', 128);
+			$table->unsignedBigInteger('created_by');
+			$table->timestamp('expires_at');
+			$table->timestamps();
             
-            $table->foreign('file_id')->references('id')->on('filestorage_files');
-            $table->foreign('created_by')->references('id')->on('users');
-        });
+			$table->foreign('file_id')->references('id')->on('filestorage_files');
+			$table->foreign('created_by')->references('id')->on('users');
+		});
         
-        Schema::create('filestorage_access_log', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->unsignedBigInteger('file_id');            
-            $table->timestamp('accessed_at');
-            $table->unsignedBigInteger('accessed_by');
-            $table->string('action', 32);
-            $table->string('ip_address', 32);
-            $table->string('host_name', 64);
+		Schema::create('filestorage_access_log', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->unsignedBigInteger('file_id');            
+			$table->timestamp('accessed_at');
+			$table->unsignedBigInteger('accessed_by');
+			$table->string('action', 32);
+			$table->string('ip_address', 32);
+			$table->string('host_name', 64);
                         
-            $table->foreign('file_id')->references('id')->on('filestorage_files');
-        });
-    }
+			$table->foreign('file_id')->references('id')->on('filestorage_files');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('filestorage_remote_access');
-    	Schema::dropIfExists('filestorage_access_log');
-    	Schema::dropIfExists('filestorage_files');
-        Schema::dropIfExists('filestorage_contents');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('filestorage_remote_access');
+		Schema::dropIfExists('filestorage_access_log');
+		Schema::dropIfExists('filestorage_files');
+		Schema::dropIfExists('filestorage_contents');
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
     {
     	$this->down();
     	
-        Schema::create('filestorage_contents', function (Blueprint $table) {
+        Schema::create('filestorage_contents', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('hash', 128);
             $table->integer('size');
@@ -24,7 +24,7 @@ 
             $table->softDeletes();
         });
         
-        Schema::create('filestorage_files', function (Blueprint $table) {
+        Schema::create('filestorage_files', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name', 256);
             $table->string('link', 128)->nullable();
@@ -39,7 +39,7 @@ 
             $table->foreign('created_by')->references('id')->on('users');
         });
         
-        Schema::create('filestorage_remote_access', function (Blueprint $table) {
+        Schema::create('filestorage_remote_access', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('file_id');            
             $table->string('token', 128);
@@ -51,7 +51,7 @@ 
             $table->foreign('created_by')->references('id')->on('users');
         });
         
-        Schema::create('filestorage_access_log', function (Blueprint $table) {
+        Schema::create('filestorage_access_log', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('file_id');            
             $table->timestamp('accessed_at');

src/Integration/Joints/FileStorageAccessJoint.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	final public static function getActionUrls($file, $accessParams = [])
 	{
-		$id = is_numeric($file)? $file: $file->id;
+		$id = is_numeric($file) ? $file : $file->id;
 		
 		$urls = [];
 		foreach (static::$allowedActions as $action) {
@@ -66,7 +66,7 @@ 
 	 */
 	final protected function hasUserAccess()
 	{
-		return $this->forUsersOnly? (bool) Auth::id(): true;
+		return $this->forUsersOnly ? (bool) Auth::id() : true;
 	}
 	
 	/**

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();
 
-    	Database\Models\FileAccessLog::create([
-    			'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)
-    	]);
-    }
+		Database\Models\FileAccessLog::create([
+				'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

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
     		$mime = $thumbnail['mime'];
     		$filename = $thumbnail['name'];
     		$contents = $thumbnail['contents'];
-    	}
-    	else {
+    	} else {
     		$mime = $file->content->type;
     		$filename = $file->name;
     		$contents = $file->content->data;

Indentation +40 added lines, -40 removed lines

@@ -7,50 +7,50 @@
 
 class FileStorageController extends Controller
 {
-    public function get(Request $request)
-    {
-    	try {
-    		$file = Database\Models\File::get($request->get('id'));
-    	} catch (\Exception $e) {
-    		abort(404);
-    	}
+	public function get(Request $request)
+	{
+		try {
+			$file = Database\Models\File::get($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 {
-    		$mime = $file->content->type;
-    		$filename = $file->name;
-    		$contents = $file->content->data;
-    	}
+		if ($useThumbnail && $request->get('thumbnail', 1) && ($thumbnail = $file->thumbnail)) {
+			$mime = $thumbnail['mime'];
+			$filename = $thumbnail['name'];
+			$contents = $thumbnail['contents'];
+		}
+		else {
+			$mime = $file->content->type;
+			$filename = $file->name;
+			$contents = $file->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);
+	}
 }

src/Database/Models/FileRemoteAccess.php

Indentation +13 added lines, -13 removed lines

@@ -6,27 +6,27 @@
 use Illuminate\Support\Facades\Auth;
 
 class FileRemoteAccess extends Model {
-    const DEFAULT_PERIOD = '1 week';
+	const DEFAULT_PERIOD = '1 week';
     
-    protected $table = 'filestorage_remote_access';
-    protected static $unguarded = true;    
+	protected $table = 'filestorage_remote_access';
+	protected static $unguarded = true;    
 
-    public static function check($fileId, $token)
-    {
-    	return (bool) self::where('file_id', $fileId)->where('token', $token)->where('expires_at', '>', date('Y-m-d H:i:s'))->count();
-    }
+	public static function check($fileId, $token)
+	{
+		return (bool) self::where('file_id', $fileId)->where('token', $token)->where('expires_at', '>', date('Y-m-d H:i:s'))->count();
+	}
     
-    public static function grant($file, $expires = self::DEFAULT_PERIOD)
-    {
+	public static function grant($file, $expires = self::DEFAULT_PERIOD)
+	{
 		return self::create([
 				'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 function getHrefAttribute()
-    {		return url('file') . '?' . http_build_query(['id' => $this->file_id, 'token' => $this->token]);
-    }
+	public function getHrefAttribute()
+	{		return url('file') . '?' . http_build_query(['id' => $this->file_id, 'token' => $this->token]);
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
     public static function grant($file, $expires = self::DEFAULT_PERIOD)
     {
 		return self::create([
-				'file_id' => is_numeric($file)? $file: $file->id,
+				'file_id' => is_numeric($file) ? $file : $file->id,
 				'token' => md5(uniqid(rand(), true)),
-				'created_by' => Auth::id()?: 0,
+				'created_by' => Auth::id() ?: 0,
 				'expires_at' => date('Y-m-d H:i:s', strtotime($expires)),
 		]);
     }