change vuefilemanager version

PaymentMethods page fix

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(

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', $settings)
+            ->with('metadata', $metadata);
+    }
+
     /**
      * Check if setup wizard was passed
      *

app/Http/Controllers/Sharing/FileSharingController.php

@@ -32,8 +32,7 @@ class FileSharingController extends Controller
     public function index($token)
     {
         // Get shared token
-        $shared = Share::where(\DB::raw('BINARY `token`'), $token)
-            ->first();
+        $shared = get_shared($token);
 
         if (! $shared) {
             return view("index");

app/Page.php

@@ -5,6 +5,25 @@ 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;

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;

app/User.php

@@ -73,6 +73,7 @@ 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
 {

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;

composer.json

@@ -15,6 +15,7 @@
         "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",

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": "0d1b10acc2a996969b828cc7f51cdee6",
+    "content-hash": "aadbe31a952d26aab5730369e2bf4089",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -1467,6 +1467,119 @@
             ],
             "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",

config/app.php

@@ -231,6 +231,7 @@ 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,
     ],
 
     'deploy_secret' => env('APP_DEPLOY_SECRET'),

config/vuefilemanager.php

@@ -2,7 +2,7 @@
 
 return [
 
-    'version'    => '1.7.7',
+    'version'    => '1.7.8',
 
     // Define size of chunk uploaded by MB. E.g. integer 128 means chunk size will be 128MB.
     'chunk_size' => env('CHUNK_SIZE', '128'),

public/js/main.js.LICENSE.txt

@@ -5,7 +5,7 @@
  */
 
 /*!
- * vue-i18n v8.21.0 
+ * vue-i18n v8.18.2 
  * (c) 2020 kazuya kawaguchi
  * Released under the MIT License.
  */
@@ -17,7 +17,7 @@
  */
 
 /**
-  * vee-validate v3.3.9
+  * vee-validate v3.3.7
   * (c) 2020 Abdelrahman Awad
   * @license MIT
   */

resources/js/views/User/PaymentMethods.vue

@@ -15,7 +15,7 @@
             </div>
 
             <!--Payment methods table-->
-            <DatatableWrapper :table-data="{data: PaymentMethods}" :paginator="false" :columns="columns" class="table">
+            <DatatableWrapper v-if="PaymentMethods" :table-data="{data: PaymentMethods}" :paginator="false" :columns="columns" class="table">
 
                 <!--Table data content-->
                 <template slot-scope="{ row }">

resources/lang/cn/vuefilemanager.php

@@ -52,4 +52,8 @@ return [
     'col_amount'      => 'Amount',
 
     'total' => 'Total',
+
+    // OG Page
+    'user_sending' => ':name is sending you this file',
+    'protected_file' => 'This link is protected by password',
 ];

resources/lang/en/vuefilemanager.php

@@ -52,4 +52,8 @@ return [
     'col_amount'      => 'Amount',
 
     'total' => 'Total',
+
+    // OG Page
+    'user_sending' => ':name is sending you this file',
+    'protected_file' => 'This link is protected by password',
 ];

resources/lang/sk/vuefilemanager.php

@@ -52,4 +52,8 @@ return [
     'col_amount'      => 'Čiastka',
 
     'total' => 'Spolu',
+
+    // OG Page
+    'user_sending' => ':name ti posiela súbor.',
+    'protected_file' => 'Tento link je chránený heslom',
 ];

resources/sass/vue-file-manager/_auth-form.scss

@@ -15,7 +15,6 @@
       .error-message {
         position: absolute;
         left: 0;
-        top: 50px;
       }
     }
   }

resources/views/index.blade.php

@@ -11,6 +11,12 @@
     {{--StyleSheet--}}
     <link href="{{ asset('css/app.css') }}?v={{ get_version() }}" rel="stylesheet">
 
+    {{--OG items--}}
+    <meta property="og:url" content="{{ url('/') }}">
+    <meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
+    <meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
+    <meta property="og:image" content="{{ asset('assets/images/vuefilemanager-og-image.jpg') }}">
+
     {{-- Apple Mobile Web App--}}
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="white">

resources/views/og-view.blade.php

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<head>
+    <link rel="icon" href="{{ isset($settings->app_favicon) && $settings->app_favicon ? $settings->app_favicon : asset('favicon.png') }}?v={{ get_version() }}">
+
+    <meta charset="utf-8">
+    <meta name="fragment" content="!">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <meta name="description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
+
+    {{--OG Public items--}}
+    <meta property="og:url" content="{{ $metadata['url'] }}">
+    <meta property="og:description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
+
+    {{--Show protected og metadata--}}
+    @if($metadata['is_protected'])
+        <meta property="og:title" content="{{ __('vuefilemanager.protected_file') }}">
+        <title>{{ __('vuefilemanager.protected_file') }}</title>
+    @endif
+
+    {{--Show public og metadata--}}
+    @if(! $metadata['is_protected'])
+
+        @if($metadata['thumbnail'])
+            <meta property="og:image" content="{{ $metadata['thumbnail'] }}">
+        @endif
+
+        <meta property="og:title" content="{{ $metadata['name'] }} ({{ $metadata['size'] }}) | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}">
+        <title>{{ $metadata['name'] }} ({{ $metadata['size'] }}) | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}</title>
+    @endif
+
+</head>
+<body></body>
+</html>

routes/web.php

@@ -11,6 +11,7 @@
 |
 */
 
+
 // Stripe WebHook
 Route::post('/stripe/webhook', 'WebhookController@handleWebhook');
 
@@ -35,6 +36,11 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], func
     Route::get('/invoice/{customer}/{token}', 'Admin\InvoiceController@show');
 });
 
-// Pages
-Route::get('/shared/{token}', 'Sharing\FileSharingController@index');
+// Get og site for web crawlers
+if( Crawler::isCrawler()) {
+    Route::get('/shared/{token}', 'AppFunctionsController@og_site');
+} else {
+    Route::get('/shared/{token}', 'Sharing\FileSharingController@index');
+}
+
 Route::get('/{any?}', 'AppFunctionsController@index')->where('any', '.*');