- frontend build

Merge remote-tracking branch 'origin/master'
# Conflicts: # public/chunks/app-others.js # public/js/main.js # public/mix-manifest.json # resources/js/components/FilesView/FileItemList.vue # resources/js/components/FilesView/FilePreview.vue # resources/js/helpers.js # resources/js/store/modules/fileFunctions.js
2026-04-06 18:53:48 +00:00 · 2020-12-21 18:22:22 +01:00 · 2020-12-21 18:20:10 +01:00 · 2020-12-21 18:19:37 +01:00 · 2020-12-21 17:17:10 +01:00 · 2020-12-21 17:15:12 +01:00
248 changed files with 14817 additions and 10135 deletions
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,10 @@ APP_URL=http://localhost
 APP_DEMO=false

 LOG_CHANNEL=stack
+
 SCOUT_DRIVER=tntsearch
+SCOUT_QUEUE=true
+
 FILESYSTEM_DRIVER=
 CHUNK_SIZE=128

@@ -19,7 +22,7 @@ DB_PASSWORD=

 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
+QUEUE_CONNECTION=database
 SESSION_DRIVER=file
 SESSION_LIFETIME=120

--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/app/Console/Commands/SetupDevelopmentEnvironment.php
 /node_modules
 /public/hot
 /public/storage
@@ -11,8 +12,10 @@
 .env.backup
 .phpunit.result.cache
 .phpstorm.meta.php
