Update custom Filename

Author: irfaardy

README.md

@@ -1,14 +1,12 @@
-# 🛡️Laravel Encrypt Upload File
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/irfaardy/encrypt-file-laravel/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/irfaardy/encrypt-file-laravel/?branch=master) [![Build Status](https://scrutinizer-ci.com/g/irfaardy/encrypt-file-laravel/badges/build.png?b=master)](https://scrutinizer-ci.com/g/irfaardy/encrypt-file-laravel/build-status/master) [![Latest Stable Version](https://poser.pugx.org/irfa/encrypt-file-laravel/v/stable)](https://packagist.org/packages/irfa/encrypt-file-laravel)  [![GitHub license](https://img.shields.io/github/license/irfaardy/encrypt-file-laravel?style=flat-square)](https://github.com/irfaardy/encrypt-file-laravel/blob/master/LICENSE) [![Support me](https://img.shields.io/badge/Support-Buy%20me%20a%20coffee-yellow.svg?style=flat-square)](https://www.buymeacoffee.com/OBaAofN)
+
+# 🚀Simple Laravel Encrypt Upload File
+[![GitHub license](https://img.shields.io/github/license/irfaardy/encrypt-file-laravel?style=flat-square)](https://github.com/irfaardy/encrypt-file-laravel/blob/master/LICENSE) [![Support me](https://img.shields.io/badge/Support-Buy%20me%20a%20coffee-yellow.svg?style=flat-square)](https://www.buymeacoffee.com/OBaAofN)
 
 <p>The Simple Laravel Encrypt Upload File uses the default encryption of Laravel which is implemented in upload file.<p>
 <h3>🛠️ Installation with Composer </h3>
 
-
-```php
-composer require irfa/encrypt-file-laravel
-```
+    composer require irfa/encrypt-file-laravel
 
 >You can get Composer [ here]( https://getcomposer.org/download/)
 
@@ -19,24 +17,20 @@ composer require irfa/encrypt-file-laravel
 
 <h3>Add to config/app.php</h3>
 
-```php
-'providers' => [
-    ....
-    Irfa\FileSafe\FileSafeServiceProvider::class,
-     ];
-```
+    'providers' => [
+        ....
+        Irfa\FileSafe\FileSafeServiceProvider::class,
+         ];
 
 
 
 <h3>Add to config/app.php</h3>
 
-```php
-'aliases' => [
-         ....
-  'FileSafe' => Irfa\FileSafe\Facades\FileSafe::class,
-
-    ],
-```
+    'aliases' => [
+             ....
+      'FileSafe' => Irfa\FileSafe\Facades\FileSafe::class,
+    
+        ],
 
   <h2>Publish Vendor</h2>
 
@@ -50,51 +44,59 @@ composer require irfa/encrypt-file-laravel
 <h2>Example store file</h2>
 
 
-```php
-<?php
-
-namespace App\Http\Controllers;
-
-use Filesafe;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
-class FileController extends Controller
-{
-   
-    public function upload_file(Request $request)
+    <?php
+    
+    namespace App\Http\Controllers;
+    
+    use Filesafe;
+    use Illuminate\Http\Request;
+    use App\Http\Controllers\Controller;
+    
+    class FileController extends Controller
     {
-       $file = $request->file('file');
-       FileSafe::store($file);
-       //This is to encrypt the file before it is uploaded to the server.
-
+       
+        public function upload_file(Request $request)
+        {
+           $file = $request->file('file');
+           FileSafe::store($file);
+    //This is to encrypt the file before it is uploaded to the server.
+
+        }
     }
-}
-```
 
 <h2>Example download file</h2>
 
 
-```php
-...  
-	   $file = 'path/to/encrypted_file.txt';
-       return FileSafe::download($file);
-	    //decrypt file to be downloaded.
-...
-```
+    <?php
+    
+    namespace App\Http\Controllers;
+    
+    use FileSafe;
+    use Illuminate\Http\Request;
+    use App\Http\Controllers\Controller;
+    
+    class FileController extends Controller
+    {
+       
+        public function upload_file(Request $request)
+        {
+           $file = 'encrypted_file.txt';
+           return FileSafe::download($file);
+		    //decrypt files to be downloaded.
+        }
+    }
 
 <h3>View Raw File</h3>
 
-```php
-...
-    $file = 'encrypt_file.txt';
-    return FileSafe::file($file)->raw();
-...
-```
+    ...
+	    $file = 'encrypt_file.txt';
+	    return FileSafe::file($file)->raw();
+	...
 
 <h2>Contribution</h2>
-
 ENG:<br>
 If you want to contribute this project and make it better, your help is very welcome.<br>
 IDN:<br>
 Jika Anda ingin berkontribusi dalam proyek ini dan menjadikannya lebih baik, bantuan Anda sangat kami harapkan.
+
+***

config/irfa/filesafe.php

@@ -1,9 +1,9 @@
 <?php 
 	return [ 
 
-		'random_filename' => true, //Generate random alnum for upload filename,
+		'random_filename' => true,//Generate random alnum for upload filename,
 
-		'path' => 'uploaded/', //Uploaded file is located in storage/app.
+		'path' => 'uploaded/',//Uploaded file is located in storage/app.
 
 
 

src/Facades/FileSafe.php

@@ -8,13 +8,13 @@
 
 class FileSafe extends Facade
 {
-	/**
-	 * Get the registered name of the component.
-	 *
-	 * @return string
-	 */
-	protected static function getFacadeAccessor()
-	{
-		return \Irfa\FileSafe\Func\FileSafe::class;
-	}
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return \Irfa\FileSafe\Func\FileSafe::class;
+    }
 }

src/FileSafeServiceProvider.php

@@ -6,27 +6,27 @@
 
 class FileSafeServiceProvider extends ServiceProvider
 {
-	/**
-	 * Register services.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		//
-	}
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
 
-	/**
-	 * Bootstrap services.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
 
-		$this->publishes([
-		__DIR__.'/../config/irfa/' => config_path('irfa') ], 'file-safe');
+        $this->publishes([
+        __DIR__.'/../config/irfa/' => config_path('irfa')],'file-safe');
 
 
-	}
+    }
 }

src/Func/File.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace Irfa\FileSafe\Func;
 
 use Irfa\FileSafe\Security\CryptFile;
@@ -7,15 +7,15 @@
 class File extends CryptFile
 {
 
-	protected static function upload($file) {
-		return CryptFile::encrypt($file);
+	protected static function upload($file,$filename){
+		return CryptFile::encrypt($file,$filename);
 	}
-	protected static function download_file($file) {
+	protected static function download_file($file){
 		return CryptFile::decrypt($file);
 	}
-	protected static function view_raw($file) {
-		return CryptFile::decrypt($file, true);
+	protected static function view_raw($file){
+		return CryptFile::decrypt($file,true);
 	}
 
 
-}
+}

src/Func/FileSafe.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace Irfa\FileSafe\Func;
 
 use Irfa\FileSafe\Func\File;
@@ -7,36 +7,36 @@ class FileSafe extends File
 {
 	private static $file;
 
-	public static function file($file) {
+	public static function file($file){
 		 self::$file = $file;
 
 		 return new static();
 	}
-	public static function store($file = null) {
-		if ($file == null) {
+	public static function store($file=null,$filename=null){
+		if($file == null){
 			$fl = self::$file;
-		} else {
+		} else{
 			$fl = $file;
 		}
-		self::upload($fl);
+		self::upload($fl,$filename);
 	}
 
-	public static function download($file = null) {
-		if ($file == null) {
+	public static function download($file=null){
+		if($file == null){
 			$fl = self::$file;
-		} else {
+		} else{
 			$fl = $file;
 		}
 		return self::download_file($fl);
 	}
 
-	public static function raw($file = null) {
-		if ($file == null) {
+	public static function raw($file=null){
+		if($file == null){
 			$fl = self::$file;
-		} else {
+		} else{
 			$fl = $file;
 		}
 		return self::view_raw($fl);
 	}
 
-}
+}

src/Security/CryptFile.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace Irfa\FileSafe\Security;
 
 use Illuminate\Support\Facades\Hash;
@@ -9,39 +9,43 @@
 class CryptFile extends File
 {
 	private static $file;
-	protected static function encrypt($file) {
+	protected static function encrypt($file,$filename){
 		$fileContent = $file->get();
 		self::$file = $file;
 		$encryptedContent = Crypt::encrypt($fileContent);
-		self::store_file(self::GenerateFileName(), $encryptedContent);
+		self::store_file(self::GenerateFileName($filename),$encryptedContent);
 
 		self::$file = null;
 
-		
+
 	}
 
-	protected static function decrypt($file, $raw = false) {
+	protected static function decrypt($file,$raw=false){
 		$fl = self::get_file($file);
 		$decryptedContent = Crypt::decrypt($fl);
-		if ($raw) {
+		if($raw){
 			$raw = $decryptedContent;
 			return $raw;
-		} else {
+		} else{
 
 			return response()->streamDownload(function() use ($decryptedContent) {
-						echo $decryptedContent;
+					    echo $decryptedContent;
 					}, $file);
 		}
 	}
-	private static function GenerateFileName() {
-		if (config("irfa.filesafe.random_filename")) {
+	private static function GenerateFileName($filename=null){
+		if(config("irfa.filesafe.random_filename")){
 			$rand = time()."_".Str::random(20).".".self::$file->getClientOriginalExtension();
-		} else {
+		} else{
 			$rand = self::$file->getClientOriginalName();
 		}
+		if(!empty($filename))
+		{
+			$rand = $filename;
+		}
 		return $rand;
 	}
 
-	
 
-}
+
+}

src/Security/File.php

@@ -6,11 +6,11 @@
 
 
 class File {
-	protected static function store_file($randomname, $encryptedContent) {
+	protected static function store_file($randomname,$encryptedContent){
 		$path = config("irfa.filesafe.path");
 		Storage::disk('local')->put($path.$randomname, $encryptedContent);
 	}
-	protected static function get_file($filename) {
+	protected static function get_file($filename){
 		$path = config("irfa.filesafe.path");
 		return Storage::disk('local')->get($path.$filename);
 	}