x-systems / epesi-filestorage

src/Seeds/FileModal.php

Indentation +3 added lines, -3 removed lines

@@ -84,9 +84,9 @@
                 				<div class="description">{$descr}</div>
             				</div>
         				</div>{empty}' . __('No file details') . '{/}')])->setSource([
-        						['title'=> __('Name'), 'descr'=> $this->file()->name],
-        						['title'=> __('Size'), 'descr'=> Utils::bytesToHuman($this->file()->content->size)],
-        ]);
+								['title'=> __('Name'), 'descr'=> $this->file()->name],
+								['title'=> __('Size'), 'descr'=> Utils::bytesToHuman($this->file()->content->size)],
+		]);
 	}
 	
 	protected function addFileRemoteLinks($container = null) {

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
 	
 	protected function setPeriodSelection()
 	{
-		if (! $this->periodSelection) {
+		if (!$this->periodSelection) {
 			$this->periodSelection = [];
 			foreach ([1, 2, 3, 4] as $count) {
 				$this->periodSelection[$count . ' weeks'] = trans_choice('{1} :count week |[2,*] :count weeks', $count);
@@ -41,7 +41,7 @@ 
 		}
 
 		foreach ($this->periodSelection as $key => $period) {
-			$default = $key == $this->defaultPeriod? ' (' . __('Default') . ')': '';
+			$default = $key == $this->defaultPeriod ? ' (' . __('Default') . ')' : '';
 			
 			$this->periodSelection[$key] = $period . $default;
 		}
@@ -51,7 +51,7 @@ 
 	{
 		$this->canvas = $canvas;
 		
-		if (! $this->file()) {
+		if (!$this->file()) {
 			$canvas->set(__('Wrong parameters for file'));
 			return;
 		}
@@ -71,12 +71,12 @@ 
 	
 	protected function file()
 	{
-		return $this->file?: ($this->file = File::get($this->canvas->stickyGET('id')));
+		return $this->file ?: ($this->file = File::get($this->canvas->stickyGET('id')));
 	}
 	
 	protected function addFileDetails($container = null)
 	{
-		$container = $container?: $this->canvas;
+		$container = $container ?: $this->canvas;
 		
 		$container->add(['Lister', 'template'=> new \atk4\ui\Template('
 						<div class="item" style="margin: 0 15px 15px 0">
@@ -90,7 +90,7 @@ 
 	}
 	
 	protected function addFileRemoteLinks($container = null) {
-		$container = $container?: $this->canvas;
+		$container = $container ?: $this->canvas;
 		
 		foreach ($this->file()->links()->where('created_by', Auth::id())->get() as $link) {
 			$container->add(['View', __('Remote access link expiring :expiry', ['expiry' => $link->expires_at])]);
@@ -106,7 +106,7 @@ 
 		$container->js(true, new jsExpression('new ClipboardJS(".copy-button")'));
 		
 		$container->on('click', '.delete-link', $container->add(['jsCallback', 'postTrigger' => 'link'])->set(function($j, $linkId) {
-			if (! $link = FileRemoteAccess::find($linkId)) return;
+			if (!$link = FileRemoteAccess::find($linkId)) return;
 			
 			$link->delete();
 			
@@ -134,7 +134,7 @@ 
 		$dropdown->setSource($this->periodSelection);
 		
 		$dropdown->onChange(function($value) {
-			$period = array_search($value, $this->periodSelection)?: $this->defaultPeriod;
+			$period = array_search($value, $this->periodSelection) ?: $this->defaultPeriod;
 			
 			FileRemoteAccess::grant($this->file(), $period);
 			

Braces +3 added lines, -1 removed lines

@@ -106,7 +106,9 @@
 		$container->js(true, new jsExpression('new ClipboardJS(".copy-button")'));
 		
 		$container->on('click', '.delete-link', $container->add(['jsCallback', 'postTrigger' => 'link'])->set(function($j, $linkId) {
-			if (! $link = FileRemoteAccess::find($linkId)) return;
+			if (! $link = FileRemoteAccess::find($linkId)) {
+				return;
+			}
 			
 			$link->delete();
 			

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)),
 		]);
     }

src/Database/Models/File.php

Indentation +166 added lines, -166 removed lines

@@ -14,211 +14,211 @@
 {
 	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');
+	}
     
     
-    /**
-     * 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

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]');
     	

src/FileStorageList.php

Spacing +2 added lines, -2 removed lines

@@ -34,11 +34,11 @@
 		$this->grid->setModel($this->getModel());
 		
 		$this->grid->addDecorator('name', ['Multiformat', function($row, $column) {
-			return [['Template', '<a href="#" class="file-modal" data-id="' . $row['id'] . '">' . $row[$column]  . '</a>']];
+			return [['Template', '<a href="#" class="file-modal" data-id="' . $row['id'] . '">' . $row[$column] . '</a>']];
 		}]);
 		
 		$this->grid->addDecorator('created_by', ['Multiformat', function($row, $column) {
-			if (! $user = User::find($row[$column])) return '';
+			if (!$user = User::find($row[$column])) return '';
 			
 			return [['Template', $user->name]];
 		}]);

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 		}]);
 		
 		$this->grid->addDecorator('created_by', ['Multiformat', function($row, $column) {
-			if (! $user = User::find($row[$column])) return '';
+			if (! $user = User::find($row[$column])) {
+				return '';
+			}
 			
 			return [['Template', $user->name]];
 		}]);