+.vscode/
 _ide_helper.php
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+prettier.json
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
--- a/README.md
+++ b/README.md
@@ -1,16 +1,6 @@
 ![logo](https://vuefilemanager.com/assets/images/vuefilemanager-horizontal-logo.svg)
 # Private Cloud Storage Build on Laravel & Vue.js

-## Supporting VueFileManager
-Hi, we are trying make the best experience with VueFileManager. There is a lot things to do, and a lot of features we can make. 
-
-But, it can't be done without you, development is more and more complicated and we have to hire new colleagues to help with it. There is couple way you can support us, and then, we support you with all great new features which can be. Thanks you for participating on this awesome software!
-
- [Buy me a Coffe](https://www.buymeacoffee.com/pepe)
- [One-time donation via PayPal](https://www.paypal.me/peterpapp)
- [Become a backer or sponsor on Patreon](https://www.patreon.com/vuefilemanager)
- [Purchase Licence on CodeCanyon](https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986)
-
 ## Contents

 - [Installation](#installation)
@@ -18,11 +8,15 @@ But, it can't be done without you, development is more and more complicated and
    - [Installation](#installation)
    - [PHP Configuration](#php-configuration)
    - [Chunk Upload](#chunk-upload)
+    - [Upgrade Guide](#upgrade-guide)
+        - [Common Instructions](#common-instructions)
+        - [Update from 1.7.12 to 1.8](#update-from-1712-to-178)
+        - [Update from 1.7.10 to 1.7.11](#update-from-1710-to-1711)
+        - [Update from 1.7.8 to 1.7.9](#update-from-178-to-179)
+        - [Update from 1.7.x to 1.7.8](#update-from-17x-to-178)
+        - [Update from 1.6.x to 1.7](#update-from-16x-to-17)
    - [Nginx Configuration](#nginx-configuration)
    - [Apache Configuration](#apache-configuration)
-    - [Recover Failed Installation](#installation-failed)
-    - [Regular Update](#regular-update)
-    - [Update from 1.6.x to 1.7 ](#update-from-16x-to-17)
 - [Payments](#payments)
    - [Get your active plans](#get-your-active-plans)
    - [Manage Failed Payments](#manage-failed-payments)
@@ -49,7 +43,6 @@ But, it can't be done without you, development is more and more complicated and
 - Nginx or Apache


-
 **These PHP Extensions are required:**

 - GD
@@ -68,7 +61,7 @@ But, it can't be done without you, development is more and more complicated and
 ## Installation

 #### 1. Upload files on your server
-Copy project files to web root folder of your domain. It's mostly located in `html`, `www` or `public_html` folder name.
+Upload project files to web root folder of your domain. It's mostly located in `html`, `www` or `public_html` folder name.

 #### 2. Configure your web root folder
 Configure your web server's document root to point to the public directory of the files you previously uploaded. For example, if you've uploaded the files in `html` folder, your domain root directory should be changed to `html/project_files/public` folder or anything else where domain root is in project `/public` directory. 
@@ -102,6 +95,13 @@ At first step you have to verify your purchase code. **Subscription service with

 That was the hardest part of installation proces. Please follow instructions in every step of Setup Wizard to successfully install VueFileManager.

+#### 7. Set up Cron
+
+Add the following Cron entry to your server. Just update your php path (if it's different) and project path:
+```
+* * * * *  /usr/local/bin/php /path-to-your-project/artisan schedule:run >> /dev/null 2>&1
+```
+
 ## PHP Configuration
 There are several PHP settings good to know to setup before you try upload any file. Please set these values in your php.ini, we provide minimal setup for you. When you set `-1` then you set infinity limits.

@@ -114,10 +114,54 @@ max_execution_time = 3600
 ```

 ## Chunk & Multipart Upload
-VueFileManager in default supporting chunk upload. Default chunk upload size is `128MB`. If you wish change this default value, go to `/config/vuefilemanager.php` and change `chunk_size` attribute.
+VueFileManager in default supporting chunk upload. Default chunk upload size is `128MB`. If you wish change this default value, go to your `.env` and change `CHUNK_SIZE` attribute.

 When you use external storage, and upload large files, to prevent failing upload process make sure you have enough space in your application space and set higher `max_execution_time` in your php.ini to move your files to external storage. 

+## Upgrade Guide
+
+### Common Instructions
+`Don't forget create backup of your database before make any changes in your production application. If you serve your files in local storage driver pay attention and don't delete your /storage folder!`
+
+These instructions is applicable for all updates. Please follow this step:
+
+- Just rewrite all project files with new excluded `/.env` file and `/storage` folder. These items must be preserved!
+
+### Update from 1.7.12 to 1.8
+- Before upload new files to your hosting, log in to VueFileManager as Admin. After uploading new files on your webhosting, visit this url `your-domain.com/service/upgrade-database` for upgrading your database.
+- Just rewrite all project files with new, excluded /.env file and /storage folder. These items must be preserved!
+- set **QUEUE_CONNECTION** to **database** in your **.env** file
+- Clear cache in your administration panel - Settings / Application / Clear Cache
+
+If you are upgrading from GitHub, don't forget run `composer install` to install new vendors.
+
+### Update from 1.7.10 to 1.7.11
+Before upload new files to your hosting, log in to VueFileManager as Admin. After uploading new files on your webhosting, visit this url `your-domain.com/service/upgrade-database` for upgrading your database.
+
+### Update from 1.7.8 to 1.7.9
+After rewrited old files with new files, log in as admin to the app and go to `your-domain.com/service/upgrade-database`. This will upgrade your database on the background.
+
+Add the following Cron entry to your server. Just update your php path (if it's different) and project path:
+```
+* * * * *  /usr/local/bin/php /path-to-your-project/artisan schedule:run >> /dev/null 2>&1
+```
+
+### Update from 1.7.x to 1.7.8
+For those who have installed VueFileManager via git or any other repository synchronization tool, dont't forget after updated code run `composer update` command to update your vendors.
+
+### Update from 1.6.x to 1.7
+
+For those, who purchase extended licence, place these lines at the end of your `/.env` file:
+```
+CASHIER_LOGGER=stack
+CASHIER_CURRENCY=
+STRIPE_KEY=
+STRIPE_SECRET=
+STRIPE_WEBHOOK_SECRET=
+CASHIER_PAYMENT_NOTIFICATION=App\Notifications\ConfirmPayment
+```
+
+Then go to https://your-domain.com/upgrade and follow the setup wizard instructions.

 ## Nginx Configuration
 If you running VueFileManager undex Nginx, don't forget set this value in your `nginx.conf` file:
@@ -180,44 +224,6 @@ Make sure you have enabled mod_rewrite. There is an example config for running V
 </VirtualHost>
 ```

-## Installation Failed
-
-What to do when installation fail and you can't continue, at first, try to fix issue why installation fail. Probably missing PHP extension or permissions wasn't set correctly.
-
-At worst scenarios, to reset Setup Wizard, delete all tables in your previously created database, delete content of `/storage/framework/cache`. Then replace content in your `.env` file from `.env.example` file. 
-
-After these steps, installation will be reseted.
-
-## Regular Update
- `Don't forget create backup of your database and storage before make any changes in your production application.`
- `If you serve your files in local storage driver pay attention and don't delete your /storage folder`
-
-Follow this steps:
- Make a backup of the .env config file located on your server.
- Upload and replace all the files on your server with what's inside the app folder.
- Restore your `.env` config file on your server.
-
-## Update VueFileManager from 1.6.x to 1.7
-`Don't forget create backup of your database and storage before make any changes in your production application.`
-
-For those, who purchase extended licence, place these lines at the end of your `/.env` file:
-```
-CASHIER_LOGGER=stack
-CASHIER_CURRENCY=
-STRIPE_KEY=
-STRIPE_SECRET=
-STRIPE_WEBHOOK_SECRET=
-CASHIER_PAYMENT_NOTIFICATION=App\Notifications\ConfirmPayment
-```
-
-Then follow this steps:
-
- Make sure you have PHP >= 7.2.5 version
- Make a backup of the .env config file located on your server.
- Upload and replace all the files on your server with what's inside the app folder.
- Restore your `.env` config file on your server.
- Go to https://your-domain.com/upgrade and follow the setup wizard instructions.
-
 # Payments
 VueFileManager is packed with **Stripe** payment options. To configure Stripe, you will be asked in Setup Wizard to set up. Or, if you skip this installation process, you will find stripe set up in you admin `Dashboard / Settings / Payments`.

@@ -258,6 +264,13 @@ To start server on your localhost, run command below. Then go to your generated
 php artisan serve
 ```

+After successfully installation via Setup Wizard, stop your artisan server, clear config cache and run your artisan server again:
+```
+php artisan config:clear
+php artisan serve
+```
+*After any change in your .env you have to restart your artisan server to reload your config cache.*
+
 To develop your Vue front-end, you have to install npm modules by this command:
 ```
 npm install
@@ -350,6 +363,15 @@ The following support channels are available at your fingertips:
 - [CodeCanyon support message](https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986/support)
 - [GitHub repository](https://vuefilemanager.com/github-access)

+## Supporting VueFileManager
+Hi, we are trying make the best experience with VueFileManager. There is a lot things to do, and a lot of features we can make. 
+
+But, it can't be done without you, development is more and more complicated and we have to hire new colleagues to help with it. There is couple way you can support us, and then, we support you with all great new features which can be. Thanks you for participating on this awesome software!
+
+- [Buy me a Coffe](https://www.buymeacoffee.com/pepe)
+- [Become a Patreon](https://www.patreon.com/vuefilemanager)
+- [One-time donation via PayPal](https://www.paypal.me/peterpapp)
+
 ## Security Vulnerabilities

 If you discover a security vulnerability within this project, please send an e-mail to [peterpapp@makingcg.com](peterpapp@makingcg.com). All security vulnerabilities will be promptly addressed.
--- a/_ide_helper.php
+++ b/_ide_helper.php
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -3,9 +3,14 @@
 namespace App\Console;

 use App\Console\Commands\Deploy;
+
+// use App\Console\Commands\SetupDevelopmentEnvironment;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProductionEnvironment;
 use App\Console\Commands\UpgradeApp;
+use App\Share;
+use App\Zip;
+use Carbon\Carbon;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

@@ -18,18 +23,29 @@ class Kernel extends ConsoleKernel
     */
    protected $commands = [
        Deploy::class,
+        // SetupDevelopmentEnvironment::class,
    ];

    /**
     * Define the application's command schedule.
     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
     * @return void
     */
    protected function schedule(Schedule $schedule)
    {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->call(function () {
+            $this->delete_expired_shared_links();
+        })->everyMinute();
+
+        $schedule->call(function () {
+            $this->delete_old_zips();
+        })->everySixHours();
+
+        // Run queue jobs every minute
+        $schedule->command('queue:work --tries=3')
+            ->everyMinute()
+            ->withoutOverlapping();
    }

    /**
@@ -39,8 +55,46 @@ class Kernel extends ConsoleKernel
     */
    protected function commands()
    {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');

        require base_path('routes/console.php');
    }
+
+    /**
+     * Delete old zips
+     */
+    protected function delete_old_zips(): void
+    {
+        // Get all zips
+        $zips = Zip::where('created_at', '<=', Carbon::now()->subDay()->toDateTimeString())->get();
+
+        $zips->each(function ($zip) {
+
+            // Delete zip file
+            \Storage::disk('local')->delete('zip/' . $zip->basename);
+
+            // Delete zip record
+            $zip->delete();
+        });
+    }
+
+    /**
+     * Get and delete expired shared links
+     */
+    protected function delete_expired_shared_links(): void
+    {
+        // Get all shares with expiration time
+        $shares = Share::whereNotNull('expire_in')->get();
+
+        $shares->each(function ($share) {
+
+            // Get dates
+            $created_at = Carbon::parse($share->created_at);
+
+            // If time was over, then delete share record
+            if ($created_at->diffInHours(Carbon::now()) >= $share->expire_in) {
+                $share->delete();
+            }
+        });
+    }
 }
--- a/app/FileManagerFile.php
+++ b/app/FileManagerFile.php
@@ -9,6 +9,7 @@ use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
 use TeamTNT\TNTSearch\Indexer\TNTIndexer;
 use \Illuminate\Database\Eloquent\SoftDeletes;
+use Kyslik\ColumnSortable\Sortable;

 /**
 * App\FileManagerFile
@@ -52,10 +53,13 @@ use \Illuminate\Database\Eloquent\SoftDeletes;
 * @method static \Illuminate\Database\Query\Builder|\App\FileManagerFile withTrashed()
 * @method static \Illuminate\Database\Query\Builder|\App\FileManagerFile withoutTrashed()
 * @mixin \Eloquent
+ * @property array|null $metadata
+ * @method static \Illuminate\Database\Eloquent\Builder|FileManagerFile sortable($defaultParameters = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|FileManagerFile whereMetadata($value)
 */
 class FileManagerFile extends Model
 {
-    use Searchable, SoftDeletes;
+    use Searchable, SoftDeletes , Sortable;

    public $public_access = null;

@@ -67,6 +71,20 @@ class FileManagerFile extends Model
        'file_url'
    ];

+    protected $casts = [
+        'metadata' => 'array',
+    ];
+
+    /**
+     * Sortable columns
+     *
+     * @var string[]
+     */
+    public $sortable = [
+        'name',
+        'created_at',
+    ];
+
    /**
     * Set routes with public access
     *
@@ -148,7 +166,9 @@ class FileManagerFile extends Model
        // Get file from external storage
        if (is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {

-            $file_pretty_name = get_pretty_name($this->attributes['basename'], $this->attributes['name'], $this->attributes['mimetype']);
+            $file_pretty_name = is_storage_driver('backblaze')
+                ? Str::snake(mb_strtolower($this->attributes['name']))
+                : get_pretty_name($this->attributes['basename'], $this->attributes['name'], $this->attributes['mimetype']);

            $header = [
                "ResponseAcceptRanges"       => "bytes",
--- a/app/FileManagerFolder.php
+++ b/app/FileManagerFolder.php
@@ -11,6 +11,7 @@ use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
 use TeamTNT\TNTSearch\Indexer\TNTIndexer;
 use \Illuminate\Database\Eloquent\SoftDeletes;
+use Kyslik\ColumnSortable\Sortable;

 /**
 * App\FileManagerFolder
@@ -58,10 +59,11 @@ use \Illuminate\Database\Eloquent\SoftDeletes;
 * @method static \Illuminate\Database\Query\Builder|\App\FileManagerFolder withTrashed()
 * @method static \Illuminate\Database\Query\Builder|\App\FileManagerFolder withoutTrashed()
 * @mixin \Eloquent
+ * @method static \Illuminate\Database\Eloquent\Builder|FileManagerFolder sortable($defaultParameters = null)
 */
 class FileManagerFolder extends Model
 {
-    use Searchable, SoftDeletes;
+    use Searchable, SoftDeletes , Sortable;

    protected $guarded = [
        'id'
@@ -71,6 +73,16 @@ class FileManagerFolder extends Model
        'items', 'trashed_items'
    ];

+    /**
+     * Sortable columns
+     *
+     * @var string[]
+     */
+    public $sortable = [
+        'name',
+        'created_at',
+    ];
+
    /**
     * Index folder
     *
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -60,7 +60,7 @@ class DashboardController extends Controller
    public function new_registrations()
    {
        return new UsersCollection(
-            User::take(7)->orderByDesc('created_at')->get()
+            User::sortable(['created_at' => 'desc'])->paginate(10)
        );
    }
 }
--- a/app/Http/Controllers/Admin/PagesController.php
+++ b/app/Http/Controllers/Admin/PagesController.php
@@ -19,7 +19,7 @@ class PagesController extends Controller
    public function index()
    {
        return new PageCollection(
-            Page::all()
+            Page::sortable()->paginate(10)
        );
    }

--- a/app/Http/Controllers/Admin/PlanController.php
+++ b/app/Http/Controllers/Admin/PlanController.php
@@ -153,7 +153,7 @@ class PlanController extends Controller
        $subscribers = Subscription::where('stripe_plan', $id)->pluck('user_id');

        return new UsersCollection(
-            User::findMany($subscribers)
+            User::sortable()->findMany($subscribers)
        );
    }
 }
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -85,8 +85,8 @@ class UserController extends Controller
    {
        $user = User::find($id);

-        if (! $user->stripeId()) {
-            return response('User is not stripe customer', 404);
+        if (! $user->stripeId() || ! $user->subscription('main')) {
+            return response('User doesn\'t have any subscription.', 404);
        }

        return new UserSubscription(
@@ -102,7 +102,7 @@ class UserController extends Controller
    public function users()
    {
        return new UsersCollection(
-            User::all()
+            User::sortable(['created_at', 'DESC'])->paginate('20')
        );
    }

--- a/app/Http/Controllers/AppFunctionsController.php
+++ b/app/Http/Controllers/AppFunctionsController.php
@@ -3,12 +3,15 @@
 namespace App\Http\Controllers;

 use App\Content;
+use App\FileManagerFile;
+use App\FileManagerFolder;
 use App\Http\Requests\PublicPages\SendMessageRequest;
 use App\Http\Resources\PageResource;
 use App\Http\Tools\Demo;
 use App\Mail\SendSupportForm;
 use App\Page;
 use App\Setting;
+use App\User;
 use Artisan;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Http\Request;
@@ -96,6 +99,68 @@ class AppFunctionsController extends Controller
            ->with('installation', $connection);
    }

+    /**
+     * Get og site for web crawlers
+     *
+     * @param $token
+     */
+    public function og_site($token)
+    {
+        // Get all settings
+        $settings = Setting::all();
+
+        // Get shared token
+        $shared = get_shared($token);
+
+        // Get user
+        $user = User::findOrFail($shared->user_id);
+
+        // Handle single file
+        if ($shared->type === 'file') {
+
+            // Get file record
+            $file = FileManagerFile::where('user_id', $shared->user_id)
+                ->where('unique_id', $shared->item_id)
+                ->first();
+
+            if ($file->thumbnail) {
+                $file->setPublicUrl($token);
+            }
+
+            $metadata = [
+                'is_protected' => $shared->protected,
+                'url'          => url('/shared', ['token' => $token]),
+                'user'         => $user->name,
+                'name'         => $file->name,
+                'size'         => $file->filesize,
+                'thumbnail'    => $file->thumbnail ? $file->thumbnail : null,
+            ];
+        }
+
+        // Handle single file
+        if ($shared->type === 'folder') {
+
+            // Get file record
+            $folder = FileManagerFolder::where('user_id', $shared->user_id)
+                ->where('unique_id', $shared->item_id)
+                ->first();
+
+            $metadata = [
+                'is_protected' => $shared->protected,
+                'url'       => url('/shared', ['token' => $token]),
+                'user'      => $user->name,
+                'name'      => $folder->name,
+                'size'      => $folder->items,
+                'thumbnail' => null,
+            ];
+        }
+
+        // Return view
+        return view("og-view")
+            ->with('settings', json_decode($settings->pluck('value', 'name')->toJson()))
+            ->with('metadata', $metadata);
+    }
+
    /**
     * Check if setup wizard was passed
     *
--- a/app/Http/Controllers/FileAccessController.php
+++ b/app/Http/Controllers/FileAccessController.php
@@ -3,8 +3,11 @@
 namespace App\Http\Controllers;

 use App\FileManagerFolder;
+use App\Http\Tools\Editor;
 use App\Http\Tools\Guardian;
 use App\Share;
+use App\User;
+use App\Zip;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -13,7 +16,11 @@ use Illuminate\Http\Request;
 use App\FileManagerFile;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Madnest\Madzipper\Facades\Madzipper;
 use Response;
+use League\Flysystem\FileNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;

 class FileAccessController extends Controller
 {
@@ -84,9 +91,63 @@ class FileAccessController extends Controller
            $this->check_file_access($shared, $file);
        }

+        // Store user download size
+        $request->user()->record_download((int)$file->getRawOriginal('filesize'));
+
        return $this->download_file($file);
    }

+    /**
+     * Get generated zip for user
+     *
+     * @param $id
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     */
+    public function get_zip($id)
+    {
+        $zip = Zip::where('id', $id)
+            ->where('user_id', Auth::id())
+            ->first();
+
+        $zip_path = 'zip/' . $zip->basename;
+
+        $header = [
+            "Content-Type"        => 'application/zip',
+            "Content-Length"      => Storage::disk('local')->size($zip_path),
+            "Accept-Ranges"       => "bytes",
+            "Content-Range"       => "bytes 0-600/" . Storage::disk('local')->size($zip_path),
+            "Content-Disposition" => "attachment; filename=" . $zip->basename,
+        ];
+
+        return Storage::disk('local')->download($zip_path, $zip->basename, $header);
+    }
+
+    /**
+     * Get generated zip for guest
+     *
+     * @param $id
+     * @param $token
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     */
+    public function get_zip_public($id, $token)
+    {
+        $zip = Zip::where('id', $id)
+            ->where('shared_token', $token)
+            ->first();
+
+        $zip_path = 'zip/' . $zip->basename;
+
+        $header = [
+            "Content-Type"        => 'application/zip',
+            "Content-Length"      => Storage::disk('local')->size($zip_path),
+            "Accept-Ranges"       => "bytes",
+            "Content-Range"       => "bytes 0-600/" . Storage::disk('local')->size($zip_path),
+            "Content-Disposition" => "attachment; filename=" . $zip->basename,
+        ];
+
+        return Storage::disk('local')->download($zip_path, $zip->basename, $header);
+    }
+
    /**
     * Get file public
     *
@@ -101,7 +162,7 @@ class FileAccessController extends Controller
        $shared = get_shared($token);

        // Abort if shared is protected
-        if ((int) $shared->protected) {
+        if ((int)$shared->protected) {
            abort(403, "Sorry, you don't have permission");
        }

@@ -113,6 +174,9 @@ class FileAccessController extends Controller
        // Check file access
        $this->check_file_access($shared, $file);

+        // Store user download size
+        User::find($shared->user_id)->record_download((int)$file->getRawOriginal('filesize'));
+
        return $this->download_file($file);
    }

@@ -154,7 +218,7 @@ class FileAccessController extends Controller
        $shared = get_shared($token);

        // Abort if thumbnail is protected
-        if ((int) $shared->protected) {
+        if ((int)$shared->protected) {
            abort(403, "Sorry, you don't have permission");
        }

--- a/app/Http/Controllers/FileBrowser/BrowseController.php
+++ b/app/Http/Controllers/FileBrowser/BrowseController.php
@@ -36,6 +36,7 @@ class BrowseController extends Controller
            ->with(['parent'])
            ->where('user_id', $user_id)
            ->whereIn('unique_id', filter_folders_ids($folders_trashed))
+            ->sortable()
            ->get();

        // Get files trashed
@@ -43,6 +44,7 @@ class BrowseController extends Controller
            ->with(['parent'])
            ->where('user_id', $user_id)
            ->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))
+            ->sortable()
            ->get();

        // Collect folders and files to single array
@@ -69,14 +71,16 @@ class BrowseController extends Controller
            ->pluck('item_id');

        // Get folders and files
-        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
            ->where('user_id', $user_id)
            ->whereIn('unique_id', $folder_ids)
+            ->sortable()
            ->get();

-        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
            ->where('user_id', $user_id)
            ->whereIn('unique_id', $file_ids)
+            ->sortable()
            ->get();

        // Collect folders and files to single array
@@ -91,7 +95,9 @@ class BrowseController extends Controller
    public function latest() {

        // Get User
-        $user = User::with(['latest_uploads'])
+        $user = User::with(['latest_uploads' => function($query) {
+            $query->sortable(); 
+        }])
            ->where('id', Auth::id())
            ->first();

@@ -106,8 +112,11 @@ class BrowseController extends Controller
    public function participant_uploads() {

        // Get User
-        $uploads = FileManagerFile::with(['parent'])->where('user_id', Auth::id())
-            ->whereUserScope('editor')->orderBy('created_at', 'DESC')->get();
+        $uploads = FileManagerFile::with(['parent'])
+            ->where('user_id', Auth::id())
+            ->whereUserScope('editor')
+            ->sortable()
+            ->get();

        return $uploads;
    }
@@ -132,12 +141,14 @@ class BrowseController extends Controller
                ->with('parent')
                ->where('user_id', $user_id)
                ->where('parent_id', $unique_id)
+                ->sortable()
                ->get();

            $files = FileManagerFile::onlyTrashed()
                ->with('parent')
                ->where('user_id', $user_id)
                ->where('folder_id', $unique_id)
+                ->sortable()
                ->get();

            // Collect folders and files to single array
@@ -145,16 +156,16 @@ class BrowseController extends Controller
        }

        // Get folders and files
-        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
            ->where('user_id', $user_id)
            ->where('parent_id', $unique_id)
-            ->orderBy('created_at', 'DESC')
+            ->sortable()
            ->get();

-        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
            ->where('user_id', $user_id)
            ->where('folder_id', $unique_id)
-            ->orderBy('created_at', 'DESC')
+            ->sortable()
            ->get();

        // Collect folders and files to single array
@@ -171,6 +182,7 @@ class BrowseController extends Controller
        $folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
            ->where('parent_id', 0)
            ->where('user_id', Auth::id())
+            ->sortable()
            ->get(['id', 'parent_id', 'unique_id', 'name']);

        return [
@@ -193,33 +205,17 @@ class BrowseController extends Controller
    {
        // Get user
        $user_id = Auth::id();
+        $query = remove_accents($request->input('query'));

        // Search files id db
-        $searched_files = FileManagerFile::search($request->input('query'))
+        $searched_files = FileManagerFile::search($query)
            ->where('user_id', $user_id)
            ->get();
-        $searched_folders = FileManagerFolder::search($request->input('query'))
+        $searched_folders = FileManagerFolder::search($query)
            ->where('user_id', $user_id)
            ->get();

        // Collect folders and files to single array
        return collect([$searched_folders, $searched_files])->collapse();
    }
-
-    /**
-     * Get file record
-     *
-     * @param $unique_id
-     * @return mixed
-     */
-    public function file_detail($unique_id)
-    {
-        // Get user id
-        $user_id = Auth::id();
-
-        return FileManagerFile::with(['shared:token,id,item_id,permission,protected'])
-            ->where('user_id', $user_id)
-            ->where('unique_id', $unique_id)
-            ->firstOrFail();
-    }
 }
--- a/app/Http/Controllers/FileFunctions/EditItemsController.php
+++ b/app/Http/Controllers/FileFunctions/EditItemsController.php
@@ -10,6 +10,7 @@ use App\Http\Requests\FileFunctions\UploadRequest;
 use App\Http\Tools\Demo;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 use App\Http\Tools\Guardian;
@@ -168,40 +169,43 @@ class EditItemsController extends Controller
     * @return ResponseFactory|\Illuminate\Http\Response
     * @throws Exception
     */
-    public function user_delete_item(DeleteItemRequest $request, $unique_id)
+    public function user_delete_item(DeleteItemRequest $request)
    {
        // Demo preview
        if (is_demo(Auth::id())) {
            return Demo::response_204();
        }

-        // Check permission to delete item for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        foreach ($request->input('data') as $file) {
+            $unique_id = $file['unique_id'];

-            // Prevent force delete for non-master users
-            if ($request->input('data.force_delete')) abort('401');
+            // Check permission to delete item for authenticated editor 
+            if ($request->user()->tokenCan('editor')) {

-            // check if shared_token cookie exist
-            if (!$request->hasCookie('shared_token')) abort('401');
+                // Prevent force delete for non-master users
+                if ($file['force_delete']) abort('401');

-            // Get shared token
-            $shared = get_shared($request->cookie('shared_token'));
+                // check if shared_token cookie exist
+                if (!$request->hasCookie('shared_token')) abort('401');

-            // Get file|folder item
-            $item = get_item($request->input('data.type'), $unique_id, Auth::id());
+                // Get shared token
+                $shared = get_shared($request->cookie('shared_token'));

-            // Check access to requested directory
-            if ($request->input('data.type') === 'folder') {
-                Guardian::check_item_access($item->unique_id, $shared);
-            } else {
-                Guardian::check_item_access($item->folder_id, $shared);
+                // Get file|folder item
+                $item = get_item($file['type'], $unique_id, Auth::id());
+
+                // Check access to requested directory
+                if ($file['type'] === 'folder') {
+                    Guardian::check_item_access($item->unique_id, $shared);
+                } else {
+                    Guardian::check_item_access($item->folder_id, $shared);
+                }
            }
+
+            // Delete item
+            Editor::delete_item($file, $unique_id);
        }

-        // Delete item
-        Editor::delete_item($request, $unique_id);
-
-        // Return response
        return response(null, 204);
    }

@@ -214,7 +218,7 @@ class EditItemsController extends Controller
     * @return ResponseFactory|\Illuminate\Http\Response
     * @throws Exception
     */
-    public function guest_delete_item(DeleteItemRequest $request, $unique_id, $token)
+    public function guest_delete_item(DeleteItemRequest $request, $token)
    {
        // Get shared record
        $shared = get_shared($token);
@@ -227,19 +231,22 @@ class EditItemsController extends Controller
        // Check shared permission
        if (!is_editor($shared)) abort(403);

-        // Get file|folder item
-        $item = get_item($request->input('data.type'), $unique_id, $shared->user_id);
+        foreach ($request->input('data') as $file) {
+            $unique_id = $file['unique_id'];

-        // Check access to requested item
-        if ($request->input('data.type') === 'folder') {
-            Guardian::check_item_access($item->unique_id, $shared);
-        } else {
-            Guardian::check_item_access($item->folder_id, $shared);
+            // Get file|folder item
+            $item = get_item($file['type'], $unique_id, $shared->user_id);
+
+            // Check access to requested item
+            if ($file['type'] === 'folder') {
+                Guardian::check_item_access($item->unique_id, $shared);
+            } else {
+                Guardian::check_item_access($item->folder_id, $shared);
+            }
+
+            // Delete item
+            Editor::delete_item($file, $unique_id, $shared);
        }
-
-        // Delete item
-        Editor::delete_item($request, $unique_id, $shared);
-
        // Return response
        return response(null, 204);
    }
@@ -309,19 +316,13 @@ class EditItemsController extends Controller
    }

    /**
-     * Move item for authenticated master|editor user
+     * User download multiple files via zip
     *
-     * @param MoveItemRequest $request
-     * @param $unique_id
-     * @return ResponseFactory|\Illuminate\Http\Response
+     * @param Request $request
+     * @return string
     */
-    public function user_move(MoveItemRequest $request, $unique_id)
+    public function user_zip_multiple_files(Request $request)
    {
-        // Demo preview
-        if (is_demo(Auth::id())) {
-            return Demo::response_204();
-        }
-
        // Check permission to upload for authenticated editor
        if ($request->user()->tokenCan('editor')) {

@@ -331,12 +332,98 @@ class EditItemsController extends Controller
            // Get shared token
            $shared = get_shared($request->cookie('shared_token'));

+            $file_parent_folders = FileManagerFile::whereUserId(Auth::id())
+                ->whereIn('unique_id', $request->input('files'))
+                ->get()
+                ->pluck('folder_id')
+                ->toArray();
+
            // Check access to requested directory
-            Guardian::check_item_access($request->to_unique_id, $shared);
+            Guardian::check_item_access($file_parent_folders, $shared);
+        }
+
+        // Get requested files
+        $files = FileManagerFile::whereUserId(Auth::id())
+            ->whereIn('unique_id', $request->input('files'))
+            ->get();
+
+        $zip = Editor::zip_files($files);
+
+        // Get file
+        return response([
+            'url'  => route('zip', $zip->id),
+            'name' => $zip->basename,
+        ], 200);
+    }
+
+    /**
+     * Guest download multiple files via zip
+     *
+     * @param Request $request
+     * @param $token
+     * @return string
+     */
+    public function guest_zip_multiple_files(Request $request, $token)
+    {
+        // Get shared record
+        $shared = get_shared($token);
+
+        $file_parent_folders = FileManagerFile::whereUserId($shared->user_id)
+            ->whereIn('unique_id', $request->input('files'))
+            ->get()
+            ->pluck('folder_id')
+            ->toArray();
+
+        // Check access to requested directory
+        Guardian::check_item_access($file_parent_folders, $shared);
+
+        // Get requested files
+        $files = FileManagerFile::whereUserId($shared->user_id)
+            ->whereIn('unique_id', $request->input('files'))
+            ->get();
+
+        $zip = Editor::zip_files($files, $shared);
+
+        // Get file
+        return response([
+            'url'  => route('zip_public', [
+                'id'    => $zip->id,
+                'token' => $shared->token,
+            ]),
+            'name' => $zip->basename,
+        ], 200);
+    }
+
+    /**
+     * Move item for authenticated master|editor user
+     *
+     * @param MoveItemRequest $request
+     * @param $unique_id
+     * @return ResponseFactory|\Illuminate\Http\Response
+     */
+    public function user_move(MoveItemRequest $request)
+    {
+        // Demo preview
+        if (is_demo(Auth::id())) {
+            return Demo::response_204();
+        }
+
+        $to_unique_id = $request->input('to_unique_id');
+
+        // Check permission to upload for authenticated editor
+        if ($request->user()->tokenCan('editor')) {
+            // check if shared_token cookie exist
+            if (!$request->hasCookie('shared_token')) abort('401');
+
+            // Get shared token
+            $shared = get_shared($request->cookie('shared_token'));
+
+            // Check access to requested directory
+            Guardian::check_item_access($to_unique_id, $shared);
        }

        // Move item
-        Editor::move($request, $unique_id);
+        Editor::move($request, $to_unique_id);

        return response('Done!', 204);
    }
@@ -349,11 +436,14 @@ class EditItemsController extends Controller
     * @param $token
     * @return ResponseFactory|\Illuminate\Http\Response
     */
-    public function guest_move(MoveItemRequest $request, $unique_id, $token)
+    public function guest_move(MoveItemRequest $request, $token)
    {
        // Get shared record
        $shared = get_shared($token);

+        //Unique id of Folder where move
+        $to_unique_id = $request->input('to_unique_id');
+
        // Demo preview
        if (is_demo(Auth::id())) {
            return Demo::response_204();
@@ -362,23 +452,28 @@ class EditItemsController extends Controller
        // Check shared permission
        if (!is_editor($shared)) abort(403);

-        $moving_unique_id = $unique_id;
+        foreach ($request->input('items') as $item) {

-        if ($request->from_type !== 'folder') {
-            $file = FileManagerFile::where('unique_id', $unique_id)
-                ->where('user_id', $shared->user_id)
-                ->firstOrFail();
+            $unique_id = $item['unique_id'];
+            $moving_unique_id = $unique_id;

-            $moving_unique_id = $file->folder_id;
+
+            if ($item['type'] !== 'folder') {
+                $file = FileManagerFile::where('unique_id', $unique_id)
+                    ->where('user_id', $shared->user_id)
+                    ->firstOrFail();
+
+                $moving_unique_id = $file->folder_id;
+            }
+
+            // Check access to requested item
+            Guardian::check_item_access([
+                $to_unique_id, $moving_unique_id
+            ], $shared);
        }

-        // Check access to requested item
-        Guardian::check_item_access([
-            $request->to_unique_id, $moving_unique_id
-        ], $shared);
-
        // Move item
-        Editor::move($request, $unique_id, $shared);
+        Editor::move($request, $to_unique_id, $shared);

        return response('Done!', 204);
    }
--- a/app/Http/Controllers/FileFunctions/FavouriteController.php
+++ b/app/Http/Controllers/FileFunctions/FavouriteController.php
@@ -20,16 +20,18 @@ class FavouriteController extends Controller
    public function store(Request $request)
    {
        // Validate request
-        $validator = Validator::make($request->all(), [
-            'unique_id' => 'required|integer',
+        $validator = Validator::make($request->input('folders'), [
+            '*.unique_id' => 'required|integer',
        ]);

        // Return error
        if ($validator->fails()) abort(400, 'Bad input');

+        foreach($request->input('folders') as $item) {
+
        // Get user & folder
        $user = Auth::user();
-        $folder = FileManagerFolder::where('unique_id', $request->unique_id)->first();
+        $folder = FileManagerFolder::where('unique_id', $item['unique_id'])->first();

        if (is_demo($user->id)) {
            return Demo::favourites($user);
@@ -39,8 +41,9 @@ class FavouriteController extends Controller
        if ($folder->user_id !== $user->id) abort(403);

        // Add folder to user favourites
-        $user->favourite_folders()->syncWithoutDetaching($request->unique_id);
+        $user->favourite_folders()->syncWithoutDetaching($item['unique_id']);

+        }
        // Return updated favourites
        return $user->favourite_folders;
    }
--- a/app/Http/Controllers/FileFunctions/ShareController.php
+++ b/app/Http/Controllers/FileFunctions/ShareController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\FileFunctions;
 use App\Http\Requests\Share\CreateShareRequest;
 use App\Http\Requests\Share\UpdateShareRequest;
 use App\Http\Resources\ShareResource;
+use App\Zip;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
@@ -51,6 +52,7 @@ class ShareController extends Controller
            'protected'  => $request->isPassword,
            'permission' => $request->permission,
            'item_id'    => $request->unique_id,
+            'expire_in'  => $request->expiration,
            'user_id'    => Auth::id(),
            'token'      => $token,
        ];
@@ -77,6 +79,7 @@ class ShareController extends Controller
        $shared->update([
            'permission' => $request->permission,
            'protected'  => $request->protected,
+            'expire_in'  => $request->expiration,
            'password'   => $request->password ? Hash::make($request->password) : $shared->password,
        ]);

@@ -91,15 +94,25 @@ class ShareController extends Controller
     * @return ResponseFactory|\Illuminate\Http\Response
     * @throws \Exception
     */
-    public function destroy($token)
+    public function destroy(Request $request)
    {
-        // Get sharing record
-        $shared = Share::where('token', $token)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
+        foreach($request->input('tokens') as $token) {

-        // Delete shared record
-        $shared->delete();
+            // Get sharing record
+            Share::where('token', $token)
+                ->where('user_id', Auth::id())
+                ->firstOrFail()
+                ->delete();
+
+            // Get zip record
+            $zip = Zip::where('shared_token', $token)
+                ->where('user_id', Auth::id())
+                ->first();
+
+            if ($zip) {
+                $zip->delete();
+            }
+        }

        // Done
        return response('Done!', 204);
--- a/app/Http/Controllers/General/UpgradeAppController.php
+++ b/app/Http/Controllers/General/UpgradeAppController.php
@@ -7,6 +7,7 @@ use App\Page;
 use App\Setting;
 use Artisan;
 use Illuminate\Http\Request;
+use Schema;

 class UpgradeAppController extends Controller
 {
@@ -123,4 +124,72 @@ class UpgradeAppController extends Controller

        return response('Done', 200);
    }
+
+    /**
+     *  Start maintenance mode
+     */
+    public function up() {
+        $command = Artisan::call('up');
+
+        if ($command === 0) {
+            echo 'System is in production mode';
+        }
+    }
+
+    /**
+     *  End maintenance mode
+     */
+    public function down() {
+        $command = Artisan::call('down');
+
+        if ($command === 0) {
+            echo 'System is in maintenance mode';
+        }
+    }
+
+    /**
+     *  Upgrade database
+     */
+    public function upgrade_database()
+    {
+        /*
+         * Upgrade expire_in in shares table
+         *
+         * @since v1.7.9
+        */
+        if (! Schema::hasColumn('shares', 'expire_in')) {
+
+            $command = Artisan::call('migrate', [
+                '--force' => true
+            ]);
+
+            if ($command === 0) {
+                echo 'Operation was successful.';
+            }
+
+            if ($command === 1) {
+                echo 'Operation failed.';
+            }
+        }
+
+        /*
+         * Upgrade expire_in in shares table
+         *
+         * @since v1.7.11
+        */
+        if (! Schema::hasColumn('file_manager_files', 'metadata')) {
+
+            $command = Artisan::call('migrate', [
+                '--force' => true
+            ]);
+
+            if ($command === 0) {
+                echo 'Operation was successful.';
+            }
+
+            if ($command === 1) {
+                echo 'Operation failed.';
+            }
+        }
+    }
 }
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -149,6 +149,8 @@ class SettingController extends Controller
        ]);

        // Clear cache
+        Artisan::call('cache:clear');
+        Artisan::call('config:clear');
        Artisan::call('config:cache');
    }
 }
--- a/app/Http/Controllers/Sharing/FileSharingController.php
+++ b/app/Http/Controllers/Sharing/FileSharingController.php
@@ -58,6 +58,10 @@ class FileSharingController extends Controller
                ->first();

            if ($image) {
+
+                // Store user download size
+                User::find($shared->user_id)->record_download((int) $image->getRawOriginal('filesize'));
+
                return $this->show_image($image);
            }
        }
@@ -247,6 +251,7 @@ class FileSharingController extends Controller
        $folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
            ->where('parent_id', $shared->item_id)
            ->where('user_id', $shared->user_id)
+            ->sortable()
            ->get(['id', 'parent_id', 'unique_id', 'name']);

        // Return folder tree
@@ -277,6 +282,7 @@ class FileSharingController extends Controller
        $folders = FileManagerFolder::with('folders:id,parent_id,unique_id,name')
            ->where('parent_id', $shared->item_id)
            ->where('user_id', $shared->user_id)
+            ->sortable()
            ->get(['id', 'parent_id', 'unique_id', 'name']);

        // Return folder tree
@@ -399,10 +405,12 @@ class FileSharingController extends Controller
    {
        $folders = FileManagerFolder::where('user_id', $shared->user_id)
            ->where('parent_id', $unique_id)
+            ->sortable()
            ->get();

        $files = FileManagerFile::where('user_id', $shared->user_id)
            ->where('folder_id', $unique_id)
+            ->sortable()
            ->get();

        return [$folders, $files];
--- a/app/Http/Controllers/User/AccountController.php
+++ b/app/Http/Controllers/User/AccountController.php
@@ -107,7 +107,15 @@ class AccountController extends Controller
     */
    public function update_user_settings(Request $request)
    {
-        // TODO: validation
+        // Validate request
+        $validator = Validator::make($request->all(), [
+            'name'   => 'string',
+            'value'  => 'string',
+        ]);
+
+        // Return error
+        if ($validator->fails()) abort(400, 'Bad input');
+
        // Get user
        $user = Auth::user();

--- a/app/Http/Helpers/helpers.php
+++ b/app/Http/Helpers/helpers.php
@@ -244,12 +244,12 @@ function is_editor($shared)
 function get_unique_id(): int
 {
    // Get files and folders
-    $folders = FileManagerFolder::withTrashed()->latest();
-    $files = FileManagerFile::withTrashed()->latest();
+    $folders = FileManagerFolder::withTrashed()->get();
+    $files = FileManagerFile::withTrashed()->get();

    // Get last ids
-    $folders_unique = ! $folders->first() ? 0 : (int) $folders->first()->unique_id;
-    $files_unique = ! $files->first() ? 0 : (int) $files->first()->unique_id;
+    $folders_unique = $folders->isEmpty() ? 0 : $folders->last()->unique_id;
+    $files_unique = $files->isEmpty() ? 0 : $files->last()->unique_id;

    // Count new unique id
    $unique_id = $folders_unique > $files_unique ? $folders_unique + 1 : $files_unique + 1;
@@ -355,6 +355,25 @@ function format_gigabytes($gigabytes)
    }
 }

+/**
+ * Format string to formated megabytes string
+ *
+ * @param $megabytes
+ * @return string
+ */
+function format_megabytes($megabytes)
+{
+    if ($megabytes >= 1000) {
+        return $megabytes / 1000 . 'GB';
+    }
+
+    if ($megabytes >= 1000000) {
+        return $megabytes / 1000000 . 'TB';
+    }
+
+    return $megabytes . 'MB';
+}
+
 /**
 * Convert megabytes to bytes
 *
@@ -528,4 +547,189 @@ function get_pretty_name($basename, $name, $mimetype)
    }

    return $name . '.' . $mimetype;
-}
+}
+
+/**
+ * Get exif data from jpeg image
+ *
+ * @param $file
+ * @return array
+ */
+function get_image_meta_data($file)
+{
+    if (get_file_type_from_mimetype($file->getMimeType()) === 'jpeg') {
+        return exif_read_data($file);
+    }
+}
+
+/**
+ * Check if app is in dev mode
+ *
+ * @return bool
+ */
+function is_dev()
+{
+    return env('APP_ENV') === 'local' ? true : false;
+}
+
+/**
+ * @param $str
+ * @return bool
+ */
+function seems_utf8($str)
+{
+    $length = strlen($str);
+    for ($i=0; $i < $length; $i++) {
+        $c = ord($str[$i]);
+        if ($c < 0x80) $n = 0; # 0bbbbbbb
+        elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb
+        elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb
+        elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb
+        elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb
+        elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b
+        else return false; # Does not match any model
+        for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+            if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
+                return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * Converts all accent characters to ASCII characters.
+ *
+ * If there are no accent characters, then the string given is just returned.
+ *
+ * @param string $string Text that might have accent characters
+ * @return string Filtered string with replaced "nice" characters.
+ */
+function remove_accents($string) {
+    if ( !preg_match('/[\x80-\xff]/', $string) )
+        return $string;
+
+    if (seems_utf8($string)) {
+        $chars = array(
+            // Decompositions for Latin-1 Supplement
+            chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
+            chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
+            chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
+            chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
+            chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
+            chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
+            chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
+            chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
+            chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
+            chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
+            chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
+            chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
+            chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
+            chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
+            chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
+            chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
+            chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
+            chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
+            chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
+            chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
+            chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
+            chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
+            chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
+            chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
+            chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
+            chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
+            chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
+            chr(195).chr(191) => 'y',
+            // Decompositions for Latin Extended-A
+            chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
+            chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
+            chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
+            chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
+            chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
+            chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
+            chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
+            chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
+            chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
+            chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
+            chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
+            chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
+            chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
+            chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
+            chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
+            chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
+            chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
+            chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
+            chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
+            chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
+            chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
+            chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
+            chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
+            chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
+            chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
+            chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+            chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
+            chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
+            chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
+            chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
+            chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
+            chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
+            chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
+            chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
+            chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
+            chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
+            chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
+            chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
+            chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
+            chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
+            chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
+            chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+            chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
+            chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
+            chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
+            chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
+            chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
+            chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+            chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
+            chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
+            chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
+            chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
+            chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
+            chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
+            chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
+            chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
+            chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
+            chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
+            chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
+            chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
+            chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
+            chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
+            chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
+            chr(197).chr(190) => 'z', chr(197).chr(191) => 's',
+            // Euro Sign
+            chr(226).chr(130).chr(172) => 'E',
+            // GBP (Pound) Sign
+            chr(194).chr(163) => '');
+
+        $string = strtr($string, $chars);
+    } else {
+        // Assume ISO-8859-1 if not UTF-8
+        $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
+            .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
+            .chr(195).chr(196).chr(197).chr(199).chr(200).chr(201).chr(202)
+            .chr(203).chr(204).chr(205).chr(206).chr(207).chr(209).chr(210)
+            .chr(211).chr(212).chr(213).chr(214).chr(216).chr(217).chr(218)
+            .chr(219).chr(220).chr(221).chr(224).chr(225).chr(226).chr(227)
+            .chr(228).chr(229).chr(231).chr(232).chr(233).chr(234).chr(235)
+            .chr(236).chr(237).chr(238).chr(239).chr(241).chr(242).chr(243)
+            .chr(244).chr(245).chr(246).chr(248).chr(249).chr(250).chr(251)
+            .chr(252).chr(253).chr(255);
+
+        $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
+
+        $string = strtr($string, $chars['in'], $chars['out']);
+        $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
+        $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
+        $string = str_replace($double_chars['in'], $double_chars['out'], $string);
+    }
+
+    return $string;
+}
--- a/app/Http/Middleware/CheckForMaintenanceMode.php
+++ b/app/Http/Middleware/CheckForMaintenanceMode.php
@@ -12,6 +12,8 @@ class CheckForMaintenanceMode extends Middleware
     * @var array
     */
    protected $except = [
-        //
+        '/service/upgrade-database',
+        '/service/down',
+        '/service/up',
    ];
 }
--- a/app/Http/Requests/FileFunctions/DeleteItemRequest.php
+++ b/app/Http/Requests/FileFunctions/DeleteItemRequest.php
@@ -25,8 +25,9 @@ class DeleteItemRequest extends FormRequest
    public function rules()
    {
        return [
-            'data.type'         => 'required|string',
-            'data.force_delete' => 'required|boolean',
+            'data[*].force_delete' => 'required|boolean',
+            'data[*].type'         => 'required|string',
+            'data[*].unique_id'    => 'required|integer'  
        ];
    }
 }
--- a/app/Http/Requests/FileFunctions/MoveItemRequest.php
+++ b/app/Http/Requests/FileFunctions/MoveItemRequest.php
@@ -25,8 +25,9 @@ class MoveItemRequest extends FormRequest
    public function rules()
    {
        return [
-            'to_unique_id'   => 'required|integer',
-            'from_type'      => 'required|string',
+            'to_unique_id'          => 'required|integer',
+            'items[*].type'         => 'required|string',
+            'items[*].unique_id'    => 'required|integer',
        ];
    }
 }
--- a/app/Http/Requests/FileFunctions/UploadRequest.php
+++ b/app/Http/Requests/FileFunctions/UploadRequest.php
@@ -2,6 +2,7 @@

 namespace App\Http\Requests\FileFunctions;

+use App\Rules\MimetypeBlacklistValidation;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;

@@ -26,7 +27,7 @@ class UploadRequest extends FormRequest
    {
        return [
            'parent_id' => 'required|integer',
-            'file'      => 'required|file',
+            'file'      => ['required','file' ,  new MimetypeBlacklistValidation]
        ];
    }
 }
--- a/app/Http/Requests/Share/CreateShareRequest.php
+++ b/app/Http/Requests/Share/CreateShareRequest.php
@@ -28,6 +28,7 @@ class CreateShareRequest extends FormRequest
            'isPassword' => 'required|boolean',
            'unique_id'  => 'required|integer',
            'type'       => 'required|string',
+            'expiration' => 'integer|nullable',
            'permission' => 'string',
            'password'   => 'string',
        ];
--- a/app/Http/Requests/Share/UpdateShareRequest.php
+++ b/app/Http/Requests/Share/UpdateShareRequest.php
@@ -27,6 +27,7 @@ class UpdateShareRequest extends FormRequest
        return [
            'protected'  => 'required|boolean',
            'permission' => 'nullable|string',
+            'expiration' => 'integer|nullable',
            'password'   => 'string',
        ];
    }
--- a/app/Http/Requests/Subscription/StoreUpgradeAccountRequest.php
+++ b/app/Http/Requests/Subscription/StoreUpgradeAccountRequest.php
@@ -46,7 +46,7 @@ class StoreUpgradeAccountRequest extends FormRequest
            'plan.data.attributes.capacity'           => 'required|digits_between:1,9',
            'plan.data.attributes.capacity_formatted' => 'required|string',
            'plan.data.attributes.currency'           => 'required|string',
-            'plan.data.attributes.description'        => 'required|string',
+            'plan.data.attributes.description'        => 'sometimes|string|nullable',
            'plan.data.attributes.name'               => 'required|string',
            'plan.data.attributes.price'              => 'required|string',
            'plan.data.id'                            => 'required|string',
--- a/app/Http/Resources/ShareResource.php
+++ b/app/Http/Resources/ShareResource.php
@@ -22,6 +22,7 @@ class ShareResource extends JsonResource
                    'permission' => $this->permission,
                    'protected'  => (int) $this->protected,
                    'item_id'    => (int) $this->item_id,
+                    'expire_in'  => (int) $this->expire_in,
                    'token'      => $this->token,
                    'link'       => $this->link,
                    'type'       => $this->type,
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -23,17 +23,17 @@ class UserResource extends JsonResource
                'id'         => (string)$this->id,
                'type'       => 'user',
                'attributes' => [
-                    'storage_capacity'        => $this->settings->storage_capacity,
-                    'subscription'            => $this->subscribed('main'),
-                    'incomplete_payment' => $this->hasIncompletePayment('main') ? route('cashier.payment', $this->subscription('main')->latestPayment()->id) : null,
-                    'stripe_customer'         => is_null($this->stripe_id) ? false : true,
-                    'name'                    => $this->name,
-                    'email'                   => env('APP_DEMO') ? obfuscate_email($this->email) : $this->email,
-                    'avatar'                  => $this->avatar,
-                    'role'                    => $this->role,
-                    'created_at_formatted'    => format_date($this->created_at, '%d. %B. %Y'),
-                    'created_at'              => $this->created_at,
-                    'updated_at'              => $this->updated_at,
+                    'storage_capacity'     => $this->settings->storage_capacity,
+                    'subscription'         => $this->subscribed('main'),
+                    'incomplete_payment'   => $this->hasIncompletePayment('main') ? route('cashier.payment', $this->subscription('main')->latestPayment()->id) : null,
+                    'stripe_customer'      => is_null($this->stripe_id) ? false : true,
+                    'name'                 => $this->name,
+                    'email'                => env('APP_DEMO') ? obfuscate_email($this->email) : $this->email,
+                    'avatar'               => $this->avatar,
+                    'role'                 => $this->role,
+                    'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
+                    'created_at'           => $this->created_at,
+                    'updated_at'           => $this->updated_at,
                ]
            ],
            'relationships' => [
--- a/app/Http/Tools/Editor.php
+++ b/app/Http/Tools/Editor.php
@@ -8,6 +8,7 @@ use App\FileManagerFile;
 use App\FileManagerFolder;
 use App\Http\Requests\FileFunctions\RenameItemRequest;
 use App\User;
+use App\Zip;
 use Aws\Exception\MultipartUploadException;
 use Aws\S3\MultipartUploader;
 use Carbon\Carbon;
@@ -18,11 +19,83 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
+use League\Flysystem\FileNotFoundException;
+use Madnest\Madzipper\Facades\Madzipper;
 use Symfony\Component\HttpKernel\Exception\HttpException;


 class Editor
 {
+
+    /**
+     * Zip selected files, store it in /zip folder and retrieve zip record
+     *
+     * @param $files
+     * @param null $shared
+     * @return mixed
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public static function zip_files($files, $shared = null)
+    {
+        // Local storage instance
+        $disk_local = Storage::disk('local');
+
+        // Create zip directory
+        if (!$disk_local->exists('zip')) {
+            $disk_local->makeDirectory('zip');
+        }
+
+        // Move file to local storage from external storage service
+        if (!is_storage_driver('local')) {
+
+            // Create temp directory
+            if (!$disk_local->exists('temp')) {
+                $disk_local->makeDirectory('temp');
+            }
+
+            foreach ($files as $file) {
+                try {
+                    $disk_local->put('temp/' . $file['basename'], Storage::get('file-manager/' . $file['basename']));
+                } catch (FileNotFoundException $e) {
+                    throw new HttpException(404, 'File not found');
+                }
+            }
+        }
+
+        // Get zip path
+        $zip_name = Str::random(16) . '.zip';
+        $zip_path = 'zip/' . $zip_name;
+
+        // Create zip
+        $zip = Madzipper::make(storage_path() . '/app/' . $zip_path);
+
+        // Get files folder on local storage drive
+        $files_directory = is_storage_driver('local') ? 'file-manager' : 'temp';
+
+        // Add files to zip
+        $files->each(function ($file) use ($zip, $files_directory) {
+            $zip->addString($file['name'], File::get(storage_path() . '/app/' . $files_directory . '/' . $file['basename']));
+        });
+
+        // Close zip
+        $zip->close();
+
+        // Delete temporary files
+        if (!is_storage_driver('local')) {
+
+            $files->each(function ($file) use ($disk_local) {
+                $disk_local->delete('temp/' . $file['basename']);
+            });
+        }
+
+        // Store zip record
+        return Zip::create([
+            'user_id'      => $shared->user_id ?? Auth::id(),
+            'shared_token' => $shared->token ?? null,
+            'basename'     => $zip_name,
+        ]);
+    }
+
    /**
     * Create new directory
     *
@@ -86,13 +159,13 @@ class Editor
     * @param null $shared
     * @throws \Exception
     */
-    public static function delete_item($request, $unique_id, $shared = null)
+    public static function delete_item($file, $unique_id, $shared = null)
    {
        // Get user id
        $user = is_null($shared) ? Auth::user() : User::findOrFail($shared->user_id);

        // Delete folder
-        if ($request->input('data.type') === 'folder') {
+        if ($file['type'] === 'folder') {

            // Get folder
            $folder = FileManagerFolder::withTrashed()
@@ -113,7 +186,7 @@ class Editor
            }

            // Force delete children files
-            if ($request->input('data.force_delete')) {
+            if ($file['force_delete']) {

                // Get children folder ids
                $child_folders = filter_folders_ids($folder->trashed_folders, 'unique_id');
@@ -142,7 +215,7 @@ class Editor
            }

            // Soft delete items
-            if (!$request->input('data.force_delete')) {
+            if (!$file['force_delete']) {

                // Remove folder from user favourites
                $user->favourite_folders()->detach($unique_id);
@@ -153,10 +226,10 @@ class Editor
        }

        // Delete item
-        if ($request->input('data.type') !== 'folder') {
+        if ($file['type'] !== 'folder') {

            // Get file
-            $file = FileManagerFile::withTrashed()
+            $item = FileManagerFile::withTrashed()
                ->where('user_id', $user->id)
                ->where('unique_id', $unique_id)
                ->first();
@@ -173,23 +246,23 @@ class Editor
            }

            // Force delete file
-            if ($request->input('data.force_delete')) {
+            if ($file['force_delete']) {

                // Delete file
-                Storage::delete('/file-manager/' . $file->basename);
+                Storage::delete('/file-manager/' . $item->basename);

                // Delete thumbnail if exist
-                if ($file->thumbnail) Storage::delete('/file-manager/' . $file->getRawOriginal('thumbnail'));
+                if ($item->thumbnail) Storage::delete('/file-manager/' . $item->getRawOriginal('thumbnail'));

                // Delete file permanently
-                $file->forceDelete();
+                $item->forceDelete();
            }

            // Soft delete file
-            if (!$request->input('data.force_delete')) {
+            if (!$file['force_delete']) {

                // Soft delete file
-                $file->delete();
+                $item->delete();
            }
        }
    }
@@ -201,32 +274,36 @@ class Editor
     * @param $unique_id
     * @param null $shared
     */
-    public static function move($request, $unique_id, $shared = null)
+    public static function move($request, $to_unique_id, $shared = null)
    {
        // Get user id
        $user_id = is_null($shared) ? Auth::id() : $shared->user_id;

-        if ($request->from_type === 'folder') {
+        foreach ($request->input('items') as $item) {
+            $unique_id = $item['unique_id'];

-            // Move folder
-            $item = FileManagerFolder::where('user_id', $user_id)
-                ->where('unique_id', $unique_id)
-                ->firstOrFail();
+            if ($item['type'] === 'folder') {

-            $item->update([
-                'parent_id' => $request->to_unique_id
-            ]);
+                // Move folder
+                $item = FileManagerFolder::where('user_id', $user_id)
+                    ->where('unique_id', $unique_id)
+                    ->firstOrFail();

-        } else {
+                $item->update([
+                    'parent_id' => $to_unique_id
+                ]);

-            // Move file under new folder
-            $item = FileManagerFile::where('user_id', $user_id)
-                ->where('unique_id', $unique_id)
-                ->firstOrFail();
+            } else {

-            $item->update([
-                'folder_id' => $request->to_unique_id
-            ]);
+                // Move file under new folder
+                $item = FileManagerFile::where('user_id', $user_id)
+                    ->where('unique_id', $unique_id)
+                    ->firstOrFail();
+
+                $item->update([
+                    'folder_id' => $to_unique_id
+                ]);
+            }
        }
    }

@@ -251,12 +328,26 @@ class Editor
        $disk_file_name = basename('chunks/' . $file->getClientOriginalName(), '.part');
        $temp_filename = $file->getClientOriginalName();

-        // Generate file
-        File::append(config('filesystems.disks.local.root') . '/chunks/' . $temp_filename, $file->get());
+        // File Path
+        $file_path = config('filesystems.disks.local.root') . '/chunks/' . $temp_filename;\

+        // Generate file
+        File::append($file_path, $file->get());
+
+        // Size of file
+        $file_size = File::size($file_path);
+
+        // Size of limit
+        $limit = get_setting('upload_limit');
+
+        // File size handling
+        if( $limit && $file_size > format_bytes($limit)) abort(413);
+    
        // If last then process file
        if ($request->boolean('is_last')) {

+            $metadata = get_image_meta_data($file);
+
            $disk_local = Storage::disk('local');
            $unique_id = get_unique_id();

@@ -292,6 +383,7 @@ class Editor
                'mimetype'   => get_file_type_from_mimetype($file_mimetype),
                'type'       => get_file_type($file_mimetype),
                'folder_id'  => $request->parent_id,
+                'metadata'   => $metadata,
                'name'       => $user_file_name,
                'unique_id'  => $unique_id,
                'basename'   => $disk_file_name,
@@ -301,6 +393,19 @@ class Editor
                'user_id'    => $user_id,
            ];

+            // Store user upload size
+            if ($request->user()) {
+
+                // If upload a loged user
+                $request->user()->record_upload($file_size);
+
+            } else {
+
+                // If upload guest
+                User::find($shared->user_id)->record_upload($file_size);
+
+            }
+
            // Return new file
            return FileManagerFile::create($options);
        }
--- a/app/Page.php
+++ b/app/Page.php
@@ -3,9 +3,42 @@
 namespace App;

 use Illuminate\Database\Eloquent\Model;
+use Kyslik\ColumnSortable\Sortable;

+/**
+ * App\Page
+ *
+ * @property int $id
+ * @property int $visibility
+ * @property string $title
+ * @property string $slug
+ * @property string $content
+ * @method static \Illuminate\Database\Eloquent\Builder|Page newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Page newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Page query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Page sortable($defaultParameters = null)
+ * @method static \Illuminate\Database\Eloquent\Builder|Page whereContent($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Page whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Page whereSlug($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Page whereTitle($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Page whereVisibility($value)
+ * @mixin \Eloquent
+ */
 class Page extends Model
 {
+    use Sortable;
+
+    /**
+     * Sortable columns
+     *
+     * @var string[]
+     */
+    public $sortable = [
+        'title',
+        'slug',
+        'visibility',
+    ];
+
    public $timestamps = false;

    protected $guarded = ['id'];
--- a/app/Rules/MimetypeBlacklistValidation.php
+++ b/app/Rules/MimetypeBlacklistValidation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Rules;
+use Illuminate\Contracts\Validation\Rule;
+
+class MimetypeBlacklistValidation implements Rule
+{
+    /**
+     * Create a new rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $mimetype_blacklist = explode(',' ,get_setting('mimetypes_blacklist'));
+        $file_mimetype = explode('/' ,$value->getMimeType());
+        
+        return !array_intersect($file_mimetype , $mimetype_blacklist);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+       abort (415,'Type of this mime type is not allowed.');
+    }
+}
--- a/app/Services/StripeService.php
+++ b/app/Services/StripeService.php
@@ -380,6 +380,8 @@ class StripeService
     */
    public function getInvoices()
    {
-        return $this->stripe->invoices()->all();
+        return $this->stripe->invoices()->all([
+            'limit' => 20
+        ]);
    }
 }
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -4,6 +4,20 @@ namespace App;

 use Illuminate\Database\Eloquent\Model;

+/**
+ * App\Setting
+ *
+ * @property int $id
+ * @property string $name
+ * @property string|null $value
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Setting whereValue($value)
+ * @mixin \Eloquent
+ */
 class Setting extends Model
 {
    public $timestamps = false;
--- a/app/Share.php
+++ b/app/Share.php
@@ -32,6 +32,8 @@ use Illuminate\Database\Eloquent\Model;
 * @method static \Illuminate\Database\Eloquent\Builder|\App\Share whereUpdatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder|\App\Share whereUserId($value)
 * @mixin \Eloquent
+ * @property int|null $expire_in
+ * @method static \Illuminate\Database\Eloquent\Builder|Share whereExpireIn($value)
 */
 class Share extends Model
 {
--- a/app/Traffic.php
+++ b/app/Traffic.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\Traffic
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property int $upload
+ * @property int $download
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereDownload($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereUpload($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Traffic whereUserId($value)
+ * @mixin \Eloquent
+ */
+class Traffic extends Model
+{
+    protected $fillable = ['user_id', 'upload', 'download'];
+}
--- a/app/User.php
+++ b/app/User.php
@@ -5,14 +5,13 @@ namespace App;
 use App\Notifications\ResetPassword;
 use App\Notifications\ResetUserPasswordNotification;
 use ByteUnits\Metric;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Carbon\Carbon;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
 use Laravel\Cashier\Billable;
 use Laravel\Passport\HasApiTokens;
+use Kyslik\ColumnSortable\Sortable;
 use Rinvex\Subscriptions\Traits\HasSubscriptions;

 /**
@@ -75,10 +74,11 @@ use Rinvex\Subscriptions\Traits\HasSubscriptions;
 * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereRole($value)
 * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereStripeId($value)
 * @method static \Illuminate\Database\Eloquent\Builder|\App\User whereTrialEndsAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User sortable($defaultParameters = null)
 */
 class User extends Authenticatable
 {
-    use HasApiTokens, Notifiable, Billable;
+    use HasApiTokens, Notifiable, Billable, Sortable;

    protected $guarded = ['id', 'role'];

@@ -113,6 +113,19 @@ class User extends Authenticatable
        'used_capacity', 'storage'
    ];

+    /**
+     * Sortable columns
+     *
+     * @var string[]
+     */
+    public $sortable = [
+        'id',
+        'name',
+        'role',
+        'created_at',
+        'storage_capacity',
+    ];
+
    /**
     * Get tax rate id for user
     *
@@ -145,10 +158,10 @@ class User extends Authenticatable
        $is_storage_limit = $storage_limitation ? $storage_limitation : 1;

        // Get user storage usage
-        if (! $is_storage_limit) {
+        if (!$is_storage_limit) {

            return [
-                'used' => $this->used_capacity,
+                'used'           => $this->used_capacity,
                'used_formatted' => Metric::bytes($this->used_capacity)->format(),
            ];
        }
@@ -182,9 +195,12 @@ class User extends Authenticatable
     */
    public function getFolderTreeAttribute()
    {
-        return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
+        // Get sorting setup
+
+        return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected,expire_in'])
            ->where('parent_id', 0)
            ->where('user_id', $this->id)
+            ->sortable()
            ->get();
    }

@@ -197,7 +213,6 @@ class User extends Authenticatable
    {
        // Get avatar from external storage
        if ($this->attributes['avatar'] && is_storage_driver(['s3', 'spaces', 'wasabi', 'backblaze'])) {
-
            return Storage::temporaryUrl($this->attributes['avatar'], now()->addDay());
        }

@@ -241,6 +256,46 @@ class User extends Authenticatable
        $this->notify(new ResetPassword($token));
    }

+    /**
+     * Record user upload filesize
+     *
+     * @param $file_size
+     */
+    public function record_upload($file_size)
+    {
+        $now = Carbon::now();
+
+        $record = Traffic::whereYear('created_at', '=', $now->year)
+            ->whereMonth('created_at', '=', $now->month)
+            ->firstOrCreate([
+                'user_id' => $this->id,
+            ]);
+
+        $record->update([
+            'upload' => $record->upload + $file_size
+        ]);
+    }
+
+    /**
+     * Record user download filesize
+     *
+     * @param $file_size
+     */
+    public function record_download($file_size)
+    {
+        $now = Carbon::now();
+
+        $record = Traffic::whereYear('created_at', '=', $now->year)
+            ->whereMonth('created_at', '=', $now->month)
+            ->firstOrCreate([
+                'user_id' => $this->id,
+            ]);
+
+        $record->update([
+            'download' => $record->download + $file_size
+        ]);
+    }
+
    /**
     * Get user favourites folder
     *
@@ -248,7 +303,7 @@ class User extends Authenticatable
     */
    public function favourite_folders()
    {
-        return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected');
+        return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected,expire_in');
    }

    /**
@@ -258,7 +313,7 @@ class User extends Authenticatable
     */
    public function latest_uploads()
    {
-        return $this->hasMany(FileManagerFile::class)->with(['parent'])->orderBy('created_at', 'DESC')->take(40);
+        return $this->hasMany(FileManagerFile::class)->with(['parent'])->take(40);
    }

    /**
--- a/app/UserSettings.php
+++ b/app/UserSettings.php
@@ -4,6 +4,34 @@ namespace App;

 use Illuminate\Database\Eloquent\Model;

+/**
+ * App\UserSettings
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property int $storage_capacity
+ * @property string|null $billing_name
+ * @property string|null $billing_address
+ * @property string|null $billing_state
+ * @property string|null $billing_city
+ * @property string|null $billing_postal_code
+ * @property string|null $billing_country
+ * @property string|null $billing_phone_number
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings query()
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingCity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingCountry($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingPhoneNumber($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingPostalCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereBillingState($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereStorageCapacity($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserSettings whereUserId($value)
+ * @mixin \Eloquent
+ */
 class UserSettings extends Model
 {
    public $timestamps = false;
--- a/app/Zip.php
+++ b/app/Zip.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+
+class Zip extends Model
+{
+    protected $guarded = ['id'];
+
+    public $incrementing = false;
+
+    protected $keyType = 'string';
+
+    /**
+     * Generate uuid
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->id = (string)Str::uuid();
+        });
+    }
+}
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,8 @@
        "fruitcake/laravel-cors": "^1.0",
        "gabrielelana/byte-units": "^0.5.0",
        "intervention/image": "^2.5",
+        "jaybizzle/laravel-crawler-detect": "^1.2",
+        "kyslik/column-sortable": "^6.3",
        "laravel/cashier": "^12.0",
        "laravel/framework": "^7.0",
        "laravel/passport": "^8.4",
@@ -23,6 +25,7 @@
        "laravel/ui": "^2.0",
        "league/flysystem-aws-s3-v3": "^1.0",
        "league/flysystem-cached-adapter": "^1.0",
+        "madnest/madzipper": "^1.1",
        "teamtnt/laravel-scout-tntsearch-driver": "^8.3"
    },
    "require-dev": {
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "c2e0a4adcc267140dcc5f4b1ee31ae2f",
+    "content-hash": "2753a719196cd76d1bd7ee346540266c",
    "packages": [
        {
            "name": "asm89/stack-cors",
@@ -1467,6 +1467,176 @@
            ],
            "time": "2019-11-02T09:15:47+00:00"
        },
+        {
+            "name": "jaybizzle/crawler-detect",
+            "version": "v1.2.98",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JayBizzle/Crawler-Detect.git",
+                "reference": "02b24e5d4dc347737577f48c688ee14c3b5dfd4f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/02b24e5d4dc347737577f48c688ee14c3b5dfd4f",
+                "reference": "02b24e5d4dc347737577f48c688ee14c3b5dfd4f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8|^5.5|^6.5",
+                "satooshi/php-coveralls": "1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jaybizzle\\CrawlerDetect\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Beech",
+                    "email": "m@rkbee.ch",
+                    "role": "Developer"
+                }
+            ],
+            "description": "CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent",
+            "homepage": "https://github.com/JayBizzle/Crawler-Detect/",
+            "keywords": [
+                "crawler",
+                "crawler detect",
+                "crawler detector",
+                "crawlerdetect",
+                "php crawler detect"
+            ],
+            "time": "2020-08-20T18:36:15+00:00"
+        },
+        {
+            "name": "jaybizzle/laravel-crawler-detect",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/JayBizzle/Laravel-Crawler-Detect.git",
+                "reference": "e39b536fb5e4f21a49328e83a2ab26f0b64b06f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/JayBizzle/Laravel-Crawler-Detect/zipball/e39b536fb5e4f21a49328e83a2ab26f0b64b06f7",
+                "reference": "e39b536fb5e4f21a49328e83a2ab26f0b64b06f7",
+                "shasum": ""
+            },
+            "require": {
+                "jaybizzle/crawler-detect": "1.*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.1.*",
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Jaybizzle\\LaravelCrawlerDetect\\LaravelCrawlerDetectServiceProvider"
+                    ],
+                    "aliases": {
+                        "Crawler": "Jaybizzle\\LaravelCrawlerDetect\\Facades\\LaravelCrawlerDetect"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Jaybizzle\\LaravelCrawlerDetect\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Beech",
+                    "email": "mbeech@mark-beech.co.uk"
+                }
+            ],
+            "description": "A Laravel package to detect web crawlers via the user agent",
+            "homepage": "http://github.com/JayBizzle/Laravel-Crawler-Detect",
+            "keywords": [
+                "bot",
+                "crawler",
+                "crawler detect",
+                "crawler detector",
+                "crawlerdetect",
+                "detect",
+                "laravel",
+                "php crawler detect",
+                "spider",
+                "user-agent"
+            ],
+            "time": "2017-06-01T20:29:30+00:00"
+        },
+        {
+            "name": "kyslik/column-sortable",
+            "version": "6.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Kyslik/column-sortable.git",
+                "reference": "9f2ddfabe5cfd9cfd67b15805e2d0de48429c995"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/9f2ddfabe5cfd9cfd67b15805e2d0de48429c995",
+                "reference": "9f2ddfabe5cfd9cfd67b15805e2d0de48429c995",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "5.8.*|^6.0|^7.0",
+                "illuminate/support": "5.8.*|^6.0|^7.0",
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^5.0",
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "package",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Kyslik\\ColumnSortable\\ColumnSortableServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Kyslik\\ColumnSortable\\": "src/ColumnSortable/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Martin Kiesel",
+                    "email": "martin.kiesel@gmail.com",
+                    "role": "Developer and maintainer"
+                }
+            ],
+            "description": "Package for handling column sorting in Laravel 6.x",
+            "keywords": [
+                "column",
+                "laravel",
+                "sort",
+                "sortable",
+                "sorting"
+            ],
+            "time": "2020-03-08T12:26:23+00:00"
+        },
        {
            "name": "laminas/laminas-diactoros",
            "version": "2.3.1",
@@ -2608,6 +2778,62 @@
            ],
            "time": "2020-07-01T11:33:50+00:00"
        },
+        {
+            "name": "madnest/madzipper",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/madnest/madzipper.git",
+                "reference": "fd1d8199d04eac103eed9355c9bba680dcf8b89b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/madnest/madzipper/zipball/fd1d8199d04eac103eed9355c9bba680dcf8b89b",
+                "reference": "fd1d8199d04eac103eed9355c9bba680dcf8b89b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-zip": "*",
+                "illuminate/filesystem": "^6.18|^7.0|^8.0",
+                "illuminate/support": "^6.18|^7.0|^8.0",
+                "php": ">=7.2.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3",
+                "orchestra/testbench": "^5.1",
+                "phpunit/phpunit": "^8.0|^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Madnest\\Madzipper\\MadzipperServiceProvider"
+                    ],
+                    "aliases": {
+                        "Madzipper": "Madnest\\Madzipper\\Madzipper"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Madnest\\Madzipper\\": "src/Madnest/Madzipper"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Theimer",
+                    "email": "theimer@madne.st",
+                    "homepage": "https://madne.st",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Wannabe successor of Chumper/Zipper package for Laravel",
+            "time": "2020-12-01T23:44:14+00:00"
+        },
        {
            "name": "moneyphp/money",
            "version": "v3.3.1",
@@ -7639,6 +7865,7 @@
                "faker",
                "fixtures"
            ],
+            "abandoned": true,
            "time": "2019-12-12T13:22:17+00:00"
        },
        {
@@ -8501,6 +8728,7 @@
            "keywords": [
                "tokenizer"
            ],
+            "abandoned": true,
            "time": "2019-09-17T06:23:10+00:00"
        },
        {
--- a/config/app.php
+++ b/config/app.php
@@ -165,6 +165,7 @@ return [
        TeamTNT\Scout\TNTSearchScoutServiceProvider::class,
        Intervention\Image\ImageServiceProvider::class,
        Laravel\Passport\PassportServiceProvider::class,
+        Madnest\Madzipper\MadzipperServiceProvider::class,

        /*
         * Package Service Providers...
@@ -231,6 +232,8 @@ return [
        'View'         => Illuminate\Support\Facades\View::class,
        'Image'        => Intervention\Image\Facades\Image::class,
        'Stripe'       => Cartalyst\Stripe\Laravel\Facades\Stripe::class,
+        'Crawler'      => Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect::class,
+        'Madzipper' => Madnest\Madzipper\Madzipper::class,
    ],

    'deploy_secret' => env('APP_DEPLOY_SECRET'),
--- a/config/content.php
+++ b/config/content.php
@@ -44,7 +44,7 @@ return [
        ],
        [
            'name'  => 'header_description',
-            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
        ],
        [
            'name'  => 'features_title',
@@ -52,7 +52,7 @@ return [
        ],
        [
            'name'  => 'features_description',
-            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
        ],
        [
            'name'  => 'feature_title_1',
@@ -84,7 +84,7 @@ return [
        ],
        [
            'name'  => 'pricing_description',
-            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
        ],
        [
            'name'  => 'get_started_title',
@@ -92,7 +92,7 @@ return [
        ],
        [
            'name'  => 'get_started_description',
-            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+            'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
        ],
        [
            'name'  => 'footer_content',
--- a/config/scout.php
+++ b/config/scout.php
@@ -41,7 +41,7 @@ return [
    |
    */

-    'queue' => env('SCOUT_QUEUE', false),
+    'queue' => env('SCOUT_QUEUE', true),

    /*
    |--------------------------------------------------------------------------
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -2,8 +2,8 @@

 return [

-    'version'    => '1.7.6',
+    'version'    => '1.8',

    // Define size of chunk uploaded by MB. E.g. integer 128 means chunk size will be 128MB.
    'chunk_size' => env('CHUNK_SIZE', '128'),
-];
+];
--- a/database/factories/FileFactory.php
+++ b/database/factories/FileFactory.php
@@ -0,0 +1,20 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\FileManagerFile;
+use Faker\Generator as Faker;
+use Illuminate\Support\Carbon;
+
+$factory->define(FileManagerFile::class, function (Faker $faker) {
+    return [
+        'unique_id'  => $faker->randomDigit,
+        'user_id'    => 0,
+        'folder_id'  => 0,
+        'name'       => $faker->firstName,
+        'basename'   => $faker->lastName,
+        'user_scope' => 'master',
+        'updated_at' => Carbon::now(),
+        'created_at' => Carbon::now()
+    ];
+});
--- a/database/factories/FolderFactory.php
+++ b/database/factories/FolderFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\FileManagerFolder;
+use Faker\Generator as Faker;
+
+$factory->define(FileManagerFolder::class, function (Faker $faker) {
+    return [
+        'id'        => $faker->randomDigit,
+        'unique_id' => $faker->randomDigit,
+        'user_id'   => 1,
+        'parent_id' => 0,
+        'name'      => $faker->sentence,
+        'type'      => 'folder',
+    ];
+});
--- a/database/migrations/2020_08_25_143449_add_expiration_at_attribute_to_shares_table.php
+++ b/database/migrations/2020_08_25_143449_add_expiration_at_attribute_to_shares_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddExpirationAtAttributeToSharesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('shares', function (Blueprint $table) {
+            $table->integer('expire_in')->after('password')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('shares', function (Blueprint $table) {
+            //
+        });
+    }
+}
--- a/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php
+++ b/database/migrations/2020_09_04_085714_add_exif_data_to_file_manager_files_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddExifDataToFileManagerFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('file_manager_files', function (Blueprint $table) {
+            $table->longText('metadata')->after('type')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('file_manager_files', function (Blueprint $table) {
+            //
+        });
+    }
+}
--- a/database/migrations/2020_11_22_101014_create_traffic_table.php
+++ b/database/migrations/2020_11_22_101014_create_traffic_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTrafficTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('traffic', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('user_id');
+            $table->bigInteger('upload')->default(0);
+            $table->bigInteger('download')->default(0);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('traffic');
+    }
+}
--- a/database/migrations/2020_12_05_090531_create_jobs_table.php
+++ b/database/migrations/2020_12_05_090531_create_jobs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('queue')->index();
+            $table->longText('payload');
+            $table->unsignedTinyInteger('attempts');
+            $table->unsignedInteger('reserved_at')->nullable();
+            $table->unsignedInteger('available_at');
+            $table->unsignedInteger('created_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('jobs');
+    }
+}
--- a/database/migrations/2020_12_13_155309_create_zips_table.php
+++ b/database/migrations/2020_12_13_155309_create_zips_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateZipsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('zips', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->bigInteger('user_id');
+            $table->string('shared_token')->nullable();
+            $table->text('basename');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('zips');
+    }
+}
--- a/database/seeds/ContentSeeder.php
+++ b/database/seeds/ContentSeeder.php
@@ -35,7 +35,7 @@ class ContentSeeder extends Seeder
            ],
            [
                'name'  => 'header_description',
-                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
            ],
            [
                'name'  => 'features_title',
@@ -43,7 +43,7 @@ class ContentSeeder extends Seeder
            ],
            [
                'name'  => 'features_description',
-                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
            ],
            [
                'name'  => 'feature_title_1',
@@ -75,7 +75,7 @@ class ContentSeeder extends Seeder
            ],
            [
                'name'  => 'pricing_description',
-                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
            ],
            [
                'name'  => 'get_started_title',
@@ -83,7 +83,7 @@ class ContentSeeder extends Seeder
            ],
            [
                'name'  => 'get_started_description',
-                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Trully freedom.',
+                'value' => 'Your private cloud storage software build on Laravel & Vue.js. No limits & no monthly fees. Truly freedom.',
            ],
            [
                'name'  => 'footer_content',
--- a/env.testing
+++ b/env.testing
@@ -0,0 +1,70 @@
+APP_NAME=vueFileManager
+APP_ENV=local
+APP_KEY=base64:v+s0R2C5q8jYySj3uwrKA8KH8c9JBIZTdXqB2ytk4j8=
+APP_DEBUG=true
+APP_URL=http://localhost
+APP_DEMO=false
+
+LOG_CHANNEL=stack
+
+
+DB_CONNECTION=sqlite
+DB_HOST=null
+DB_PORT=null
+DB_DATABASE=database/database.sqlite
+DB_USERNAME=null
+DB_PASSWORD=null
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=sty
+MAIL_PORT=3254
+MAIL_USERNAME=Milos
+MAIL_PASSWORD=milos123
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS="${MAIL_USERNAME}"
+MAIL_FROM_NAME="${MAIL_USERNAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=
+AWS_BUCKET=
+
+DO_SPACES_KEY=
+DO_SPACES_SECRET=
+DO_SPACES_ENDPOINT=
+DO_SPACES_REGION=
+DO_SPACES_BUCKET=
+
+WASABI_KEY=
+WASABI_SECRET=
+WASABI_ENDPOINT=
+WASABI_REGION=
+WASABI_BUCKET=
+
+BACKBLAZE_KEY=
+BACKBLAZE_SECRET=
+BACKBLAZE_ENDPOINT=
+BACKBLAZE_REGION=
+BACKBLAZE_BUCKET=
+
+PASSPORT_CLIENT_ID=1
+PASSPORT_CLIENT_SECRET=TqSdKJUbCbC7g5To3Clriw9BMblef0nIdEaI81Q5
+
+APP_DEPLOY_SECRET=
+
+CASHIER_LOGGER=stack
+CASHIER_CURRENCY=
+STRIPE_KEY=
+STRIPE_SECRET=
+STRIPE_WEBHOOK_SECRET=
+CASHIER_PAYMENT_NOTIFICATION=App\Notifications\ConfirmPayment
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
        "lodash": "^4.17.20",
        "node-sass": "^4.14.1",
        "vee-validate": "^3.3.9",
-        "vue": "^2.6.10",
+        "vue": "^2.6.11",
        "vue-feather-icons": "^5.1.0",
        "vue-i18n": "^8.21.0",
        "vue-router": "^3.4.3",
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -8,6 +8,7 @@
    AddType video/ogg .ogv
    AddType video/mp4 .mp4
    AddType video/webm .webm
+
    <ifModule mod_headers.c>
        Header set Connection keep-alive
    </ifModule>
--- a/public/assets/icons/alphabet.svg
+++ b/public/assets/icons/alphabet.svg
@@ -0,0 +1,12 @@
+<svg width="13px" height="15px" viewBox="0 0 13 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="VueFileManager" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Storage-Alert-Copy" transform="translate(-888.000000, -238.000000)" stroke="#000000" stroke-width="1.6">
+            <g id="Sorting-Menu" transform="translate(865.000000, 67.000000)">
+                <g id="alphabet-icon" transform="translate(24.000000, 172.000000)">
+                    <polyline id="Path" points="11.1999993 13.1999991 5.59999967 0.199999094 0 13.1999991 5.59999967 0.199999094"></polyline>
+                    <line x1="2.25" y1="8" x2="8.75" y2="8" id="Line-2"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/public/assets/images/vuefilemanager-horizontal-logo-dark.svg
+++ b/public/assets/images/vuefilemanager-horizontal-logo-dark.svg
--- a/public/assets/images/vuefilemanager-og-image.jpg
+++ b/public/assets/images/vuefilemanager-og-image.jpg
--- a/public/chunks/admin-account.js
+++ b/public/chunks/admin-account.js
--- a/public/chunks/admin.js
+++ b/public/chunks/admin.js
--- a/public/chunks/app-appearance.js
+++ b/public/chunks/app-appearance.js
--- a/public/chunks/app-billings.js
+++ b/public/chunks/app-billings.js
--- a/public/chunks/app-email.js
+++ b/public/chunks/app-email.js
--- a/public/chunks/app-index.js
+++ b/public/chunks/app-index.js
--- a/public/chunks/app-others.js
+++ b/public/chunks/app-others.js
--- a/public/chunks/app-payments.js
+++ b/public/chunks/app-payments.js
--- a/public/chunks/app-settings.js
+++ b/public/chunks/app-settings.js
--- a/public/chunks/app-setup.js
+++ b/public/chunks/app-setup.js
--- a/public/chunks/billings-detail.js
+++ b/public/chunks/billings-detail.js
--- a/public/chunks/contact-us.js
+++ b/public/chunks/contact-us.js
--- a/public/chunks/create-new-password.js
+++ b/public/chunks/create-new-password.js
--- a/public/chunks/dashboard.js
+++ b/public/chunks/dashboard.js
--- a/public/chunks/database.js
+++ b/public/chunks/database.js
--- a/public/chunks/dynamic-page.js
+++ b/public/chunks/dynamic-page.js
--- a/public/chunks/environment-setup.js
+++ b/public/chunks/environment-setup.js
--- a/public/chunks/files.js
+++ b/public/chunks/files.js
--- a/public/chunks/files~chunks/shared-files~chunks/shared-page.js
+++ b/public/chunks/files~chunks/shared-files~chunks/shared-page.js
--- a/public/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js
+++ b/public/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js
--- a/public/chunks/forgotten-password.js
+++ b/public/chunks/forgotten-password.js
--- a/public/chunks/installation-disclaimer.js
+++ b/public/chunks/installation-disclaimer.js
--- a/public/chunks/invoices.js
+++ b/public/chunks/invoices.js
--- a/public/chunks/landing-page.js
+++ b/public/chunks/landing-page.js
--- a/public/chunks/not-found-shared.js
+++ b/public/chunks/not-found-shared.js
--- a/public/chunks/page-edit.js
+++ b/public/chunks/page-edit.js
--- a/public/chunks/pages.js
+++ b/public/chunks/pages.js
--- a/public/chunks/plan-create.js
+++ b/public/chunks/plan-create.js
--- a/public/chunks/plan-delete.js
+++ b/public/chunks/plan-delete.js
--- a/public/chunks/plan-settings.js
+++ b/public/chunks/plan-settings.js
--- a/public/chunks/plan-subscribers.js
+++ b/public/chunks/plan-subscribers.js
--- a/public/chunks/plan.js
+++ b/public/chunks/plan.js
--- a/public/chunks/plans.js
+++ b/public/chunks/plans.js
--- a/public/chunks/profile.js
+++ b/public/chunks/profile.js
--- a/public/chunks/purchase-code.js
+++ b/public/chunks/purchase-code.js
--- a/public/chunks/settings-create-payment-methods.js
+++ b/public/chunks/settings-create-payment-methods.js
--- a/public/chunks/settings-invoices.js
+++ b/public/chunks/settings-invoices.js
--- a/public/chunks/settings-password.js
+++ b/public/chunks/settings-password.js
--- a/Show More
+++ b/Show More