dark mode update

app/Http/Controllers/Admin/PagesController.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\PageCollection;
+use App\Http\Resources\PageResource;
+use App\Page;
+use Illuminate\Http\Request;
+
+class PagesController extends Controller
+{
+    /**
+     * Get all pages
+     *
+     * @return PageCollection
+     */
+    public function index()
+    {
+        return new PageCollection(
+            Page::all()
+        );
+    }
+
+    /**
+     * Get page resource
+     *
+     * @param $slug
+     * @return PageResource
+     */
+    public function show($slug)
+    {
+        return new PageResource(
+            Page::where('slug', $slug)->first()
+        );
+    }
+
+    /**
+     * Update page content
+     *
+     * @param Request $request
+     * @param $slug
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function update(Request $request, $slug) {
+        $page = Page::where('slug', $slug)->first();
+
+        $page->update([
+            $request->name => $request->value
+        ]);
+
+        return response('Done', 204);
+    }
+}

app/Http/Controllers/AppFunctionsController.php

@@ -2,11 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Content;
+use App\Http\Requests\PublicPages\SendMessageRequest;
+use App\Http\Resources\PageResource;
+use App\Mail\SendSupportForm;
+use App\Page;
 use App\Setting;
 use Doctrine\DBAL\Driver\PDOException;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Mail;
 use Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -20,6 +26,9 @@ class AppFunctionsController extends Controller
     public function index()
     {
         try {
+            // Try to connect to database
+            \DB::getPdo();
+
             $connection = $this->get_setup_status();
             $settings = json_decode(Setting::all()->pluck('value', 'name')->toJson());
 
@@ -33,6 +42,36 @@ class AppFunctionsController extends Controller
             ->with('installation', $connection);
     }
 
+    /**
+     * Send contact message from pages
+     *
+     * @param SendMessageRequest $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function contact_form(SendMessageRequest $request)
+    {
+        // Get receiver email
+        $receiver = Setting::where('name', 'contact_email')->first();
+
+        // Send message
+        Mail::to($receiver->value)->send(new SendSupportForm($request->all()));
+
+        return response('Done', 200);
+    }
+
+    /**
+     * Get single page content
+     *
+     * @param $slug
+     * @return PageResource
+     */
+    public function get_page($slug)
+    {
+        return new PageResource(
+            Page::where('slug', $slug)->first()
+        );
+    }
+
     /**
      * Check if setup wizard was passed
      *
@@ -40,8 +79,6 @@ class AppFunctionsController extends Controller
      */
     private function get_setup_status(): string
     {
-        \DB::getPdo();
-
         $setup_success = Setting::where('name', 'setup_wizard_success')->first();
 
         $connection = $setup_success ? 'setup-done' : 'setup-disclaimer';

app/Http/Controllers/General/SetupWizardController.php

@@ -194,16 +194,12 @@ class SetupWizardController extends Controller
                 'value' => $request->currency,
             ],
             [
-                'name'  => 'stripe_webhook_secret',
-                'value' => $request->webhookSecret,
+                'name'  => 'payments_configured',
+                'value' => 1,
             ],
             [
-                'name'  => 'stripe_secret_key',
-                'value' => $request->secret,
-            ],
-            [
-                'name'  => 'stripe_publishable_key',
-                'value' => $request->key,
+                'name'  => 'payments_active',
+                'value' => 1,
             ],
         ]);
 
@@ -475,6 +471,11 @@ class SetupWizardController extends Controller
             $logo = store_system_image($request->file('logo'), 'system');
         }
 
+        // Store Logo horizontal
+        if ($request->hasFile('logo_horizontal')) {
+            $logo_horizontal = store_system_image($request->file('logo_horizontal'), 'system');
+        }
+
         // Store favicon
         if ($request->hasFile('favicon')) {
             $favicon = store_system_image($request->file('favicon'), 'system');
@@ -494,6 +495,10 @@ class SetupWizardController extends Controller
                 'name'  => 'app_logo',
                 'value' => $request->hasFile('logo') ? $logo : null,
             ],
+            [
+                'name'  => 'app_logo_horizontal',
+                'value' => $request->hasFile('logo_horizontal') ? $logo_horizontal : null,
+            ],
             [
                 'name'  => 'app_favicon',
                 'value' => $request->hasFile('favicon') ? $favicon : null,
@@ -587,6 +592,11 @@ class SetupWizardController extends Controller
             'value' => $request->purchase_code,
         ]);
 
+        // Create legal pages
+        if ($request->license === 'Extended') {
+            Artisan::call('db:seed --class=PageSeeder');
+        }
+
         // Retrieve access token
         $response = Route::dispatch(self::make_login_request($request));
 

app/Http/Helpers/helpers.php

@@ -2,6 +2,7 @@
 
 use App\FileManagerFile;
 use App\FileManagerFolder;
+use App\Setting;
 use App\Share;
 use ByteUnits\Metric;
 use Carbon\Carbon;
