Merge pull request #1524 from KodeStar/remove_dropdown_on_single_provider

Remove search provider dropdown when there's only a single provider

.env.example

@@ -4,16 +4,34 @@ APP_KEY=
 APP_DEBUG=false
 APP_URL=http://localhost
 
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+BCRYPT_ROUNDS=12
+
 LOG_CHANNEL=daily
+LOG_STACK=single
 
 DB_CONNECTION=sqlite
 DB_DATABASE=app.sqlite
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
+#DB_CONNECTION=<mysql | pgsql>
+#DB_HOST=<hostname | ip>
+#DB_PORT=<port number>
+#DB_DATABASE=<database>
+#DB_USERNAME=<user>
+#DB_PASSWORD=<password>
+
+BROADCAST_CONNECTION=log
+CACHE_STORE=file
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
 QUEUE_DRIVER=sync
 
 REDIS_HOST=127.0.0.1
@@ -41,3 +59,11 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+AUTH_ROLES_ENABLE=false
+AUTH_ROLES_HEADER="remote-groups"
+AUTH_ROLES_HTTP_HEADER="HTTP_REMOTE_GROUPS"
+AUTH_ROLES_ADMIN="admin"
+AUTH_ROLES_DELIMITER=","
+
+ALLOW_INTERNAL_REQUESTS=false

.eslintignore

@@ -0,0 +1,3 @@
+huebee.js
+jquery-ui.min.js
+bootstrap.js

.eslintrc

@@ -0,0 +1,13 @@
+{
+    "extends": ["airbnb-base", "prettier"],
+    "plugins": ["prettier"],
+    "rules": {
+        "prettier/prettier": ["error"]
+    },
+    "env": {
+        "browser": true
+    },
+    "globals": {
+        "$": true
+    }
+}

.github/workflows/call_issue_pr_tracker.yml

@@ -0,0 +1,16 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled,closed]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -0,0 +1,13 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron:  '35 15 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.github/workflows/ci.yml

@@ -0,0 +1,59 @@
+name: Tests (PHP)
+
+on: [pull_request]
+
+jobs:
+  tests:
+    name: Run tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: '8.3'
+          extensions: mbstring, dom, fileinfo, mysql, libxml, xml, xmlwriter, dom, tokenizer, filter, json, phar, pcre, openssl, pdo, intl, curl
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: vendor
+          key: composer-${{ hashFiles('composer.lock') }}
+
+      #- name: Run composer install
+      #  run: composer install -n --prefer-dist
+      #  env:
+      #    APP_ENV: testing
+
+      - name: Prepare Laravel Application
+        run: |
+          cp .env.example .env
+          php artisan key:generate
+
+      - name: Cache yarn dependencies
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: yarn-${{ hashFiles('yarn.lock') }}
+
+      - name: Run yarn
+        run: yarn && yarn dev
+
+      - name: Run ESLint
+        run: yarn lint
+
+      - name: Run tests
+        run: php artisan test
+        env:
+          APP_ENV: testing
+
+      - name: Php code sniffer
+        run: ./vendor/bin/phpcs --config-set ignore_warnings_on_exit 1
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@master
+        if: failure()
+        with:
+          name: Logs
+          path: ./storage/logs

.gitignore

