x-systems / epesi-filestorage

src/FileStorageController.php

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/File.php

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/FileStorageList.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		$grid->setModel($this->getModel());
 		
 		$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>']];
 		}]);
 
 		$grid->on('click', '.file-modal', $this->add(new FileModal())->show());

src/Seeds/FileView.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
 
 	public function __construct($file)
 	{
-		$this->file = is_numeric($file)? File::get($file): $file;
+		$this->file = is_numeric($file) ? File::get($file) : $file;
 	}
 	
 	public function renderView()
@@ -34,7 +34,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);
@@ -42,7 +42,7 @@ 
 		}
 		
 		foreach ($this->periodSelection as $key => $period) {
-			$default = $key == $this->defaultPeriod? ' (' . __('Default') . ')': '';
+			$default = $key == $this->defaultPeriod ? ' (' . __('Default') . ')' : '';
 			
 			$this->periodSelection[$key] = $period . $default;
 		}
@@ -50,7 +50,7 @@ 
 	
 	protected function addContents()
 	{
-		if (! $this->file) {
+		if (!$this->file) {
 			$this->set(__('Wrong parameters for file'));
 			return;
 		}
@@ -70,13 +70,13 @@ 
 	
 	protected function addFileDetails($container = null)
 	{
-		$container = $container?: $this;
+		$container = $container ?: $this;
 		
 		$container->add([new FileDetailsLister($this->file)]);
 	}
 	
 	protected function addFileRemoteLinks($container = null) {
-		$container = $container?: $this;
+		$container = $container ?: $this;
 		
 		foreach ($this->file->userActiveLinks()->get() as $link) {
 			$container->add(['View', __('Remote access link expiring :expiry', ['expiry' => $link->expires_at])]);
@@ -90,7 +90,7 @@ 
 		$container->js(true, new jsExpression('new ClipboardJS(".copy-button")'));
 		
 		$container->on('click', '.delete-link', $this->add(['jsCallback', 'postTrigger' => 'link'])->set(function($j, $linkId) {
-			if (! $link = FileRemoteAccess::find($linkId)) return;
+			if (!$link = FileRemoteAccess::find($linkId)) return;
 			
 			$link->delete();
 			
@@ -101,19 +101,19 @@ 
 	protected function addFileControlButtons() {
 		$urls = FileStorageAccessJoint::getActionUrls($this->file);
 		
-		if (! $this->actionDisabled('preview') && ($urls['preview']?? null)) {
+		if (!$this->actionDisabled('preview') && ($urls['preview']?? null)) {
 			$this->add(['Button', 'class' => ['basic'], 'icon' => 'file alternate outline'])->set(__('View'))->link($urls['preview'])->setAttr(['target' => '_blank']);
 		}
 		
-		if (! $this->actionDisabled('download') && ($urls['download']?? null)) {
+		if (!$this->actionDisabled('download') && ($urls['download']?? null)) {
 			$this->add(['Button', 'class' => ['basic'], 'icon' => 'file download'])->set(__('Download'))->link($urls['download']);
 		}
 		
-		if (! $this->actionDisabled('history')) {
+		if (!$this->actionDisabled('history')) {
 			$this->add(['Button', 'class' => ['basic'], 'icon' => 'history'])->set(__('Access History'))->link(url('view/filestorage:file-access-history/body') . '?' . http_build_query(['id' => $this->file->id]));
 		}
 		
-		if (! $this->actionDisabled('remote')) {
+		if (!$this->actionDisabled('remote')) {
 			$linkControl = $this->add(['View', 'ui' => 'basic buttons']);
 			
 			$linkButton = $linkControl->add(['Button', 'class' => ['basic'], 'icon' => 'linkify'])->set(__('Get Remote Link'));
@@ -123,7 +123,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

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

src/Seeds/FileDetailsLister.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 
 	public function __construct($file)
 	{
-		$this->file = is_numeric($file)? File::get($file): $file;
+		$this->file = is_numeric($file) ? File::get($file) : $file;
 	}
 	
 	public function init()
@@ -34,7 +34,7 @@ 
 	
 	public function getDefaultSource()
 	{
-		return $this->file? [
+		return $this->file ? [
 				'name' => [
 						'title'=> __('Name'),
 						'descr'=> $this->file->name
@@ -51,6 +51,6 @@ 
 						'title'=> __('Created At'),
 						'descr'=> $this->file->created_at->format('Y-m-d H:i:s')
 				]
-		]: [];
+		] : [];
 	}
 }
\ No newline at end of file