@@ -10,6 +11,55 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 
+function get_setting($setting) {
+    return Setting::where('name', $setting)->first()->value;
+}
+
+/**
+ * Create paragraph from text
+ *
+ * @param $str
+ * @return mixed|null|string|string[]
+ */
+function add_paragraphs($str)
+{
+    // Trim whitespace
+    if (($str = trim($str)) === '') return '';
+
+    // Standardize newlines
+    $str = str_replace(array("\r\n", "\r"), "\n", $str);
+
+    // Trim whitespace on each line
+    $str = preg_replace('~^[ \t]+~m', '', $str);
+    $str = preg_replace('~[ \t]+$~m', '', $str);
+
+    // The following regexes only need to be executed if the string contains html
+    if ($html_found = (strpos($str, '<') !== FALSE)) {
+        // Elements that should not be surrounded by p tags
+        $no_p = '(?:p|div|article|header|aside|hgroup|canvas|output|progress|section|figcaption|audio|video|nav|figure|footer|video|details|main|menu|summary|h[1-6r]|ul|ol|li|blockquote|d[dlt]|pre|t[dhr]|t(?:able|body|foot|head)|c(?:aption|olgroup)|form|s(?:elect|tyle)|a(?:ddress|rea)|ma(?:p|th))';
+
+        // Put at least two linebreaks before and after $no_p elements
+        $str = preg_replace('~^<' . $no_p . '[^>]*+>~im', "\n$0", $str);
+        $str = preg_replace('~</' . $no_p . '\s*+>$~im', "$0\n", $str);
+    }
+
+    // Do the <p> magic!
+    $str = '<p>' . trim($str) . '</p>';
+    $str = preg_replace('~\n{2,}~', "</p>\n\n<p>", $str);
+
+    // The following regexes only need to be executed if the string contains html
+    if ($html_found !== FALSE) {
+        // Remove p tags around $no_p elements
+        $str = preg_replace('~<p>(?=</?' . $no_p . '[^>]*+>)~i', '', $str);
+        $str = preg_replace('~(</?' . $no_p . '[^>]*+>)</p>~i', '$1', $str);
+    }
+
+    // Convert single linebreaks to <br />
+    $str = preg_replace('~(?<!\n)\n(?!\n)~', "<br>\n", $str);
+
+    return $str;
+}
+
 /**
  * Set environment value
  *

app/Http/Mail/SendSupportForm.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class SendSupportForm extends Mailable
+{
+    use Queueable, SerializesModels;
+    private $request;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        $from = config('mail.from')['address'];
+
+        return $this->from($from)
+            ->replyTo($this->request['email'])
+            ->subject('New Contact Message from ' . $this->request['email'])
+            ->view('mails.contact-message')
+            ->with('request', $this->request);
+    }
+}

app/Http/Requests/PublicPages/SendMessageRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests\PublicPages;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SendMessageRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'email'   => 'required|email',
+            'message' => 'required|string',
+        ];
+    }
+}

app/Http/Resources/PageCollection.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class PageCollection extends ResourceCollection
+{
+    public $collects = PageResource::class;
+
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => $this->collection,
+        ];
+    }
+}

app/Http/Resources/PageResource.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => [
+                'id'         => $this->id,
+                'type'       => 'pages',
+                'attributes' => [
+                    'visibility'        => $this->visibility,
+                    'title'             => $this->title,
+                    'slug'              => $this->slug,
+                    'content'           => $this->content,
+                    'content_formatted' => add_paragraphs($this->content),
+                ]
+            ],
+        ];
+    }
+}

app/Http/Tools/Editor.php

@@ -206,8 +206,11 @@ class Editor
         $user_id = is_null($shared) ? Auth::id() : $shared->user_id;
         $user_storage_used = user_storage_percentage($user_id, $file->getSize());
 
+        // Get storage limitation setup
+        $storage_limitation = get_setting('storage_limitation');
+
         // Check if user can upload
-        if (config('vuefilemanager.limit_storage_by_capacity') && $user_storage_used >= 100) {
+        if ($storage_limitation && $user_storage_used >= 100) {
             abort(423, 'You exceed your storage limit!');
         }
 

app/Page.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Page extends Model
+{
+    public $timestamps = false;
+
+    protected $guarded = ['id'];
+}

app/User.php

@@ -118,8 +118,20 @@ class User extends Authenticatable
      */
     public function getStorageAttribute()
     {
+        // Get storage limitation setup
+        $storage_limitation = get_setting('storage_limitation');
+
+        // Get user storage usage
+        if (!$storage_limitation) {
+            return [
+                'used' => $this->used_capacity,
+                'used_formatted' => Metric::bytes($this->used_capacity)->format(),
+            ];
+        }
+
         return [
             'used'               => (float)get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity),
+            'used_formatted'     => get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity) . '%',
             'capacity'           => $this->settings->storage_capacity,
             'capacity_formatted' => format_gigabytes($this->settings->storage_capacity),
         ];