@@ -3,6 +3,7 @@
 /public/hot
 /public/storage
 /storage/*.key
+/storage/debugbar
 /.idea
 /.vagrant
 Homestead.json
@@ -27,3 +28,4 @@ yarn-error.log
 .VolumeIcon.icns
 storage/app/public/avatars/*
 .env
+.phpunit.result.cache

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "Listen for Xdebug",
+        "type": "php",
+        "request": "launch",
+        "port": 9003,
+        "pathMappings": {
+          "/var/www/html": "${workspaceFolder}"
+        }
+      }
+    ]
+  }
+  

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "Start Docker Compose",
+        "type": "shell",
+        "command": "docker-compose up --build",
+        "group": {
+          "kind": "build",
+          "isDefault": true
+        },
+        "problemMatcher": []
+      }
+    ]
+  }
+  

SECURITY.md

@@ -1,14 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 2.3.x   | :white_check_mark: |
-| < 2.3   | :x:                |
-
-## Reporting a Vulnerability
-
-You can report any vulnerabilities on our discord server by DM-ing a team member, or asking a team member to DM you.
-
-https://discord.com/invite/YWrKVTn

app/Application.php

@@ -2,15 +2,58 @@
 
 namespace App;
 
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
+/**
+ * App\Application
+ *
+ * @property string $appid
+ * @property string $name
+ * @property string|null $sha
+ * @property string|null $icon
+ * @property string|null $website
+ * @property string|null $license
+ * @property string|null $description
+ * @property int $enhanced
+ * @property string $tile_background
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property string|null $class
+ * @method static Builder|Application newModelQuery()
+ * @method static Builder|Application newQuery()
+ * @method static Builder|Application query()
+ * @method static Builder|Application whereAppid($value)
+ * @method static Builder|Application whereClass($value)
+ * @method static Builder|Application whereCreatedAt($value)
+ * @method static Builder|Application whereDescription($value)
+ * @method static Builder|Application whereEnhanced($value)
+ * @method static Builder|Application whereIcon($value)
+ * @method static Builder|Application whereLicense($value)
+ * @method static Builder|Application whereName($value)
+ * @method static Builder|Application whereSha($value)
+ * @method static Builder|Application whereTileBackground($value)
+ * @method static Builder|Application whereUpdatedAt($value)
+ * @method static Builder|Application whereWebsite($value)
+ */
 class Application extends Model
 {
+    /**
+     * @var bool
+     */
     public $incrementing = false;
 
+    /**
+     * @var string
+     */
     protected $primaryKey = 'appid';
 
-    //
+    /**
+     * @return mixed
+     */
     public function icon()
     {
         if (! file_exists(storage_path('app/public/'.$this->icon))) {
@@ -23,12 +66,12 @@ class Application extends Model
         return $this->icon;
     }
 
-    public function iconView()
+    public function iconView(): string
     {
         return asset('storage/'.$this->icon);
     }
 
-    public function defaultColour()
+    public function defaultColour(): string
     {
         // check if light or dark
         if ($this->tile_background == 'light') {
@@ -38,35 +81,35 @@ class Application extends Model
         return '#161b1f';
     }
 
-    public function class()
+    public function class(): string
     {
         $name = $this->name;
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
-
-        return $class;
+        return \App\SupportedApps::class.'\\'.$name.'\\'.$name;
     }
 
-    public static function classFromName($name)
+    /**
+     * @param $name
+     */
+    public static function classFromName($name): string
     {
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+        $class = \App\SupportedApps::class.'\\'.$name.'\\'.$name;
 
         return $class;
     }
 
-    public static function apps()
+    public static function apps(): Collection
     {
         $json = json_decode(file_get_contents(storage_path('app/supportedapps.json'))) ?? [];
         $apps = collect($json->apps);
-        $sorted = $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
 
-        return $sorted;
+        return $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
     }
 
-    public static function autocomplete()
+    public static function autocomplete(): array
     {
         $apps = self::apps();
         $list = [];
@@ -80,25 +123,27 @@ class Application extends Model
         return $list;
     }
 
+    /**
+     * @param $appid
+     * @return mixed|null
+     * @throws GuzzleException
+     */
     public static function getApp($appid)
     {
+        Log::debug("Get app triggered for: $appid");
+
         $localapp = self::where('appid', $appid)->first();
         $app = self::single($appid);
 
         $application = ($localapp) ? $localapp : new self;
 
-        if (! file_exists(app_path('SupportedApps/'.className($app->name)))) {
-            SupportedApps::getFiles($app);
-            SupportedApps::saveApp($app, $application);
-        } else {
-            // check if there has been an update for this app
-            if ($localapp) {
-                if ($localapp->sha !== $app->sha) {
-                    SupportedApps::getFiles($app);
-                    $app = SupportedApps::saveApp($app, $application);
-                }
-            } else {
-                SupportedApps::getFiles($app);
+        // Files missing? || app not in db || old sha version
+        if (! file_exists(app_path('SupportedApps/'.className($app->name))) ||
+            ! $localapp ||
+            $localapp->sha !== $app->sha
+        ) {
+            $gotFiles = SupportedApps::getFiles($app);
+            if ($gotFiles) {
                 $app = SupportedApps::saveApp($app, $application);
             }
         }
@@ -106,20 +151,33 @@ class Application extends Model
         return $app;
     }
 
+    /**
+     * @param $appid
+     * @return mixed|null
+     */
     public static function single($appid)
     {
         $apps = self::apps();
         $app = $apps->where('appid', $appid)->first();
+
+        if ($app === null) {
+            // Try in db for Private App
+            $appModel = self::where('appid', $appid)->first();
+            if ($appModel) {
+                $app = json_decode($appModel->toJson());
+            }
+        }
+
         if ($app === null) {
             return null;
         }
         $classname = preg_replace('/[^\p{L}\p{N}]/u', '', $app->name);
-        $app->class = '\App\SupportedApps\\'.$classname.'\\'.$classname;
+        $app->class = \App\SupportedApps::class.'\\'.$classname.'\\'.$classname;
 
         return $app;
     }
 
-    public static function applist()
+    public static function applist(): array
     {
         $list = [];
         $list['null'] = 'None';
@@ -128,6 +186,15 @@ class Application extends Model
             $list[$app->appid] = $app->name;
         }
 
+        // Check for private apps in the db
+        $appsListFromDB = self::all(['appid', 'name']);
+
+        foreach ($appsListFromDB as $app) {
+            // Already existing keys are overwritten,
+            // only private apps should be added at the end
+            $list[$app->appid] = $app->name;
+        }
+
         return $list;
     }
 }

app/Console/Commands/RegisterApp.php

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 use App\Application;
 use App\SupportedApps;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
 
 class RegisterApp extends Command
 {
@@ -13,7 +14,7 @@ class RegisterApp extends Command
      *
      * @var string
      */
-    protected $signature = 'register:app {folder}';
+    protected $signature = 'register:app {folder} {--remove}';
 
     /**
      * The console command description.
@@ -34,10 +35,8 @@ class RegisterApp extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return mixed
      */
-    public function handle()
+    public function handle(): void
     {
         $folder = $this->argument('folder');
         if ($folder == 'all') {
@@ -49,29 +48,55 @@ class RegisterApp extends Command
                 $this->addApp($folder);
             }
         } else {
-            $this->addApp($folder);
+            $this->addApp($folder, $this->option('remove'));
         }
     }
 
-    public function addApp($folder)
+    /**
+     * @param $folder
+     */
+    public function addApp($folder, bool $remove = false): void
     {
         $json = app_path('SupportedApps/'.$folder.'/app.json');
-        if (file_exists($json)) {
-            $app = json_decode(file_get_contents($json));
-            if (isset($app->appid)) {
-                $exists = Application::find($app->appid);
-                if ($exists) {
-                    $this->error('Application already registered - '.$exists->name.' - '.$exists->appid);
-                } else {
-                    // Doesn't exist so add it
-                    SupportedApps::saveApp($app, new Application);
-                    $this->info('Application Added - '.$app->name.' - '.$app->appid);
-                }
-            } else {
-                $this->error('No App ID for - '.$folder);
-            }
-        } else {
-            $this->error('Could not find '.$json);
+
+        if (!file_exists($json)) {
+            $this->error('Could not find ' . $json);
+            return;
         }
+
+        $app = json_decode(file_get_contents($json));
+
+        if (!isset($app->appid)) {
+            $this->error('No App ID for - ' . $folder);
+            return;
+        }
+
+        $exists = Application::find($app->appid);
+
+        if ($exists) {
+            if ($remove) {
+                $exists->delete();
+                $this->info('Application Removed - ' . $app->name . ' - ' . $app->appid);
+                return;
+            }
+            $this->error('Application already registered - ' . $exists->name . ' - ' . $exists->appid);
+            return;
+        }
+
+        // Doesn't exist so add it
+        SupportedApps::saveApp($app, new Application);
+        $this->saveIcon($folder, $app->icon);
+        $this->info('Application Added - ' . $app->name . ' - ' . $app->appid);
+    }
+
+    /**
+     * @param $appFolder
+     * @param $icon
+     */
+    private function saveIcon($appFolder, $icon): void
+    {
+        $iconPath = app_path('SupportedApps/' . $appFolder . '/' . $icon);
+        $contents = file_get_contents($iconPath);
+        Storage::disk('public')->put('icons/'.$icon, $contents);
     }
 }

app/Console/Kernel.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Console;
-
-use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-
-class Kernel extends ConsoleKernel
-{
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
-    /**
-     * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
-     */
-    protected function schedule(Schedule $schedule)
-    {
-        // $schedule->command('inspire')
-        //          ->hourly();
-    }
-
-    /**
-     * Register the commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        $this->load(__DIR__.'/Commands');
-
-        require base_path('routes/console.php');
-    }
-}

app/EnhancedApps.php

@@ -2,9 +2,6 @@
 
 namespace App;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-
 interface EnhancedApps
 {
     public function test();

app/Exceptions/Handler.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Throwable;
-
-class Handler extends ExceptionHandler
-{
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
-     */
-    protected $dontFlash = [
-        'current_password',
-        'password',
-        'password_confirmation',
-    ];
-
-    /**
-     * Register the exception handling callbacks for the application.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->reportable(function (Throwable $e) {
-            //
-        });
-    }
-}

app/Facades/Form.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Form extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'custom-form';
+    }
+}

app/Helper.php

@@ -1,44 +1,74 @@
 <?php
 
 use Illuminate\Support\Str;
+use enshrined\svgSanitize\Sanitizer;
 
-function format_bytes($bytes, $is_drive_size = true, $beforeunit = '', $afterunit = '')
+/**
+ * @param $bytes
+ * @param bool $is_drive_size
+ * @param string $beforeunit
+ * @param string $afterunit
+ * @return string
+ */
+function format_bytes($bytes, bool $is_drive_size = true, string $beforeunit = '', string $afterunit = ''): string
 {
     $btype = ($is_drive_size === true) ? 1000 : 1024;
     $labels = ['B', 'KB', 'MB', 'GB', 'TB'];
-    for ($x = 0; $bytes >= $btype && $x < (count($labels) - 1); $bytes /= $btype, $x++); // use 1000 rather than 1024 to simulate HD size not real size
+    // use 1000 rather than 1024 to simulate HD size not real size
+    for ($x = 0; $bytes >= $btype && $x < (count($labels) - 1); $bytes /= $btype, $x++) ;
     if ($labels[$x] == 'TB') {
-        return round($bytes, 3).$beforeunit.$labels[$x].$afterunit;
+        return round($bytes, 3) . $beforeunit . $labels[$x] . $afterunit;
     } elseif ($labels[$x] == 'GB') {
-        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+        return round($bytes, 2) . $beforeunit . $labels[$x] . $afterunit;
     } elseif ($labels[$x] == 'MB') {
-        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+        return round($bytes, 2) . $beforeunit . $labels[$x] . $afterunit;
     } else {
-        return round($bytes, 0).$beforeunit.$labels[$x].$afterunit;
+        return round($bytes, 0) . $beforeunit . $labels[$x] . $afterunit;
     }
 }
 
-function str_slug($title, $separator = '-', $language = 'en')
+function parse_size($size) {
+    $unit = strtolower(substr($size, -1));
+    $bytes = (int)$size;
+    switch($unit) {
+        case 'g': $bytes *= 1024 * 1024 * 1024; break;
+        case 'm': $bytes *= 1024 * 1024; break;
+        case 'k': $bytes *= 1024; break;
+    }
+    return $bytes;
+}
+
+/**
+ * @param $title
+ * @param string $separator
+ * @param string $language
+ * @return string
+ */
+function str_slug($title, string $separator = '-', string $language = 'en'): string
 {
     return Str::slug($title, $separator, $language);
 }
 
-if (! function_exists('str_is')) {
+if (!function_exists('str_is')) {
     /**
      * Determine if a given string matches a given pattern.
      *
-     * @param  string|array  $pattern
-     * @param  string  $value
+     * @param string|array $pattern
+     * @param string $value
      * @return bool
      *
      * @deprecated Str::is() should be used directly instead. Will be removed in Laravel 6.0.
      */
-    function str_is($pattern, $value)
+    function str_is($pattern, string $value): bool
     {
         return Str::is($pattern, $value);
     }
 }
 
+/**
+ * @param $hex
+ * @return float|int
+ */
 function get_brightness($hex)
 {
     // returns brightness value from 0 to 255
@@ -46,7 +76,7 @@ function get_brightness($hex)
     // $hex = str_replace('#', '', $hex);
     $hex = preg_replace("/[^0-9A-Fa-f]/", '', $hex);
     if (strlen($hex) == 3) {
-        $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+        $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
     $c_r = hexdec(substr($hex, 0, 2));
@@ -56,7 +86,11 @@ function get_brightness($hex)
     return (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 }
 
-function title_color($hex)
+/**
+ * @param $hex
+ * @return string
+ */
+function title_color($hex): string
 {
     if (get_brightness($hex) > 130) {
         return ' black';
@@ -65,20 +99,56 @@ function title_color($hex)
     }
 }
 
-function getLinkTargetAttribute()
+/**
+ * @return string
+ */
+function getLinkTargetAttribute(): string
 {
     $target = \App\Setting::fetch('window_target');
 
     if ($target === 'current') {
         return '';
     } else {
-        return ' target="'.$target.'"';
+        return ' target="' . $target . '"';
     }
 }
 
+/**
+ * @param $name
+ * @return array|string|string[]|null
+ */
 function className($name)
 {
-    $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
-
-    return $name;
+    return preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+}
+
+/**
+ * @param string $file
+ * @param string $extension
+ * @return bool
+ */
+function isImage(string $file, string $extension): bool
+{
+    $allowedExtensions = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'svg', 'webp', 'ico'];
+
+    if (!in_array($extension, $allowedExtensions)) {
+        return false;
+    }
+
+    $tempFileName = @tempnam("/tmp", "image-check-");
+    $handle = fopen($tempFileName, "w");
+
+    fwrite($handle, $file);
+    fclose($handle);
+
+    if ($extension === 'svg') {
+        $sanitizer = new Sanitizer();
+        $sanitizedSvg = $sanitizer->sanitize(file_get_contents($tempFileName));
+        file_put_contents($tempFileName, $sanitizedSvg);
+
+        return 'image/svg+xml' === mime_content_type($tempFileName);
+    }
+
+    $size = @getimagesize($tempFileName);
+    return is_array($size) && str_starts_with($size['mime'], 'image');
 }

app/Http/Controllers/Auth/LoginController.php

@@ -4,11 +4,17 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\User;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpFoundation\Response;
 
 class LoginController extends Controller
 {
@@ -30,7 +36,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/';
+    protected string $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -40,10 +46,10 @@ class LoginController extends Controller
     public function __construct()
     {
         Session::put('backUrl', URL::previous());
-        $this->middleware('guest')->except('logout');
+        $this->middleware('guest')->except(['logout','autologin']);
     }
 
-    public function username()
+    public function username(): string
     {
         return 'username';
     }
@@ -51,12 +57,10 @@ class LoginController extends Controller
     /**
      * Handle a login request to the application.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
-    public function login(Request $request)
+    public function login(Request $request): Response
     {
         $current_user = User::currentUser();
         $request->merge(['username' => $current_user->username, 'remember' => true]);
@@ -88,7 +92,7 @@ class LoginController extends Controller
     {
     }
 
-    public function setUser(User $user)
+    public function setUser(User $user): RedirectResponse
     {
         Auth::logout();
         session(['current_user' => $user]);
@@ -96,10 +100,21 @@ class LoginController extends Controller
         return redirect()->route('dash');
     }
 
-    public function autologin($uuid)
+    /**
+     * @param $uuid
+     */
+    public function autologin($uuid): RedirectResponse
     {
+        Auth::logout();
+
         $user = User::where('autologin', $uuid)->first();
+
+        if (!$user) {
+            return redirect()->route('dash');
+        }
+
         Auth::login($user, true);
+
         session(['current_user' => $user]);
 
         return redirect()->route('dash');
@@ -108,18 +123,24 @@ class LoginController extends Controller
     /**
      * Show the application's login form.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
-    public function showLoginForm()
+    public function showLoginForm(): \Illuminate\View\View
     {
         return view('auth.login');
     }
 
-    protected function authenticated(Request $request, $user)
+    /**
+     * @param $user
+     */
+    protected function authenticated(Request $request, $user): RedirectResponse
     {
         return back();
     }
 
+    /**
+     * @return mixed|string
+     */
     public function redirectTo()
     {
         return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;

app/Http/Controllers/Auth/RegisterController.php

@@ -27,7 +27,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/';
+    protected string $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -41,11 +41,8 @@ class RegisterController extends Controller
 
     /**
      * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
      */
-    protected function validator(array $data)
+    protected function validator(array $data): \Illuminate\Contracts\Validation\Validator
     {
         return Validator::make($data, [
             'name' => 'required|string|max:255',
@@ -56,11 +53,8 @@ class RegisterController extends Controller
 
     /**
      * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return \App\User
      */
-    protected function create(array $data)
+    protected function create(array $data): User
     {
         return User::create([
             'name' => $data['name'],

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/';
+    protected string $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Controller.php

@@ -4,14 +4,12 @@ namespace App\Http\Controllers;
 
 use App\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\Auth;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, ValidatesRequests;
 
     protected $user;
 

app/Http/Controllers/HealthController.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Item;
+use App\User;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\RateLimiter;
+
+class HealthController extends Controller
+{
+    private static function getUsers(): int
+    {
+        return User::count();
+    }
+
+    private static function getItems(): int
+    {
+        return Item::select('id')
+            ->where('deleted_at', null)
+            ->where('type', '0')
+            ->count();
+    }
+
+    /**
+     * Handle the incoming request.
+     *
+     * @return JsonResponse|Response
+     * @throws BindingResolutionException
+     */
+    public function __invoke(Request $request)
+    {
+        $REQUESTS_MAX_PER_MIN = 30;
+        $STATUS_TOO_MANY_REQUESTS = 429;
+
+        if (RateLimiter::remaining('health', $REQUESTS_MAX_PER_MIN) < 1) {
+            return response()->make('Too many attempts.', $STATUS_TOO_MANY_REQUESTS);
+        }
+
+        RateLimiter::hit('health');
+
+        return response()->json([
+            'status' => 'ok',
+            'items' => self::getItems(),
+            'users' => self::getUsers(),
+        ]);
+    }
+}

app/Http/Controllers/HomeController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
 
 class HomeController extends Controller
 {
@@ -13,15 +13,14 @@ class HomeController extends Controller
      */
     public function __construct()
     {
+        parent::__construct();
         $this->middleware('auth');
     }
 
     /**
      * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(): RedirectResponse
     {
         return redirect()->route('dash');
     }

app/Http/Controllers/ImportController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class ImportController extends Controller
+{
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('allowed');
+    }
+
+    /**
+     * Handle the incoming request.
+     */
+    public function __invoke(Request $request): View
+    {
+        return view('items.import');
+    }
+}

app/Http/Controllers/ItemController.php

@@ -5,50 +5,96 @@ namespace App\Http\Controllers;
 use App\Application;
 use App\Item;
 use App\Jobs\ProcessApps;
-use App\Search;
-use App\Setting;
-use App\SupportedApps;
 use App\User;
-use Artisan;
-use GrahamCampbell\GitHub\Facades\GitHub;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\ServerException;
+use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Validation\ValidationException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+use Illuminate\Http\Response;
+use enshrined\svgSanitize\Sanitizer;
 
 class ItemController extends Controller
 {
     public function __construct()
     {
+        parent::__construct();
         $this->middleware('allowed');
     }
 
     /**
      * Display a listing of the resource on the dashboard.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function dash()
+    public function dash(Request $request): View
     {
-        $data['apps'] = Item::whereHas('parents', function ($query) {
-            $query->where('id', 0);
-        })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
+        $treat_tags_as = \App\Setting::fetch('treat_tags_as');
 
-        $data['all_apps'] = Item::whereHas('parents', function ($query) {
-            $query->where('id', 0);
-        })->orWhere('type', 1)->orderBy('order', 'asc')->get();
+        $data["treat_tags_as"] = $treat_tags_as;
+
+        if (config('app.auth_roles_enable')) {
+            $roles = explode(config('app.auth_roles_delimiter'), $request->header(config('app.auth_roles_header')));
+            if ($treat_tags_as == 'categories') {
+                $data['categories'] = Item::whereHas('children')->with('children', function ($query) {
+                    $query->pinned()->orderBy('order', 'asc');
+                })->pinned()->orderBy('order', 'asc')->get();
+            } elseif ($treat_tags_as == 'tags') {
+                $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
+                $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
+                $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
+                    $query->where('type', 1)->pinned();
+                })->orderBy('order', 'asc')->get();
+            } else {
+                $data['apps'] = Item::whereHas('parents', function ($query) {
+                    $query->where('id', 0);
+                })->whereIn('role', $roles)->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
+        
+                $data['all_apps'] = Item::whereHas('parents', function ($query) {
+                    $query->where('id', 0);
+                })->orWhere('type', 1)->orderBy('order', 'asc')->get();
+            }
+        } else {
+            if ($treat_tags_as == 'categories') {
+                $data['categories'] = Item::whereHas('children')->with('children', function ($query) {
+                    $query->pinned()->orderBy('order', 'asc');
+                })->pinned()->orderBy('order', 'asc')->get();
+            } elseif ($treat_tags_as == 'tags') {
+                $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
+                $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
+                $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
+                    $query->where('type', 1)->pinned();
+                })->orderBy('order', 'asc')->get();
+            } else {
+                $data['apps'] = Item::whereHas('parents', function ($query) {
+                    $query->where('id', 0);
+                })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
+
+                $data['all_apps'] = Item::whereHas('parents', function ($query) {
+                    $query->where('id', 0);
+                })->orWhere(function ($query) {
+                    $query->where('type', 1)->whereNot('id', 0);
+                })->orderBy('order', 'asc')->get();
+            }
+        }
 
         //$data['all_apps'] = Item::doesntHave('parents')->get();
-        //die(print_r($data['apps']));
+        // die(print_r($data));
         return view('welcome', $data);
     }
 
     /**
      * Set order on the dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @return void
      */
     public function setOrder(Request $request)
     {
@@ -63,9 +109,9 @@ class ItemController extends Controller
     /**
      * Pin item on the dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @param $id
      */
-    public function pin($id)
+    public function pin($id): RedirectResponse
     {
         $item = Item::findOrFail($id);
         $item->pinned = true;
@@ -78,9 +124,9 @@ class ItemController extends Controller
     /**
      * Unpin item on the dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @param $id
      */
-    public function unpin($id)
+    public function unpin($id): RedirectResponse
     {
         $item = Item::findOrFail($id);
         $item->pinned = false;
@@ -93,21 +139,29 @@ class ItemController extends Controller
     /**
      * Unpin item on the dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @return RedirectResponse|View
      */
     public function pinToggle($id, $ajax = false, $tag = false)
     {
         $item = Item::findOrFail($id);
-        $new = ((bool) $item->pinned === true) ? false : true;
+        $new = !(((bool)$item->pinned === true));
         $item->pinned = $new;
         $item->save();
+
         if ($ajax) {
-            if (is_numeric($tag) && $tag > 0) {
-                $item = Item::whereId($tag)->first();
-                $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
-            } else {
-                $data['apps'] = Item::pinned()->orderBy('order', 'asc')->get();
+            $item = Item::whereId($tag)->first();
+
+            $data['apps'] = new Collection;
+
+            if ((int)$tag === 0) {
+                $tags = Item::where('type', 1)->pinned()->orderBy('order', 'asc')->get();
+                $data['apps'] = $data['apps']->merge($tags);
             }
+
+            $apps = $item->children()->pinned()->orderBy('order', 'asc')->get();
+            $data['apps'] = $data['apps']->merge($apps);
+
+
             $data['ajax'] = true;
 
             return view('sortable', $data);
@@ -120,12 +174,10 @@ class ItemController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request): View
     {
-        $trash = (bool) $request->input('trash');
+        $trash = (bool)$request->input('trash');
 
         $data['apps'] = Item::ofType('item')->orderBy('title', 'asc')->get();
         $data['trash'] = Item::ofType('item')->onlyTrashed()->get();
@@ -138,12 +190,11 @@ class ItemController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function create()
+    public function create(): View
     {
         //
+        $data['item'] = new \App\Item();
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
         $data['tags']->prepend(__('app.dashboard'), 0);
         $data['current_tags'] = '0';
@@ -153,15 +204,12 @@ class ItemController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit(int $id): View
     {
         // Get the item
         $item = Item::find($id);
-        if ($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
+        if ($item->appid === null && $item->class !== null) { // old apps won't have an app id so set it
             $app = Application::where('class', $item->class)->first();
             if ($app) {
                 $item->appid = $app->appid;
@@ -177,45 +225,116 @@ class ItemController extends Controller
         return view('items.edit', $data);
     }
 
-    public function storelogic($request, $id = null)
+    /**
+     * @param null $id
+     * @throws ValidationException
+     */
+    public static function storelogic(Request $request, $id = null): Item
     {
         $application = Application::single($request->input('appid'));
         $validatedData = $request->validate([
             'title' => 'required|max:255',
             'url' => 'required',
+            'file' => 'image'
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $image = $request->file('file');
+            $extension = $image->getClientOriginalExtension();
+
+            if ($extension === 'svg') {
+                $sanitizer = new Sanitizer();
+                $sanitizedSvg = $sanitizer->sanitize(file_get_contents($image->getRealPath()));
+
+                // Verify that the sanitization removed malicious content
+                if (strpos($sanitizedSvg, '<script>') !== false) {
+                    throw ValidationException::withMessages(['file' => 'SVG contains malicious content and cannot be uploaded.']);
+                }
+
+                // Save the sanitized SVG back to the file
+                file_put_contents($image->getRealPath(), $sanitizedSvg);
+            }
+
+            $path = $image->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
         } elseif (strpos($request->input('icon'), 'http') === 0) {
-            $contents = file_get_contents($request->input('icon'));
+            $options = [
+                "ssl" => [
+                    "verify_peer" => false,
+                    "verify_peer_name" => false,
+                ],
+            ];
 
-            if ($application) {
-                $icon = $application->icon;
-            } else {
-                $file = $request->input('icon');
-                $path_parts = pathinfo($file);
-                $icon = md5($contents);
-                $icon .= '.'.$path_parts['extension'];
+            // Proxy management
+            $httpsProxy = getenv('HTTPS_PROXY');
+            $httpsProxyLower = getenv('https_proxy');
+            if ($httpsProxy !== false || $httpsProxyLower !== false) {
+                $options['proxy']['http'] = $httpsProxy ?: $httpsProxyLower;
+            }
+
+            $file = $request->input('icon');
+            $path_parts = pathinfo($file);
+            if (!array_key_exists('extension', $path_parts)) {
+                throw ValidationException::withMessages(['file' => 'Icon URL must have a valid file extension.']);
+            }
+            $extension = $path_parts['extension'];
+
+            $contents = file_get_contents($request->input('icon'), false, stream_context_create($options));
+
+            if ($extension === 'svg') {
+                $sanitizer = new Sanitizer();
+                $contents = $sanitizer->sanitize($contents);
+
+                // Verify that the sanitization removed malicious content
+                if (strpos($contents, '<script>') !== false) {
+                    throw ValidationException::withMessages(['file' => 'SVG contains malicious content and cannot be uploaded.']);
+                }
+            }
+
+            if (!isImage($contents, $extension)) {
+                throw ValidationException::withMessages(['file' => 'Icon must be an image.']);
+            }
+
+            $path = 'icons/' . ($application ? $application->icon : md5($contents) . '.' . $extension);
+
+            // Private apps could have here duplicated icons folder
+            if (strpos($path, 'icons/icons/') !== false) {
+                $path = str_replace('icons/icons/', 'icons/', $path);
+            }
+            if (!Storage::disk('public')->exists($path)) {
+                Storage::disk('public')->put($path, $contents);
             }
-            $path = 'icons/'.$icon;
-            Storage::disk('public')->put($path, $contents);
             $request->merge([
                 'icon' => $path,
             ]);
         }
 
         $config = Item::checkConfig($request->input('config'));
+
+        // Don't overwrite the stored password if it wasn't submitted when updating the item
+        if ($id !== null && strpos($config, '"password":null') !== false) {
+            $storedItem = Item::find($id);
+            $storedConfigObject = json_decode($storedItem->getAttribute('description'));
+
+            $configObject = json_decode($config);
+            if ($storedConfigObject && property_exists($storedConfigObject, 'password')) {
+                $configObject->password = $storedConfigObject->password;
+            } else {
+                $configObject->password = null;
+            }
+
+            $config = json_encode($configObject);
+        }
+
         $current_user = User::currentUser();
         $request->merge([
             'description' => $config,
-            'user_id' => $current_user->id,
+            'user_id' => $current_user->getId(),
         ]);
 
-        if ($request->input('appid') === 'null') {
+        if ($request->input('appid') === 'null' || $request->input('appid') === null) {
             $request->merge([
                 'class' => null,
             ]);
@@ -233,17 +352,15 @@ class ItemController extends Controller
         }
 
         $item->parents()->sync($request->tags);
+        return $item;
     }
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
     {
-        $this->storelogic($request);
+        self::storelogic($request);
 
         $route = route('dash', []);
 
@@ -253,25 +370,18 @@ class ItemController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(int $id): void
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
     {
-        $this->storelogic($request, $id);
+        self::storelogic($request, $id);
         $route = route('dash', []);
 
         return redirect($route)
@@ -280,14 +390,11 @@ class ItemController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request, $id)
+    public function destroy(Request $request, int $id): RedirectResponse
     {
         //
-        $force = (bool) $request->input('force');
+        $force = (bool)$request->input('force');
         if ($force) {
             Item::withTrashed()
                 ->where('id', $id)
@@ -304,16 +411,13 @@ class ItemController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function restore($id)
+    public function restore(int $id): RedirectResponse
     {
         //
         Item::withTrashed()
-                ->where('id', $id)
-                ->restore();
+            ->where('id', $id)
+            ->restore();
 
         $route = route('items.index', []);
 
@@ -324,57 +428,62 @@ class ItemController extends Controller
     /**
      * Return details for supported apps
      *
-     * @return Json
+     * @throws GuzzleException
      */
-    public function appload(Request $request)
+    public function appload(Request $request): ?string
     {
         $output = [];
         $appid = $request->input('app');
+        $itemId = $request->input('item_id');
 
         if ($appid === 'null') {
             return null;
         }
-        /*$appname = $request->input('app');
-        //die($appname);
-
-        $app_details = Application::where('name', $appname)->firstOrFail();
-        $appclass = $app_details->class();
-        $app = new $appclass;
-
-        // basic details
-        $output['icon'] = $app_details->icon();
-        $output['name'] = $app_details->name;
-        $output['iconview'] = $app_details->iconView();
-        $output['colour'] = $app_details->defaultColour();
-        $output['class'] = $appclass;
-
-        // live details
-        if($app instanceof \App\EnhancedApps) {
-            $output['config'] = className($app_details->name).'.config';
-        } else {
-            $output['config'] = null;
-        }*/
-
-        $output['config'] = null;
-        $output['custom'] = null;
 
         $app = Application::single($appid);
-        $output = (array) $app;
+
+        if (!$app) {
+            return response()->json(['error' => 'Application not found.'], 404);
+        }
+
+        $output = (array)$app;
 
         $appdetails = Application::getApp($appid);
 
-        if ((bool) $app->enhanced === true) {
-            // if(!isset($app->config)) { // class based config
-            $output['custom'] = className($appdetails->name).'.config';
-            // }
+        if (!$appdetails) {
+            return response()->json(['error' => 'Application details not found.'], 404);
+        }
+
+        if ((bool)$app->enhanced === true) {
+            $item = $itemId ? Item::find($itemId) : Item::where('appid', $appid)->first();
+
+            if ($item) {
+                $output['custom'] = className($appdetails->name) . '.config';
+                $output['appvalue'] = $item->description;
+            } else {
+                // Ensure the app is installed if not found
+                $output['custom'] = className($appdetails->name) . '.config';
+                $output['appvalue'] = null;
+            }
         }
 
         $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
-        $output['iconview'] = config('app.appsource').'icons/'.$app->icon;
+
+        if (strpos($app->icon, '://') !== false) {
+            $output['iconview'] = $app->icon;
+        } elseif (strpos($app->icon, 'icons/') !== false) {
+            $output['iconview'] = URL::to('/') . '/storage/' . $app->icon;
+            $output['icon'] = str_replace('icons/', '', $output['icon']);
+        } else {
+            $output['iconview'] = config('app.appsource') . 'icons/' . $app->icon;
+        }
 
         return json_encode($output);
     }
 
+    /**
+     * @return void
+     */
     public function testConfig(Request $request)
     {
         $data = $request->input('data');
@@ -382,47 +491,105 @@ class ItemController extends Controller
         $single = Application::single($data['type']);
         $app = $single->class;
 
+        // If password is not resubmitted fill it from the database when in edit mode
+        if (array_key_exists('password', $data) &&
+            $data['password'] === null &&
+            array_key_exists('id', $data)
+        ) {
+            $item = Item::find($data['id']);
+            if ($item) {
+                $itemConfig = $item->getConfig();
+                $data['password'] = $itemConfig->password;
+            }
+        }
+
         $app_details = new $app();
-        $app_details->config = (object) $data;
+        $app_details->config = (object)$data;
         $app_details->test();
     }
 
-    public function execute($url, $attrs = [], $overridevars = false)
+    /**
+     * @param $url
+     * @param array|bool $overridevars
+     * @throws GuzzleException
+     */
+    public function execute($url, array $attrs = [], $overridevars = false): ?ResponseInterface
     {
-        $res = null;
-
-        $vars = ($overridevars !== false) ?
-        $overridevars : [
+        // Default Guzzle client configuration
+        $clientOptions = [
             'http_errors' => false,
             'timeout' => 15,
             'connect_timeout' => 15,
-            'verify' => false,
+            'verify' => false, // In production, set this to `true` and manage certs.
         ];
 
-        $client = new Client($vars);
+        // If the user provided overrides, use them.
+        if ($overridevars !== false) {
+            $clientOptions = $overridevars;
+        }
 
+        // Resolve the hostname to an IP address
+        $host = parse_url($url, PHP_URL_HOST);
+        $ip = gethostbyname($host);
+
+        // Check if the IP is private or reserved
+        $allowInternalIps = env('ALLOW_INTERNAL_REQUESTS', false);
+        if (!$allowInternalIps && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false) {
+            Log::warning('Blocked access to private or reserved IPs.', ['ip' => $ip, 'host' => $host]);
+            abort(Response::HTTP_FORBIDDEN, 'Access to private or reserved IPs is not allowed.');
+        }
+
+        // Force Guzzle to use the resolved IP address
+        $clientOptions['curl'][CURLOPT_RESOLVE] = ["{$host}:80:{$ip}", "{$host}:443:{$ip}"];
+
+        $client = new Client($clientOptions);
         $method = 'GET';
 
         try {
             return $client->request($method, $url, $attrs);
-        } catch (\GuzzleHttp\Exception\ConnectException $e) {
-            Log::error('Connection refused');
-            Log::debug($e->getMessage());
-        } catch (\GuzzleHttp\Exception\ServerException $e) {
+        } catch (ConnectException $e) {
+            Log::warning('SSRF Attempt Blocked: Connection to a private IP was prevented.', [
+                'url' => $url,
+                'error' => $e->getMessage()
+            ]);
+            return null;
+        } catch (ServerException $e) {
             Log::debug($e->getMessage());
+        } catch (\Exception $e) {
+            Log::error('General error: ' . $e->getMessage());
         }
 
-        return $res;
+        return null;
     }
 
-    public function websitelookup($url)
+    /**
+     * @param $url
+     * @throws GuzzleException
+     */
+    public function websitelookup($url): StreamInterface
     {
-        $url = \base64_decode($url);
-        $data = $this->execute($url);
+        $decodedUrl = base64_decode($url);
 
-        return $data->getBody();
+        // Validate the URL format.
+        if (filter_var($decodedUrl, FILTER_VALIDATE_URL) === false) {
+            abort(Response::HTTP_BAD_REQUEST, 'Invalid URL format provided.');
+        }
+
+        $response = $this->execute($decodedUrl);
+
+        // If execute() returns null, it means the connection failed.
+        // This can happen for many reasons, including our SSRF protection kicking in.
+        if ($response === null) {
+            abort(Response::HTTP_FORBIDDEN, 'Access to the requested resource is not allowed or the resource is unavailable.');
+        }
+    
+        return $response->getBody();
     }
 
+    /**
+     * @param $id
+     * @return void
+     */
     public function getStats($id)
     {
         $item = Item::find($id);
@@ -435,7 +602,10 @@ class ItemController extends Controller
         }
     }
 
-    public function checkAppList()
+    /**
+     * @return \Illuminate\Contracts\Foundation\Application|RedirectResponse|Redirector
+     */
+    public function checkAppList(): RedirectResponse
     {
         ProcessApps::dispatch();
         $route = route('items.index');

app/Http/Controllers/ItemRestController.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Item;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
+
+class ItemRestController extends Controller
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('allowed');
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(): Collection
+    {
+        $columns = [
+            'title',
+            'colour',
+            'url',
+            'description',
+            'appid',
+            'appdescription',
+        ];
+
+        return Item::select($columns)
+            ->where('deleted_at', null)
+            ->where('type', '0')
+            ->orderBy('order', 'asc')
+            ->get();
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return void
+     */
+    public function create()
+    {
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): object
+    {
+        $item = ItemController::storelogic($request);
+
+        if ($item) {
+            return (object) ['status' => 'OK'];
+        }
+
+        return (object) ['status' => 'FAILED'];
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(Item $item): Response
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(Item $item): Response
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, Item $item): Response
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Item $item): Response
+    {
+        //
+    }
+}

app/Http/Controllers/SearchController.php

@@ -2,27 +2,138 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Search;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Http;
 
 class SearchController extends Controller
 {
+    /**
+     * @return Application|RedirectResponse|Redirector|mixed|void
+     */
     public function index(Request $request)
     {
         $requestprovider = $request->input('provider');
         $query = $request->input('q');
 
+        // Sanitize the query to prevent XSS
+        $query = htmlspecialchars($query, ENT_QUOTES, 'UTF-8'); 
+
         $provider = Search::providerDetails($requestprovider);
 
+        if (!$provider || !isset($provider->type)) {
+            abort(404, 'Invalid provider');
+        }
+
+        // If the query is empty, redirect to the provider's base URL
+        if (!$query || trim($query) === '') {
+            return redirect($provider->url);
+        }
+
         if ($provider->type == 'standard') {
             return redirect($provider->url.'?'.$provider->query.'='.urlencode($query));
         } elseif ($provider->type == 'external') {
             $class = new $provider->class;
-            //print_r($provider);
             return $class->getResults($query, $provider);
         }
 
-        //print_r($provider);
+        abort(404, 'Provider type not supported');
+    }
+
+    /**
+     * Get autocomplete suggestions for a search query
+     *
+     * @return JsonResponse
+     */
+    public function autocomplete(Request $request)
+    {
+        $requestprovider = $request->input('provider');
+        $query = $request->input('q');
+
+        if (!$query || trim($query) === '') {
+            return response()->json([]);
+        }
+
+        $provider = Search::providerDetails($requestprovider);
+
+        if (!$provider || !isset($provider->autocomplete)) {
+            return response()->json([]);
+        }
+
+        // Replace {query} placeholder with actual query
+        $autocompleteUrl = str_replace('{query}', urlencode($query), $provider->autocomplete);
+
+        try {
+            $response = Http::timeout(5)->get($autocompleteUrl);
+
+            if ($response->successful()) {
+                $data = $response->body();
+                
+                // Parse the response based on provider
+                $suggestions = $this->parseAutocompleteResponse($data, $provider->id);
+                
+                return response()->json($suggestions);
+            }
+        } catch (\Exception $e) {
+            // Return empty array on error
+            return response()->json([]);
+        }
+
+        return response()->json([]);
+    }
+
+    /**
+     * Parse autocomplete response based on provider format
+     *
+     * @param string $data
+     * @param string $providerId
+     * @return array
+     */
+    private function parseAutocompleteResponse($data, $providerId)
+    {
+        $suggestions = [];
+
+        switch ($providerId) {
+            case 'google':
+                // Google returns XML format
+                if (strpos($data, '<?xml') === 0) {
+                    $xml = simplexml_load_string($data);
+                    if ($xml && isset($xml->CompleteSuggestion)) {
+                        foreach ($xml->CompleteSuggestion as $suggestion) {
+                            if (isset($suggestion->suggestion['data'])) {
+                                $suggestions[] = (string) $suggestion->suggestion['data'];
+                            }
+                        }
+                    }
+                }
+                break;
+
+            case 'bing':
+            case 'ddg':
+                // Bing and DuckDuckGo return JSON array format
+                $json = json_decode($data, true);
+                if (is_array($json) && isset($json[1]) && is_array($json[1])) {
+                    $suggestions = $json[1];
+                }
+                break;
+
+            default:
+                // Try to parse as JSON array
+                $json = json_decode($data, true);
+                if (is_array($json)) {
+                    if (isset($json[1]) && is_array($json[1])) {
+                        $suggestions = $json[1];
+                    } else {
+                        $suggestions = $json;
+                    }
+                }
+                break;
+        }
+
+        return $suggestions;
     }
 }

app/Http/Controllers/SettingsController.php

@@ -2,24 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\Setting;
 use App\SettingGroup;
-use App\User;
+use Exception;
+use enshrined\svgSanitize\Sanitizer;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 class SettingsController extends Controller
 {
     public function __construct()
     {
+        parent::__construct();
         $this->middleware('allowed');
     }
 
-    /**
-     * @return \Illuminate\View\View
-     */
-    public function index()
+    public function index(): View
     {
         $settings = SettingGroup::with([
             'settings',
@@ -31,11 +30,10 @@ class SettingsController extends Controller
     }
 
     /**
-     * @param int $id
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return RedirectResponse|View
      */
-    public function edit($id)
+    public function edit(int $id)
     {
         $setting = Setting::find($id);
         //die("s: ".$setting->label);
@@ -47,66 +45,82 @@ class SettingsController extends Controller
         if (! is_null($setting)) {
             return view('settings.edit')->with([
                 'setting' => $setting,
+                'value' => $setting->value,
             ]);
         } else {
             $route = route('settings.list', []);
 
             return redirect($route)
             ->with([
-                'error' => __('app.alert.error.not_exist'),
+                'errors' => collect([__('app.alert.error.not_exist')]),
             ]);
         }
     }
 
-    /**
-     * @param int $id
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
     {
         $setting = Setting::find($id);
         $user = $this->user();
+        $route = route('settings.index', []);
 
-        if (! is_null($setting)) {
-            $data = Setting::getInput($request);
+        try {
+            if (is_null($setting)) {
+                throw new Exception('not_exists');
+            }
 
-            $setting_value = null;
+            if ($setting->type === 'image') {
+                $validatedData = $request->validate([
+                    'value' => 'image',
+                ]);
 
-            if ($setting->type == 'image') {
-                if ($request->hasFile('value')) {
-                    $path = $request->file('value')->store('backgrounds');
-                    $setting_value = $path;
+                if (!$request->hasFile('value')) {
+                    throw new \Exception('file_too_big');
                 }
+
+                $image = $request->file('value');
+                $extension = $image->getClientOriginalExtension();
+
+                if ($extension === 'svg') {
+                    $sanitizer = new Sanitizer();
+                    $sanitizedSvg = $sanitizer->sanitize(file_get_contents($image->getRealPath()));
+
+                    // Verify that the sanitization removed malicious content
+                    if (strpos($sanitizedSvg, '<script>') !== false) {
+                        throw new \Exception('SVG contains malicious content and cannot be uploaded.');
+                    }
+
+                    // Save the sanitized SVG back to the file
+                    file_put_contents($image->getRealPath(), $sanitizedSvg);
+                }
+
+                $path = $image->store('backgrounds', 'public');
+
+                if ($path === null) {
+                    throw new \Exception('file_not_stored');
+                }
+
+                $setting_value = $path;
             } else {
+                $data = Setting::getInput($request);
                 $setting_value = $data->value;
             }
 
             $user->settings()->detach($setting->id);
             $user->settings()->save($setting, ['uservalue' => $setting_value]);
 
-            $route = route('settings.index', []);
-
             return redirect($route)
-            ->with([
-                'success' => __('app.alert.success.setting_updated'),
-            ]);
-        } else {
-            $route = route('settings.index', []);
-
+                ->with([
+                    'success' => __('app.alert.success.setting_updated'),
+                ]);
+        } catch (Exception $e) {
             return redirect($route)
-            ->with([
-                'error' => __('app.alert.error.not_exist'),
-            ]);
+                ->with([
+                    'errors' => collect([__('app.alert.error.' . $e->getMessage())]),
+                ]);
         }
     }
 
-    /**
-     * @param int $id
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function clear($id)
+    public function clear(int $id): RedirectResponse
     {
         $user = $this->user();
         $setting = Setting::find($id);

app/Http/Controllers/TagController.php

@@ -4,7 +4,10 @@ namespace App\Http\Controllers;
 
 use App\Item;
 use App\User;
-use DB;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
 class TagController extends Controller
@@ -17,9 +20,9 @@ class TagController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
-    public function index(Request $request)
+    public function index(Request $request): \Illuminate\View\View
     {
         $trash = (bool) $request->input('trash');
 
@@ -35,9 +38,9 @@ class TagController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
-    public function create()
+    public function create(): \Illuminate\View\View
     {
         $data = [];
 
@@ -46,24 +49,22 @@ class TagController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
     {
         $validatedData = $request->validate([
             'title' => 'required|max:255',
+            'file' => 'image'
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
         }
 
-        $slug = str_slug($request->title, '-');
+        $slug = str_slug($request->title, '-', 'en_US');
 
         $current_user = User::currentUser();
 
@@ -71,7 +72,7 @@ class TagController extends Controller
         $request->merge([
             'type' => '1',
             'url' => $slug,
-            'user_id' => $current_user->id,
+            'user_id' => $current_user->getId(),
         ]);
         //die(print_r($request->all()));
         Item::create($request->all());
@@ -85,27 +86,30 @@ class TagController extends Controller
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param $slug
      */
-    public function show($slug)
+    public function show($slug, Request $request): View
     {
         $item = Item::whereUrl($slug)->first();
         //print_r($item);
-        $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+        if (config('app.auth_roles_enable')) {
+            $roles = explode(config('app.auth_roles_delimiter'), $request->header(config('app.auth_roles_header')));
+            $data['apps'] = $item->children()->whereIn('role', $roles)->pinned()->orderBy('order', 'asc')->get();
+        } else {
+            $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+        }
         $data['tag'] = $item->id;
         $data['all_apps'] = $item->children;
 
+        $data['taglist'] = Item::ofType('tag')->where('id', '>', 0)->orderBy('title', 'asc')->get();
+
         return view('welcome', $data);
     }
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit(int $id): View
     {
         // Get the item
         $item = Item::find($id);
@@ -117,25 +121,22 @@ class TagController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, int $id): RedirectResponse
     {
         $validatedData = $request->validate([
             'title' => 'required|max:255',
+            'file' => 'image'
         ]);
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
         }
 
-        $slug = str_slug($request->title, '-');
+        $slug = str_slug($request->title, '-', 'en_US');
         // set item type to tag
         $request->merge([
             'url' => $slug,
@@ -151,11 +152,8 @@ class TagController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request, $id)
+    public function destroy(Request $request, int $id): RedirectResponse
     {
         //
         $force = (bool) $request->input('force');
@@ -175,11 +173,8 @@ class TagController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function restore($id)
+    public function restore(int $id): RedirectResponse
     {
         //
         Item::withTrashed()
@@ -191,9 +186,15 @@ class TagController extends Controller
             ->with('success', __('app.alert.success.item_restored'));
     }
 
-    public function add($tag, $item)
+    /**
+     * Add item to tag
+     *
+     * @param $tag
+     * @param $item
+     * @return int 1|0
+     */
+    public function add($tag, $item): int
     {
-        $output = 0;
         $tag = Item::find($tag);
         $item = Item::find($item);
         if ($tag && $item) {
@@ -205,6 +206,6 @@ class TagController extends Controller
             }
         }
 
-        return $output;
+        return 0;
     }
 }

app/Http/Controllers/UserController.php

@@ -2,8 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use App\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
@@ -12,15 +13,14 @@ class UserController extends Controller
 {
     public function __construct()
     {
+        parent::__construct();
         $this->middleware('allowed')->except(['selectUser']);
     }
 
     /**
      * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(): View
     {
         $data['users'] = User::all();
 
@@ -29,17 +29,15 @@ class UserController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function create()
+    public function create(): View
     {
         $data = [];
 
         return view('users.create', $data);
     }
 
-    public function selectUser()
+    public function selectUser(): \Illuminate\View\View
     {
         Auth::logout();
         $data['users'] = User::all();
@@ -49,18 +47,15 @@ class UserController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
     {
         $validatedData = $request->validate([
             'username' => 'required|max:255|unique:users',
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
             'password_confirmation' => 'nullable',
-
+            'file' => 'image'
         ]);
         $user = new User;
         $user->username = $request->input('username');
@@ -73,7 +68,7 @@ class UserController extends Controller
         }
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('avatars');
+            $path = $request->file('file')->store('avatars', 'public');
             $user->avatar = $path;
         }
 
@@ -91,22 +86,16 @@ class UserController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(int $id): void
     {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function edit(User $user)
+    public function edit(User $user): View
     {
         $data['user'] = $user;
 
@@ -115,18 +104,15 @@ class UserController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, User $user)
+    public function update(Request $request, User $user): RedirectResponse
     {
         $validatedData = $request->validate([
             'username' => 'required|max:255|unique:users,username,'.$user->id,
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
             'password_confirmation' => 'nullable',
+            'file' => 'image'
         ]);
         //die(print_r($request->all()));
 
@@ -142,7 +128,7 @@ class UserController extends Controller
         }
 
         if ($request->hasFile('file')) {
-            $path = $request->file('file')->store('avatars');
+            $path = $request->file('file')->store('avatars', 'public');
             $user->avatar = $path;
         }
 
@@ -163,10 +149,9 @@ class UserController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return RedirectResponse | void
      */
-    public function destroy(User $user)
+    public function destroy(User $user): RedirectResponse
     {
         if ($user->id !== 1) {
             $user->delete();

app/Http/Kernel.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Http;
-
-use Illuminate\Foundation\Http\Kernel as HttpKernel;
-
-class Kernel extends HttpKernel
-{
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * These middleware are run during every request to your application.
-     *
-     * @var array
-     */
-    protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
-    ];
-
-    /**
-     * The application's route middleware groups.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ],
-
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
-    ];
-
-    /**
-     * The application's route middleware.
-     *
-     * These middleware may be assigned to groups or used individually.
-     *
-     * @var array
-     */
-    protected $routeMiddleware = [
-        'allowed' => \App\Http\Middleware\CheckAllowed::class,
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-    ];
-}

app/Http/Middleware/CheckAllowed.php

@@ -2,8 +2,11 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use App\User;
 use Closure;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use Session;
@@ -13,29 +16,28 @@ class CheckAllowed
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
+     * @throws AuthenticationException
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         $route = Route::currentRouteName();
         $current_user = User::currentUser();
 
+        // Non admin users can't access users management
         if (str_is('users*', $route)) {
-            if ($current_user->id !== 1) {
+            if ($current_user->getId() !== 1) {
                 return redirect()->route('dash');
             }
         }
 
-        if ($route == 'dash') {
-            //print_r(User::all());
-            //die("here".var_dump($current_user->password));
-            if ((bool) $current_user->public_front === true) {
+        // Public access to frontpage
+        if ($route === 'dash' || $route === 'tags.show') {
+            if ((bool)$current_user->public_front === true) {
                 return $next($request);
             }
         }
 
+        // Continue with passwordless user
         if (empty($current_user->password)) {
             return $next($request);
         }
@@ -43,11 +45,13 @@ class CheckAllowed
         // Check if user is logged in as $current_user
         if (Auth::check()) {
             $loggedin_user = Auth::user();
-            if ($loggedin_user->id === $current_user->id) {
+            if ($loggedin_user->id === $current_user->getId()) {
                 return $next($request);
             }
         }
 
-        return Auth::authenticate();
+        // Redirect to login
+        Auth::authenticate();
+        return redirect()->route('user.select');
     }
 }

app/Http/Middleware/EncryptCookies.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
-
-class EncryptCookies extends Middleware
-{
-    /**
-     * The names of the cookies that should not be encrypted.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,20 +2,17 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
-     * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, string $guard = null): Response
     {
         if (Auth::guard($guard)->check()) {
             return redirect()->intended();

app/Http/Middleware/TrimStrings.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
-
-class TrimStrings extends Middleware
-{
-    /**
-     * The names of the attributes that should not be trimmed.
-     *
-     * @var array
-     */
-    protected $except = [
-        'password',
-        'password_confirmation',
-    ];
-}

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
-use Symfony\Component\HttpFoundation\Cookie;
-
-class VerifyCsrfToken extends Middleware
-{
-    /**
-     * The URIs that should be excluded from CSRF verification.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-        'order',
-        'appload',
-        'test_config',
-        //'get_stats'
-    ];
-
-    /**
-     * Add the CSRF token to the response cookies.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Symfony\Component\HttpFoundation\Response  $response
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    protected function addCookieToResponse($request, $response)
-    {
-        $config = config('session');
-
-        if ($response instanceof Responsable) {
-            $response = $response->toResponse($request);
-        }
-
-        $response->headers->setCookie(
-            new Cookie(
-                'HEIMDALL-XSRF-TOKEN', $request->session()->token(), $this->availableAt(60 * $config['lifetime']),
-                $config['path'], $config['domain'], $config['secure'], false, false, $config['same_site'] ?? null
-            )
-        );
-
-        return $response;
-    }
-
-    /**
-     * Determine if the cookie contents should be serialized.
-     *
-     * @return bool
-     */
-    public static function serialized()
-    {
-        return EncryptCookies::serialized('HEIMDALL-XSRF-TOKEN');
-    }
-}

app/Item.php

@@ -2,46 +2,120 @@
 
 namespace App;
 
-use App\Application;
-use App\ItemTag;
-use App\User;
+use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use stdClass;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 
+// @codingStandardsIgnoreStart
+/**
+ * App\Item
+ *
+ * @property int $id
+ * @property string $title
+ * @property string|null $colour
+ * @property string|null $icon
+ * @property string $url
+ * @property string|null $description
+ * @property int $pinned
+ * @property int $order
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $type
+ * @property int $user_id
+ * @property string|null $class
+ * @property string|null $appid
+ * @property string|null $appdescription
+ * @property string|null $role
+ * @property-read \Illuminate\Database\Eloquent\Collection|Item[] $children
+ * @property-read int|null $children_count
+ * @property-read string $droppable
+ * @property-read \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\UrlGenerator|mixed|string $link
+ * @property-read string $link_icon
+ * @property-read string $link_target
+ * @property-read string $link_type
+ * @property-read \Illuminate\Database\Eloquent\Collection|Item[] $parents
+ * @property-read int|null $parents_count
+ * @property-read \App\User|null $user
+ * @method static \Database\Factories\ItemFactory factory(...$parameters)
+ * @method static Builder|Item newModelQuery()
+ * @method static Builder|Item newQuery()
+ * @method static Builder|Item ofType($type)
+ * @method static \Illuminate\Database\Query\Builder|Item onlyTrashed()
+ * @method static Builder|Item pinned()
+ * @method static Builder|Item query()
+ * @method static Builder|Item whereAppdescription($value)
+ * @method static Builder|Item whereRole($value)
+ * @method static Builder|Item whereAppid($value)
+ * @method static Builder|Item whereClass($value)
+ * @method static Builder|Item whereColour($value)
+ * @method static Builder|Item whereCreatedAt($value)
+ * @method static Builder|Item whereDeletedAt($value)
+ * @method static Builder|Item whereDescription($value)
+ * @method static Builder|Item whereIcon($value)
+ * @method static Builder|Item whereId($value)
+ * @method static Builder|Item whereOrder($value)
+ * @method static Builder|Item wherePinned($value)
+ * @method static Builder|Item whereTitle($value)
+ * @method static Builder|Item whereType($value)
+ * @method static Builder|Item whereUpdatedAt($value)
+ * @method static Builder|Item whereUrl($value)
+ * @method static Builder|Item whereUserId($value)
+ * @method static \Illuminate\Database\Query\Builder|Item withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|Item withoutTrashed()
+ * @mixin \Eloquent
+ */
+// @codingStandardsIgnoreEnd
 class Item extends Model
 {
     use SoftDeletes;
 
-    protected static function boot()
+    use HasFactory;
+
+    protected static function boot(): void
     {
         parent::boot();
 
         static::addGlobalScope('user_id', function (Builder $builder) {
             $current_user = User::currentUser();
             if ($current_user) {
-                $builder->where('user_id', $current_user->id)->orWhere('user_id', 0);
+                $builder->where('user_id', $current_user->getId())->orWhere('user_id', 0);
             } else {
                 $builder->where('user_id', 0);
             }
         });
     }
 
-    //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'appdescription', 'description', 'pinned', 'order', 'type', 'class', 'user_id', 'tag_id', 'appid',
+        'title',
+        'url',
+        'colour',
+        'icon',
+        'appdescription',
+        'description',
+        'pinned',
+        'order',
+        'type',
+        'class',
+        'user_id',
+        'tag_id',
+        'appid',
+        'role',
     ];
 
 
 
     /**
      * Scope a query to only include pinned items.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopePinned($query)
+    public function scopePinned(Builder $query): Builder
     {
         return $query->where('pinned', 1);
     }
@@ -63,30 +137,68 @@ class Item extends Model
         $id = $this->id;
         $tags = ItemTag::select('tag_id')->where('item_id', $id)->pluck('tag_id')->toArray();
         $tagdetails = self::select('id', 'title', 'url', 'pinned')->whereIn('id', $tags)->get();
-        //print_r($tags);
-        if (in_array(0, $tags)) {
-            $details = new self([
-                'id' => 0,
-                'title' => __('app.dashboard'),
-                'url' => '',
-                'pinned' => 0,
-            ]);
-            $tagdetails->prepend($details);
-        }
 
         return $tagdetails;
     }
 
-    public function parents()
+    protected function title(): Attribute
     {
-        return $this->belongsToMany(\App\Item::class, 'item_tag', 'item_id', 'tag_id');
+        return Attribute::make(
+            get: fn (mixed $value) => ($value === 'app.dashboard' ? __('app.dashboard') : $value),
+        );
     }
 
-    public function children()
+    protected function tagUrl(): Attribute
     {
-        return $this->belongsToMany(\App\Item::class, 'item_tag', 'tag_id', 'item_id');
+        return Attribute::make(
+            get: fn (mixed $value, array $attributes) => ($attributes['id'] === 0 ? '0-dash' : $attributes['url']),
+        );
     }
 
+    public function getTagClass(): string
+    {
+        $tags = $this->tags();
+        $slugs = [];
+
+        foreach ($tags as $tag) {
+            if ($tag->id === 0) {
+                $tag->url = '0-dash';
+            }
+            if ($tag->url) {
+                $slugs[] = 'tag-'.$tag->url;
+            }
+        }
+
+        return implode(' ', $slugs);
+    }
+
+    public function getTagList(): string
+    {
+        $tags = $this->tags();
+        $titles = [];
+        // print_r($tags);
+        foreach ($tags as $tag) {
+            if ($tag->title) {
+                $titles[] = $tag->title;
+            }
+        }
+
+        return implode(', ', $titles);
+    }
+
+    public function parents(): BelongsToMany
+    {
+        return $this->belongsToMany(Item::class, 'item_tag', 'item_id', 'tag_id');
+    }
+
+    public function children(): BelongsToMany
+    {
+        return $this->belongsToMany(Item::class, 'item_tag', 'tag_id', 'item_id');
+    }
+
+    /**
+     * @return \Illuminate\Contracts\Foundation\Application|UrlGenerator|mixed|string
+     */
     public function getLinkAttribute()
     {
         if ((int) $this->type === 1) {
@@ -96,7 +208,7 @@ class Item extends Model
         }
     }
 
-    public function getDroppableAttribute()
+    public function getDroppableAttribute(): string
     {
         if ((int) $this->type === 1) {
             return ' droppable';
@@ -105,7 +217,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkTargetAttribute()
+    public function getLinkTargetAttribute(): string
     {
         $target = Setting::fetch('window_target');
 
@@ -116,7 +228,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkIconAttribute()
+    public function getLinkIconAttribute(): string
     {
         if ((int) $this->type === 1) {
             return 'fa-tag';
@@ -125,7 +237,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkTypeAttribute()
+    public function getLinkTypeAttribute(): string
     {
         if ((int) $this->type === 1) {
             return 'tags';
@@ -134,6 +246,10 @@ class Item extends Model
         }
     }
 
+    /**
+     * @param $class
+     * @return false|mixed|string
+     */
     public static function nameFromClass($class)
     {
         $explode = explode('\\', $class);
@@ -142,6 +258,11 @@ class Item extends Model
         return $name;
     }
 
+    /**
+     * @param $query
+     * @param $type
+     * @return mixed
+     */
     public function scopeOfType($query, $type)
     {
         switch ($type) {
@@ -156,7 +277,7 @@ class Item extends Model
         return $query->where('type', $typeid);
     }
 
-    public function enhanced()
+    public function enhanced(): bool
     {
         /*if(isset($this->class) && !empty($this->class)) {
             $app = new $this->class;
@@ -167,27 +288,34 @@ class Item extends Model
         return $this->description !== null;
     }
 
-    public static function isEnhanced($class)
+    /**
+     * @param $class
+     */
+    public static function isEnhanced($class): bool
     {
-        if (!class_exists($class) || $class === null || $class === 'null') {
+        if (!class_exists($class, false) || $class === null || $class === 'null') {
             return false;
         }
         $app = new $class;
 
-        return (bool) ($app instanceof \App\EnhancedApps);
+        return (bool) ($app instanceof EnhancedApps);
     }
 
+    /**
+     * @param $class
+     * @return false|mixed
+     */
     public static function isSearchProvider($class)
     {
-        if (!class_exists($class) || $class === null || $class === 'null') {
+        if (!class_exists($class, false) || $class === null || $class === 'null') {
             return false;
         }
         $app = new $class;
 
-        return ((bool) ($app instanceof \App\SearchInterface)) ? $app : false;
+        return ((bool) ($app instanceof SearchInterface)) ? $app : false;
     }
 
-    public function enabled()
+    public function enabled(): bool
     {
         if ($this->enhanced()) {
             $config = $this->getconfig();
@@ -199,12 +327,15 @@ class Item extends Model
         return false;
     }
 
+    /**
+     * @return mixed|stdClass
+     */
     public function getconfig()
     {
         // $explode = explode('\\', $this->class);
 
         if (! isset($this->description) || empty($this->description)) {
-            $config = new \stdClass;
+            $config = new stdClass;
             // $config->name = end($explode);
             $config->enabled = false;
             $config->override_url = null;
@@ -227,7 +358,10 @@ class Item extends Model
         return $config;
     }
 
-    public static function applicationDetails($class)
+    /**
+     * @param $class
+     */
+    public static function applicationDetails($class): ?Application
     {
         if (! empty($class)) {
             $name = self::nameFromClass($class);
@@ -237,13 +371,16 @@ class Item extends Model
             }
         }
 
-        return false;
+        return null;
     }
 
-    public static function getApplicationDescription($class)
+    /**
+     * @param $class
+     */
+    public static function getApplicationDescription($class): string
     {
         $details = self::applicationDetails($class);
-        if ($details !== false) {
+        if ($details !== null) {
             return $details->description.' - '.$details->license;
         }
 
@@ -253,8 +390,8 @@ class Item extends Model
     /**
      * Get the user that owns the item.
      */
-    public function user()
+    public function user(): BelongsTo
     {
-        return $this->belongsTo(\App\User::class);
+        return $this->belongsTo(User::class);
     }
 }

app/ItemTag.php

@@ -2,8 +2,26 @@
 
 namespace App;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
+/**
+ * App\ItemTag
+ *
+ * @property int $item_id
+ * @property int $tag_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag query()
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag whereItemId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag whereTagId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|ItemTag whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class ItemTag extends Pivot
 {
+    use HasFactory;
 }

app/Jobs/ProcessApps.php

@@ -5,14 +5,17 @@ namespace App\Jobs;
 use App\Application;
 use App\Item;
 use App\SupportedApps;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
-class ProcessApps implements ShouldQueue
+class ProcessApps implements ShouldQueue, ShouldBeUnique
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -29,10 +32,11 @@ class ProcessApps implements ShouldQueue
     /**
      * Execute the job.
      *
-     * @return void
+     * @throws GuzzleException
      */
-    public function handle()
+    public function handle(): void
     {
+        Log::debug('Process Apps dispatched');
         $localapps = Application::whereNull('class')->get();
         $json = SupportedApps::getList()->getBody();
 
@@ -47,7 +51,9 @@ class ProcessApps implements ShouldQueue
         foreach ($items as $item) {
             if (! file_exists(app_path('SupportedApps/'.Item::nameFromClass($item->class)))) {
                 $app = Application::where('class', $item->class)->first();
-                Application::getApp($app->appid);
+                if ($app) {
+                    Application::getApp($app->appid);
+                }
             }
         }
     }

app/Jobs/UpdateApps.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Application;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
+
+class UpdateApps implements ShouldQueue, ShouldBeUnique
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @throws GuzzleException
+     */
+    public function handle(): void
+    {
+        Log::debug('Update of all apps triggered!');
+        $apps = Application::all('appid')->toArray();
+
+        // We onl update the apps that are actually in use by items
+        // 1 sec delay after each update to throttle the requests
+        foreach ($apps as $appKey => $app) {
+            Application::getApp($app['appid']);
+            sleep(1);
+        }
+
+        Log::debug('Update of all apps finished!');
+
+        Cache::lock('updateApps')->forceRelease();
+    }
+
+    public function failed($exception): void
+    {
+        Cache::lock('updateApps')->forceRelease();
+    }
+}

app/Providers/AppServiceProvider.php

@@ -4,65 +4,49 @@ namespace App\Providers;
 
 use App\Application;
 use App\Jobs\ProcessApps;
+use App\Jobs\UpdateApps;
 use App\Setting;
 use App\User;
-use Artisan;
+use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
-use Schema;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use App\Services\CustomFormBuilder;
+use Spatie\Html\Html;
 
 class AppServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        if (! is_file(base_path('.env'))) {
-            copy(base_path('.env.example'), base_path('.env'));
+        if (! class_exists('ZipArchive')) {
+            die('You are missing php-zip');
         }
-        $this->genKey();
-        if (! is_file(database_path('app.sqlite'))) {
-            // first time setup
-            touch(database_path('app.sqlite'));
-            Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
-            //Cache
-            //Artisan::call('config:cache');
-            //Artisan::call('route:cache');
-        }
-        if (is_file(database_path('app.sqlite'))) {
-            if (Schema::hasTable('settings')) {
 
-                // check version to see if an upgrade is needed
-                $db_version = Setting::_fetch('version');
-                $app_version = config('app.version');
-                if (version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
-                    Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
-                    ProcessApps::dispatch();                 
-                }
-            } else {
-                Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
-            }
-        }
+        $this->createEnvFile();
+
+        $this->setupDatabase();
 
         if (! is_file(public_path('storage/.gitignore'))) {
             Artisan::call('storage:link');
             \Session::put('current_user', null);
         }
 
+        $applications = Application::all();
+
+        if ($applications->count() <= 0) {
+            ProcessApps::dispatch();
+        }
+
         $lang = Setting::fetch('language');
         \App::setLocale($lang);
 
-        $applications = Application::all();
-        if ($applications->count() <= 0) {
-            if (class_exists('ZipArchive')) {
-                ProcessApps::dispatch();
-            } else {
-                die('You are missing php-zip');
-            }
-        }
-
         // User specific settings need to go here as session isn't available at this point in the app
         view()->composer('*', function ($view) {
             if (isset($_SERVER['HTTP_AUTHORIZATION']) && ! empty($_SERVER['HTTP_AUTHORIZATION'])) {
@@ -90,7 +74,12 @@ class AppServiceProvider extends ServiceProvider
             }
 
             $alt_bg = '';
-            if ($bg_image = Setting::fetch('background_image')) {
+            $trianglify = 'false';
+            $trianglify_seed = null;
+            if (Setting::fetch('trianglify')) {
+                $trianglify = 'true';
+                $trianglify_seed = Setting::fetch('trianglify_seed');
+            } elseif ($bg_image = Setting::fetch('background_image')) {
                 $alt_bg = ' style="background-image: url(storage/'.$bg_image.')"';
             }
 
@@ -98,8 +87,15 @@ class AppServiceProvider extends ServiceProvider
             $current_user = User::currentUser();
 
             $view->with('alt_bg', $alt_bg);
+            $view->with('trianglify', $trianglify);
+            $view->with('trianglify_seed', $trianglify_seed);
             $view->with('allusers', $allusers);
             $view->with('current_user', $current_user);
+            if (config('app.auth_roles_enable')) {
+                $view->with('enable_auth_admin_controls', in_array(config('app.auth_roles_admin'), explode(config('app.auth_roles_delimiter'), $_SERVER[config('app.auth_roles_http_header')])));
+            } else {
+                $view->with('enable_auth_admin_controls', true);
+            }
         });
 
         $this->app['view']->addNamespace('SupportedApps', app_path('SupportedApps'));
@@ -115,10 +111,8 @@ class AppServiceProvider extends ServiceProvider
 
     /**
      * Generate app key if missing and .env exists
-     *
-     * @return void
      */
-    public function genKey()
+    public function genKey(): void
     {
         if (is_file(base_path('.env'))) {
             if (empty(env('APP_KEY'))) {
@@ -129,13 +123,76 @@ class AppServiceProvider extends ServiceProvider
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
+        if ($this->app->isLocal()) {
+            $this->app->register(IdeHelperServiceProvider::class);
+        }
+
+        $this->app->singleton('custom-form', function ($app) {
+            return new CustomFormBuilder($app->make(Html::class));
+        });
+
         $this->app->singleton('settings', function () {
             return new Setting();
         });
     }
+
+    /**
+     * Check if database needs an update or do first time database setup
+     *
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    public function setupDatabase(): void
+    {
+        $db_type = config()->get('database.default');
+
+        if ($db_type == 'sqlite') {
+            $db_file = database_path(env('DB_DATABASE', 'app.sqlite'));
+            Log::debug('SQLite Database Path: ' . $db_file);
+            if (! is_file($db_file)) {
+                touch($db_file);
+            }
+        }
+
+        if ($this->needsDBUpdate()) {
+            Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
+            ProcessApps::dispatchSync();
+            $this->updateApps();
+        }
+    }
+
+    public function createEnvFile(): void
+    {
+        if (!is_file(base_path('.env'))) {
+            copy(base_path('.env.example'), base_path('.env'));
+        }
+
+        $this->genKey();
+    }
+
+    private function needsDBUpdate(): bool
+    {
+        if (!Schema::hasTable('settings')) {
+            return true;
+        }
+
+        $db_version = Setting::_fetch('version');
+        $app_version = config('app.version');
+
+        return version_compare($app_version, $db_version) === 1;
+    }
+
+    private function updateApps(): void
+    {
+        // This lock ensures that the job is not invoked multiple times.
+        // In 5 minutes all app updates should be finished.
+        $lock = Cache::lock('updateApps', 5*60);
+
+        if ($lock->get()) {
+            UpdateApps::dispatchAfterResponse();
+        }
+    }
 }

app/Providers/AuthServiceProvider.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
-
-class AuthServiceProvider extends ServiceProvider
-{
-    /**
-     * The policy mappings for the application.
-     *
-     * @var array
-     */
-    protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
-    ];
-
-    /**
-     * Register any authentication / authorization services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->registerPolicies();
-
-        //
-    }
-}

app/Providers/BroadcastServiceProvider.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\Facades\Broadcast;
-use Illuminate\Support\ServiceProvider;
-
-class BroadcastServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        Broadcast::routes();
-
-        require base_path('routes/channels.php');
-    }
-}

app/Providers/EventServiceProvider.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        'App\Events\Event' => [
-            'App\Listeners\EventListener',
-        ],
-    ];
-
-    /**
-     * Register any events for your application.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
-
-        //
-    }
-}

app/Providers/RouteServiceProvider.php

@@ -12,16 +12,13 @@ class RouteServiceProvider extends ServiceProvider
      *
      * In addition, it is set as the URL generator's root namespace.
      *
-     * @var string
+     * REMOVED WITH LARAVEL 8 UPGRADE
      */
-    protected $namespace = 'App\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
 
@@ -30,10 +27,8 @@ class RouteServiceProvider extends ServiceProvider
 
     /**
      * Define the routes for the application.
-     *
-     * @return void
      */
-    public function map()
+    public function map(): void
     {
         $this->mapApiRoutes();
 
@@ -46,13 +41,10 @@ class RouteServiceProvider extends ServiceProvider
      * Define the "web" routes for the application.
      *
      * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
      */
-    protected function mapWebRoutes()
+    protected function mapWebRoutes(): void
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
              ->group(base_path('routes/web.php'));
     }
 
@@ -60,14 +52,11 @@ class RouteServiceProvider extends ServiceProvider
      * Define the "api" routes for the application.
      *
      * These routes are typically stateless.
-     *
-     * @return void
      */
-    protected function mapApiRoutes()
+    protected function mapApiRoutes(): void
     {
         Route::prefix('api')
              ->middleware('api')
-             ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }
 }

app/Search.php

@@ -2,12 +2,8 @@
 
 namespace App;
 
-use App\Item;
-use App\Setting;
-use Cache;
-use Form;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Request as Input;
 use Yaml;
 
 abstract class Search
@@ -15,9 +11,9 @@ abstract class Search
     /**
      * List of all search providers
      *
-     * @return array
+     * @return Collection
      */
-    public static function providers()
+    public static function providers(): Collection
     {
         $providers = self::standardProviders();
         $providers = $providers + self::appProviders();
@@ -28,7 +24,7 @@ abstract class Search
     /**
      * Gets details for a single provider
      *
-     * @return object
+     * @return false|object
      */
     public static function providerDetails($provider)
     {
@@ -45,7 +41,7 @@ abstract class Search
      *
      * @return array
      */
-    public static function standardProviders()
+    public static function standardProviders(): array
     {
         // $providers = json_decode(file_get_contents(storage_path('app/searchproviders.json')));
         // print_r($providers);
@@ -65,7 +61,7 @@ abstract class Search
      *
      * @return array
      */
-    public static function appProviders()
+    public static function appProviders(): array
     {
         $providers = [];
         $userapps = Item::all();
@@ -94,9 +90,9 @@ abstract class Search
     /**
      * Outputs the search form
      *
-     * @return html
+     * @return string
      */
-    public static function form()
+    public static function form(): string
     {
         $output = '';
         $homepage_search = Setting::fetch('homepage_search');
@@ -109,23 +105,38 @@ abstract class Search
         if ((bool) $homepage_search !== true) {
             return $output;
         }
-        $user_search_provider = $user_search_provider ?? 'none';
+        $user_search_provider = Input::get('p') ?? $user_search_provider ?? 'none';
 
-        if ((bool) $homepage_search && (bool) $search_provider) {
+        if ((bool) $search_provider) {
             if ((bool) $user_search_provider) {
                 $name = 'app.options.'.$user_search_provider;
                 $provider = self::providerDetails($user_search_provider);
+                $providers = self::providers();
+                $providerCount = count($providers);
+
+                // If there's only one provider, use its key instead of the user's setting
+                if ($providerCount === 1) {
+                    $user_search_provider = $providers->keys()->first();
+                }
 
                 $output .= '<div class="searchform">';
                 $output .= '<form action="'.url('search').'"'.getLinkTargetAttribute().' method="get">';
                 $output .= '<div id="search-container" class="input-container">';
-                $output .= '<select name="provider">';
-                foreach (self::providers() as $key => $searchprovider) {
-                    $selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
-                    $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
+                
+                // Only show dropdown if there's more than one provider
+                if ($providerCount > 1) {
+                    $output .= '<select name="provider">';
+                    foreach ($providers as $key => $searchprovider) {
+                        $selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
+                        $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
+                    }
+                    $output .= '</select>';
+                } else {
+                    // Hidden input for single provider
+                    $output .= '<input type="hidden" name="provider" value="'.$user_search_provider.'" />';
                 }
-                $output .= '</select>';
-                $output .= Form::text('q', null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __('app.settings.search').'...']);
+                
+                $output .= '<input type="text" name="q" value="'.e(Input::get('q') ?? '').'" class="homesearch" autofocus placeholder="'.__('app.settings.search').'..." />';
                 $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
                 $output .= '</div>';
                 $output .= '</form>';

app/SearchInterface.php

@@ -2,9 +2,6 @@
 
 namespace App;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-
 interface SearchInterface
 {
     public function getResults($query, $providerdetails);

app/Services/CustomFormBuilder.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Services;
+
+use Spatie\Html\Html;
+use Illuminate\Support\HtmlString;
+
+class CustomFormBuilder
+{
+    protected Html $html;
+
+    public function __construct(Html $html)
+    {
+        $this->html = $html;
+    }
+
+    public function text($name, $value = null, $options = [])
+    {
+        return new HtmlString(
+            $this->html->input('text', $name, $value)->attributes($options)
+        );
+    }
+
+    public function password($name, $options = [])
+    {
+        return new HtmlString(
+            $this->html->input('password', $name)->attributes($options)
+        );
+    }
+
+    public function hidden($name, $value = null, $options = [])
+    {
+        return new HtmlString(
+            $this->html->input('hidden', $name, $value)->attributes($options)
+        );
+    }
+
+    public function checkbox($name, $value = null, $checked = false, $options = [])
+    {
+        return new HtmlString(
+            $this->html->checkbox($name, $value, $checked)->attributes($options)
+        );
+    }
+
+    public function select($name, $list = [], $selected = null, $options = [])
+    {
+        return new HtmlString(
+            $this->html->select($name)->options($list, $selected)->attributes($options)
+        );
+    }
+
+    public function textarea($name, $value = null, $options = [])
+    {
+        return new HtmlString(
+            $this->html->textarea($name, $value)->attributes($options)
+        );
+    }
+
+    public function input($type, $name, $value = null, $options = [])
+    {
+        return new HtmlString(
+            $this->html->input($type, $name, $value)->attributes($options)
+        );
+    }
+
+    // Add other methods as needed
+}

app/Setting.php

@@ -2,14 +2,46 @@
 
 namespace App;
 
-use App\Search;
-use App\User;
-use Form;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Session\SessionManager;
+use Illuminate\Session\Store;
+use enshrined\svgSanitize\Sanitizer;
 
+/**
+ * App\Setting
+ *
+ * @mixin Builder
+ * @property int $id
+ * @property int $group_id
+ * @property string $key
+ * @property string $type
+ * @property string|null $options
+ * @property string $label
+ * @property string|null $value
+ * @property string $order
+ * @property int $system
+ * @property-read mixed $edit_value
+ * @property-read mixed $list_value
+ * @property-read \App\SettingGroup|null $group
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\User[] $users
+ * @property-read int|null $users_count
+ * @method static Builder|Setting newModelQuery()
+ * @method static Builder|Setting newQuery()
+ * @method static Builder|Setting query()
+ * @method static Builder|Setting whereGroupId($value)
+ * @method static Builder|Setting whereId($value)
+ * @method static Builder|Setting whereKey($value)
+ * @method static Builder|Setting whereLabel($value)
+ * @method static Builder|Setting whereOptions($value)
+ * @method static Builder|Setting whereOrder($value)
+ * @method static Builder|Setting whereSystem($value)
+ * @method static Builder|Setting whereType($value)
+ * @method static Builder|Setting whereValue($value)
+ */
 class Setting extends Model
 {
     /**
@@ -37,14 +69,25 @@ class Setting extends Model
      */
     protected static $cache = [];
 
-    /**
-     * @return array
-     */
-    public static function getInput(Request $request)
+    public static function getInput(Request $request): object
     {
+        $image = $request->file('value');
+        if ($image && $image->getClientOriginalExtension() === 'svg') {
+            $sanitizer = new Sanitizer();
+            $sanitizedSvg = $sanitizer->sanitize(file_get_contents($image->getRealPath()));
+
+            // Verify that the sanitization removed malicious content
+            if (strpos($sanitizedSvg, '<script>') !== false) {
+                throw new \Exception('SVG contains malicious content and cannot be uploaded.');
+            }
+
+            // Save the sanitized SVG back to the file
+            file_put_contents($image->getRealPath(), $sanitizedSvg);
+        }
+
         return (object) [
             'value' => $request->input('value'),
-            'image' => $request->file('value'),
+            'image' => $image,
         ];
     }
 
@@ -59,7 +102,11 @@ class Setting extends Model
         switch ($this->type) {
             case 'image':
                 if (! empty($this->value)) {
-                    $value = '<a href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank">'.__('app.settings.view').'</a>';
+                    $value = '<a href="'.asset('storage/'.$this->value).'" title="'.
+                        __('app.settings.view').
+                        '" target="_blank">'.
+                        __('app.settings.view').
+                        '</a>';
                 } else {
                     $value = __('app.options.none');
                 }
@@ -77,7 +124,9 @@ class Setting extends Model
                     if ($this->key === 'search_provider') {
                         $options = Search::providers()->pluck('name', 'id')->toArray();
                     }
-                    $value = __($options[$this->value]);
+                    $value = (array_key_exists($this->value, $options))
+                        ? __($options[$this->value])
+                        : __('app.options.none');
                 } else {
                     $value = __('app.options.none');
                 }
@@ -101,74 +150,88 @@ class Setting extends Model
         switch ($this->type) {
             case 'image':
                 $value = '';
-                if (isset($this->value) && ! empty($this->value)) {
-                    $value .= '<a class="setting-view-image" href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank"><img src="'.asset('storage/'.$this->value).'" /></a>';
+                if (isset($this->value) && !empty($this->value)) {
+                    $value .= '<a class="setting-view-image" href="' .
+                        asset('storage/' . $this->value) .
+                        '" title="' .
+                        __('app.settings.view') .
+                        '" target="_blank"><img src="' .
+                        asset('storage/' .
+                            $this->value) .
+                        '" /></a>';
                 }
-                $value .= Form::file('value', ['class' => 'form-control']);
-                if (isset($this->value) && ! empty($this->value)) {
-                    $value .= '<a class="settinglink" href="'.route('settings.clear', $this->id).'" title="'.__('app.settings.remove').'">'.__('app.settings.reset').'</a>';
+                $value .= '<input type="file" name="value" class="form-control" />';
+                if (isset($this->value) && !empty($this->value)) {
+                    $value .= '<a class="settinglink" href="' .
+                        route('settings.clear', $this->id) .
+                        '" title="' .
+                        __('app.settings.remove') .
+                        '">' .
+                        __('app.settings.reset') .
+                        '</a>';
                 }
-
+    
                 break;
             case 'boolean':
                 $checked = false;
-                if (isset($this->value) && (bool) $this->value === true) {
+                if (isset($this->value) && (bool)$this->value === true) {
                     $checked = true;
                 }
                 $set_checked = ($checked) ? ' checked="checked"' : '';
                 $value = '
                 <input type="hidden" name="value" value="0" />
                 <label class="switch">
-                    <input type="checkbox" name="value" value="1"'.$set_checked.' />
+                    <input type="checkbox" name="value" value="1"' . $set_checked . ' />
                     <span class="slider round"></span>
                 </label>';
-
+    
                 break;
             case 'select':
                 $options = json_decode($this->options);
                 if ($this->key === 'search_provider') {
                     $options = Search::providers()->pluck('name', 'id');
                 }
+                $value = '<select name="value" class="form-control">';
                 foreach ($options as $key => $opt) {
-                    $options->$key = __($opt);
+                    $value .= '<option value="' . $key . '" ' . (($this->value == $key) ? 'selected' : '') . '>' . __($opt) . '</option>';
                 }
-                $value = Form::select('value', $options, null, ['class' => 'form-control']);
+                $value .= '</select>';
                 break;
             case 'textarea':
-                $value = Form::textarea('value', null, ['class' => 'form-control', 'cols' => '44', 'rows' => '15']);
+                $value = '<textarea name="value" class="form-control" cols="44" rows="15">' . htmlspecialchars($this->value, ENT_QUOTES, 'UTF-8') . '</textarea>';
                 break;
             default:
-                $value = Form::text('value', null, ['class' => 'form-control']);
+                $value = '<input type="text" name="value" class="form-control" value="' . htmlspecialchars($this->value, ENT_QUOTES, 'UTF-8') . '" />';
                 break;
         }
-
+    
         return $value;
     }
-
-    public function group()
+    
+    public function group(): BelongsTo
     {
         return $this->belongsTo(\App\SettingGroup::class, 'group_id');
     }
 
     /**
-     * @param string $key
      *
      * @return mixed
      */
-    public static function fetch($key)
+    public static function fetch(string $key)
     {
         $user = self::user();
 
         return self::_fetch($key, $user);
     }
 
+    // @codingStandardsIgnoreStart
     /**
-     * @param string $key
      *
      * @return mixed
      */
-    public static function _fetch($key, $user = null)
+    public static function _fetch(string $key, $user = null)
     {
+        // @codingStandardsIgnoreEnd
         //$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
         //if (Setting::cached($cachekey)) {
         //    return Setting::$cache[$cachekey];
@@ -209,20 +272,14 @@ class Setting extends Model
     }
 
     /**
-     * @param string $key
      * @param $value
      */
-    public static function add($key, $value)
+    public static function add(string $key, $value)
     {
         self::$cache[$key] = $value;
     }
 
-    /**
-     * @param string $key
-     *
-     * @return bool
-     */
-    public static function cached($key)
+    public static function cached(string $key): bool
     {
         return array_key_exists($key, self::$cache);
     }
@@ -230,11 +287,14 @@ class Setting extends Model
     /**
      * The users that belong to the setting.
      */
-    public function users()
+    public function users(): BelongsToMany
     {
         return $this->belongsToMany(\App\User::class)->using(\App\SettingUser::class)->withPivot('uservalue');
     }
 
+    /**
+     * @return \Illuminate\Contracts\Foundation\Application|SessionManager|Store|mixed
+     */
     public static function user()
     {
         return User::currentUser();

app/SettingGroup.php

@@ -3,7 +3,24 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
+/**
+ * App\SettingGroup
+ *
+ * @property int $id
+ * @property string $title
+ * @property int $order
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Setting[] $settings
+ * @property-read int|null $settings_count
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup query()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup whereOrder($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingGroup whereTitle($value)
+ * @mixin \Eloquent
+ */
 class SettingGroup extends Model
 {
     /**
@@ -20,7 +37,7 @@ class SettingGroup extends Model
      */
     public $timestamps = false;
 
-    public function settings()
+    public function settings(): HasMany
     {
         return $this->hasMany(\App\Setting::class, 'group_id');
     }

app/SettingUser.php

@@ -4,6 +4,20 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
+/**
+ * App\SettingUser
+ *
+ * @property int $setting_id
+ * @property int $user_id
+ * @property string|null $uservalue
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser query()
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser whereSettingId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|SettingUser whereUservalue($value)
+ * @mixin \Eloquent
+ */
 class SettingUser extends Pivot
 {
     //

app/SupportedApps.php

@@ -3,8 +3,11 @@
 namespace App;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\ServerException;
 use Illuminate\Support\Facades\Log;
+use Psr\Http\Message\ResponseInterface;
 
 abstract class SupportedApps
 {
@@ -14,7 +17,13 @@ abstract class SupportedApps
 
     protected $error;
 
-    public function appTest($url, $attrs = [], $overridevars = false)
+    /**
+     * @param $url
+     * @param array $attrs
+     * @return object
+     * @throws GuzzleException
+     */
+    public function appTest($url, array $attrs = []): object
     {
         if (empty($this->config->url)) {
             return (object) [
@@ -53,28 +62,41 @@ abstract class SupportedApps
         ];
     }
 
-    public function execute($url, $attrs = [], $overridevars = false, $overridemethod = false)
-    {
+    /**
+     * @param $url
+     * @param array $attrs
+     * @param array|bool|null $overridevars
+     * @param string|bool|null $overridemethod
+     * @return ResponseInterface|null
+     * @throws GuzzleException
+     */
+    public function execute(
+        $url,
+        array $attrs = [],
+        $overridevars = null,
+        $overridemethod = null
+    ): ?ResponseInterface {
         $res = null;
 
-        $vars = ($overridevars !== false) ?
-        $overridevars : [
+        $vars = ($overridevars === null || $overridevars === false) ?
+         [
             'http_errors' => false,
             'timeout' => 15,
             'connect_timeout' => 15,
-        ];
+        ] : $overridevars;
 
         $client = new Client($vars);
 
-        $method = ($overridemethod !== false) ? $overridemethod : $this->method;
+        $method = ($overridemethod === null || $overridemethod === false) ? $this->method : $overridemethod;
+
 
         try {
             return $client->request($method, $url, $attrs);
-        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+        } catch (ConnectException $e) {
             Log::error('Connection refused');
             Log::debug($e->getMessage());
             $this->error = 'Connection refused - '.(string) $e->getMessage();
-        } catch (\GuzzleHttp\Exception\ServerException $e) {
+        } catch (ServerException $e) {
             Log::debug($e->getMessage());
             $this->error = (string) $e->getResponse()->getBody();
         }
@@ -83,11 +105,19 @@ abstract class SupportedApps
         return $res;
     }
 
+    /**
+     * @return void
+     */
     public function login()
     {
     }
 
-    public function normaliseurl($url, $addslash = true)
+    /**
+     * @param string $url
+     * @param bool $addslash
+     * @return string
+     */
+    public function normaliseurl(string $url, bool $addslash = true): string
     {
         $url = rtrim($url, '/');
         if ($addslash) {
@@ -97,9 +127,14 @@ abstract class SupportedApps
         return $url;
     }
 
+    /**
+     * @param $status
+     * @param $data
+     * @return false|string
+     */
     public function getLiveStats($status, $data)
     {
-        $className = get_class($this);
+        $className = $this::class;
         $explode = explode('\\', $className);
         $name = end($explode);
 
@@ -109,7 +144,11 @@ abstract class SupportedApps
         //return
     }
 
-    public static function getList()
+    /**
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public static function getList(): ResponseInterface
     {
         // $list_url = 'https://apps.heimdall.site/list';
         $list_url = config('app.appsource').'list.json';
@@ -127,13 +166,25 @@ abstract class SupportedApps
         }
     }
 
-    public static function getFiles($app)
+    /**
+     * @param $app
+     * @return bool|false
+     * @throws GuzzleException
+     */
+    public static function getFiles($app): bool
     {
+        Log::debug("Download triggered for ".print_r($app, true));
+
         $zipurl = config('app.appsource').'files/'.$app->sha.'.zip';
 
-        $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15]);
+        $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15, 'verify' => false]);
         $res = $client->request('GET', $zipurl);
 
+        // Something went wrong?
+        if ($res->getStatusCode() !== 200) {
+            return false;
+        }
+
         if (! file_exists(app_path('SupportedApps'))) {
             mkdir(app_path('SupportedApps'), 0777, true);
         }
@@ -149,9 +200,16 @@ abstract class SupportedApps
             unlink($src); //Deleting the Zipped file
         } else {
             var_dump($x);
+            return false;
         }
+        return true;
     }
 
+    /**
+     * @param $details
+     * @param $app
+     * @return mixed
+     */
     public static function saveApp($details, $app)
     {
         $app->appid = $details->appid;

app/User.php

@@ -2,13 +2,54 @@
 
 namespace App;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
+// @codingStandardsIgnoreStart
+/**
+ * App\User
+ *
+ * @property int $id
+ * @property string $username
+ * @property string $email
+ * @property string|null $avatar
+ * @property string|null $password
+ * @property string|null $autologin
+ * @property int $public_front
+ * @property string|null $remember_token
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Item[] $items
+ * @property-read int|null $items_count
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
+ * @property-read int|null $notifications_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Setting[] $settings
+ * @property-read int|null $settings_count
+ * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|User query()
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereAutologin($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereAvatar($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User wherePublicFront($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereUsername($value)
+ * @mixin \Eloquent
+ */
+// @codingStandardsIgnoreEnd
 class User extends Authenticatable
 {
     use Notifiable;
 
+    use HasFactory;
+
     /**
      * The attributes that are mass assignable.
      *
@@ -27,20 +68,28 @@ class User extends Authenticatable
         'password', 'remember_token',
     ];
 
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
     /**
      * Get the items for the user.
      */
-    public function items()
+    public function items(): HasMany
     {
-        return $this->hasMany(\App\Item::class);
+        return $this->hasMany(Item::class);
     }
 
     /**
      * The settings that belong to the user.
      */
-    public function settings()
+    public function settings(): BelongsToMany
     {
-        return $this->belongsToMany(\App\Setting::class)->withPivot('uservalue');
+        return $this->belongsToMany(Setting::class)->withPivot('uservalue');
     }
 
     public static function currentUser()

artisan

@@ -1,53 +1,15 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Component\Console\Input\ArgvInput;
+
 define('LARAVEL_START', microtime(true));
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-
+// Register the Composer autoloader...
 require __DIR__.'/vendor/autoload.php';
 
-$app = require_once __DIR__.'/bootstrap/app.php';
-
-/*
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
-
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
-
-$status = $kernel->handle(
-    $input = new Symfony\Component\Console\Input\ArgvInput,
-    new Symfony\Component\Console\Output\ConsoleOutput
-);
-
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
-
-$kernel->terminate($input, $status);
+// Bootstrap Laravel and handle the command...
+$status = (require_once __DIR__.'/bootstrap/app.php')
+    ->handleCommand(new ArgvInput);
 
 exit($status);

bootstrap/app.php

@@ -1,55 +1,43 @@
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Create The Application
-|--------------------------------------------------------------------------
-|
-| The first thing we will do is create a new Laravel application instance
-| which serves as the "glue" for all the components of Laravel, and is
-| the IoC container for the system binding all of the various parts.
-|
-*/
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Configuration\Exceptions;
+use Illuminate\Foundation\Configuration\Middleware;
 
-$app = new Illuminate\Foundation\Application(
-    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
-);
+return Application::configure(basePath: dirname(__DIR__))
+    ->withProviders([
+        \Spatie\Html\HtmlServiceProvider::class,
+    ])
+    ->withRouting(
+        web: __DIR__.'/../routes/web.php',
+        api: __DIR__.'/../routes/api.php',
+        commands: __DIR__.'/../routes/console.php',
+        channels: __DIR__.'/../routes/channels.php',
+        health: '/up',
+    )
+    ->withMiddleware(function (Middleware $middleware) {
+        $middleware->redirectGuestsTo(fn () => route('login'));
 
-/*
-|--------------------------------------------------------------------------
-| Bind Important Interfaces
-|--------------------------------------------------------------------------
-|
-| Next, we need to bind some important interfaces into the container so
-| we will be able to resolve them when needed. The kernels serve the
-| incoming requests to this application from both the web and CLI.
-|
-*/
+        $middleware->validateCsrfTokens(except: [
+            //
+            'order',
+            'appload',
+            'test_config',
+            //'get_stats'
+        ]);
 
-$app->singleton(
-    Illuminate\Contracts\Http\Kernel::class,
-    App\Http\Kernel::class
-);
+        $middleware->append(\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class);
 
-$app->singleton(
-    Illuminate\Contracts\Console\Kernel::class,
-    App\Console\Kernel::class
-);
+        $middleware->throttleApi('60,1');
 
-$app->singleton(
-    Illuminate\Contracts\Debug\ExceptionHandler::class,
-    App\Exceptions\Handler::class
-);
+        $middleware->replace(\Illuminate\Http\Middleware\TrustProxies::class, \App\Http\Middleware\TrustProxies::class);
 
-/*
-|--------------------------------------------------------------------------
-| Return The Application
-|--------------------------------------------------------------------------
-|
-| This script returns the application instance. The instance is given to
-| the calling script so we can separate the building of the instances
-| from the actual running of the application and sending responses.
-|
-*/
-
-return $app;
+        $middleware->alias([
+            'allowed' => \App\Http\Middleware\CheckAllowed::class,
+            'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        ]);
+    })
+    ->withExceptions(function (Exceptions $exceptions) {
+        //
+    })->create();

bootstrap/providers.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    App\Providers\AppServiceProvider::class,
+    App\Providers\FormMacroServiceProvider::class,
+    App\Providers\RouteServiceProvider::class,
+];

composer.json

@@ -1,37 +1,49 @@
 {
     "name": "laravel/laravel",
     "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+    "keywords": [
+        "framework",
+        "laravel"
+    ],
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.2.5",
-        "fideloper/proxy": "^4.0",
-        "graham-campbell/github": "^10.5",
-        "guzzlehttp/guzzle": "^7.4",
-        "laravel/framework": "^7.0",
-        "laravel/tinker": "^2.0",
-        "laravel/ui": "^2.4",
-        "laravelcollective/html": "^6.0",
-        "symfony/yaml": "^5.4"
+        "php": "^8.2",
+        "ext-intl": "*",
+        "ext-json": "*",
+        "enshrined/svg-sanitize": "^0.21.0",
+        "graham-campbell/github": "^12.5",
+        "guzzlehttp/guzzle": "^7.8",
+        "laravel/framework": "^11.45",
+        "laravel/tinker": "^2.9",
+        "laravel/ui": "^4.4",
+        "league/flysystem-aws-s3-v3": "^3.0",
+        "nunomaduro/collision": "^8.0",
+        "spatie/laravel-html": "^3.11",
+        "spatie/laravel-ignition": "^2.4",
+        "symfony/yaml": "^7.0"
     },
     "require-dev": {
-        "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~6.0",
-        "symfony/thanks": "^1.0"
+        "barryvdh/laravel-ide-helper": "^3.0",
+        "filp/whoops": "^2.8",
+        "mockery/mockery": "^1.6",
+        "phpunit/phpunit": "^10.5",
+        "squizlabs/php_codesniffer": "3.*",
+        "symfony/thanks": "^1.2",
+        "fakerphp/faker": "^1.23"
     },
     "autoload": {
         "classmap": [
-            "database/seeds",
+            "database/seeders",
             "database/factories"
         ],
         "files": [
             "app/Helper.php"
         ],
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
@@ -42,6 +54,7 @@
     "extra": {
         "laravel": {
             "dont-discover": [
+                "barryvdh/laravel-ide-helper"
             ]
         }
     },
@@ -55,6 +68,12 @@
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover"
+        ],
+        "post-update-cmd": [
+            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
+            "@php artisan ide-helper:generate",
+            "@php artisan ide-helper:meta",
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ]
     },
     "config": {
@@ -63,7 +82,10 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "kylekatarnls/update-helper": true,
-            "symfony/thanks": true
+            "symfony/thanks": true,
+            "php-http/discovery": true
         }
-    }
+    },
+    "minimum-stability": "stable",
+    "prefer-stable": true
 }

config/app.php

@@ -1,240 +1,32 @@
 <?php
 
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Facade;
+
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Name
-    |--------------------------------------------------------------------------
-    |
-    | This value is the name of your application. This value is used when the
-    | framework needs to place the application's name in a notification or
-    | any other location as required by the application or its packages.
-    |
-    */
+    'version' => '2.7.7',
 
-    'name' => env('APP_NAME', 'Heimdall'),
-    'version' => '2.4.9',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Environment
-    |--------------------------------------------------------------------------
-    |
-    | This value determines the "environment" your application is currently
-    | running in. This may determine how you prefer to configure various
-    | services your application utilizes. Set this in your ".env" file.
-    |
-    */
-
-    'env' => env('APP_ENV', 'production'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Debug Mode
-    |--------------------------------------------------------------------------
-    |
-    | When your application is in debug mode, detailed error messages with
-    | stack traces will be shown on every error that occurs within your
-    | application. If disabled, a simple generic error page is shown.
-    |
-    */
-
-    'debug' => (bool) env('APP_DEBUG', false),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application URL
-    |--------------------------------------------------------------------------
-    |
-    | This URL is used by the console to properly generate URLs when using
-    | the Artisan command line tool. You should set this to the root of
-    | your application so that it is used when running Artisan tasks.
-    |
-    */
-
-    'url' => env('APP_URL', 'http://localhost'),
-
-    'asset_url' => env('ASSET_URL', null),
     'appsource' => env('APP_SOURCE', 'https://appslist.heimdall.site/'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Application Timezone
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the default timezone for your application, which
-    | will be used by the PHP date and date-time functions. We have gone
-    | ahead and set this to a sensible default for you out of the box.
-    |
-    */
+    'allow_internal_requests' => env('ALLOW_INTERNAL_REQUESTS', false),
 
-    'timezone' => 'UTC',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Locale Configuration
-    |--------------------------------------------------------------------------
-    |
-    | The application locale determines the default locale that will be used
-    | by the translation service provider. You are free to set this value
-    | to any of the locales which will be supported by the application.
-    |
-    */
-
-    'locale' => 'en',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Fallback Locale
-    |--------------------------------------------------------------------------
-    |
-    | The fallback locale determines the locale to use when the current one
-    | is not available. You may change the value to correspond to any of
-    | the language folders that are provided through your application.
-    |
-    */
-
-    'fallback_locale' => 'en',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Faker Locale
-    |--------------------------------------------------------------------------
-    |
-    | This locale will be used by the Faker PHP library when generating fake
-    | data for your database seeds. For example, this will be used to get
-    | localized telephone numbers, street address information and more.
-    |
-    */
-
-    'faker_locale' => 'en_US',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Encryption Key
-    |--------------------------------------------------------------------------
-    |
-    | This key is used by the Illuminate encrypter service and should be set
-    | to a random, 32 character string, otherwise these encrypted strings
-    | will not be safe. Please do this before deploying an application!
-    |
-    */
-
-    'key' => env('APP_KEY', 'base64:I206O8ibx+GQyRE7BeOxDobn04Mfmyyc5Ptzns/C0mY='),
-
-    'cipher' => 'AES-256-CBC',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Autoloaded Service Providers
-    |--------------------------------------------------------------------------
-    |
-    | The service providers listed here will be automatically loaded on the
-    | request to your application. Feel free to add your own services to
-    | this array to grant expanded functionality to your applications.
-    |
-    */
-
-    'providers' => [
-
-        /*
-         * Laravel Framework Service Providers...
-         */
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Translation\TranslationServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
-        /*
-         * Package Service Providers...
-         */
-        Collective\Html\HtmlServiceProvider::class,
-        /*
-         * Application Service Providers...
-         */
-        App\Providers\AppServiceProvider::class,
-        App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
-        App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Class Aliases
-    |--------------------------------------------------------------------------
-    |
-    | This array of class aliases will be registered when this application
-    | is started. However, feel free to register as many as you wish as
-    | the aliases are "lazy" loaded so they don't hinder performance.
-    |
-    */
-
-    'aliases' => [
-
-        'App' => Illuminate\Support\Facades\App::class,
-        'Arr' => Illuminate\Support\Arr::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Form' => Collective\Html\FormFacade::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Html' => Collective\Html\HtmlFacade::class,
-        'Http' => Illuminate\Support\Facades\Http::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Mail' => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Redis' => Illuminate\Support\Facades\Redis::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'Str' => Illuminate\Support\Str::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
-        'Yaml' => Symfony\Component\Yaml\Yaml::class,
-
-        'SupportedApps' => App\SupportedApps::class,
+    'aliases' => Facade::defaultAliases()->merge([
         'EnhancedApps' => App\EnhancedApps::class,
+        'Form' => App\Facades\Form::class,
+        'Redis' => Illuminate\Support\Facades\Redis::class,
+        'SupportedApps' => App\SupportedApps::class,
+        'Yaml' => Symfony\Component\Yaml\Yaml::class,
+    ])->toArray(),
 
-    ],
+    'auth_roles_enable' =>  (bool) env('AUTH_ROLES_ENABLE', false),
+
+    'auth_roles_header' =>  env('AUTH_ROLES_HEADER', 'remote-groups'),
+
+    'auth_roles_http_header' =>  env('AUTH_ROLES_HTTP_HEADER', 'HTTP_REMOTE_GROUPS'),
+
+    'auth_roles_admin' =>  env('AUTH_ROLES_ADMIN', 'admin'),
+
+    'auth_roles_delimiter' =>  env('AUTH_ROLES_DELIMITER', ','),
 
 ];

config/auth.php

@@ -2,116 +2,18 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Defaults
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default authentication "guard" and password
-    | reset options for your application. You may change these defaults
-    | as required, but they're a perfect start for most applications.
-    |
-    */
-
-    'defaults' => [
-        'guard' => 'web',
-        'passwords' => 'users',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Guards
-    |--------------------------------------------------------------------------
-    |
-    | Next, you may define every authentication guard for your application.
-    | Of course, a great default configuration has been defined for you
-    | here which uses session storage and the Eloquent user provider.
-    |
-    | All authentication drivers have a user provider. This defines how the
-    | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
-    |
-    | Supported: "session", "token"
-    |
-    */
-
     'guards' => [
-        'web' => [
-            'driver' => 'session',
-            'provider' => 'users',
-        ],
-
         'api' => [
             'driver' => 'token',
             'provider' => 'users',
             'hash' => false,
         ],
     ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | User Providers
-    |--------------------------------------------------------------------------
-    |
-    | All authentication drivers have a user provider. This defines how the
-    | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
-    |
-    | If you have multiple user tables or models you may configure multiple
-    | sources which represent each model / table. These sources may then
-    | be assigned to any extra authentication guards you have defined.
-    |
-    | Supported: "database", "eloquent"
-    |
-    */
-
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
-        ],
-
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Resetting Passwords
-    |--------------------------------------------------------------------------
-    |
-    | You may specify multiple password reset configurations if you have more
-    | than one user table or model in the application and you want to have
-    | separate password reset settings based on the specific user types.
-    |
-    | The expire time is the number of minutes that the reset token should be
-    | considered valid. This security feature keeps tokens short-lived so
-    | they have less time to be guessed. You may change this as needed.
-    |
-    */
-
-    'passwords' => [
-        'users' => [
-            'provider' => 'users',
-            'table' => 'password_resets',
-            'expire' => 60,
-            'throttle' => 60,
+            'model' => App\User::class, // Update this to the correct namespace
         ],
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Password Confirmation Timeout
-    |--------------------------------------------------------------------------
-    |
-    | Here you may define the amount of seconds before a password confirmation
-    | times out and the user is prompted to re-enter their password via the
-    | confirmation screen. By default, the timeout lasts for three hours.
-    |
-    */
-
-    'password_timeout' => 10800,
-
 ];

config/broadcasting.php

@@ -1,59 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Broadcaster
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default broadcaster that will be used by the
-    | framework when an event needs to be broadcast. You may set this to
-    | any of the connections defined in the "connections" array below.
-    |
-    | Supported: "pusher", "redis", "log", "null"
-    |
-    */
-
-    'default' => env('BROADCAST_DRIVER', 'null'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Broadcast Connections
-    |--------------------------------------------------------------------------
-    |
-    | Here you may define all of the broadcast connections that will be used
-    | to broadcast events to other systems or over websockets. Samples of
-    | each available type of connection are provided inside this array.
-    |
-    */
-
-    'connections' => [
-
-        'pusher' => [
-            'driver' => 'pusher',
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
-            'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS' => true,
-            ],
-        ],
-
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-        ],
-
-        'log' => [
-            'driver' => 'log',
-        ],
-
-        'null' => [
-            'driver' => 'null',
-        ],
-
-    ],
-
-];

config/cache.php

@@ -1,103 +0,0 @@
-<?php
-
-use Illuminate\Support\Str;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Cache Store
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default cache connection that gets used while
-    | using this caching library. This connection is used when another is
-    | not explicitly specified when executing a given caching function.
-    |
-    | Supported: "apc", "array", "database", "file", "memcached", "redis"
-    |
-    */
-
-    'default' => env('CACHE_DRIVER', 'file'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Cache Stores
-    |--------------------------------------------------------------------------
-    |
-    | Here you may define all of the cache "stores" for your application as
-    | well as their drivers. You may even define multiple stores for the
-    | same cache driver to group types of items stored in your caches.
-    |
-    */
-
-    'stores' => [
-
-        'apc' => [
-            'driver' => 'apc',
-        ],
-
-        'array' => [
-            'driver' => 'array',
-            'serialize' => false,
-        ],
-
-        'database' => [
-            'driver' => 'database',
-            'table' => 'cache',
-            'connection' => null,
-        ],
-
-        'file' => [
-            'driver' => 'file',
-            'path' => storage_path('framework/cache/data'),
-        ],
-
-        'memcached' => [
-            'driver' => 'memcached',
-            'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
-            'sasl' => [
-                env('MEMCACHED_USERNAME'),
-                env('MEMCACHED_PASSWORD'),
-            ],
-            'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
-            ],
-            'servers' => [
-                [
-                    'host' => env('MEMCACHED_HOST', '127.0.0.1'),
-                    'port' => env('MEMCACHED_PORT', 11211),
-                    'weight' => 100,
-                ],
-            ],
-        ],
-
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-        ],
-
-        'dynamodb' => [
-            'driver' => 'dynamodb',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
-            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
-            'endpoint' => env('DYNAMODB_ENDPOINT'),
-        ],
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Cache Key Prefix
-    |--------------------------------------------------------------------------
-    |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
-    |
-    */
-
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
-
-];

config/database.php

@@ -1,146 +1,22 @@
 <?php
 
-use Illuminate\Support\Str;
-
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default Database Connection Name
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify which of the database connections below you wish
-    | to use as your default connection for all database work. Of course
-    | you may use many connections at once using the Database library.
-    |
-    */
-
-    'default' => env('DB_CONNECTION', 'sqlite'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Database Connections
-    |--------------------------------------------------------------------------
-    |
-    | Here are each of the database connections setup for your application.
-    | Of course, examples of configuring each database platform that is
-    | supported by Laravel is shown below to make development simple.
-    |
-    |
-    | All database work in Laravel is done through the PHP PDO facilities
-    | so make sure you have the driver for your particular database of
-    | choice installed on your machine before you begin development.
-    |
-    */
+    'default' => env('DB_CONNECTION', 'sqlite'),  // Make sure the default connection is set
 
     'connections' => [
-
         'sqlite' => [
             'driver' => 'sqlite',
-            //'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'database' => database_path(env('DB_DATABASE', 'app.sqlite')),
+            'database' => database_path(env('DB_DATABASE', 'app.sqlite')), // Make sure to use the correct path
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), // Enable foreign key constraints
         ],
-
-        'mysql' => [
-            'driver' => 'mysql',
-            'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'unix_socket' => env('DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
-        ],
-
-        'pgsql' => [
-            'driver' => 'pgsql',
-            'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'schema' => 'public',
-            'sslmode' => 'prefer',
-        ],
-
-        'sqlsrv' => [
-            'driver' => 'sqlsrv',
-            'url' => env('DATABASE_URL'),
-            'host' => env('DB_HOST', 'localhost'),
-            'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
-            'prefix' => '',
-            'prefix_indexes' => true,
-        ],
-        
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Migration Repository Table
-    |--------------------------------------------------------------------------
-    |
-    | This table keeps track of all the migrations that have already run for
-    | your application. Using this information, we can determine which of
-    | the migrations on disk haven't actually been run in the database.
-    |
-    */
-
-    'migrations' => 'migrations',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Redis Databases
-    |--------------------------------------------------------------------------
-    |
-    | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
-    | such as APC or Memcached. Laravel makes it easy to dig right in.
-    |
-    */
-
-    'redis' => [
-
-        'client' => env('REDIS_CLIENT', 'phpredis'),
-
-        'options' => [
-            'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
-        ],
-
-        'default' => [
-            'url' => env('REDIS_URL'),
-            'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', '6379'),
-            'database' => env('REDIS_DB', '0'),
-        ],
-
-        'cache' => [
-            'url' => env('REDIS_URL'),
-            'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', '6379'),
-            'database' => env('REDIS_CACHE_DB', '1'),
-        ],
 
+    'migrations' => [
+        'table' => 'migrations',
+        'update_date_on_publish' => false, // disable to preserve original behavior for existing applications
     ],
 
 ];

config/filesystems.php

@@ -2,69 +2,14 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Default Filesystem Disk
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the default filesystem disk that should be used
-    | by the framework. The "local" disk, as well as a variety of cloud
-    | based disks are available to your application. Just store away!
-    |
-    */
-
-    'default' => env('FILESYSTEM_DRIVER', 'public'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Cloud Filesystem Disk
-    |--------------------------------------------------------------------------
-    |
-    | Many applications store files both locally and in the cloud. For this
-    | reason, you may specify a default "cloud" driver here. This driver
-    | will be bound as the Cloud disk implementation in the container.
-    |
-    */
-
     'cloud' => env('FILESYSTEM_CLOUD', 's3'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Filesystem Disks
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure as many filesystem "disks" as you wish, and you
-    | may even configure multiple disks of the same driver. Defaults have
-    | been setup for each driver as an example of the required options.
-    |
-    | Supported Drivers: "local", "ftp", "s3", "rackspace"
-    |
-    */
-
     'disks' => [
-
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'throw' => false,
         ],
-
-        'public' => [
-            'driver' => 'local',
-            'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
-            'visibility' => 'public',
-        ],
-
-        's3' => [
-            'driver' => 's3',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'region' => env('AWS_DEFAULT_REGION'),
-            'bucket' => env('AWS_BUCKET'),
-            'url' => env('AWS_URL'),
-            'endpoint' => env('AWS_ENDPOINT'),
-        ],
-        
     ],
 
 ];

config/hashing.php

@@ -1,52 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Hash Driver
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default hash driver that will be used to hash
-    | passwords for your application. By default, the bcrypt algorithm is
-    | used; however, you remain free to modify this option if you wish.
-    |
-    | Supported: "bcrypt", "argon", "argon2id"
-    |
-    */
-
-    'driver' => 'bcrypt',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Bcrypt Options
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the configuration options that should be used when
-    | passwords are hashed using the Bcrypt algorithm. This will allow you
-    | to control the amount of time it takes to hash the given password.
-    |
-    */
-
-    'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 10),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Argon Options
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the configuration options that should be used when
-    | passwords are hashed using the Argon algorithm. These will allow you
-    | to control the amount of time it takes to hash the given password.
-    |
-    */
-
-    'argon' => [
-        'memory' => 1024,
-        'threads' => 2,
-        'time' => 2,
-    ],
-
-];

config/logging.php

@@ -1,104 +0,0 @@
-<?php
-
-use Monolog\Handler\NullHandler;
-use Monolog\Handler\StreamHandler;
-use Monolog\Handler\SyslogUdpHandler;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Log Channel
-    |--------------------------------------------------------------------------
-    |
-    | This option defines the default log channel that gets used when writing
-    | messages to the logs. The name specified in this option should match
-    | one of the channels defined in the "channels" configuration array.
-    |
-    */
-
-    'default' => env('LOG_CHANNEL', 'stack'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Log Channels
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log channels for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Drivers: "single", "daily", "slack", "syslog",
-    |                    "errorlog", "monolog",
-    |                    "custom", "stack"
-    |
-    */
-
-    'channels' => [
-        'stack' => [
-            'driver' => 'stack',
-            'channels' => ['single'],
-            'ignore_exceptions' => false,
-        ],
-
-        'single' => [
-            'driver' => 'single',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
-        ],
-
-        'daily' => [
-            'driver' => 'daily',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
-            'days' => 14,
-        ],
-
-        'slack' => [
-            'driver' => 'slack',
-            'url' => env('LOG_SLACK_WEBHOOK_URL'),
-            'username' => 'Laravel Log',
-            'emoji' => ':boom:',
-            'level' => 'critical',
-        ],
-
-        'papertrail' => [
-            'driver' => 'monolog',
-            'level' => 'debug',
-            'handler' => SyslogUdpHandler::class,
-            'handler_with' => [
-                'host' => env('PAPERTRAIL_URL'),
-                'port' => env('PAPERTRAIL_PORT'),
-            ],
-        ],
-
-        'stderr' => [
-            'driver' => 'monolog',
-            'handler' => StreamHandler::class,
-            'formatter' => env('LOG_STDERR_FORMATTER'),
-            'with' => [
-                'stream' => 'php://stderr',
-            ],
-        ],
-
-        'syslog' => [
-            'driver' => 'syslog',
-            'level' => 'debug',
-        ],
-
-        'errorlog' => [
-            'driver' => 'errorlog',
-            'level' => 'debug',
-        ],
-
-        'null' => [
-            'driver' => 'monolog',
-            'handler' => NullHandler::class,
-        ],
-
-        'emergency' => [
-            'path' => storage_path('logs/laravel.log'),
-        ],
-    ],
-
-];

config/mail.php

@@ -2,116 +2,15 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Mail Driver
-    |--------------------------------------------------------------------------
-    |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
-    |            "sparkpost", "log", "array"
-    |
-    */
-
-    'driver' => env('MAIL_DRIVER', 'smtp'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Address
-    |--------------------------------------------------------------------------
-    |
-    | Here you may provide the host address of the SMTP server used by your
-    | applications. A default option is provided that is compatible with
-    | the Mailgun mail service which will provide reliable deliveries.
-    |
-    */
-
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Port
-    |--------------------------------------------------------------------------
-    |
-    | This is the SMTP port used by your application to deliver e-mails to
-    | users of the application. Like the host we have set this value to
-    | stay compatible with the Mailgun e-mail application by default.
-    |
-    */
-
-    'port' => env('MAIL_PORT', 587),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Global "From" Address
-    |--------------------------------------------------------------------------
-    |
-    | You may wish for all e-mails sent by your application to be sent from
-    | the same address. Here, you may specify a name and address that is
-    | used globally for all e-mails that are sent by your application.
-    |
-    */
-
-    'from' => [
-        'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-        'name' => env('MAIL_FROM_NAME', 'Example'),
+    'mailers' => [
+        'mailgun' => [
+            'transport' => 'mailgun',
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-
-    'password' => env('MAIL_PASSWORD'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Markdown Mail Settings
-    |--------------------------------------------------------------------------
-    |
-    | If you are using Markdown based email rendering, you may configure your
-    | theme and component paths here, allowing you to customize the design
-    | of the emails. Or, you may simply stick with the Laravel defaults!
-    |
-    */
-
     'markdown' => [
         'theme' => 'default',
 

config/queue.php

@@ -1,89 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Queue Connection Name
-    |--------------------------------------------------------------------------
-    |
-    | Laravel's queue API supports an assortment of back-ends via a single
-    | API, giving you convenient access to each back-end using the same
-    | syntax for every one. Here you may define a default connection.
-    |
-    */
-
-    'default' => env('QUEUE_CONNECTION', 'sync'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Queue Connections
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the connection information for each server that
-    | is used by your application. A default configuration has been added
-    | for each back-end shipped with Laravel. You are free to add more.
-    |
-    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
-    |
-    */
-
-    'connections' => [
-
-        'sync' => [
-            'driver' => 'sync',
-        ],
-
-        'database' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'default',
-            'retry_after' => 90,
-        ],
-
-        'beanstalkd' => [
-            'driver' => 'beanstalkd',
-            'host' => 'localhost',
-            'queue' => 'default',
-            'retry_after' => 90,
-            'block_for' => 0,
-        ],
-
-        'sqs' => [
-            'driver' => 'sqs',
-            'key' => env('AWS_ACCESS_KEY_ID'),
-            'secret' => env('AWS_SECRET_ACCESS_KEY'),
-            'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
-            'suffix' => env('SQS_SUFFIX'),
-            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
-        ],
-
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-            'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 90,
-            'block_for' => null,
-        ],
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Failed Queue Jobs
-    |--------------------------------------------------------------------------
-    |
-    | These options configure the behavior of failed queue job logging so you
-    | can control which database and table are used to store the jobs that
-    | have failed. You may change them to any database / table you wish.
-    |
-    */
-
-    'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
-        'database' => env('DB_CONNECTION', 'mysql'),
-        'table' => 'failed_jobs',
-    ],
-
-];

config/services.php

@@ -2,32 +2,11 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Third Party Services
-    |--------------------------------------------------------------------------
-    |
-    | This file is for storing the credentials for third party services such
-    | as Mailgun, Postmark, AWS and more. This file provides the de facto
-    | location for this type of information, allowing packages to have
-    | a conventional file to locate the various service credentials.
-    |
-    */
-
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
         'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+        'scheme' => 'https',
     ],
 
-    'postmark' => [
-        'token' => env('POSTMARK_TOKEN'),
-    ],
-
-    'ses' => [
-        'key' => env('AWS_ACCESS_KEY_ID'),
-        'secret' => env('AWS_SECRET_ACCESS_KEY'),
-        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
-    ],
-    
 ];

config/session.php

@@ -1,199 +0,0 @@
-<?php
-
-use Illuminate\Support\Str;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Session Driver
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default session "driver" that will be used on
-    | requests. By default, we will use the lightweight native driver but
-    | you may specify any of the other wonderful drivers provided here.
-    |
-    | Supported: "file", "cookie", "database", "apc",
-    |            "memcached", "redis", "array"
-    |
-    */
-
-    'driver' => env('SESSION_DRIVER', 'file'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Lifetime
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the number of minutes that you wish the session
-    | to be allowed to remain idle before it expires. If you want them
-    | to immediately expire on the browser closing, set that option.
-    |
-    */
-
-    'lifetime' => env('SESSION_LIFETIME', 120),
-
-    'expire_on_close' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Encryption
-    |--------------------------------------------------------------------------
-    |
-    | This option allows you to easily specify that all of your session data
-    | should be encrypted before it is stored. All encryption will be run
-    | automatically by Laravel and you can use the Session like normal.
-    |
-    */
-
-    'encrypt' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session File Location
-    |--------------------------------------------------------------------------
-    |
-    | When using the native session driver, we need a location where session
-    | files may be stored. A default has been set for you but a different
-    | location may be specified. This is only needed for file sessions.
-    |
-    */
-
-    'files' => storage_path('framework/sessions'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Database Connection
-    |--------------------------------------------------------------------------
-    |
-    | When using the "database" or "redis" session drivers, you may specify a
-    | connection that should be used to manage these sessions. This should
-    | correspond to a connection in your database configuration options.
-    |
-    */
-
-    'connection' => env('SESSION_CONNECTION', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Database Table
-    |--------------------------------------------------------------------------
-    |
-    | When using the "database" session driver, you may specify the table we
-    | should use to manage the sessions. Of course, a sensible default is
-    | provided for you; however, you are free to change this as needed.
-    |
-    */
-
-    'table' => 'sessions',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Cache Store
-    |--------------------------------------------------------------------------
-    |
-    | When using the "apc" or "memcached" session drivers, you may specify a
-    | cache store that should be used for these sessions. This value must
-    | correspond with one of the application's configured cache stores.
-    |
-    */
-
-    'store' => env('SESSION_STORE', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Sweeping Lottery
-    |--------------------------------------------------------------------------
-    |
-    | Some session drivers must manually sweep their storage location to get
-    | rid of old sessions from storage. Here are the chances that it will
-    | happen on a given request. By default, the odds are 2 out of 100.
-    |
-    */
-
-    'lottery' => [2, 100],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Cookie Name
-    |--------------------------------------------------------------------------
-    |
-    | Here you may change the name of the cookie used to identify a session
-    | instance by ID. The name specified here will get used every time a
-    | new session cookie is created by the framework for every driver.
-    |
-    */
-
-    'cookie' => env(
-        'SESSION_COOKIE',
-        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
-    ),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Cookie Path
-    |--------------------------------------------------------------------------
-    |
-    | The session cookie path determines the path for which the cookie will
-    | be regarded as available. Typically, this will be the root path of
-    | your application but you are free to change this when necessary.
-    |
-    */
-
-    'path' => '/',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Session Cookie Domain
-    |--------------------------------------------------------------------------
-    |
-    | Here you may change the domain of the cookie used to identify a session
-    | in your application. This will determine which domains the cookie is
-    | available to in your application. A sensible default has been set.
-    |
-    */
-
-    'domain' => env('SESSION_DOMAIN', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | HTTPS Only Cookies
-    |--------------------------------------------------------------------------
-    |
-    | By setting this option to true, session cookies will only be sent back
-    | to the server if the browser has a HTTPS connection. This will keep
-    | the cookie from being sent to you if it can not be done securely.
-    |
-    */
-
-    'secure' => env('SESSION_SECURE_COOKIE'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | HTTP Access Only
-    |--------------------------------------------------------------------------
-    |
-    | Setting this value to true will prevent JavaScript from accessing the
-    | value of the cookie and the cookie will only be accessible through
-    | the HTTP protocol. You are free to modify this option if needed.
-    |
-    */
-
-    'http_only' => true,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Same-Site Cookies
-    |--------------------------------------------------------------------------
-    |
-    | This option determines how your cookies behave when cross-site requests
-    | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
-    |
-    | Supported: "lax", "strict"
-    |
-    */
-
-    'same_site' => null,
-
-];

database/factories/ItemFactory.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Item;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ItemFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        return [
+            'title' => $this->faker->unique()->text(),
+            'url' => $this->faker->unique()->url(),
+        ];
+    }
+}

database/factories/ItemTagFactory.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Item;
+use App\ItemTag;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ItemTagFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        return [];
+    }
+}

database/factories/UserFactory.php

@@ -1,23 +1,41 @@
 <?php
 
-use Faker\Generator as Faker;
+namespace Database\Factories;
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| This directory should contain each of the model factory definitions for
-| your application. Factories provide a convenient way to generate new
-| model instances for testing / seeding your application's database.
-|
-*/
+use Illuminate\Support\Facades\Hash;
+use App\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
 
-$factory->define(App\User::class, function (Faker $faker) {
-    return [
-        'name' => $faker->name,
-        'email' => $faker->unique()->safeEmail,
-        'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
-        'remember_token' => str_random(10),
-    ];
-});
+class UserFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    protected static ?string $password;
+
+    public function definition(): array
+    {
+        return [
+            'username' => $this->faker->name(),
+            'email' => $this->faker->unique()->safeEmail(),
+            'password' => static::$password ??= Hash::make('password'),
+            'public_front' => 1,
+            'remember_token' => Str::random(10),
+        ];
+    }
+
+    /**
+     * Indicate that the model's email address should be unverified.
+     */
+    public function unverified(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'email_verified_at' => null,
+            ];
+        });
+    }
+}

database/migrations/2018_01_27_155922_create_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('items', function (Blueprint $table) {
             $table->increments('id');
@@ -29,11 +27,9 @@ class CreateItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('items');
     }
-}
+};

database/migrations/2018_02_04_185524_create_settings_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('settings', function (Blueprint $table) {
             $table->increments('id');
@@ -28,11 +26,9 @@ class CreateSettingsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('settings');
     }
-}
+};

database/migrations/2018_02_04_185802_create_setting_groups_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingGroupsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('setting_groups', function (Blueprint $table) {
             $table->increments('id');
@@ -22,11 +20,9 @@ class CreateSettingGroupsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('setting_groups');
     }
-}
+};

database/migrations/2018_02_16_175830_add_columns_to_items_for_groups.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddColumnsToItemsForGroups extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->integer('type')->default(0)->index(); // 0 = item, 1 = category
@@ -20,13 +18,11 @@ class AddColumnsToItemsForGroups extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['type']);
         });
     }
-}
+};

database/migrations/2018_02_16_193703_item_tag.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ItemTag extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('item_tag', function (Blueprint $table) {
             $table->integer('item_id')->unsigned()->index();
@@ -25,11 +23,9 @@ class ItemTag extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('item_tag');
     }
-}
+};

database/migrations/2018_10_12_122907_create_users_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
@@ -28,11 +26,9 @@ class CreateUsersTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
     }
-}
+};

database/migrations/2018_10_12_123036_create_password_resets_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePasswordResetsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('password_resets', function (Blueprint $table) {
             $table->string('email')->index();
@@ -22,11 +20,9 @@ class CreatePasswordResetsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('password_resets');
     }
-}
+};

database/migrations/2018_10_12_131222_add_user_id_to_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddUserIdToItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->integer('user_id')->default(1)->index(); // 0 = item, 1 = category
@@ -20,13 +18,11 @@ class AddUserIdToItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['user_id']);
         });
     }
-}
+};

database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSettingUserPivotTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('setting_user', function (Blueprint $table) {
             $table->integer('setting_id')->unsigned()->index();
@@ -25,11 +23,9 @@ class CreateSettingUserPivotTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('setting_user');
     }
-}
+};

database/migrations/2018_10_18_110905_create_applications_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateApplicationsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('applications', function (Blueprint $table) {
             $table->string('appid')->unique();
@@ -30,11 +28,9 @@ class CreateApplicationsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('applications');
     }
-}
+};

database/migrations/2018_10_23_132008_add_class_to_items_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClassToItemsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->string('class')->nullable();
@@ -20,13 +18,11 @@ class AddClassToItemsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['class']);
         });
     }
-}
+};

database/migrations/2018_10_31_191604_create_jobs_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -26,11 +24,9 @@ class CreateJobsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('jobs');
     }
-}
+};

database/migrations/2018_11_06_112434_create_failed_jobs_table.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFailedJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -25,11 +23,9 @@ class CreateFailedJobsTable extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('failed_jobs');
     }
-}
+};

database/migrations/2022_03_15_140911_add_appid_to_items.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAppidToItems extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->string('appid')->nullable();
@@ -20,13 +18,11 @@ class AddAppidToItems extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->dropColumn(['appid']);
         });
     }
-}
+};

database/migrations/2022_03_16_093044_add_class_to_application.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClassToApplication extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->string('class')->nullable()->index();
@@ -20,13 +18,11 @@ class AddClassToApplication extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('applications', function (Blueprint $table) {
             $table->dropColumn(['class']);
         });
     }
-}
+};

database/migrations/2022_03_16_181343_add_app_description_to_items.php

@@ -4,14 +4,12 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAppDescriptionToItems extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('items', function (Blueprint $table) {
             $table->text('appdescription')->nullable();
@@ -20,13 +18,11 @@ class AddAppDescriptionToItems extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('items', function (Blueprint $table) {
             //
         });
     }
-}
+};

database/migrations/2023_01_27_121000_add_role_to_item.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->text('role')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table('items', function (Blueprint $table) {
+            //
+        });
+    }
+};

database/migrations/2024_02_16_000000_rename_password_resets_table.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::rename('password_resets', 'password_reset_tokens');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::rename('password_reset_tokens', 'password_resets');
+    }
+};

database/migrations/2025_07_17_134226_create_cache_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('cache', function (Blueprint $table) {
+            $table->string('key')->primary();
+            $table->mediumText('value');
+            $table->integer('expiration');
+        });
+
+        Schema::create('cache_locks', function (Blueprint $table) {
+            $table->string('key')->primary();
+            $table->string('owner');
+            $table->integer('expiration');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('cache');
+        Schema::dropIfExists('cache_locks');
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -1,15 +1,15 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         $this->call(SettingsSeeder::class);
         $this->call(UsersSeeder::class);

database/seeders/SettingsSeeder.php

@@ -0,0 +1,353 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Setting;
+use App\SettingGroup;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Locale;
+
+class SettingsSeeder extends Seeder
+{
+
+    /**
+     * @return false|string
+     */
+    public static function getSupportedLanguageMap()
+    {
+        if (! class_exists('Locale')) {
+            Log::info('PHP Extension Intl not found. Falling back to English language support only.');
+            return json_encode(['en' => 'English']);
+        }
+
+        $languageDirectories = array_filter(glob(lang_path().'/*'), 'is_dir');
+        $result = [];
+
+        foreach ($languageDirectories as $languageDirectory) {
+            $language = self::getLanguageFromDirectory($languageDirectory);
+            $resultNative = mb_convert_case(
+                Locale::getDisplayLanguage($language.'-', $language),
+                MB_CASE_TITLE,
+                'UTF-8'
+            );
+            $resultEn = ucfirst(Locale::getDisplayLanguage($language, 'en'));
+            $result[$language] = "$resultNative ($resultEn)";
+        }
+
+        return json_encode($result);
+    }
+
+    /**
+     * @param $languageDirectory
+     * @return false|string[]
+     */
+    public static function getLanguageFromDirectory($languageDirectory)
+    {
+        $directories = explode('/', $languageDirectory);
+
+        return $directories[array_key_last($directories)];
+    }
+
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // Groups
+        if (! $setting_group = SettingGroup::find(1)) {
+            $setting_group = new SettingGroup;
+            $setting_group->id = 1;
+            $setting_group->title = 'app.settings.system';
+            $setting_group->order = 0;
+            $setting_group->save();
+        } else {
+            $setting_group->title = 'app.settings.system';
+            $setting_group->save();
+        }
+        if (! $setting_group = SettingGroup::find(2)) {
+            $setting_group = new SettingGroup;
+            $setting_group->id = 2;
+            $setting_group->title = 'app.settings.appearance';
+            $setting_group->order = 1;
+            $setting_group->save();
+        } else {
+            $setting_group->title = 'app.settings.appearance';
+            $setting_group->save();
+        }
+        if (! $setting_group = SettingGroup::find(3)) {
+            $setting_group = new SettingGroup;
+            $setting_group->id = 3;
+            $setting_group->title = 'app.settings.miscellaneous';
+            $setting_group->order = 2;
+            $setting_group->save();
+        } else {
+            $setting_group->title = 'app.settings.miscellaneous';
+            $setting_group->save();
+        }
+        if (! $setting_group = SettingGroup::find(4)) {
+            $setting_group = new SettingGroup;
+            $setting_group->id = 4;
+            $setting_group->title = 'app.settings.advanced';
+            $setting_group->order = 3;
+            $setting_group->save();
+        } else {
+            $setting_group->title = 'app.settings.advanced';
+            $setting_group->save();
+        }
+
+        if ($version = Setting::find(1)) {
+            $version->label = 'app.settings.version';
+            $version->value = config('app.version');
+            $version->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 1;
+            $setting->group_id = 1;
+            $setting->key = 'version';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.version';
+            $setting->value = config('app.version');
+            $setting->system = true;
+            $setting->save();
+        }
+
+        if (! $setting = Setting::find(2)) {
+            $setting = new Setting;
+            $setting->id = 2;
+            $setting->group_id = 2;
+            $setting->key = 'background_image';
+            $setting->type = 'image';
+            $setting->label = 'app.settings.background_image';
+            $setting->save();
+        } else {
+            $setting->label = 'app.settings.background_image';
+            $setting->save();
+        }
+        if (! $setting = Setting::find(3)) {
+            $setting = new Setting;
+            $setting->id = 3;
+            $setting->group_id = 3;
+            $setting->key = 'homepage_search';
+            $setting->type = 'boolean';
+            $setting->label = 'app.settings.homepage_search';
+            $setting->save();
+        } else {
+            $setting->label = 'app.settings.homepage_search';
+            $setting->save();
+        }
+
+        $options = json_encode([
+            'none' => 'app.options.none',
+            'google' => 'app.options.google',
+            'ddg' => 'app.options.ddg',
+            'qwant' => 'app.options.qwant',
+            'bing' => 'app.options.bing',
+            'startpage' => 'app.options.startpage',
+        ]);
+
+        if (! $setting = Setting::find(4)) {
+            $setting = new Setting;
+            $setting->id = 4;
+            $setting->group_id = 3;
+            $setting->key = 'search_provider';
+            $setting->type = 'select';
+            $setting->options = $options;
+            $setting->label = 'app.settings.search_provider';
+            $setting->save();
+        } else {
+            $setting->options = $options;
+            $setting->label = 'app.settings.search_provider';
+            $setting->save();
+        }
+
+        $language_options = SettingsSeeder::getSupportedLanguageMap();
+
+        if ($languages = Setting::find(5)) {
+            $languages->options = $language_options;
+            $languages->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 5;
+            $setting->group_id = 1;
+            $setting->key = 'language';
+            $setting->type = 'select';
+            $setting->label = 'app.settings.language';
+            $setting->options = $language_options;
+            $setting->value = 'en';
+            $setting->save();
+        }
+        
+        if (! $setting = Setting::find(12)) {
+            $setting = new Setting;
+            $setting->id = 12;
+            $setting->group_id = 2;
+            $setting->key = 'trianglify';
+            $setting->type = 'boolean';
+            $setting->label = 'app.settings.trianglify';
+            $setting->save();
+        } else {
+            $setting->label = 'app.settings.trianglify';
+            $setting->save();
+        }
+        
+        if (! $setting = Setting::find(13)) {
+            $setting = new Setting;
+            $setting->id = 13;
+            $setting->group_id = 2;
+            $setting->key = 'trianglify_seed';
+            $setting->type = 'text';
+            $setting->value = 'heimdall';
+            $setting->label = 'app.settings.trianglify_seed';
+            $setting->save();
+        } else {
+            $setting->label = 'app.settings.trianglify_seed';
+            $setting->save();
+        }
+
+        $window_target_options = json_encode([
+            'current' => 'app.settings.window_target.current',
+            'heimdall' => 'app.settings.window_target.one',
+            '_blank' => 'app.settings.window_target.new',
+        ]);
+
+        if (! $setting = Setting::find(7)) {
+            $setting = new Setting;
+            $setting->id = 7;
+            $setting->group_id = 3;
+            $setting->key = 'window_target';
+            $setting->type = 'select';
+            $setting->options = $window_target_options;
+            $setting->label = 'app.settings.window_target';
+            $setting->value = 'heimdall';
+            $setting->save();
+        } else {
+            $setting->options = $window_target_options;
+            $setting->label = 'app.settings.window_target';
+            $setting->save();
+        }
+
+        if ($support = Setting::find(8)) {
+            $support->label = 'app.settings.support';
+            $support->value =
+                '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a>'.
+                ' | '.
+                '<a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a>'.
+                ' | '.
+                '<a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
+            $support->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 8;
+            $setting->group_id = 1;
+            $setting->key = 'support';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.support';
+            $setting->value = '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a>'.
+                ' | '.
+                '<a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a>'.
+                ' | '.
+                '<a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
+            $setting->system = true;
+            $setting->save();
+        }
+
+        if ($donate = Setting::find(9)) {
+            $donate->label = 'app.settings.donate';
+            $donate->value = '<a rel="noopener" target="_blank" href="https://www.paypal.me/heimdall">Paypal</a>';
+            $donate->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 9;
+            $setting->group_id = 1;
+            $setting->key = 'donate';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.donate';
+            $setting->value = '<a rel="noopener" target="_blank" href="https://www.paypal.me/heimdall">Paypal</a>';
+            $setting->system = true;
+            $setting->save();
+        }
+
+        if (! $setting = Setting::find(10)) {
+            $setting = new Setting;
+            $setting->id = 10;
+            $setting->group_id = 4;
+            $setting->key = 'custom_css';
+            $setting->type = 'textarea';
+            $setting->label = 'app.settings.custom_css';
+            $setting->value = '';
+            $setting->save();
+        } else {
+            $setting->type = 'textarea';
+            $setting->group_id = 4;
+            $setting->label = 'app.settings.custom_css';
+            $setting->save();
+        }
+
+        if (! $setting = Setting::find(11)) {
+            $setting = new Setting;
+            $setting->id = 11;
+            $setting->group_id = 4;
+            $setting->key = 'custom_js';
+            $setting->type = 'textarea';
+            $setting->label = 'app.settings.custom_js';
+            $setting->value = '';
+            $setting->save();
+        } else {
+            $setting->type = 'textarea';
+            $setting->group_id = 4;
+            $setting->label = 'app.settings.custom_js';
+            $setting->save();
+        }
+
+        if (! $home_tag = \App\Item::find(0)) {
+            $home_tag = new \App\Item;
+            $home_tag->id = 0;
+            $home_tag->title = 'app.dashboard';
+            $home_tag->pinned = 0;
+            $home_tag->url = '';
+            $home_tag->type = 1;
+            $home_tag->user_id = 0;
+
+            $home_tag->save();
+            $home_tag_id = $home_tag->id;
+
+            if ($home_tag_id != 0) {
+                Log::info("Home Tag returned with id $home_tag_id from db! Changing to 0.");
+
+                DB::update('update items set id = 0 where id = ?', [$home_tag_id]);
+            }
+
+            $homeapps = \App\Item::withoutGlobalScope('user_id')->doesntHave('parents')->get();
+            foreach ($homeapps as $app) {
+                if ($app->id === 0) {
+                    continue;
+                }
+                $app->parents()->attach(0);
+            }
+        }
+
+        $tag_options = json_encode([
+            'folders' => 'app.settings.folders',
+            'tags' => 'app.settings.tags',
+            'categories' => 'app.settings.categories',
+        ]);
+
+        if (! $setting = Setting::find(14)) {
+            $setting = new Setting;
+            $setting->id = 14;
+            $setting->group_id = 2;
+            $setting->key = 'treat_tags_as';
+            $setting->type = 'select';
+            $setting->options = $tag_options;
+            $setting->value = 'folders';
+            $setting->label = 'app.settings.treat_tags_as';
+            $setting->save();
+        } else {
+            $setting->options = $tag_options;
+            $setting->label = 'app.settings.treat_tags_as';
+            $setting->save();
+        }
+    }
+}

database/seeders/UsersSeeder.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\User;
+use Illuminate\Database\Seeder;
+
+class UsersSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        // Groups
+        if (!User::find(1)) {
+            $user = new User;
+            $user->username = 'admin';
+            $user->email = 'admin@test.com';
+            $user->password = null;
+            $user->public_front = 0; // Default value for public_front
+            $user->save();
+
+            $user_id = $user->id;
+
+            if ($user_id != 1) {
+                Log::info("First User returned with id $user_id from db! Changing to 1.");
+
+                DB::update('update users set id = 1 where id = ?', [$user_id]);
+            }
+        }
+    }
+}