Update version number

Fixes to tags and show tags on application list

.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

@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: '7.4'
+          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
@@ -21,10 +21,10 @@ jobs:
           path: vendor
           key: composer-${{ hashFiles('composer.lock') }}
 
-      - name: Run composer install
-        run: composer install -n --prefer-dist
-        env:
-          APP_ENV: testing
+      #- name: Run composer install
+      #  run: composer install -n --prefer-dist
+      #  env:
+      #    APP_ENV: testing
 
       - name: Prepare Laravel Application
         run: |
@@ -40,14 +40,20 @@ jobs:
       - name: Run yarn
         run: yarn && yarn dev
 
+      - name: Run ESLint
+        run: yarn lint
+
       - name: Run tests
-        run: ./vendor/bin/phpunit
+        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
+          path: ./storage/logs

app/Application.php

@@ -2,9 +2,43 @@
 
 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
 {
     /**
@@ -32,17 +66,11 @@ class Application extends Model
         return $this->icon;
     }
 
-    /**
-     * @return string
-     */
     public function iconView(): string
     {
         return asset('storage/'.$this->icon);
     }
 
-    /**
-     * @return string
-     */
     public function defaultColour(): string
     {
         // check if light or dark
@@ -53,36 +81,27 @@ class Application extends Model
         return '#161b1f';
     }
 
-    /**
-     * @return string
-     */
     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;
     }
 
     /**
      * @param $name
-     * @return string
      */
-    public static function classFromName($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;
     }
 
-    /**
-     * @return \Illuminate\Support\Collection
-     */
-    public static function apps(): \Illuminate\Support\Collection
+    public static function apps(): Collection
     {
         $json = json_decode(file_get_contents(storage_path('app/supportedapps.json'))) ?? [];
         $apps = collect($json->apps);
@@ -90,9 +109,6 @@ class Application extends Model
         return $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
     }
 
-    /**
-     * @return array
-     */
     public static function autocomplete(): array
     {
         $apps = self::apps();
@@ -110,6 +126,7 @@ class Application extends Model
     /**
      * @param $appid
      * @return mixed|null
+     * @throws GuzzleException
      */
     public static function getApp($appid)
     {
@@ -121,13 +138,12 @@ class Application extends Model
         $application = ($localapp) ? $localapp : new self;
 
         // Files missing? || app not in db || old sha version
-        if (
-            ! file_exists(app_path('SupportedApps/'.className($app->name))) ||
+        if (! file_exists(app_path('SupportedApps/'.className($app->name))) ||
             ! $localapp ||
             $localapp->sha !== $app->sha
         ) {
             $gotFiles = SupportedApps::getFiles($app);
-            if($gotFiles) {
+            if ($gotFiles) {
                 $app = SupportedApps::saveApp($app, $application);
             }
         }
@@ -147,7 +163,7 @@ class Application extends Model
         if ($app === null) {
             // Try in db for Private App
             $appModel = self::where('appid', $appid)->first();
-            if($appModel) {
+            if ($appModel) {
                 $app = json_decode($appModel->toJson());
             }
         }
@@ -156,14 +172,11 @@ class Application extends Model
             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;
     }
 
-    /**
-     * @return array
-     */
     public static function applist(): array
     {
         $list = [];
@@ -176,7 +189,7 @@ class Application extends Model
         // Check for private apps in the db
         $appsListFromDB = self::all(['appid', 'name']);
 
-        foreach($appsListFromDB as $app) {
+        foreach ($appsListFromDB as $app) {
             // Already existing keys are overwritten,
             // only private apps should be added at the end
             $list[$app->appid] = $app->name;

app/Console/Commands/RegisterApp.php

@@ -35,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') {
@@ -54,7 +52,10 @@ class RegisterApp extends Command
         }
     }
 
-    public function addApp($folder, $remove = false)
+    /**
+     * @param $folder
+     */
+    public function addApp($folder, bool $remove = false): void
     {
         $json = app_path('SupportedApps/'.$folder.'/app.json');
 
@@ -88,7 +89,12 @@ class RegisterApp extends Command
         $this->info('Application Added - ' . $app->name . ' - ' . $app->appid);
     }
 
-    private function saveIcon($appFolder, $icon) {
+    /**
+     * @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

@@ -7,22 +7,10 @@ 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)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')
         //          ->hourly();
@@ -30,10 +18,8 @@ class Kernel extends ConsoleKernel
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
 

app/Exceptions/Handler.php

@@ -8,18 +8,9 @@ use Throwable;
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of the exception types that are not reported.
+     * The list of the inputs that are never flashed to the session on validation exceptions.
      *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
+     * @var array<int, string>
      */
     protected $dontFlash = [
         'current_password',
@@ -29,10 +20,8 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             //

app/Helper.php

@@ -2,43 +2,61 @@
 
 use Illuminate\Support\Str;
 
-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')
+/**
+ * @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 +64,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 +74,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 +87,52 @@ 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'];
+
+    if (!in_array($extension, $allowedExtensions)) {
+        return false;
+    }
+
+    $tempFileName = @tempnam("/tmp", "image-check-");
+    $handle = fopen($tempFileName, "w");
+
+    fwrite($handle, $file);
+    fclose($handle);
+
+    if ($extension == 'svg') {
+        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,13 +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;
 
 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

@@ -19,8 +19,6 @@ class HomeController extends Controller
 
     /**
      * Show the application dashboard.
-     *
-     * @return RedirectResponse
      */
     public function index(): RedirectResponse
     {

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

@@ -6,17 +6,21 @@ use App\Application;
 use App\Item;
 use App\Jobs\ProcessApps;
 use App\User;
-use Artisan;
 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\Storage;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Validation\ValidationException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 class ItemController extends Controller
 {
@@ -28,21 +32,39 @@ class ItemController extends Controller
 
     /**
      * Display a listing of the resource on the dashboard.
-     *
-     * @return View
      */
     public function dash(): 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 ($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);
     }
 
@@ -65,7 +87,6 @@ class ItemController extends Controller
      * Pin item on the dashboard.
      *
      * @param $id
-     * @return RedirectResponse
      */
     public function pin($id): RedirectResponse
     {
@@ -81,7 +102,6 @@ class ItemController extends Controller
      * Unpin item on the dashboard.
      *
      * @param $id
-     * @return RedirectResponse
      */
     public function unpin($id): RedirectResponse
     {
@@ -104,13 +124,21 @@ class ItemController extends Controller
         $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);
@@ -123,12 +151,10 @@ class ItemController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @return View
      */
-    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();
@@ -141,8 +167,6 @@ class ItemController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return View
      */
     public function create(): View
     {
@@ -156,9 +180,6 @@ class ItemController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return View
      */
     public function edit(int $id): View
     {
@@ -181,47 +202,48 @@ class ItemController extends Controller
     }
 
     /**
-     * @param Request $request
-     * @param $id
-     * @return void
+     * @param null $id
+     * @throws ValidationException
      */
-    public function storelogic(Request $request, $id = null)
+    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');
+            $path = $request->file('file')->store('icons', 'public');
             $request->merge([
                 'icon' => $path,
             ]);
         } elseif (strpos($request->input('icon'), 'http') === 0) {
-            $options=array(
-                "ssl"=>array(
-                    "verify_peer"=>false,
-                    "verify_peer_name"=>false,
-                ),
-            );  
+            $options = [
+                "ssl" => [
+                    "verify_peer" => false,
+                    "verify_peer_name" => false,
+                ],
+            ];
+
+            $file = $request->input('icon');
+            $path_parts = pathinfo($file);
+            $extension = $path_parts['extension'];
+
             $contents = file_get_contents($request->input('icon'), false, stream_context_create($options));
 
-            if ($application) {
-                $icon = $application->icon;
-            } else {
-                $file = $request->input('icon');
-                $path_parts = pathinfo($file);
-                $icon = md5($contents);
-                $icon .= '.'.$path_parts['extension'];
+            if (!isImage($contents, $extension)) {
+                throw ValidationException::withMessages(['file' => 'Icon must be an image.']);
             }
-            $path = 'icons/'.$icon;
+
+            $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);
+                $path = str_replace('icons/icons/', 'icons/', $path);
             }
-            if(! Storage::disk('public')->exists($path)) {
+            if (!Storage::disk('public')->exists($path)) {
                 Storage::disk('public')->put($path, $contents);
             }
             $request->merge([
@@ -266,17 +288,15 @@ class ItemController extends Controller
         }
 
         $item->parents()->sync($request->tags);
+        return $item;
     }
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     public function store(Request $request): RedirectResponse
     {
-        $this->storelogic($request);
+        self::storelogic($request);
 
         $route = route('dash', []);
 
@@ -286,9 +306,6 @@ class ItemController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
      */
     public function show(int $id): void
     {
@@ -297,14 +314,10 @@ class ItemController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     public function update(Request $request, int $id): RedirectResponse
     {
-        $this->storelogic($request, $id);
+        self::storelogic($request, $id);
         $route = route('dash', []);
 
         return redirect($route)
@@ -313,15 +326,11 @@ class ItemController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     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)
@@ -338,16 +347,13 @@ class ItemController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param int $id
-     * @return RedirectResponse
      */
     public function restore(int $id): RedirectResponse
     {
         //
         Item::withTrashed()
-                ->where('id', $id)
-                ->restore();
+            ->where('id', $id)
+            ->restore();
 
         $route = route('items.index', []);
 
@@ -358,8 +364,7 @@ class ItemController extends Controller
     /**
      * Return details for supported apps
      *
-     * @param Request $request
-     * @return string|null
+     * @throws GuzzleException
      */
     public function appload(Request $request): ?string
     {
@@ -374,32 +379,35 @@ class ItemController extends Controller
         $output['custom'] = null;
 
         $app = Application::single($appid);
-        $output = (array) $app;
+        $output = (array)$app;
 
         $appdetails = Application::getApp($appid);
 
-        if ((bool) $app->enhanced === true) {
+        if ((bool)$app->enhanced === true) {
             // if(!isset($app->config)) { // class based config
-            $output['custom'] = className($appdetails->name).'.config';
+            $output['custom'] = className($appdetails->name) . '.config';
             // }
         }
 
         $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
 
-        if(strpos($app->icon, '://') !== false) {
+        if (strpos($app->icon, '://') !== false) {
             $output['iconview'] = $app->icon;
-        } elseif(strpos($app->icon, 'icons/') !== false) {
+        } elseif (strpos($app->icon, 'icons/') !== false) {
             // Private apps have the icon locally
-            $output['iconview'] = URL::to('/').'/storage/'.$app->icon;
+            $output['iconview'] = URL::to('/') . '/storage/' . $app->icon;
             $output['icon'] = str_replace('icons/', '', $output['icon']);
         } else {
-            $output['iconview'] = config('app.appsource').'icons/'.$app->icon;
+            $output['iconview'] = config('app.appsource') . 'icons/' . $app->icon;
         }
 
 
         return json_encode($output);
     }
 
+    /**
+     * @return void
+     */
     public function testConfig(Request $request)
     {
         $data = $request->input('data');
@@ -408,7 +416,10 @@ class ItemController extends Controller
         $app = $single->class;
 
         // If password is not resubmitted fill it from the database when in edit mode
-        if ($data['password'] === null && array_key_exists('id', $data)) {
+        if (array_key_exists('password', $data) &&
+            $data['password'] === null &&
+            array_key_exists('id', $data)
+        ) {
             $item = Item::find($data['id']);
             if ($item) {
                 $itemConfig = $item->getConfig();
@@ -417,21 +428,24 @@ class ItemController extends Controller
         }
 
         $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 : [
-            'http_errors' => false,
-            'timeout' => 15,
-            'connect_timeout' => 15,
-            'verify' => false,
-        ];
+            $overridevars : [
+                'http_errors' => false,
+                'timeout' => 15,
+                'connect_timeout' => 15,
+                'verify' => false,
+            ];
 
         $client = new Client($vars);
 
@@ -446,10 +460,14 @@ class ItemController extends Controller
             Log::debug($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);
@@ -457,6 +475,10 @@ class ItemController extends Controller
         return $data->getBody();
     }
 
+    /**
+     * @param $id
+     * @return void
+     */
     public function getStats($id)
     {
         $item = Item::find($id);
@@ -469,7 +491,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

@@ -3,10 +3,16 @@
 namespace App\Http\Controllers;
 
 use App\Search;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 
 class SearchController extends Controller
 {
+    /**
+     * @return Application|RedirectResponse|Redirector|mixed|void
+     */
     public function index(Request $request)
     {
         $requestprovider = $request->input('provider');

app/Http/Controllers/SettingsController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Setting;
 use App\SettingGroup;
+use Exception;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -16,9 +17,6 @@ class SettingsController extends Controller
         $this->middleware('allowed');
     }
 
-    /**
-     * @return View
-     */
     public function index(): View
     {
         $settings = SettingGroup::with([
@@ -31,7 +29,6 @@ class SettingsController extends Controller
     }
 
     /**
-     * @param int $id
      *
      * @return RedirectResponse|View
      */
@@ -53,60 +50,60 @@ class SettingsController extends Controller
 
             return redirect($route)
             ->with([
-                'error' => __('app.alert.error.not_exist'),
+                'errors' => collect([__('app.alert.error.not_exist')]),
             ]);
         }
     }
 
-    /**
-     * @param Request $request
-     * @param int $id
-     *
-     * @return RedirectResponse
-     */
     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'
+                    );
                 }
+
+                $path = $request->file('value')->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 RedirectResponse
-     */
     public function clear(int $id): RedirectResponse
     {
         $user = $this->user();

app/Http/Controllers/TagController.php

@@ -4,11 +4,11 @@ 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;
-use Illuminate\Http\Response;
 
 class TagController extends Controller
 {
@@ -20,9 +20,9 @@ class TagController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return Response
+     * @return Application|Factory|View
      */
-    public function index(Request $request)
+    public function index(Request $request): \Illuminate\View\View
     {
         $trash = (bool) $request->input('trash');
 
@@ -38,9 +38,9 @@ class TagController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return Response
+     * @return Application|Factory|View
      */
-    public function create()
+    public function create(): \Illuminate\View\View
     {
         $data = [];
 
@@ -49,24 +49,22 @@ class TagController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     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();
 
@@ -89,7 +87,6 @@ class TagController extends Controller
      * Display the specified resource.
      *
      * @param $slug
-     * @return View
      */
     public function show($slug): View
     {
@@ -104,9 +101,6 @@ class TagController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return View
      */
     public function edit(int $id): View
     {
@@ -120,25 +114,22 @@ class TagController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return RedirectResponse
      */
     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,
@@ -154,9 +145,6 @@ class TagController extends Controller
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param int $id
-     * @return RedirectResponse
      */
     public function destroy(Request $request, int $id): RedirectResponse
     {
@@ -178,9 +166,6 @@ class TagController extends Controller
 
     /**
      * Restore the specified resource from soft deletion.
-     *
-     * @param int $id
-     * @return RedirectResponse
      */
     public function restore(int $id): RedirectResponse
     {

app/Http/Controllers/UserController.php

@@ -19,8 +19,6 @@ class UserController extends Controller
 
     /**
      * Display a listing of the resource.
-     *
-     * @return View
      */
     public function index(): View
     {
@@ -31,8 +29,6 @@ class UserController extends Controller
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return View
      */
     public function create(): View
     {
@@ -41,7 +37,7 @@ class UserController extends Controller
         return view('users.create', $data);
     }
 
-    public function selectUser()
+    public function selectUser(): \Illuminate\View\View
     {
         Auth::logout();
         $data['users'] = User::all();
@@ -51,9 +47,6 @@ class UserController extends Controller
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return RedirectResponse
      */
     public function store(Request $request): RedirectResponse
     {
@@ -62,7 +55,7 @@ class UserController extends Controller
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
             'password_confirmation' => 'nullable',
-
+            'file' => 'image'
         ]);
         $user = new User;
         $user->username = $request->input('username');
@@ -75,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;
         }
 
@@ -93,9 +86,6 @@ class UserController extends Controller
 
     /**
      * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
      */
     public function show(int $id): void
     {
@@ -104,9 +94,6 @@ class UserController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param User $user
-     * @return View
      */
     public function edit(User $user): View
     {
@@ -117,10 +104,6 @@ class UserController extends Controller
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param User $user
-     * @return RedirectResponse
      */
     public function update(Request $request, User $user): RedirectResponse
     {
@@ -129,6 +112,7 @@ class UserController extends Controller
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
             'password_confirmation' => 'nullable',
+            'file' => 'image'
         ]);
         //die(print_r($request->all()));
 
@@ -144,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;
         }
 
@@ -165,7 +149,6 @@ class UserController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param User $user
      * @return RedirectResponse | void
      */
     public function destroy(User $user): RedirectResponse

app/Http/Kernel.php

@@ -31,26 +31,25 @@ class Kernel extends HttpKernel
             \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',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':60,1',
             'bindings',
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
-     * These middleware may be assigned to groups or used individually.
+     * Aliases may be used to conveniently assign middleware to routes and groups.
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'allowed' => \App\Http\Middleware\CheckAllowed::class,
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::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,11 +16,9 @@ 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();
@@ -30,9 +31,7 @@ class CheckAllowed
         }
 
         // Public access to frontpage
-        if ($route == 'dash') {
-            //print_r(User::all());
-            //die("here".var_dump($current_user->password));
+        if ($route === 'dash' || $route === 'tags.show') {
             if ((bool)$current_user->public_front === true) {
                 return $next($request);
             }

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

@@ -9,9 +9,10 @@ class TrimStrings extends Middleware
     /**
      * The names of the attributes that should not be trimmed.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $except = [
+        'current_password',
         '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/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+    /**
+     * The names of the query string parameters that should be ignored.
+     *
+     * @var array<int, string>
+     */
+    protected $except = [
+        // 'fbclid',
+        // 'utm_campaign',
+        // 'utm_content',
+        // 'utm_medium',
+        // 'utm_source',
+        // 'utm_term',
+    ];
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -18,5 +18,4 @@ class VerifyCsrfToken extends Middleware
         'test_config',
         //'get_stats'
     ];
-
 }

app/Item.php

@@ -2,16 +2,82 @@
 
 namespace App;
 
+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-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 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();
 
@@ -25,20 +91,28 @@ class Item extends Model
         });
     }
 
-    //
     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',
     ];
 
 
 
     /**
      * 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);
     }
@@ -60,30 +134,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) {
@@ -93,7 +205,7 @@ class Item extends Model
         }
     }
 
-    public function getDroppableAttribute()
+    public function getDroppableAttribute(): string
     {
         if ((int) $this->type === 1) {
             return ' droppable';
@@ -102,7 +214,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkTargetAttribute()
+    public function getLinkTargetAttribute(): string
     {
         $target = Setting::fetch('window_target');
 
@@ -113,7 +225,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkIconAttribute()
+    public function getLinkIconAttribute(): string
     {
         if ((int) $this->type === 1) {
             return 'fa-tag';
@@ -122,7 +234,7 @@ class Item extends Model
         }
     }
 
-    public function getLinkTypeAttribute()
+    public function getLinkTypeAttribute(): string
     {
         if ((int) $this->type === 1) {
             return 'tags';
@@ -131,6 +243,10 @@ class Item extends Model
         }
     }
 
+    /**
+     * @param $class
+     * @return false|mixed|string
+     */
     public static function nameFromClass($class)
     {
         $explode = explode('\\', $class);
@@ -139,6 +255,11 @@ class Item extends Model
         return $name;
     }
 
+    /**
+     * @param $query
+     * @param $type
+     * @return mixed
+     */
     public function scopeOfType($query, $type)
     {
         switch ($type) {
@@ -153,7 +274,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;
@@ -164,16 +285,23 @@ 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, 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, false) || $class === null || $class === 'null') {
@@ -181,10 +309,10 @@ class Item extends Model
         }
         $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();
@@ -196,12 +324,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;
@@ -224,7 +355,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);
@@ -234,13 +368,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;
         }
 
@@ -250,8 +387,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,6 +5,7 @@ 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;
@@ -31,9 +32,9 @@ class ProcessApps implements ShouldQueue, ShouldBeUnique
     /**
      * Execute the job.
      *
-     * @return void
+     * @throws GuzzleException
      */
-    public function handle()
+    public function handle(): void
     {
         Log::debug('Process Apps dispatched');
         $localapps = Application::whereNull('class')->get();

app/Jobs/UpdateApps.php

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Application;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -29,9 +30,9 @@ class UpdateApps implements ShouldQueue, ShouldBeUnique
     /**
      * Execute the job.
      *
-     * @return void
+     * @throws GuzzleException
      */
-    public function handle()
+    public function handle(): void
     {
         Log::debug('Update of all apps triggered!');
         $apps = Application::all('appid')->toArray();
@@ -48,10 +49,7 @@ class UpdateApps implements ShouldQueue, ShouldBeUnique
         Cache::lock('updateApps')->forceRelease();
     }
 
-    /**
-     * @return void
-     */
-    public function failed($exception)
+    public function failed($exception): void
     {
         Cache::lock('updateApps')->forceRelease();
     }

app/Providers/AppServiceProvider.php

@@ -7,19 +7,20 @@ use App\Jobs\ProcessApps;
 use App\Jobs\UpdateApps;
 use App\Setting;
 use App\User;
+use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 class AppServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         if (! class_exists('ZipArchive')) {
             die('You are missing php-zip');
@@ -40,6 +41,9 @@ class AppServiceProvider extends ServiceProvider
             ProcessApps::dispatch();
         }
 
+        $lang = Setting::fetch('language');
+        \App::setLocale($lang);
+
         // 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'])) {
@@ -67,17 +71,21 @@ 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.')"';
             }
 
             $allusers = User::all();
             $current_user = User::currentUser();
 
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
-
             $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);
         });
@@ -95,10 +103,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'))) {
@@ -109,11 +115,13 @@ 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('settings', function () {
             return new Setting();
         });
@@ -122,14 +130,18 @@ class AppServiceProvider extends ServiceProvider
     /**
      * Check if database needs an update or do first time database setup
      *
-     * @return void
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function setupDatabase(): void
     {
         $db_type = config()->get('database.default');
 
-        if ($db_type == 'sqlite' && ! is_file(database_path('app.sqlite'))) {
-            touch(database_path('app.sqlite'));
+        if ($db_type == 'sqlite') {
+            $db_file = database_path(env('DB_DATABASE', 'app.sqlite'));
+            if (! is_file($db_file)) {
+                touch($db_file);
+            }
         }
 
         if ($this->needsDBUpdate()) {
@@ -139,9 +151,6 @@ class AppServiceProvider extends ServiceProvider
         }
     }
 
-    /**
-     * @return void
-     */
     public function createEnvFile(): void
     {
         if (!is_file(base_path('.env'))) {
@@ -151,9 +160,6 @@ class AppServiceProvider extends ServiceProvider
         $this->genKey();
     }
 
-    /**
-     * @return bool
-     */
     private function needsDBUpdate(): bool
     {
         if (!Schema::hasTable('settings')) {
@@ -166,10 +172,7 @@ class AppServiceProvider extends ServiceProvider
         return version_compare($app_version, $db_version) === 1;
     }
 
-    /**
-     * @return void
-     */
-    private function updateApps()
+    private function updateApps(): void
     {
         // This lock ensures that the job is not invoked multiple times.
         // In 5 minutes all app updates should be finished.

app/Providers/AuthServiceProvider.php

@@ -17,13 +17,9 @@ class AuthServiceProvider extends ServiceProvider
 
     /**
      * Register any authentication / authorization services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->registerPolicies();
-
         //
     }
 }

app/Providers/BroadcastServiceProvider.php

@@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Broadcast::routes();
 

app/Providers/EventServiceProvider.php

@@ -19,13 +19,19 @@ class EventServiceProvider extends ServiceProvider
 
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         parent::boot();
 
         //
     }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     */
+    public function shouldDiscoverEvents(): bool
+    {
+        return false;
+    }
 }

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

@@ -4,6 +4,7 @@ namespace App;
 
 use Cache;
 use Form;
+use Illuminate\Support\Collection;
 use Yaml;
 
 abstract class Search
@@ -11,9 +12,9 @@ abstract class Search
     /**
      * List of all search providers
      *
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
-    public static function providers()
+    public static function providers(): Collection
     {
         $providers = self::standardProviders();
         $providers = $providers + self::appProviders();
@@ -61,7 +62,7 @@ abstract class Search
      *
      * @return array
      */
-    public static function appProviders()
+    public static function appProviders(): array
     {
         $providers = [];
         $userapps = Item::all();
@@ -121,7 +122,15 @@ abstract class Search
                     $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
                 }
                 $output .= '</select>';
-                $output .= Form::text('q', null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __('app.settings.search').'...']);
+                $output .= Form::text(
+                    'q',
+                    null,
+                    [
+                        'class' => 'homesearch',
+                        'autofocus' => 'autofocus',
+                        'placeholder' => __('app.settings.search').'...'
+                    ]
+                );
                 $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
                 $output .= '</div>';
                 $output .= '</form>';

app/Setting.php

@@ -3,10 +3,46 @@
 namespace App;
 
 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\Session\SessionManager;
+use Illuminate\Session\Store;
 use Illuminate\Support\Facades\Input;
 
+/**
+ * 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
 {
     /**
@@ -34,10 +70,6 @@ class Setting extends Model
      */
     protected static $cache = [];
 
-    /**
-     * @param Request $request
-     * @return object
-     */
     public static function getInput(Request $request): object
     {
         return (object) [
@@ -57,7 +89,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');
                 }
@@ -75,7 +111,9 @@ class Setting extends Model
                     if ($this->key === 'search_provider') {
                         $options = Search::providers()->pluck('name', 'id')->toArray();
                     }
-                    $value = (array_key_exists($this->value, $options)) ? __($options[$this->value]) : __('app.options.none');
+                    $value = (array_key_exists($this->value, $options))
+                        ? __($options[$this->value])
+                        : __('app.options.none');
                 } else {
                     $value = __('app.options.none');
                 }
@@ -100,11 +138,24 @@ class Setting extends Model
             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>';
+                    $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 .= '<a class="settinglink" href="'.
+                        route('settings.clear', $this->id).
+                        '" title="'.
+                        __('app.settings.remove').
+                        '">'.
+                        __('app.settings.reset').
+                        '</a>';
                 }
 
                 break;
@@ -143,30 +194,30 @@ class Setting extends Model
         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];
@@ -207,20 +258,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);
     }
@@ -228,11 +273,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,7 +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
 {
@@ -13,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) [
@@ -52,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();
         }
@@ -82,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) {
@@ -96,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);
 
@@ -108,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';
@@ -129,7 +169,7 @@ abstract class SupportedApps
     /**
      * @param $app
      * @return bool|false
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public static function getFiles($app): bool
     {
@@ -165,6 +205,11 @@ abstract class SupportedApps
         return true;
     }
 
+    /**
+     * @param $details
+     * @param $app
+     * @return mixed
+     */
     public static function saveApp($details, $app)
     {
         $app->appid = $details->appid;

app/User.php

@@ -2,15 +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.
      *

composer.json

@@ -8,26 +8,28 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.4.32",
-        "facade/ignition": "^2.3.6",
-        "fideloper/proxy": "^4.0",
-        "graham-campbell/github": "^10.5",
+        "php": "^8.1",
+        "graham-campbell/github": "^12.0",
         "guzzlehttp/guzzle": "^7.4",
-        "laravel/framework": "^8.0",
-        "laravel/tinker": "^2.0",
-        "laravel/ui": "^3.0",
-        "laravelcollective/html": "^6.0",
-        "nunomaduro/collision": "^5.0",
-        "symfony/yaml": "^5.4",
+        "laravel/framework": "^10.44",
+        "laravel/tinker": "^2.8",
+        "laravel/ui": "^4.2",
+        "laravelcollective/html": "^6.4",
+        "nunomaduro/collision": "^6.3",
+        "symfony/yaml": "^6.2",
         "ext-json": "*",
-        "ext-intl": "*"
+        "ext-intl": "*",
+        "league/flysystem-aws-s3-v3": "^3.0",
+        "spatie/laravel-ignition": "^2.0"
     },
     "require-dev": {
-        "filp/whoops": "~2.0",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~9.0",
-        "symfony/thanks": "^1.0"
+        "barryvdh/laravel-ide-helper": "^2.13",
+        "filp/whoops": "^2.8",
+        "mockery/mockery": "^1.4.4",
+        "phpunit/phpunit": "^9.5.10",
+        "squizlabs/php_codesniffer": "3.*",
+        "symfony/thanks": "^1.2",
+        "fakerphp/faker": "^1.9.1"
     },
     "autoload": {
         "classmap": [
@@ -51,6 +53,7 @@
     "extra": {
         "laravel": {
             "dont-discover": [
+                "barryvdh/laravel-ide-helper"
             ]
         }
     },
@@ -64,6 +67,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": {
@@ -72,7 +81,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,5 +1,8 @@
 <?php
 
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Facade;
+
 return [
 
     /*
@@ -14,7 +17,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),
-    'version' => '2.5.1',
+    'version' => '2.6.1',
 
     /*
     |--------------------------------------------------------------------------
@@ -125,6 +128,24 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Maintenance Mode Driver
+    |--------------------------------------------------------------------------
+    |
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
+    |
+    */
+
+    'maintenance' => [
+        'driver' => 'file',
+        // 'store'  => 'redis',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -136,34 +157,7 @@ return [
     |
     */
 
-    '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,
-
+    'providers' => ServiceProvider::defaultProviders()->merge([
         /*
          * Package Service Providers...
          */
@@ -176,8 +170,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
-    ],
+    ])->toArray(),
 
     /*
     |--------------------------------------------------------------------------
@@ -190,51 +183,13 @@ return [
     |
     */
 
-    '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' => Collective\Html\FormFacade::class,
+        'Html' => Collective\Html\HtmlFacade::class,
+        'Redis' => Illuminate\Support\Facades\Redis::class,
+        'SupportedApps' => App\SupportedApps::class,
+        'Yaml' => Symfony\Component\Yaml\Yaml::class,
+    ])->toArray(),
 
 ];

config/auth.php

@@ -31,7 +31,7 @@ return [
     | 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"
+    | Supported: "session"
     |
     */
 
@@ -86,16 +86,20 @@ return [
     | 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
+    | The expiry time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
     | they have less time to be guessed. You may change this as needed.
     |
+    | The throttle setting is the number of seconds a user must wait before
+    | generating more password reset tokens. This prevents the user from
+    | quickly generating a very large amount of password reset tokens.
+    |
     */
 
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'table' => 'password_resets',
+            'table' => 'password_reset_tokens',
             'expire' => 60,
             'throttle' => 60,
         ],

config/broadcasting.php

@@ -11,7 +11,7 @@ return [
     | 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"
+    | Supported: "pusher", "ably", "redis", "log", "null"
     |
     */
 
@@ -37,8 +37,20 @@ return [
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS' => true,
+                'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
+                'port' => env('PUSHER_PORT', 443),
+                'scheme' => env('PUSHER_SCHEME', 'https'),
+                'encrypted' => true,
+                'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
             ],
+            'client_options' => [
+                // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
+            ],
+        ],
+
+        'ably' => [
+            'driver' => 'ably',
+            'key' => env('ABLY_KEY'),
         ],
 
         'redis' => [

config/cache.php

@@ -13,8 +13,6 @@ return [
     | 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'),
@@ -28,6 +26,9 @@ return [
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
+    | Supported drivers: "apc", "array", "database", "file",
+    |         "memcached", "redis", "dynamodb", "octane", "null"
+    |
     */
 
     'stores' => [
@@ -45,11 +46,13 @@ return [
             'driver' => 'database',
             'table' => 'cache',
             'connection' => null,
+            'lock_connection' => null,
         ],
 
         'file' => [
             'driver' => 'file',
             'path' => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
@@ -60,7 +63,7 @@ return [
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -74,6 +77,7 @@ return [
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
+            'lock_connection' => 'default',
         ],
 
         'dynamodb' => [
@@ -85,6 +89,10 @@ return [
             'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
+        'octane' => [
+            'driver' => 'octane',
+        ],
+
     ],
 
     /*
@@ -92,12 +100,12 @@ return [
     | 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.
+    | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
+    | stores there might be other applications using the same cache. For
+    | that reason, you may prefix every cache key to avoid collisions.
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
 ];

config/cors.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['api/*', 'sanctum/csrf-cookie'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];

config/database.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('DB_CONNECTION', 'sqlite'),
+    'default' => env('DB_CONNECTION', 'mysql'),
 
     /*
     |--------------------------------------------------------------------------
@@ -37,9 +37,10 @@ return [
 
         'sqlite' => [
             'driver' => 'sqlite',
-            //'database' => env('DB_DATABASE', database_path('database.sqlite')),
-            'database' => database_path(env('DB_DATABASE', 'app.sqlite')),
+            'url' => env('DATABASE_URL'),
+            'database' => database_path(env('DB_DATABASE', 'database.sqlite')),
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
         'mysql' => [
@@ -73,7 +74,7 @@ return [
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
-            'schema' => 'public',
+            'search_path' => 'public',
             'sslmode' => 'prefer',
         ],
 
@@ -88,8 +89,10 @@ return [
             'charset' => 'utf8',
             'prefix' => '',
             'prefix_indexes' => true,
+            // 'encrypt' => env('DB_ENCRYPT', 'yes'),
+            // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'),
         ],
-        
+
     ],
 
     /*
@@ -111,7 +114,7 @@ return [
     |--------------------------------------------------------------------------
     |
     | 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
+    | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
@@ -128,7 +131,8 @@ return [
         'default' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_DB', '0'),
         ],
@@ -136,7 +140,8 @@ return [
         'cache' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
+            'password' => env('REDIS_PASSWORD'),
             'port' => env('REDIS_PORT', '6379'),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],

config/filesystems.php

@@ -13,18 +13,7 @@ return [
     |
     */
 
-    '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.
-    |
-    */
+    'default' => env('FILESYSTEM_DISK', 'local'),
 
     'cloud' => env('FILESYSTEM_CLOUD', 's3'),
 
@@ -35,9 +24,9 @@ return [
     |
     | 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.
+    | been set up for each driver as an example of the required values.
     |
-    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -46,6 +35,7 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'throw' => false,
         ],
 
         'public' => [
@@ -53,6 +43,7 @@ return [
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
+            'throw' => false,
         ],
 
         's3' => [
@@ -63,8 +54,25 @@ return [
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
         ],
-        
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Symbolic Links
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the symbolic links that will be created when the
+    | `storage:link` Artisan command is executed. The array keys should be
+    | the locations of the links and the values should be their targets.
+    |
+    */
+
+    'links' => [
+        public_path('storage') => storage_path('app/public'),
     ],
 
 ];

config/hashing.php

@@ -29,7 +29,8 @@ return [
     */
 
     'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 10),
+        'rounds' => env('BCRYPT_ROUNDS', 12),
+        'verify' => true,
     ],
 
     /*
@@ -44,9 +45,10 @@ return [
     */
 
     'argon' => [
-        'memory' => 1024,
-        'threads' => 2,
-        'time' => 2,
+        'memory' => 65536,
+        'threads' => 1,
+        'time' => 4,
+        'verify' => true,
     ],
 
-];
+];

config/logging.php

@@ -3,6 +3,7 @@
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
 
 return [
 
@@ -17,7 +18,23 @@ return [
     |
     */
 
-    'default' => env('LOG_CHANNEL', 'daily'),
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Deprecations Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the log channel that should be used to log warnings
+    | regarding deprecated PHP and library features. This allows you to get
+    | your application ready for upcoming major versions of dependencies.
+    |
+    */
+
+    'deprecations' => [
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => false,
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -44,14 +61,16 @@ return [
         'single' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'daily' => [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
             'days' => 14,
+            'replace_placeholders' => true,
         ],
 
         'slack' => [
@@ -59,36 +78,44 @@ return [
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
             'emoji' => ':boom:',
-            'level' => 'critical',
+            'level' => env('LOG_LEVEL', 'critical'),
+            'replace_placeholders' => true,
         ],
 
         'papertrail' => [
             'driver' => 'monolog',
-            'level' => 'debug',
-            'handler' => SyslogUdpHandler::class,
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'stderr' => [
             'driver' => 'monolog',
+            'level' => env('LOG_LEVEL', 'debug'),
             'handler' => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
                 'stream' => 'php://stderr',
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'facility' => LOG_USER,
+            'replace_placeholders' => true,
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'null' => [

config/mail.php

@@ -4,45 +4,97 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | 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"
+    | This option controls the default mailer that is used to send any email
+    | messages sent by your application. Alternative mailers may be setup
+    | and used as needed; however, this mailer will be used by default.
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | 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.
+    | Here you may configure all of the mailers used by your application plus
+    | their respective settings. Several examples have been configured for
+    | you and you are free to add your own as your application requires.
+    |
+    | Laravel supports a variety of mail "transport" drivers to be used while
+    | sending an e-mail. You will specify which one you are using for your
+    | mailers below. You are free to add additional mailers as required.
+    |
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
+    |            "postmark", "log", "array", "failover", "roundrobin"
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'mailers' => [
+        'smtp' => [
+            'transport' => 'smtp',
+            'url' => env('MAIL_URL'),
+            'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+            'port' => env('MAIL_PORT', 587),
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'username' => env('MAIL_USERNAME'),
+            'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
+            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+        ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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.
-    |
-    */
+        'ses' => [
+            'transport' => 'ses',
+        ],
 
-    'port' => env('MAIL_PORT', 587),
+        'postmark' => [
+            'transport' => 'postmark',
+            // 'message_stream_id' => null,
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
+
+        'mailgun' => [
+            'transport' => 'mailgun',
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+
+        'failover' => [
+            'transport' => 'failover',
+            'mailers' => [
+                'smtp',
+                'log',
+            ],
+        ],
+
+        'roundrobin' => [
+            'transport' => 'roundrobin',
+            'mailers' => [
+                'ses',
+                'postmark',
+            ],
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -60,47 +112,6 @@ return [
         'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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

config/queue.php

@@ -39,6 +39,7 @@ return [
             'table' => 'jobs',
             'queue' => 'default',
             'retry_after' => 90,
+            'after_commit' => false,
         ],
 
         'beanstalkd' => [
@@ -47,6 +48,7 @@ return [
             'queue' => 'default',
             'retry_after' => 90,
             'block_for' => 0,
+            'after_commit' => false,
         ],
 
         'sqs' => [
@@ -54,9 +56,10 @@ return [
             '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'),
+            'queue' => env('SQS_QUEUE', 'default'),
             'suffix' => env('SQS_SUFFIX'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'after_commit' => false,
         ],
 
         'redis' => [
@@ -65,6 +68,7 @@ return [
             'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
             'block_for' => null,
+            'after_commit' => false,
         ],
 
     ],
@@ -81,7 +85,7 @@ return [
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],

config/services.php

@@ -18,6 +18,7 @@ return [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
         'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+        'scheme' => 'https',
     ],
 
     'postmark' => [
@@ -29,5 +30,5 @@ return [
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
-    
+
 ];

config/session.php

@@ -14,7 +14,7 @@ return [
     | you may specify any of the other wonderful drivers provided here.
     |
     | Supported: "file", "cookie", "database", "apc",
-    |            "memcached", "redis", "array"
+    |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
@@ -72,7 +72,7 @@ return [
     |
     */
 
-    'connection' => env('SESSION_CONNECTION', null),
+    'connection' => env('SESSION_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------
@@ -92,13 +92,15 @@ return [
     | 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.
+    | While using one of the framework's cache driven session backends you may
+    | list a cache store that should be used for these sessions. This value
+    | must match with one of the application's configured cache "stores".
+    |
+    | Affects: "apc", "dynamodb", "memcached", "redis"
     |
     */
 
-    'store' => env('SESSION_STORE', null),
+    'store' => env('SESSION_STORE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -153,7 +155,7 @@ return [
     |
     */
 
-    'domain' => env('SESSION_DOMAIN', null),
+    'domain' => env('SESSION_DOMAIN'),
 
     /*
     |--------------------------------------------------------------------------
@@ -162,7 +164,7 @@ return [
     |
     | 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.
+    | the cookie from being sent to you when it can't be done securely.
     |
     */
 
@@ -188,12 +190,25 @@ return [
     |
     | 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.
+    | will set this value to "lax" since this is a secure default value.
     |
-    | Supported: "lax", "strict"
+    | Supported: "lax", "strict", "none", null
     |
     */
 
     'same_site' => null,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Partitioned Cookies
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will tie the cookie to the top-level site for
+    | a cross-site context. Partitioned cookies are accepted by the browser
+    | when flagged "secure" and the Same-Site attribute is set to "none".
+    |
+    */
+
+    'partitioned' => false,
+
 ];

config/view.php

@@ -33,4 +33,4 @@ return [
         realpath(storage_path('framework/views'))
     ),
 
-];
+];

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

@@ -2,6 +2,8 @@
 
 namespace Database\Factories;
 
+use Illuminate\Support\Facades\Hash;
+use App\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
@@ -12,23 +14,23 @@ class UserFactory extends Factory
      *
      * @return array
      */
-    public function definition()
+    protected static ?string $password;
+
+    public function definition(): array
     {
         return [
-            'name' => $this->faker->name(),
+            'username' => $this->faker->name(),
             'email' => $this->faker->unique()->safeEmail(),
-            'email_verified_at' => now(),
-            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+            'password' => static::$password ??= Hash::make('password'),
+            'public_front' => 1,
             'remember_token' => Str::random(10),
         ];
     }
 
     /**
      * Indicate that the model's email address should be unverified.
-     *
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
      */
-    public function unverified()
+    public function unverified(): Factory
     {
         return $this->state(function (array $attributes) {
             return [
@@ -36,4 +38,4 @@ class UserFactory extends Factory
             ];
         });
     }
-}
+}

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/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/seeders/DatabaseSeeder.php

@@ -8,10 +8,8 @@ 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

@@ -22,12 +22,16 @@ class SettingsSeeder extends Seeder
             return json_encode(['en' => 'English']);
         }
 
-        $languageDirectories = array_filter(glob(resource_path().'/lang/*'), 'is_dir');
+        $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');
+            $resultNative = mb_convert_case(
+                Locale::getDisplayLanguage($language.'-', $language),
+                MB_CASE_TITLE,
+                'UTF-8'
+            );
             $resultEn = ucfirst(Locale::getDisplayLanguage($language, 'en'));
             $result[$language] = "$resultNative ($resultEn)";
         }
@@ -48,10 +52,8 @@ class SettingsSeeder extends Seeder
 
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Groups
         if (! $setting_group = SettingGroup::find(1)) {
@@ -176,6 +178,33 @@ class SettingsSeeder extends Seeder
             $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',
@@ -201,7 +230,12 @@ class SettingsSeeder extends Seeder
 
         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->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;
@@ -210,7 +244,11 @@ class SettingsSeeder extends Seeder
             $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->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();
         }
@@ -275,7 +313,7 @@ class SettingsSeeder extends Seeder
             $home_tag->save();
             $home_tag_id = $home_tag->id;
 
-            if($home_tag_id != 0) {
+            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]);
@@ -289,5 +327,28 @@ class SettingsSeeder extends Seeder
                 $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

@@ -9,13 +9,11 @@ class UsersSeeder extends Seeder
 {
     /**
      * Run the database seeds.
-     *
-     * @return void
      */
-    public function run()
+    public function run(): void
     {
         // Groups
-        if (! $user = User::find(1)) {
+        if (!User::find(1)) {
             $user = new User;
             $user->username = 'admin';
             $user->email = 'admin@test.com';
@@ -24,13 +22,11 @@ class UsersSeeder extends Seeder
 
             $user_id = $user->id;
 
-            if($user_id != 1) {
+            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]);
             }
-        } else {
-            //$user->save();
         }
     }
 }

lang/br/app.php

@@ -0,0 +1,133 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | App Language Lines
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'settings.system' => 'Sistema',
+    'settings.appearance' => 'Aparência',
+    'settings.miscellaneous' => 'Diversos',
+    'settings.support' => 'Ajuda',
+    'settings.donate' => 'Doar',
+
+    'settings.version' => 'Versão',
+    'settings.background_image' => 'Imagem de fundo',
+    'settings.trianglify' => 'Trianglify',
+    'settings.trianglify_seed' => 'Trianglify Random Seed',
+    'settings.window_target' => 'Link é aberto em',
+    'settings.window_target.current' => 'Abra nesta aba',
+    'settings.window_target.one' => 'Abra na mesma aba',
+    'settings.window_target.new' => 'Abra em uma nova aba',
+    'settings.homepage_search' => 'Pesquisa na página inicial',
+    'settings.search_provider' => 'Provedor de pesquisa',
+    'settings.language' => 'Idioma',
+    'settings.reset' => 'Redefinir de volta ao padrão',
+    'settings.remove' => 'Remover',
+    'settings.search' => 'busca',
+    'settings.no_items' => 'Nenhum item encontrado',
+    'settings.advanced' => 'Avançado',
+    'settings.custom_css' => 'CSS Customizado',
+    'settings.custom_js' => 'JavaScript Customizado',
+
+    'settings.label' => 'Rótulo',
+    'settings.value' => 'Valor',
+    'settings.edit' => 'Editar',
+    'settings.view' => 'Ver',
+
+    'options.none' => '- não configurado -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => 'Página inicial',
+    'options.yes' => 'Sim',
+    'options.no' => 'Não',
+    'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
+
+    'buttons.save' => 'Salvar',
+    'buttons.cancel' => 'Cancelar',
+    'buttons.add' => 'Adicionar',
+    'buttons.upload' => 'Carregar um arquivo',
+    'buttons.downloadapps' => 'Atualizar lista de Apps',
+
+    'dashboard' => 'Página Inicial do dashboard',
+    'dashboard.reorder' => 'Reordenar e fixar itens',
+    'dashboard.settings' => 'Configurações',
+
+    'dash.pin_item' => 'Fixar o item na dashboard',
+    'dash.no_apps' => 'Atualmente não há aplicativos fixados, :link1 ou :link2',
+    'dash.link1' => 'Adicionar um aplivativo aqui',
+    'dash.link2' => 'Fixar um item na dashboard',
+    'dash.pinned_items' => 'Itens fixados',
+
+    'apps.app_list' => 'Lista de aplicativos',
+    'apps.view_trash' => 'Ver lixo',
+    'apps.add_application' => 'Adicionar aplicativo',
+    'apps.application_name' => 'Nome do aplicativo',
+    'apps.colour' => 'Cor',
+    'apps.icon' => 'Ícone',
+    'app.import' => 'Importar',
+    'apps.pinned' => 'Fixado',
+    'apps.title' => 'Título',
+    'apps.hex' => 'Cor hexadecimal',
+    'apps.username' => 'Nome de usuário',
+    'apps.password' => 'Senha',
+    'apps.config' => 'Configuração',
+    'apps.apikey' => 'API Key',
+    'apps.enable' => 'Habilitar',
+    'apps.tag_list' => 'Lista de tags',
+    'apps.add_tag' => 'Adicionar tag',
+    'apps.tag_name' => 'Nome da tag',
+    'apps.tags' => 'Tags',
+    'apps.override' => 'Se diferente do URL principal',
+    'apps.preview' => 'Vizualizar',
+    'apps.apptype' => 'Tipo de Aplicativo',
+    'apps.website' => 'Website',
+    'apps.description' => 'Descrição',
+    'apps.only_admin_account' => 'Somente se tiver conta admin!',
+    'apps.autologin_url' => 'URL de login automático',
+    'apps.show_deleted' => 'Mostrando Aplicativos Apagados',
+
+    'user.user_list' => 'Comercial',
+    'user.add_user' => 'Adicionar usuários',
+    'user.username' => 'Nome de usuário',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'O email',
+    'user.password_confirm' => 'Confirme a Senha',
+    'user.secure_front' => 'Permitir acesso público à frente - Aplicado apenas se uma senha for definida.',
+    'user.autologin' => 'Permitir o login a partir de um URL específico. Qualquer pessoa com o link pode fazer o login.',
+
+    'url' => 'URL',
+    'title' => 'Título',
+    'delete' => 'Apagar',
+    'optional' => 'Opcional',
+    'restore' => 'Restaurar',
+    'export' => 'Exportar',
+    'import' => 'Importar',
+
+    'alert.success.item_created' => 'Item criado com sucesso',
+    'alert.success.item_updated' => 'Item atualizado com sucesso',
+    'alert.success.item_deleted' => 'Item apagado com sucesso',
+    'alert.success.item_restored' => 'Item restaurado com sucesso',
+
+    'alert.success.tag_created' => 'Tag criada com sucesso',
+    'alert.success.tag_updated' => 'Tag atualizada com sucesso',
+    'alert.success.tag_deleted' => 'Tag apagada com sucesso',
+    'alert.success.tag_restored' => 'Tag restaurada com sucesso',
+    'alert.success.updating'=> 'Atualizando lista de apps',
+    'alert.success.setting_updated' => 'Você editou com sucesso essa configuração',
+    'alert.error.not_exist' => 'Essa configuração não existe.',
+    'alert.success.updating' => 'Atualizando lista de Apps',
+
+    'alert.success.user_created' => 'Usuário criado com sucesso',
+    'alert.success.user_updated' => 'Usuário atualizado com sucesso',
+    'alert.success.user_deleted' => 'Usuário excluído com sucesso',
+    'alert.success.user_restored' => 'Usuário restaurado com sucesso',
+
+];

lang/cs/app.php

@@ -0,0 +1,108 @@
+<?php
+
+return array (
+  'settings.system' => 'Systém',
+  'settings.appearance' => 'Vzhled',
+  'settings.miscellaneous' => 'Různé',
+  'settings.advanced' => 'Rozšířené nastavení',
+  'settings.support' => 'Podpora',
+  'settings.donate' => 'Podpořte nás',
+  'settings.version' => 'Verze',
+  'settings.background_image' => 'Obrázek pozadí',
+  'settings.trianglify' => 'Trianglify',
+  'settings.trianglify_seed' => 'Trianglify Random Seed',
+  'settings.window_target' => 'Odkazy otevírat v',
+  'settings.window_target.current' => 'Otevřít v této záložce',
+  'settings.window_target.one' => 'Otevřít ve stejné záložce',
+  'settings.window_target.new' => 'Otevřít v nové záložce',
+  'settings.homepage_search' => 'Vyhledávání na domovské stránce',
+  'settings.search_provider' => 'Vyhledávat pomocí',
+  'settings.language' => 'Jazyk',
+  'settings.reset' => 'Obnovit výchozí nastavení',
+  'settings.remove' => 'Odstranit',
+  'settings.search' => 'hledat',
+  'settings.no_items' => 'Žadné položky nenalezeny',
+  'settings.label' => 'Název',
+  'settings.value' => 'Hodnota',
+  'settings.edit' => 'Upravit',
+  'settings.view' => 'Náhled',
+  'settings.custom_css' => 'Vlastní CSS',
+  'settings.custom_js' => 'Vlastní JavaScript',
+  'options.none' => '- nenastaveno -',
+  'options.google' => 'Google',
+  'options.ddg' => 'DuckDuckGo',
+  'options.bing' => 'Bing',
+  'options.qwant' => 'Qwant',
+  'options.startpage' => 'StartPage',
+  'options.yes' => 'Ano',
+  'options.no' => 'Ne',
+  'options.nzbhydra' => 'NZBHydra',
+  'options.jackett' => 'Jackett',
+  'buttons.save' => 'Uložit',
+  'buttons.cancel' => 'Zrušit',
+  'buttons.add' => 'Přidat',
+  'buttons.upload' => 'Nahrát ikonu',
+  'buttons.downloadapps' => 'Aktualizovat seznam aplikací',
+  'dash.pin_item' => 'Připnout na dashboard',
+  'dash.no_apps' => 'Aktuálně nemáte žádné připnuté aplikace, :link1 nebo :link2',
+  'dash.link1' => 'Přidejte zde aplikacei',
+  'dash.link2' => 'Připnout na dashboard',
+  'dash.pinned_items' => 'Připnuté položky',
+  'apps.app_list' => 'Seznam aplikací',
+  'apps.view_trash' => 'Zobrazit koš',
+  'apps.add_application' => 'Přidat aplikaci',
+  'apps.application_name' => 'Název aplikace',
+  'apps.colour' => 'Barva',
+  'apps.icon' => 'Ikona',
+  'apps.pinned' => 'Připnuto',
+  'apps.title' => 'Název',
+  'apps.hex' => 'Hex barva',
+  'apps.username' => 'Uživatelské jméno',
+  'apps.password' => 'Heslo',
+  'apps.config' => 'Config',
+  'apps.apikey' => 'API Klíč',
+  'apps.enable' => 'Povolit',
+  'apps.tag_list' => 'Seznam tagů',
+  'apps.add_tag' => 'Přidat tag',
+  'apps.tag_name' => 'Název tagu',
+  'apps.tags' => 'Tagy',
+  'apps.override' => 'Pokud je různá od hlavní url',
+  'apps.preview' => 'Náhled',
+  'apps.apptype' => 'Typ apliakce',
+  'apps.website' => 'Webová stránka',
+  'apps.description' => 'Popis',
+  'apps.only_admin_account' => 'Pouze pokud máte administrátorský účet!',
+  'apps.autologin_url' => 'URL automatického přihlášení',
+  'apps.show_deleted' => 'Zobrazit smazané aplikace',
+  'dashboard' => 'Domácí obrazovka',
+  'user.user_list' => 'Uživatelé',
+  'user.add_user' => 'Přidat uživatele',
+  'user.username' => 'Uživatelské jméno',
+  'user.avatar' => 'Avatar',
+  'user.email' => 'Email',
+  'user.password_confirm' => 'Potvrdit heslo',
+  'user.secure_front' => 'Povolit veřejný přístup k rozhraní - Nastavte pouze pokud je nastaveno heslo.',
+  'user.autologin' => 'Povolit přihlášení ze specifické URL. Kdokoliv s odkazem se může přihlásit.',
+  'url' => 'URL',
+  'title' => 'Název',
+  'delete' => 'Smazat',
+  'optional' => 'Volitelné',
+  'restore' => 'Obnovit',
+  'alert.success.item_created' => 'Položka úspěšně vytvořena',
+  'alert.success.item_updated' => 'Položka úspěšně aktualizována',
+  'alert.success.item_deleted' => 'Položka úspěšně smazána',
+  'alert.success.item_restored' => 'Položka úspěšně obnovena',
+  'alert.success.updating' => 'Aktualizuji seznam aplikací',
+  'alert.success.tag_created' => 'Tag úspěšně vytvořen',
+  'alert.success.tag_updated' => 'Tag úspěšně aktualizován',
+  'alert.success.tag_deleted' => 'Tag úspěšně smazán',
+  'alert.success.tag_restored' => 'Tag úspěšně obnoven',
+  'alert.success.setting_updated' => 'Úspěšně jste aktualizovali nastavení',
+  'alert.error.not_exist' => 'Tohle nastavení neexistuje.',
+  'alert.success.user_created' => 'Uživatel úspěšně vytovřen',
+  'alert.success.user_updated' => 'Uživatel úspěšně aktualizován',
+  'alert.success.user_deleted' => 'Uživatel úspěšně smazán',
+  'alert.success.user_restored' => 'Uživatel úspěšně obnoven',
+  'dashboard.reorder' => 'Změňte pořadí a připněte položky',
+  'dashboard.settings' => 'Nastavení',
+);

lang/da/app.php

@@ -0,0 +1,108 @@
+<?php
+
+return array (
+  'settings.system' => 'System',
+  'settings.appearance' => 'Appearance',
+  'settings.miscellaneous' => 'Miscellaneous',
+  'settings.advanced' => 'Fremskreden',
+  'settings.support' => 'Support',
+  'settings.donate' => 'Doner',
+  'settings.version' => 'Version',
+  'settings.background_image' => 'Baggrundsbillede',
+  'settings.trianglify' => 'Trianglify',
+  'settings.trianglify_seed' => 'Trianglify Random Seed',
+  'settings.window_target' => 'Link opens in',
+  'settings.window_target.current' => 'Åbn i denne fane',
+  'settings.window_target.one' => 'Åbn i den samme fane',
+  'settings.window_target.new' => 'Åbn i en ny fane',
+  'settings.homepage_search' => 'Homepage Search',
+  'settings.search_provider' => 'Standardsøgemaskine',
+  'settings.language' => 'Sprog',
+  'settings.reset' => 'Nulstil tilbage til standard',
+  'settings.remove' => 'Fjern',
+  'settings.search' => 'søg',
+  'settings.no_items' => 'Intet fundet',
+  'settings.label' => 'Etiket',
+  'settings.value' => 'Værdi',
+  'settings.edit' => 'Rediger',
+  'settings.view' => 'Vis',
+  'settings.custom_css' => 'Brugerdefineret CSS',
+  'settings.custom_js' => 'Brugerdefineret JavaScript',
+  'options.none' => '- ikke indstillet -',
+  'options.google' => 'Google',
+  'options.ddg' => 'DuckDuckGo',
+  'options.bing' => 'Bing',
+  'options.qwant' => 'Qwant',
+  'options.startpage' => 'Startside',
+  'options.yes' => 'Ja',
+  'options.no' => 'Nej',
+  'options.nzbhydra' => 'NZBHydra',
+  'options.jackett' => 'Jackett',
+  'buttons.save' => 'Gem',
+  'buttons.cancel' => 'Afbryd',
+  'buttons.add' => 'Tilføj',
+  'buttons.upload' => 'Upload et ikon',
+  'buttons.downloadapps' => 'Opdater apps-listen',
+  'dash.pin_item' => 'Fastgør element til dashboard',
+  'dash.no_apps' => 'Der er i øjeblikket ingen fastgjorte applikationer, :link1 eller :link2',
+  'dash.link1' => 'Add an application here',
+  'dash.link2' => 'Pin an item to the dash',
+  'dash.pinned_items' => 'Fastgjorte elementer',
+  'apps.app_list' => 'Applikations liste',
+  'apps.view_trash' => 'View trash',
+  'apps.add_application' => 'Tilføj applikation',
+  'apps.application_name' => 'Applikations navn',
+  'apps.colour' => 'Farver',
+  'apps.icon' => 'Ikon',
+  'apps.pinned' => 'Fastgjort',
+  'apps.title' => 'Titel',
+  'apps.hex' => 'Hex farver',
+  'apps.username' => 'brugernavn',
+  'apps.password' => 'kodeord',
+  'apps.config' => 'Config',
+  'apps.apikey' => 'API nøgle',
+  'apps.enable' => 'Aktiver',
+  'apps.tag_list' => 'Tags liste',
+  'apps.add_tag' => 'Tilføj tag',
+  'apps.tag_name' => 'Tag navn',
+  'apps.tags' => 'Tags',
+  'apps.override' => 'Hvis det er anderledes end hovedwebadressen',
+  'apps.preview' => 'Eksempel',
+  'apps.apptype' => 'Applikationstype',
+  'apps.website' => 'Internet side',
+  'apps.description' => 'Beskrivelse',
+  'apps.only_admin_account' => 'Kun hvis du har en admin-konto!',
+  'apps.autologin_url' => 'Auto login url',
+  'apps.show_deleted' => 'Viser slettede applikationer',
+  'dashboard' => 'Home dashboard',
+  'user.user_list' => 'Brugere',
+  'user.add_user' => 'Tilføj bruger',
+  'user.username' => 'Brugernavn',
+  'user.avatar' => 'Avatar',
+  'user.email' => 'E-mail',
+  'user.password_confirm' => 'Bekræft kodeord',
+  'user.secure_front' => 'Tillad offentlig adgang til forsiden - Kun håndhævet, hvis der er angivet en adgangskode.',
+  'user.autologin' => 'Tillad at logge ind fra en bestemt URL. Alle med linket kan logge ind.',
+  'url' => 'URL',
+  'title' => 'Title',
+  'delete' => 'Slet',
+  'optional' => 'Valgfri',
+  'restore' => 'Genskab',
+  'alert.success.item_created' => 'Item created successfully',
+  'alert.success.item_updated' => 'Item updated successfully',
+  'alert.success.item_deleted' => 'Item deleted successfully',
+  'alert.success.item_restored' => 'Item restored successfully',
+  'alert.success.updating' => 'Updating apps list',
+  'alert.success.tag_created' => 'Tag oprettet med succes',
+  'alert.success.tag_updated' => 'Tag opdateret med succes',
+  'alert.success.tag_deleted' => 'Tag slettet med succes',
+  'alert.success.tag_restored' => 'Tag genskabt med succes',
+  'alert.success.setting_updated' => 'You have successfully edited this setting',
+  'alert.error.not_exist' => 'Denne indstilling findes ikke.',
+  'alert.success.user_created' => 'Bruger oprettet med succes',
+  'alert.success.user_updated' => 'Bruger opdateret med succes',
+  'alert.success.user_deleted' => 'Bruger slettet med succes',
+  'alert.success.user_restored' => 'Bruger genskabt med succes',
+  'dashboard.reorder' => 'Genbestil og fastgør varer',
+  'dashboard.settings' => 'Indstillinger',
+);

lang/de/app.php

@@ -0,0 +1,108 @@
+<?php
+
+return array (
+  'settings.system' => 'System',
+  'settings.appearance' => 'Aussehen',
+  'settings.miscellaneous' => 'Sonstiges',
+  'settings.advanced' => 'Erweitert',
+  'settings.support' => 'Unterstütze',
+  'settings.donate' => 'Spende',
+  'settings.version' => 'Version',
+  'settings.background_image' => 'Hintergrundbild',
+  'settings.trianglify' => 'Trianglify',
+  'settings.trianglify_seed' => 'Trianglify Random Seed',
+  'settings.window_target' => 'Link öffnen in',
+  'settings.window_target.current' => 'In diesem Tab öffnen',
+  'settings.window_target.one' => 'Im selben Tab öffnen',
+  'settings.window_target.new' => 'Im neuen Tab öffnen',
+  'settings.homepage_search' => 'Startseite Sucheingabe',
+  'settings.search_provider' => 'Suchanbieter',
+  'settings.language' => 'Sprache',
+  'settings.reset' => 'Zurücksetzen auf Standard',
+  'settings.remove' => 'Entfernen',
+  'settings.search' => 'suche',
+  'settings.no_items' => 'Keine Elemente gefunden',
+  'settings.label' => 'Bezeichnung',
+  'settings.value' => 'Wert',
+  'settings.edit' => 'Bearbeiten',
+  'settings.view' => 'Ansicht',
+  'settings.custom_css' => 'Angepasstes CSS',
+  'settings.custom_js' => 'Angepasstes JavaScript',
+  'options.none' => '- nicht festgelegt -',
+  'options.google' => 'Google',
+  'options.ddg' => 'DuckDuckGo',
+  'options.bing' => 'Bing',
+  'options.qwant' => 'Qwant',
+  'options.startpage' => 'StartSeite',
+  'options.yes' => 'Ja',
+  'options.no' => 'Nein',
+  'options.nzbhydra' => 'NZBHydra',
+  'options.jackett' => 'Jackett',
+  'buttons.save' => 'Speichern',
+  'buttons.cancel' => 'Abbrechen',
+  'buttons.add' => 'Hinzufügen',
+  'buttons.upload' => 'Hochladen einer Datei',
+  'buttons.downloadapps' => 'Update der Anwendungsliste',
+  'dash.pin_item' => 'Element auf dem Dashboard anheften',
+  'dash.no_apps' => 'Derzeit gibt es keine angeheftete Anwendungen. :link1 oder :link2',
+  'dash.link1' => 'Anwendung neu hinzufügen',
+  'dash.link2' => 'anheften',
+  'dash.pinned_items' => 'Angeheftete Elemente',
+  'apps.app_list' => 'Anwendungsliste',
+  'apps.view_trash' => 'Ansicht Papierkorb',
+  'apps.add_application' => 'Anwendung hinzufügen',
+  'apps.application_name' => 'Anwendungsname',
+  'apps.colour' => 'Farbe',
+  'apps.icon' => 'Symbol',
+  'apps.pinned' => 'Angeheftet',
+  'apps.title' => 'Titel',
+  'apps.hex' => 'Hex-Farbe',
+  'apps.username' => 'Benutzername',
+  'apps.password' => 'Passwort',
+  'apps.config' => 'Konfiguration',
+  'apps.apikey' => 'API Key',
+  'apps.enable' => 'Aktivieren',
+  'apps.tag_list' => 'Tags Liste',
+  'apps.add_tag' => 'Tag hinzufügen',
+  'apps.tag_name' => 'Tag Name',
+  'apps.tags' => 'Tags',
+  'apps.override' => 'Fals anders zur Haupt-URL',
+  'apps.preview' => 'Vorschau',
+  'apps.apptype' => 'Anwendungstyp',
+  'apps.website' => 'Webseite',
+  'apps.description' => 'Beschreibung',
+  'apps.only_admin_account' => 'Nur mit Admin-Konto!',
+  'apps.autologin_url' => 'Auto Login URL',
+  'apps.show_deleted' => 'Gelöschte Anwendung anzeigen',
+  'dashboard' => 'Home Dashboard',
+  'user.user_list' => 'Nutzer',
+  'user.add_user' => 'Nutzer hinzufügen',
+  'user.username' => 'Benutzername',
+  'user.avatar' => 'Avatar',
+  'user.email' => 'Email',
+  'user.password_confirm' => 'Passwort bestätigen',
+  'user.secure_front' => 'Öffentlichen Zugang erlauben - Tritt nur bei gesetztem Passwort in kraft.',
+  'user.autologin' => 'Anmelden von spezieller URL erlauben. Jeder mit diesem Link kann sich anmelden.',
+  'url' => 'URL',
+  'title' => 'Titel',
+  'delete' => 'Löschen',
+  'optional' => 'Optional',
+  'restore' => 'Wiederherstellen',
+  'alert.success.item_created' => 'Element erfolgreich erstellt',
+  'alert.success.item_updated' => 'Element erfolgreich aktualisiert',
+  'alert.success.item_deleted' => 'Element erfolgreich gelöscht',
+  'alert.success.item_restored' => 'Element erfolgreich wiederhergestellt',
+  'alert.success.updating' => 'Aktualisiere Anwendungsliste',
+  'alert.success.tag_created' => 'Tag erfolgreich erstellt',
+  'alert.success.tag_updated' => 'Tag erfolgreich aktualisiert',
+  'alert.success.tag_deleted' => 'Tag erfolgreich gelöscht',
+  'alert.success.tag_restored' => 'Tag erfolgreich wiederhergestellt',
+  'alert.success.setting_updated' => 'Die Einstellungen wurden übernommen',
+  'alert.error.not_exist' => 'Diese Einstellung existiert nicht.',
+  'alert.success.user_created' => 'Nutzer erfolgreich erstellt',
+  'alert.success.user_updated' => 'Nutzer erfolgreich aktualisiert',
+  'alert.success.user_deleted' => 'Nutzer erfolgreich gelöscht',
+  'alert.success.user_restored' => 'Nutzer erfolgreich wiederhergestellt',
+  'dashboard.reorder' => 'Elemente neu anordnen und anheften',
+  'dashboard.settings' => 'Einstellungen',
+);