Update app.php

Laravel shift and update defaults

.env

@@ -1,31 +0,0 @@
-APP_NAME=Heimdall
-APP_ENV=local
-APP_KEY=base64:I206O8ibx+GQyRE7BeOxDobn04Mfmyyc5Ptzns/C0mY=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://localhost
-
-DB_CONNECTION=sqlite
-DB_DATABASE=app.sqlite
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1

.env.example

@@ -1,19 +1,17 @@
-APP_NAME=Laravel
+APP_NAME=Heimdall
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
+APP_DEBUG=false
 APP_URL=http://localhost
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+LOG_CHANNEL=daily
+
+DB_CONNECTION=sqlite
+DB_DATABASE=app.sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 QUEUE_DRIVER=sync
@@ -22,14 +20,24 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -1,3 +1,4 @@
+/app/SupportedApps
 /node_modules
 /public/hot
 /public/storage
@@ -25,3 +26,4 @@ yarn-error.log
 .Trashes
 .VolumeIcon.icns
 storage/app/public/avatars/*
+.env

SECURITY.md

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

app/Application.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Application extends Model
+{
+    public $incrementing = false;
+
+    protected $primaryKey = 'appid';
+
+    //
+    public function icon()
+    {
+        if (! file_exists(storage_path('app/public/'.$this->icon))) {
+            $img_src = app_path('SupportedApps/'.$this->name.'/'.str_replace('icons/', '', $this->icon));
+            $img_dest = storage_path('app/public/'.$this->icon);
+            //die("i: ".$img_src);
+            @copy($img_src, $img_dest);
+        }
+
+        return $this->icon;
+    }
+
+    public function iconView()
+    {
+        return asset('storage/'.$this->icon);
+    }
+
+    public function defaultColour()
+    {
+        // check if light or dark
+        if ($this->tile_background == 'light') {
+            return '#fafbfc';
+        }
+
+        return '#161b1f';
+    }
+
+    public function class()
+    {
+        $name = $this->name;
+        $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+
+        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+
+        return $class;
+    }
+
+    public static function classFromName($name)
+    {
+        $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+
+        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+
+        return $class;
+    }
+
+    public static function apps()
+    {
+        $json = json_decode(file_get_contents(storage_path('app/supportedapps.json'))) ?? [];
+        $apps = collect($json->apps);
+        $sorted = $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
+
+        return $sorted;
+    }
+
+    public static function autocomplete()
+    {
+        $apps = self::apps();
+        $list = [];
+        foreach ($apps as $app) {
+            $list[] = (object) [
+                'label' => $app->name,
+                'value' => $app->appid,
+            ];
+        }
+
+        return $list;
+    }
+
+    public static function getApp($appid)
+    {
+        $localapp = self::where('appid', $appid)->first();
+        $app = self::single($appid);
+
+        $application = ($localapp) ? $localapp : new self;
+
+        if (! file_exists(app_path('SupportedApps/'.className($app->name)))) {
+            SupportedApps::getFiles($app);
+            SupportedApps::saveApp($app, $application);
+        } else {
+            // check if there has been an update for this app
+            if ($localapp) {
+                if ($localapp->sha !== $app->sha) {
+                    SupportedApps::getFiles($app);
+                    $app = SupportedApps::saveApp($app, $application);
+                }
+            } else {
+                SupportedApps::getFiles($app);
+                $app = SupportedApps::saveApp($app, $application);
+            }
+        }
+
+        return $app;
+    }
+
+    public static function single($appid)
+    {
+        $apps = self::apps();
+        $app = $apps->where('appid', $appid)->first();
+        if ($app === null) {
+            return null;
+        }
+        $classname = preg_replace('/[^\p{L}\p{N}]/u', '', $app->name);
+        $app->class = '\App\SupportedApps\\'.$classname.'\\'.$classname;
+
+        return $app;
+    }
+
+    public static function applist()
+    {
+        $list = [];
+        $list['null'] = 'None';
+        $apps = self::apps();
+        foreach ($apps as $app) {
+            $list[$app->appid] = $app->name;
+        }
+
+        return $list;
+    }
+}

app/Console/Commands/RegisterApp.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Application;
+use App\SupportedApps;
+use Illuminate\Console\Command;
+
+class RegisterApp extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'register:app {folder}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Add a local app to the registry';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $folder = $this->argument('folder');
+        if ($folder == 'all') {
+            $apps = scandir(app_path('SupportedApps'));
+            foreach ($apps as $folder) {
+                if ($folder == '.' || $folder == '..') {
+                    continue;
+                }
+                $this->addApp($folder);
+            }
+        } else {
+            $this->addApp($folder);
+        }
+    }
+
+    public function addApp($folder)
+    {
+        $json = app_path('SupportedApps/'.$folder.'/app.json');
+        if (file_exists($json)) {
+            $app = json_decode(file_get_contents($json));
+            if (isset($app->appid)) {
+                $exists = Application::find($app->appid);
+                if ($exists) {
+                    $this->error('Application already registered - '.$exists->name.' - '.$exists->appid);
+                } else {
+                    // Doesn't exist so add it
+                    SupportedApps::saveApp($app, new Application);
+                    $this->info('Application Added - '.$app->name.' - '.$app->appid);
+                }
+            } else {
+                $this->error('No App ID for - '.$folder);
+            }
+        } else {
+            $this->error('Could not find '.$json);
+        }
+    }
+}

app/EnhancedApps.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+
+interface EnhancedApps
+{
+    public function test();
+
+    public function livestats();
+
+    public function url($endpoint);
+}

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -22,32 +22,20 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
+        'current_password',
         'password',
         'password_confirmation',
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function register()
     {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        return parent::render($request, $exception);
+        $this->reportable(function (Throwable $e) {
+            //
+        });
     }
 }

app/Helper.php

@@ -1,36 +1,84 @@
 <?php
 
+use Illuminate\Support\Str;
+
 function format_bytes($bytes, $is_drive_size = true, $beforeunit = '', $afterunit = '')
 {
-	$btype = ($is_drive_size === true) ? 1000 : 1024;
-    $labels = array('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
-    if($labels[$x] == "TB") return(round($bytes, 3).$beforeunit.$labels[$x].$afterunit);
-    elseif($labels[$x] == "GB") return(round($bytes, 2).$beforeunit.$labels[$x].$afterunit);
-    elseif($labels[$x] == "MB") return(round($bytes, 2).$beforeunit.$labels[$x].$afterunit);
-    else return(round($bytes, 0).$beforeunit.$labels[$x].$afterunit);
+    $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
+    if ($labels[$x] == 'TB') {
+        return round($bytes, 3).$beforeunit.$labels[$x].$afterunit;
+    } elseif ($labels[$x] == 'GB') {
+        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+    } elseif ($labels[$x] == 'MB') {
+        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+    } else {
+        return round($bytes, 0).$beforeunit.$labels[$x].$afterunit;
+    }
 }
 
-function get_brightness($hex) {
+function str_slug($title, $separator = '-', $language = 'en')
+{
+    return Str::slug($title, $separator, $language);
+}
+
+if (! function_exists('str_is')) {
+    /**
+     * Determine if a given string matches a given pattern.
+     *
+     * @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)
+    {
+        return Str::is($pattern, $value);
+    }
+}
+
+function get_brightness($hex)
+{
     // returns brightness value from 0 to 255
     // strip off any leading #
-    $hex = str_replace('#', '', $hex);
-    if(strlen($hex) == 3) {
+    // $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];
     }
-   
+
     $c_r = hexdec(substr($hex, 0, 2));
     $c_g = hexdec(substr($hex, 2, 2));
     $c_b = hexdec(substr($hex, 4, 2));
-   
+
     return (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 }
 
 function title_color($hex)
 {
-    if(get_brightness($hex) > 130) {
+    if (get_brightness($hex) > 130) {
         return ' black';
     } else {
         return ' white';
     }
-}
+}
+
+function getLinkTargetAttribute()
+{
+    $target = \App\Setting::fetch('window_target');
+
+    if ($target === 'current') {
+        return '';
+    } else {
+        return ' target="'.$target.'"';
+    }
+}
+
+function className($name)
+{
+    $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+
+    return $name;
+}

app/Http/Controllers/Auth/LoginController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\User;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
@@ -59,7 +59,7 @@ class LoginController extends Controller
     public function login(Request $request)
     {
         $current_user = User::currentUser();
-        $request->merge(['username' => $current_user->username]);
+        $request->merge(['username' => $current_user->username, 'remember' => true]);
         //die(print_r($request->all()));
         $this->validateLogin($request);
 
@@ -92,14 +92,16 @@ class LoginController extends Controller
     {
         Auth::logout();
         session(['current_user' => $user]);
+
         return redirect()->route('dash');
     }
 
     public function autologin($uuid)
     {
         $user = User::where('autologin', $uuid)->first();
-        Auth::login($user);
+        Auth::login($user, true);
         session(['current_user' => $user]);
+
         return redirect()->route('dash');
     }
 
@@ -122,5 +124,4 @@ class LoginController extends Controller
     {
         return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;
     }
-
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
+use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
 {

app/Http/Controllers/Controller.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
 use App\User;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Auth;
 
 class Controller extends BaseController
 {
@@ -22,7 +22,6 @@ class Controller extends BaseController
             //print_r($this->user);
             return $next($request);
         });
-        
     }
 
     public function user()

app/Http/Controllers/ItemController.php

@@ -2,11 +2,20 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Application;
 use App\Item;
+use App\Jobs\ProcessApps;
+use App\Search;
 use App\Setting;
+use App\SupportedApps;
 use App\User;
-use App\SupportedApps\Nzbget;
+use Artisan;
+use GrahamCampbell\GitHub\Facades\GitHub;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
 
 class ItemController extends Controller
@@ -15,19 +24,28 @@ class ItemController extends Controller
     {
         $this->middleware('allowed');
     }
-     /**
+
+    /**
      * Display a listing of the resource on the dashboard.
      *
      * @return \Illuminate\Http\Response
      */
     public function dash()
     {
-        $data['apps'] = Item::doesntHave('parents')->pinned()->orderBy('order', 'asc')->get();
-        $data['all_apps'] = Item::doesntHave('parents')->get();
+        $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('type', 1)->orderBy('order', 'asc')->get();
+
+        //$data['all_apps'] = Item::doesntHave('parents')->get();
+        //die(print_r($data['apps']));
         return view('welcome', $data);
     }
 
-     /**
+    /**
      * Set order on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -35,15 +53,14 @@ class ItemController extends Controller
     public function setOrder(Request $request)
     {
         $order = array_filter($request->input('order'));
-        foreach($order as $o => $id) {
+        foreach ($order as $o => $id) {
             $item = Item::find($id);
             $item->order = $o;
             $item->save();
         }
     }
-    
 
-     /**
+    /**
      * Pin item on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -53,11 +70,12 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = true;
         $item->save();
-        $route = route('dash', [], false);
+        $route = route('dash', []);
+
         return redirect($route);
     }
 
-     /**
+    /**
      * Unpin item on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -67,32 +85,39 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = false;
         $item->save();
-        $route = route('dash', [], false);
+        $route = route('dash', []);
+
         return redirect($route);
     }
 
-     /**
+    /**
      * Unpin item on the dashboard.
      *
      * @return \Illuminate\Http\Response
      */
-    public function pinToggle($id, $ajax=false)
+    public function pinToggle($id, $ajax = false, $tag = false)
     {
         $item = Item::findOrFail($id);
-        $new = ((bool)$item->pinned === true) ? false : true;
+        $new = ((bool) $item->pinned === true) ? false : true;
         $item->pinned = $new;
         $item->save();
-        if($ajax) {
-            $data['apps'] = Item::pinned()->get();
+        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();
+            }
             $data['ajax'] = true;
+
             return view('sortable', $data);
         } else {
-            $route = route('dash', [], false);
+            $route = route('dash', []);
+
             return redirect($route);
-            }
+        }
     }
 
-   
     /**
      * Display a listing of the resource.
      *
@@ -100,18 +125,17 @@ class ItemController extends Controller
      */
     public function index(Request $request)
     {
-        $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();
-        if($trash) {
+        if ($trash) {
             return view('items.trash', $data);
         } else {
             return view('items.list', $data);
         }
     }
 
-
     /**
      * Show the form for creating a new resource.
      *
@@ -121,9 +145,94 @@ class ItemController extends Controller
     {
         //
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
-        $data['current_tags'] = [];
-        return view('items.create', $data);
+        $data['tags']->prepend(__('app.dashboard'), 0);
+        $data['current_tags'] = '0';
 
+        return view('items.create', $data);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        // Get the item
+        $item = Item::find($id);
+        if ($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
+            $app = Application::where('class', $item->class)->first();
+            if ($app) {
+                $item->appid = $app->appid;
+            }
+        }
+        $data['item'] = $item;
+        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['tags']->prepend(__('app.dashboard'), 0);
+        $data['current_tags'] = $data['item']->tags();
+        //$data['current_tags'] = $data['item']->parent;
+        //die(print_r($data['current_tags']));
+        // show the edit form and pass the nerd
+        return view('items.edit', $data);
+    }
+
+    public function storelogic($request, $id = null)
+    {
+        $application = Application::single($request->input('appid'));
+        $validatedData = $request->validate([
+            'title' => 'required|max:255',
+            'url' => 'required',
+        ]);
+
+        if ($request->hasFile('file')) {
+            $path = $request->file('file')->store('icons');
+            $request->merge([
+                'icon' => $path,
+            ]);
+        } elseif (strpos($request->input('icon'), 'http') === 0) {
+            $contents = file_get_contents($request->input('icon'));
+
+            if ($application) {
+                $icon = $application->icon;
+            } else {
+                $file = $request->input('icon');
+                $path_parts = pathinfo($file);
+                $icon = md5($contents);
+                $icon .= '.'.$path_parts['extension'];
+            }
+            $path = 'icons/'.$icon;
+            Storage::disk('public')->put($path, $contents);
+            $request->merge([
+                'icon' => $path,
+            ]);
+        }
+
+        $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
+        $request->merge([
+            'description' => $config,
+            'user_id' => $current_user->id,
+        ]);
+
+        if ($request->input('appid') === 'null') {
+            $request->merge([
+                'class' => null,
+            ]);
+        } else {
+            $request->merge([
+                'class' => Application::classFromName($application->name),
+            ]);
+        }
+
+        if ($id === null) {
+            $item = Item::create($request->all());
+        } else {
+            $item = Item::find($id);
+            $item->update($request->all());
+        }
+
+        $item->parents()->sync($request->tags);
     }
 
     /**
@@ -134,34 +243,10 @@ class ItemController extends Controller
      */
     public function store(Request $request)
     {
-        //
-        $validatedData = $request->validate([
-            'title' => 'required|max:255',
-            'url' => 'required|url',
-        ]);
+        $this->storelogic($request);
 
-        if($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
-            $request->merge([
-                'icon' => $path
-            ]);
-        }
+        $route = route('dash', []);
 
-        $config = Item::checkConfig($request->input('config'));
-        $current_user = User::currentUser();
-        $request->merge([
-            'description' => $config,
-            'user_id' => $current_user->id
-        ]);
-
-
-        //die(print_r($request->input('config')));
-        
-        $item = Item::create($request->all());
-
-        $item->parents()->sync($request->tags);
-
-        $route = route('dash', [], false);
         return redirect($route)
             ->with('success', __('app.alert.success.item_created'));
     }
@@ -177,23 +262,6 @@ class ItemController extends Controller
         //
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        // Get the item
-        $data['item'] = Item::find($id);
-        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
-        $data['current_tags'] = $data['item']->parents;
-
-        // show the edit form and pass the nerd
-        return view('items.edit', $data);    
-    }
-
     /**
      * Update the specified resource in storage.
      *
@@ -203,33 +271,11 @@ class ItemController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $validatedData = $request->validate([
-            'title' => 'required|max:255',
-            'url' => 'required|url',
-        ]);
-            //die(print_r($request->all()));
-        if($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
-            $request->merge([
-                'icon' => $path
-            ]);
-        }
-        
-        $config = Item::checkConfig($request->input('config'));
-        $current_user = User::currentUser();
-        $request->merge([
-            'description' => $config,
-            'user_id' => $current_user->id
-        ]);
+        $this->storelogic($request, $id);
+        $route = route('dash', []);
 
-        $item = Item::find($id);
-        $item->update($request->all());
-
-        $item->parents()->sync($request->tags);
-
-        $route = route('dash', [], false);
         return redirect($route)
-            ->with('success',__('app.alert.success.item_updated'));
+            ->with('success', __('app.alert.success.item_updated'));
     }
 
     /**
@@ -241,8 +287,8 @@ class ItemController extends Controller
     public function destroy(Request $request, $id)
     {
         //
-        $force = (bool)$request->input('force');
-        if($force) {
+        $force = (bool) $request->input('force');
+        if ($force) {
             Item::withTrashed()
                 ->where('id', $id)
                 ->forceDelete();
@@ -250,9 +296,10 @@ class ItemController extends Controller
             Item::find($id)->delete();
         }
 
-        $route = route('items.index', [], false);
-        return redirect($route)       
-            ->with('success',__('app.alert.success.item_deleted'));
+        $route = route('items.index', []);
+
+        return redirect($route)
+            ->with('success', __('app.alert.success.item_deleted'));
     }
 
     /**
@@ -266,21 +313,12 @@ class ItemController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();      
-        
-        $route = route('items.inded', [], false);
-        return redirect($route)
-            ->with('success',__('app.alert.success.item_restored'));
-    }
+                ->restore();
 
-    public function isSupportedAppByKey($app)
-    {
-        $output = false;
-        $all_supported = Item::supportedList();
-        if(array_key_exists($app, $all_supported)) {
-            $output = new $all_supported[$app];
-        }
-        return $output;
+        $route = route('items.index', []);
+
+        return redirect($route)
+            ->with('success', __('app.alert.success.item_restored'));
     }
 
     /**
@@ -291,21 +329,49 @@ class ItemController extends Controller
     public function appload(Request $request)
     {
         $output = [];
-        $app = $request->input('app');
+        $appid = $request->input('app');
 
-        if(($app_details = $this->isSupportedAppByKey($app)) !== false) {
-            // basic details
-            $output['icon'] = $app_details->icon();
-            $output['colour'] = $app_details->defaultColour();
-
-            // live details
-            if($app_details instanceof \App\SupportedApps\Contracts\Livestats) {
-                $output['config'] = $app_details->configDetails();
-            } else {
-                $output['config'] = null;
-            }
+        if ($appid === 'null') {
+            return null;
         }
-        
+        /*$appname = $request->input('app');
+        //die($appname);
+
+        $app_details = Application::where('name', $appname)->firstOrFail();
+        $appclass = $app_details->class();
+        $app = new $appclass;
+
+        // basic details
+        $output['icon'] = $app_details->icon();
+        $output['name'] = $app_details->name;
+        $output['iconview'] = $app_details->iconView();
+        $output['colour'] = $app_details->defaultColour();
+        $output['class'] = $appclass;
+
+        // live details
+        if($app instanceof \App\EnhancedApps) {
+            $output['config'] = className($app_details->name).'.config';
+        } else {
+            $output['config'] = null;
+        }*/
+
+        $output['config'] = null;
+        $output['custom'] = null;
+
+        $app = Application::single($appid);
+        $output = (array) $app;
+
+        $appdetails = Application::getApp($appid);
+
+        if ((bool) $app->enhanced === true) {
+            // if(!isset($app->config)) { // class based config
+            $output['custom'] = className($appdetails->name).'.config';
+            // }
+        }
+
+        $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
+        $output['iconview'] = config('app.appsource').'icons/'.$app->icon;
+
         return json_encode($output);
     }
 
@@ -313,30 +379,68 @@ class ItemController extends Controller
     {
         $data = $request->input('data');
         //$url = $data[array_search('url', array_column($data, 'name'))]['value'];
-        
-        $app = $data['type'];
+        $single = Application::single($data['type']);
+        $app = $single->class;
 
         $app_details = new $app();
-        $app_details->config = (object)$data;
-        $app_details->testConfig();
+        $app_details->config = (object) $data;
+        $app_details->test();
+    }
+
+    public function execute($url, $attrs = [], $overridevars = false)
+    {
+        $res = null;
+
+        $vars = ($overridevars !== false) ?
+        $overridevars : [
+            'http_errors' => false,
+            'timeout' => 15,
+            'connect_timeout' => 15,
+            'verify' => false,
+        ];
+
+        $client = new Client($vars);
+
+        $method = 'GET';
+
+        try {
+            return $client->request($method, $url, $attrs);
+        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+            Log::error('Connection refused');
+            Log::debug($e->getMessage());
+        } catch (\GuzzleHttp\Exception\ServerException $e) {
+            Log::debug($e->getMessage());
+        }
+
+        return $res;
+    }
+
+    public function websitelookup($url)
+    {
+        $url = \base64_decode($url);
+        $data = $this->execute($url);
+
+        return $data->getBody();
     }
 
     public function getStats($id)
     {
         $item = Item::find($id);
 
-        $config = json_decode($item->description);
-        if(isset($config->type)) {
-            $config->url = $item->url;
-            if(isset($config->override_url) && !empty($config->override_url)) {
-                $config->url = $config->override_url;
-            }
-            $app_details = new $config->type;
-            $app_details->config = $config;
-            echo $app_details->executeConfig();
+        $config = $item->getconfig();
+        if (isset($item->class)) {
+            $application = new $item->class;
+            $application->config = $config;
+            echo $application->livestats();
         }
-        
     }
 
-    
+    public function checkAppList()
+    {
+        ProcessApps::dispatch();
+        $route = route('items.index');
+
+        return redirect($route)
+            ->with('success', __('app.alert.success.updating'));
+    }
 }

app/Http/Controllers/SearchController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Search;
+use Illuminate\Http\Request;
+
+class SearchController extends Controller
+{
+    public function index(Request $request)
+    {
+        $requestprovider = $request->input('provider');
+        $query = $request->input('q');
+
+        $provider = Search::providerDetails($requestprovider);
+
+        if ($provider->type == 'standard') {
+            return redirect($provider->url.'?'.$provider->query.'='.urlencode($query));
+        } elseif ($provider->type == 'external') {
+            $class = new $provider->class;
+            //print_r($provider);
+            return $class->getResults($query, $provider);
+        }
+
+        //print_r($provider);
+    }
+}

app/Http/Controllers/SettingsController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use App\Setting;
 use App\SettingGroup;
 use App\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller
 {
@@ -40,15 +40,18 @@ class SettingsController extends Controller
         $setting = Setting::find($id);
         //die("s: ".$setting->label);
 
-        if((bool)$setting->system === true) return abort(404);
+        if ((bool) $setting->system === true) {
+            return abort(404);
+        }
 
-        if (!is_null($setting)) {
+        if (! is_null($setting)) {
             return view('settings.edit')->with([
                 'setting' => $setting,
             ]);
         } else {
-            $route = route('settings.list', [], false);
-            return redirect($route) 
+            $route = route('settings.list', []);
+
+            return redirect($route)
             ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
@@ -65,37 +68,39 @@ class SettingsController extends Controller
         $setting = Setting::find($id);
         $user = $this->user();
 
-        if (!is_null($setting)) {
-            $data = Setting::getInput();
+        if (! is_null($setting)) {
+            $data = Setting::getInput($request);
+
+            $setting_value = null;
 
             if ($setting->type == 'image') {
-
-
-                if($request->hasFile('value')) {
+                if ($request->hasFile('value')) {
                     $path = $request->file('value')->store('backgrounds');
                     $setting_value = $path;
                 }
-            
             } else {
                 $setting_value = $data->value;
             }
 
             $user->settings()->detach($setting->id);
             $user->settings()->save($setting, ['uservalue' => $setting_value]);
-            
-            $route = route('settings.index', [], false);
-            return redirect($route) 
+
+            $route = route('settings.index', []);
+
+            return redirect($route)
             ->with([
                 'success' => __('app.alert.success.setting_updated'),
             ]);
         } else {
-            $route = route('settings.index', [], false);
-            return redirect($route) 
+            $route = route('settings.index', []);
+
+            return redirect($route)
             ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
     }
+
     /**
      * @param int $id
      *
@@ -105,15 +110,19 @@ class SettingsController extends Controller
     {
         $user = $this->user();
         $setting = Setting::find($id);
-        if((bool)$setting->system !== true) {
+        if ((bool) $setting->system !== true) {
             $user->settings()->detach($setting->id);
             $user->settings()->save($setting, ['uservalue' => '']);
         }
-        $route = route('settings.index', [], false);
-        return redirect($route) 
+        $route = route('settings.index', []);
+
+        return redirect($route)
         ->with([
             'success' => __('app.alert.success.setting_updated'),
         ]);
-    
+    }
+
+    public function search(Request $request)
+    {
     }
 }

app/Http/Controllers/TagController.php

@@ -2,9 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Item;
+use App\User;
 use DB;
+use Illuminate\Http\Request;
 
 class TagController extends Controller
 {
@@ -12,6 +13,7 @@ class TagController extends Controller
     {
         $this->middleware('allowed');
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -19,11 +21,11 @@ class TagController extends Controller
      */
     public function index(Request $request)
     {
-        $trash = (bool)$request->input('trash');
+        $trash = (bool) $request->input('trash');
 
-        $data['apps'] = Item::ofType('tag')->orderBy('title', 'asc')->get();
-        $data['trash'] = Item::ofType('tag')->onlyTrashed()->get();
-        if($trash) {
+        $data['apps'] = Item::ofType('tag')->where('id', '>', 0)->orderBy('title', 'asc')->get();
+        $data['trash'] = Item::ofType('tag')->where('id', '>', 0)->onlyTrashed()->get();
+        if ($trash) {
             return view('tags.trash', $data);
         } else {
             return view('tags.list', $data);
@@ -38,6 +40,7 @@ class TagController extends Controller
     public function create()
     {
         $data = [];
+
         return view('tags.create', $data);
     }
 
@@ -53,24 +56,28 @@ class TagController extends Controller
             'title' => 'required|max:255',
         ]);
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('icons');
             $request->merge([
-                'icon' => $path
+                'icon' => $path,
             ]);
         }
 
         $slug = str_slug($request->title, '-');
 
+        $current_user = User::currentUser();
+
         // set item type to tag
         $request->merge([
             'type' => '1',
-            'url' => $slug
+            'url' => $slug,
+            'user_id' => $current_user->id,
         ]);
         //die(print_r($request->all()));
         Item::create($request->all());
 
-        $route = route('dash', [], false);
+        $route = route('dash', []);
+
         return redirect($route)
             ->with('success', __('app.alert.success.tag_created'));
     }
@@ -86,7 +93,9 @@ class TagController extends Controller
         $item = Item::whereUrl($slug)->first();
         //print_r($item);
         $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+        $data['tag'] = $item->id;
         $data['all_apps'] = $item->children;
+
         return view('welcome', $data);
     }
 
@@ -103,7 +112,7 @@ class TagController extends Controller
 
         // show the edit form and pass the nerd
         return view('tags.edit')
-            ->with('item', $item);    
+            ->with('item', $item);
     }
 
     /**
@@ -119,24 +128,25 @@ class TagController extends Controller
             'title' => 'required|max:255',
         ]);
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('icons');
             $request->merge([
-                'icon' => $path
+                'icon' => $path,
             ]);
         }
 
         $slug = str_slug($request->title, '-');
         // set item type to tag
         $request->merge([
-            'url' => $slug
+            'url' => $slug,
         ]);
 
         Item::find($id)->update($request->all());
 
-        $route = route('dash', [], false);
+        $route = route('dash', []);
+
         return redirect($route)
-        ->with('success',__('app.alert.success.tag_updated'));
+        ->with('success', __('app.alert.success.tag_updated'));
     }
 
     /**
@@ -148,18 +158,19 @@ class TagController extends Controller
     public function destroy(Request $request, $id)
     {
         //
-        $force = (bool)$request->input('force');
-        if($force) {
+        $force = (bool) $request->input('force');
+        if ($force) {
             Item::withTrashed()
                 ->where('id', $id)
                 ->forceDelete();
         } else {
             Item::find($id)->delete();
         }
-        
-        $route = route('tags.index', [], false);
+
+        $route = route('tags.index', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_deleted'));
+            ->with('success', __('app.alert.success.item_deleted'));
     }
 
     /**
@@ -173,10 +184,11 @@ class TagController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();        
-        $route = route('tags.index', [], false);
+                ->restore();
+        $route = route('tags.index', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_restored'));
+            ->with('success', __('app.alert.success.item_restored'));
     }
 
     public function add($tag, $item)
@@ -184,14 +196,15 @@ class TagController extends Controller
         $output = 0;
         $tag = Item::find($tag);
         $item = Item::find($item);
-        if($tag && $item) {
+        if ($tag && $item) {
             // only add items, not cats
-            if((int)$item->type === 0) {
+            if ((int) $item->type === 0) {
                 $tag->children()->attach($item);
+
                 return 1;
             }
         }
+
         return $output;
     }
-
 }

app/Http/Controllers/UserController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\User;
-use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
 
 class UserController extends Controller
 {
@@ -14,6 +14,7 @@ class UserController extends Controller
     {
         $this->middleware('allowed')->except(['selectUser']);
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -22,6 +23,7 @@ class UserController extends Controller
     public function index()
     {
         $data['users'] = User::all();
+
         return view('users.index', $data);
     }
 
@@ -33,6 +35,7 @@ class UserController extends Controller
     public function create()
     {
         $data = [];
+
         return view('users.create', $data);
     }
 
@@ -40,8 +43,8 @@ class UserController extends Controller
     {
         Auth::logout();
         $data['users'] = User::all();
-        return view('userselect', $data);
 
+        return view('userselect', $data);
     }
 
     /**
@@ -56,7 +59,7 @@ class UserController extends Controller
             'username' => 'required|max:255|unique:users',
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
-            'password_confirmation' => 'nullable'
+            'password_confirmation' => 'nullable',
 
         ]);
         $user = new User;
@@ -65,24 +68,25 @@ class UserController extends Controller
         $user->public_front = $request->input('public_front');
 
         $password = $request->input('password');
-        if(!empty($password)) {
+        if (! empty($password)) {
             $user->password = bcrypt($password);
         }
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('avatars');
             $user->avatar = $path;
         }
 
-        if ((bool)$request->input('autologin_allow') === true) {
-            $user->autologin = (string)Str::uuid();
+        if ((bool) $request->input('autologin_allow') === true) {
+            $user->autologin = (string) Str::uuid();
         }
 
         $user->save();
-        
-        $route = route('dash', [], false);
+
+        $route = route('dash', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.user_updated'));
+            ->with('success', __('app.alert.success.user_updated'));
     }
 
     /**
@@ -105,8 +109,8 @@ class UserController extends Controller
     public function edit(User $user)
     {
         $data['user'] = $user;
-        return view('users.edit', $data);
 
+        return view('users.edit', $data);
     }
 
     /**
@@ -122,38 +126,38 @@ class UserController extends Controller
             'username' => 'required|max:255|unique:users,username,'.$user->id,
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
-            'password_confirmation' => 'nullable'
+            'password_confirmation' => 'nullable',
         ]);
-            //die(print_r($request->all()));
+        //die(print_r($request->all()));
 
         $user->username = $request->input('username');
         $user->email = $request->input('email');
         $user->public_front = $request->input('public_front');
 
         $password = $request->input('password');
-        if(!empty($password)) {
+        if (! empty($password)) {
             $user->password = bcrypt($password);
-        } elseif($password == 'null') {
+        } elseif ($password == 'null') {
             $user->password = null;
         }
-    
-        if($request->hasFile('file')) {
+
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('avatars');
             $user->avatar = $path;
         }
 
-        if ((bool)$request->input('autologin_allow') === true) {
-            $user->autologin = (is_null($user->autologin)) ? (string)Str::uuid() : $user->autologin;
+        if ((bool) $request->input('autologin_allow') === true) {
+            $user->autologin = (is_null($user->autologin)) ? (string) Str::uuid() : $user->autologin;
         } else {
             $user->autologin = null;
         }
 
         $user->save();
 
-        $route = route('dash', [], false);
-        return redirect($route)
-            ->with('success',__('app.alert.success.user_updated'));
+        $route = route('dash', []);
 
+        return redirect($route)
+            ->with('success', __('app.alert.success.user_updated'));
     }
 
     /**
@@ -164,12 +168,12 @@ class UserController extends Controller
      */
     public function destroy(User $user)
     {
-        if($user->id !== 1) {
+        if ($user->id !== 1) {
             $user->delete();
-            $route = route('dash', [], false);
-            return redirect($route)
-            ->with('success',__('app.alert.success.user_deleted'));
+            $route = route('dash', []);
 
+            return redirect($route)
+            ->with('success', __('app.alert.success.user_deleted'));
         }
     }
 }

app/Http/Middleware/CheckAllowed.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use App\User;
 use Closure;
 use Illuminate\Support\Facades\Auth;
-use App\User;
 use Illuminate\Support\Facades\Route;
 use Session;
 
@@ -22,27 +22,32 @@ class CheckAllowed
         $route = Route::currentRouteName();
         $current_user = User::currentUser();
 
-        if(str_is('users*', $route)) {
-            if($current_user->id !== 1) {
+        if (str_is('users*', $route)) {
+            if ($current_user->id !== 1) {
                 return redirect()->route('dash');
             }
         }
 
-        if($route == 'dash') {
+        if ($route == 'dash') {
             //print_r(User::all());
             //die("here".var_dump($current_user->password));
-            if((bool)$current_user->public_front === true) return $next($request);
+            if ((bool) $current_user->public_front === true) {
+                return $next($request);
+            }
         }
 
-        if(empty($current_user->password)) return $next($request);
+        if (empty($current_user->password)) {
+            return $next($request);
+        }
 
         // Check if user is logged in as $current_user
         if (Auth::check()) {
             $loggedin_user = Auth::user();
-            if($loggedin_user->id === $current_user->id) return $next($request);
+            if ($loggedin_user->id === $current_user->id) {
+                return $next($request);
+            }
         }
 
         return Auth::authenticate();
-
     }
 }

app/Http/Middleware/TrustProxies.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $proxies;
+    protected $proxies = ['192.168.0.0/16', '172.16.0.0/12', '10.0.0.0/8', '127.0.0.1'];
 
     /**
      * The current proxy header mappings.

app/Http/Middleware/VerifyCsrfToken.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+use Symfony\Component\HttpFoundation\Cookie;
 
 class VerifyCsrfToken extends Middleware
 {
@@ -18,4 +19,39 @@ class VerifyCsrfToken extends Middleware
         'test_config',
         //'get_stats'
     ];
+
+    /**
+     * Add the CSRF token to the response cookies.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Symfony\Component\HttpFoundation\Response  $response
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function addCookieToResponse($request, $response)
+    {
+        $config = config('session');
+
+        if ($response instanceof Responsable) {
+            $response = $response->toResponse($request);
+        }
+
+        $response->headers->setCookie(
+            new Cookie(
+                'HEIMDALL-XSRF-TOKEN', $request->session()->token(), $this->availableAt(60 * $config['lifetime']),
+                $config['path'], $config['domain'], $config['secure'], false, false, $config['same_site'] ?? null
+            )
+        );
+
+        return $response;
+    }
+
+    /**
+     * Determine if the cookie contents should be serialized.
+     *
+     * @return bool
+     */
+    public static function serialized()
+    {
+        return EncryptCookies::serialized('HEIMDALL-XSRF-TOKEN');
+    }
 }

app/Item.php

@@ -2,11 +2,13 @@
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
-use Symfony\Component\ClassLoader\ClassMapGenerator;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Builder;
+use App\Application;
+use App\ItemTag;
 use App\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Symfony\Component\ClassLoader\ClassMapGenerator;
 
 class Item extends Model
 {
@@ -18,97 +20,20 @@ class Item extends Model
 
         static::addGlobalScope('user_id', function (Builder $builder) {
             $current_user = User::currentUser();
-            $builder->where('user_id', $current_user->id);
+            if ($current_user) {
+                $builder->where('user_id', $current_user->id)->orWhere('user_id', 0);
+            } else {
+                $builder->where('user_id', 0);
+            }
         });
     }
 
     //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order', 'type', 'user_id'
+        'title', 'url', 'colour', 'icon', 'appdescription', 'description', 'pinned', 'order', 'type', 'class', 'user_id', 'appid',
     ];
 
-    /**
-     * The attributes that should be mutated to dates.
-     *
-     * @var array
-     */
-    protected $dates = ['deleted_at'];
 
-    public static function supportedList()
-    {
-        return [
-            'AirSonic' => \App\SupportedApps\AirSonic::class,
-            'Cardigann' => \App\SupportedApps\Cardigann::class,
-            'CouchPotato' => \App\SupportedApps\CouchPotato::class,
-            'Bazarr' => \App\SupportedApps\Bazarr::class,
-            'Bitwarden' => \App\SupportedApps\Bitwarden::class,
-            'Booksonic' => \App\SupportedApps\Booksonic::class,
-            'BookStack' => \App\SupportedApps\BookStack::class,
-            'Deluge' => \App\SupportedApps\Deluge::class,
-            'Dokuwiki' => \App\SupportedApps\Dokuwiki::class,
-            'Duplicati' => \App\SupportedApps\Duplicati::class,
-            'Emby' => \App\SupportedApps\Emby::class,
-            'Flood' => \App\SupportedApps\Flood::class,
-            'FreshRSS' => \App\SupportedApps\FreshRSS::class,
-            'Gitea' => \App\SupportedApps\Gitea::class,
-            'Glances' => \App\SupportedApps\Glances::class,
-            'Grafana' => \App\SupportedApps\Grafana::class,
-            'Graylog' => \App\SupportedApps\Graylog::class,
-            'Headphones' => \App\SupportedApps\Headphones::class,
-            'Home Assistant' => \App\SupportedApps\HomeAssistant::class,
-            'Jackett' => \App\SupportedApps\Jackett::class,
-            'Jdownloader' => \App\SupportedApps\Jdownloader::class,
-            'Krusader' => \App\SupportedApps\Krusader::class,
-            'LibreNMS' => \App\SupportedApps\LibreNMS::class,
-            'Lidarr' => \App\SupportedApps\Lidarr::class,
-            'Mailcow' => \App\SupportedApps\Mailcow::class,
-            'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class,
-            'Medusa' => \App\SupportedApps\Medusa::class,
-            'Monica' => \App\SupportedApps\Monica::class,
-            'MusicBrainz' => \App\SupportedApps\MusicBrainz::class,
-            'Mylar' => \App\SupportedApps\Mylar::class,
-            'NZBGet' => \App\SupportedApps\Nzbget::class,
-            'Netdata' => \App\SupportedApps\Netdata::class,
-            'Nextcloud' => \App\SupportedApps\Nextcloud::class,
-            'Now Showing' => \App\SupportedApps\NowShowing::class,
-            'Nzbhydra' => \App\SupportedApps\Nzbhydra::class,
-            'OPNSense' => \App\SupportedApps\Opnsense::class,
-            'Ombi' => \App\SupportedApps\Ombi::class,
-            'Openhab' => \App\SupportedApps\Openhab::class,
-            'OpenMediaVault' => \App\SupportedApps\OpenMediaVault::class,
-            'Pihole' => \App\SupportedApps\Pihole::class,
-            'Plex' => \App\SupportedApps\Plex::class,
-            'Plexpy' => \App\SupportedApps\Plexpy::class,
-            'Plexrequests' => \App\SupportedApps\Plexrequests::class,
-            'Portainer' => \App\SupportedApps\Portainer::class,
-            'Proxmox' => \App\SupportedApps\Proxmox::class,
-            'Radarr' => \App\SupportedApps\Radarr::class,
-            'Rancher' => \App\SupportedApps\Rancher::class,
-            'Runeaudio' => \App\SupportedApps\Runeaudio::class,
-            'Sabnzbd' => \App\SupportedApps\Sabnzbd::class,
-            'Sickrage' => \App\SupportedApps\Sickrage::class,
-            'Sonarr' => \App\SupportedApps\Sonarr::class,
-            'Syncthing' => \App\SupportedApps\Syncthing::class,
-            'Tautulli' => \App\SupportedApps\Tautulli::class,
-            'Transmission' => \App\SupportedApps\Transmission::class,
-            'Traefik' => \App\SupportedApps\Traefik::class,
-            'tt-rss' => \App\SupportedApps\Ttrss::class,
-            'TVheadend' => \App\SupportedApps\TVheadend::class,
-            'UniFi' => \App\SupportedApps\Unifi::class,
-            'unRAID' => \App\SupportedApps\Unraid::class,
-            'pfSense' => \App\SupportedApps\Pfsense::class,
-            'pyLoad' => \App\SupportedApps\pyLoad::class,
-            'ruTorrent' => \App\SupportedApps\ruTorrent::class,
-            'Virtualmin' => \App\SupportedApps\Virtualmin::class,
-            'Watcher3' => \App\SupportedApps\Watcher3::class,
-            'Webmin' => \App\SupportedApps\Webmin::class,
-            'WebTools' => \App\SupportedApps\WebTools::class,
-        ];
-    }
-    public static function supportedOptions()
-    {
-        return array_keys(self::supportedList());
-    }
 
     /**
      * Scope a query to only include pinned items.
@@ -121,61 +46,51 @@ class Item extends Model
         return $query->where('pinned', 1);
     }
 
-    public function getConfigAttribute()
-    {
-        $output = null;
-        $view = null;
-        if(isset($this->description) && !empty($this->description)){
-            $output = json_decode($this->description);
-            $output = is_object($output) ? $output : new \stdClass();
-            if(isset($output->type) && !empty($output->type)) {
-                $class = $output->type;
-                $sap = new $class();
-                $view = $sap->configDetails();
-                $output->view = $view;
-            }
-            if(!isset($output->dataonly)) $output->dataonly = '0';
-
-        }
-        return (object)$output;
-    }
     public static function checkConfig($config)
     {
-        if(empty($config)) {
+        // die(print_r($config));
+        if (empty($config)) {
             $config = null;
         } else {
-            $store = false;
-            //die(var_dump($config));
-            foreach($config as $key => $check) {
-                if($key == 'type') continue;
-                if($key == 'dataonly') continue;
-                if(!empty($check) && $check != '0') {
-                    $store = true;
-                    break;
-                }
-            }
-            //die(var_dump($store))
-
-            $config['enabled'] = ($store) ? true : false;
             $config = json_encode($config);
         }
-        return $config;
 
+        return $config;
+    }
+
+    public function tags()
+    {
+        $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()
     {
-        return $this->belongsToMany('App\Item', 'item_tag', 'item_id', 'tag_id');
+        return $this->belongsToMany(\App\Item::class, 'item_tag', 'item_id', 'tag_id');
     }
+
     public function children()
     {
-        return $this->belongsToMany('App\Item', 'item_tag', 'tag_id', 'item_id');
+        return $this->belongsToMany(\App\Item::class, 'item_tag', 'tag_id', 'item_id');
     }
 
     public function getLinkAttribute()
     {
-        if((int)$this->type === 1) {
-            return '/tag/'.$this->url;
+        if ((int) $this->type === 1) {
+            return url('tag/'.$this->url);
         } else {
             return $this->url;
         }
@@ -183,7 +98,7 @@ class Item extends Model
 
     public function getDroppableAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return ' droppable';
         } else {
             return '';
@@ -194,33 +109,42 @@ class Item extends Model
     {
         $target = Setting::fetch('window_target');
 
-        if((int)$this->type === 1 || $target === 'current') {
+        if ((int) $this->type === 1 || $target === 'current') {
             return '';
         } else {
-            return ' target="' . $target . '"';
+            return ' target="'.$target.'"';
         }
     }
 
     public function getLinkIconAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return 'fa-tag';
         } else {
             return 'fa-arrow-alt-to-right';
         }
     }
+
     public function getLinkTypeAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return 'tags';
         } else {
             return 'items';
         }
     }
 
+    public static function nameFromClass($class)
+    {
+        $explode = explode('\\', $class);
+        $name = end($explode);
+
+        return $name;
+    }
+
     public function scopeOfType($query, $type)
     {
-        switch($type) {
+        switch ($type) {
             case 'item':
                 $typeid = 0;
                 break;
@@ -232,13 +156,102 @@ class Item extends Model
         return $query->where('type', $typeid);
     }
 
+    public function enhanced()
+    {
+        /*if(isset($this->class) && !empty($this->class)) {
+            $app = new $this->class;
+        } else {
+            return false;
+        }
+        return (bool)($app instanceof \App\EnhancedApps);*/
+        return $this->description !== null;
+    }
+
+    public static function isEnhanced($class)
+    {
+        if ($class === null || $class === 'null') {
+            return false;
+        }
+        $app = new $class;
+
+        return (bool) ($app instanceof \App\EnhancedApps);
+    }
+
+    public static function isSearchProvider($class)
+    {
+        $app = new $class;
+
+        return ((bool) ($app instanceof \App\SearchInterface)) ? $app : false;
+    }
+
+    public function enabled()
+    {
+        if ($this->enhanced()) {
+            $config = $this->getconfig();
+            if ($config) {
+                return (bool) $config->enabled;
+            }
+        }
+
+        return false;
+    }
+
+    public function getconfig()
+    {
+        // $explode = explode('\\', $this->class);
+
+        if (! isset($this->description) || empty($this->description)) {
+            $config = new \stdClass;
+            // $config->name = end($explode);
+            $config->enabled = false;
+            $config->override_url = null;
+            $config->apikey = null;
+
+            return $config;
+        }
+
+        $config = json_decode($this->description);
+
+        // $config->name = end($explode);
+
+        $config->url = $this->url;
+        if (isset($config->override_url) && ! empty($config->override_url)) {
+            $config->url = $config->override_url;
+        } else {
+            $config->override_url = null;
+        }
+
+        return $config;
+    }
+
+    public static function applicationDetails($class)
+    {
+        if (! empty($class)) {
+            $name = self::nameFromClass($class);
+            $application = Application::where('name', $name)->first();
+            if ($application) {
+                return $application;
+            }
+        }
+
+        return false;
+    }
+
+    public static function getApplicationDescription($class)
+    {
+        $details = self::applicationDetails($class);
+        if ($details !== false) {
+            return $details->description.' - '.$details->license;
+        }
+
+        return '';
+    }
+
     /**
      * Get the user that owns the item.
      */
     public function user()
     {
-        return $this->belongsTo('App\User');
-    }   
-
-
+        return $this->belongsTo(\App\User::class);
+    }
 }

app/ItemTag.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class ItemTag extends Pivot
+{
+}

app/Jobs/ProcessApps.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Application;
+use App\Item;
+use App\SupportedApps;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
+
+class ProcessApps implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $localapps = Application::whereNull('class')->get();
+        $json = SupportedApps::getList()->getBody();
+
+        Storage::disk('local')->put('supportedapps.json', $json);
+
+        foreach ($localapps as $app) {
+            $app->class = $app->class();
+            $app->save();
+        }
+
+        $items = Item::whereNotNull('class')->get();
+        foreach ($items as $item) {
+            if (! file_exists(app_path('SupportedApps/'.Item::nameFromClass($item->class)))) {
+                $app = Application::where('class', $item->class)->first();
+                Application::getApp($app->appid);
+            }
+        }
+    }
+}

app/Providers/AppServiceProvider.php

@@ -2,11 +2,13 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
-use Artisan;
-use Schema;
+use App\Application;
+use App\Jobs\ProcessApps;
 use App\Setting;
 use App\User;
+use Artisan;
+use Illuminate\Support\ServiceProvider;
+use Schema;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -17,89 +19,111 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        
-
-        if(!is_file(base_path('.env'))) {
-            touch(base_path('.env'));
-            Artisan::call('key:generate');
+        if (! is_file(base_path('.env'))) {
+            copy(base_path('.env.example'), base_path('.env'));
         }
-        if(!is_file(database_path('app.sqlite'))) {
+        $this->genKey();
+        if (! is_file(database_path('app.sqlite'))) {
             // first time setup
             touch(database_path('app.sqlite'));
-            Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
+            Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
             //Cache
             //Artisan::call('config:cache');
             //Artisan::call('route:cache');
         }
-        if(is_file(database_path('app.sqlite'))) {
-            if(Schema::hasTable('settings')) {
+        if (is_file(database_path('app.sqlite'))) {
+            if (Schema::hasTable('settings')) {
 
                 // check version to see if an upgrade is needed
                 $db_version = Setting::_fetch('version');
                 $app_version = config('app.version');
-                if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
-                    Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));                   
+                if (version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
+                    Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
                 }
             } else {
-                Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); 
+                Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
             }
-
         }
-        if(!is_file(public_path('storage'))) {
+
+        if (! is_file(public_path('storage/.gitignore'))) {
             Artisan::call('storage:link');
             \Session::put('current_user', null);
         }
 
-        // User specific settings need to go here as session isn't available at this point in the app
-        view()->composer('*', function ($view) 
-        {
+        $lang = Setting::fetch('language');
+        \App::setLocale($lang);
 
-            if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = 
+        $applications = Application::all();
+        if ($applications->count() <= 0) {
+            if (class_exists('ZipArchive')) {
+                ProcessApps::dispatch();
+            } else {
+                die('You are missing php-zip');
+            }
+        }
+
+        // User specific settings need to go here as session isn't available at this point in the app
+        view()->composer('*', function ($view) {
+            if (isset($_SERVER['HTTP_AUTHORIZATION']) && ! empty($_SERVER['HTTP_AUTHORIZATION'])) {
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                 explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
             }
-            if(!\Auth::check()) {
-                if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+            if (! \Auth::check()) {
+                if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])
+                        && ! empty($_SERVER['PHP_AUTH_USER']) && ! empty($_SERVER['PHP_AUTH_PW'])) {
                     $credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
-                    
-                    if (\Auth::attempt($credentials)) {
+
+                    if (\Auth::attempt($credentials, true)) {
                         // Authentication passed...
                         $user = \Auth::user();
                         //\Session::put('current_user', $user);
-                        session(['current_user' => $user]);                
+                        session(['current_user' => $user]);
+                    }
+                } elseif (isset($_SERVER['REMOTE_USER']) && ! empty($_SERVER['REMOTE_USER'])) {
+                    $user = User::where('username', $_SERVER['REMOTE_USER'])->first();
+                    if ($user) {
+                        \Auth::login($user, true);
+                        session(['current_user' => $user]);
                     }
                 }
             }
 
-
             $alt_bg = '';
-            if($bg_image = Setting::fetch('background_image')) {
-                $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
+            if ($bg_image = Setting::fetch('background_image')) {
+                $alt_bg = ' style="background-image: url(storage/'.$bg_image.')"';
             }
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
 
             $allusers = User::all();
             $current_user = User::currentUser();
 
-            $view->with('alt_bg', $alt_bg );    
-            $view->with('allusers', $allusers );    
-            $view->with('current_user', $current_user );   
-
-    
-            
-            
-        });  
+            $view->with('alt_bg', $alt_bg);
+            $view->with('allusers', $allusers);
+            $view->with('current_user', $current_user);
+        });
 
+        $this->app['view']->addNamespace('SupportedApps', app_path('SupportedApps'));
 
         if (env('FORCE_HTTPS') === true) {
             \URL::forceScheme('https');
         }
 
-        if(env('APP_URL') != 'http://localhost') {
+        if (env('APP_URL') != 'http://localhost') {
             \URL::forceRootUrl(env('APP_URL'));
         }
+    }
 
+    /**
+     * Generate app key if missing and .env exists
+     *
+     * @return void
+     */
+    public function genKey()
+    {
+        if (is_file(base_path('.env'))) {
+            if (empty(env('APP_KEY'))) {
+                Artisan::call('key:generate', ['--force' => true, '--no-interaction' => true]);
+            }
+        }
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {

app/Providers/BroadcastServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {

app/Providers/EventServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

app/Providers/RouteServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {

app/Search.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App;
+
+use App\Item;
+use App\Setting;
+use Cache;
+use Form;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Yaml;
+
+abstract class Search
+{
+    /**
+     * List of all search providers
+     *
+     * @return array
+     */
+    public static function providers()
+    {
+        $providers = self::standardProviders();
+        $providers = $providers + self::appProviders();
+
+        return collect($providers);
+    }
+
+    /**
+     * Gets details for a single provider
+     *
+     * @return object
+     */
+    public static function providerDetails($provider)
+    {
+        $providers = self::providers();
+        if (! isset($providers[$provider])) {
+            return false;
+        }
+
+        return (object) $providers[$provider] ?? false;
+    }
+
+    /**
+     * Array of the standard providers
+     *
+     * @return array
+     */
+    public static function standardProviders()
+    {
+        // $providers = json_decode(file_get_contents(storage_path('app/searchproviders.json')));
+        // print_r($providers);
+        $providers = Yaml::parseFile(storage_path('app/searchproviders.yaml'));
+        $all = [];
+        foreach ($providers as $key => $provider) {
+            $all[$key] = $provider;
+            $all[$key]['type'] = 'standard';
+        }
+
+        return $all;
+    }
+
+    /**
+     * Loops through users apps to see if app is a search provider, might be worth
+     * looking into caching this at some point
+     *
+     * @return array
+     */
+    public static function appProviders()
+    {
+        $providers = [];
+        $userapps = Item::all();
+        foreach ($userapps as $app) {
+            if (empty($app->class)) {
+                continue;
+            }
+            if (($provider = Item::isSearchProvider($app->class)) !== false) {
+                $name = Item::nameFromClass($app->class);
+                $providers[$app->id] = [
+                    'id' => $app->id,
+                    'type' => $provider->type,
+                    'class' => $app->class,
+                    'url' => $app->url,
+                    'name' => $app->title,
+                    'colour' => $app->colour,
+                    'icon' => $app->icon,
+                    'description' => $app->description,
+                ];
+            }
+        }
+
+        return $providers;
+    }
+
+    /**
+     * Outputs the search form
+     *
+     * @return html
+     */
+    public static function form()
+    {
+        $output = '';
+        $homepage_search = Setting::fetch('homepage_search');
+        $search_provider = Setting::where('key', '=', 'search_provider')->first();
+        $user_search_provider = Setting::fetch('search_provider');
+        //die(print_r($search_provider));
+
+        //die(var_dump($user_search_provider));
+        // return early if search isn't applicable
+        if ((bool) $homepage_search !== true) {
+            return $output;
+        }
+        $user_search_provider = $user_search_provider ?? 'none';
+
+        if ((bool) $homepage_search && (bool) $search_provider) {
+            if ((bool) $user_search_provider) {
+                $name = 'app.options.'.$user_search_provider;
+                $provider = self::providerDetails($user_search_provider);
+
+                $output .= '<div class="searchform">';
+                $output .= '<form action="'.url('search').'"'.getLinkTargetAttribute().' method="get">';
+                $output .= '<div id="search-container" class="input-container">';
+                $output .= '<select name="provider">';
+                foreach (self::providers() as $key => $searchprovider) {
+                    $selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
+                    $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
+                }
+                $output .= '</select>';
+                $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>';
+                $output .= '</div>';
+            }
+        }
+
+        return $output;
+    }
+}

app/SearchInterface.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+
+interface SearchInterface
+{
+    public function getResults($query, $providerdetails);
+}

app/Setting.php

@@ -2,11 +2,13 @@
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Input;
-use Form;
-use Illuminate\Support\Facades\Auth;
+use App\Search;
 use App\User;
+use Form;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 
 class Setting extends Model
 {
@@ -18,7 +20,7 @@ class Setting extends Model
     protected $table = 'settings';
 
     protected $fillable = [
-        'id', 'group_id', 'key', 'type', 'options', 'label', 'value', 'order', 'system'
+        'id', 'group_id', 'key', 'type', 'options', 'label', 'value', 'order', 'system',
     ];
 
     /**
@@ -38,44 +40,47 @@ class Setting extends Model
     /**
      * @return array
      */
-    public static function getInput()
+    public static function getInput(Request $request)
     {
         return (object) [
-            'value' => Input::get('value'),
-            'image' => Input::file('value'),
+            'value' => $request->input('value'),
+            'image' => $request->file('value'),
         ];
     }
 
     public function getListValueAttribute()
     {
-        if((bool)$this->system === true) {
+        if ((bool) $this->system === true) {
             $value = self::_fetch($this->key);
         } else {
             $value = self::fetch($this->key);
         }
         $this->value = $value;
-        switch($this->type) {
+        switch ($this->type) {
             case 'image':
-                if(!empty($this->value)) {
+                if (! empty($this->value)) {
                     $value = '<a href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank">'.__('app.settings.view').'</a>';
                 } else {
                     $value = __('app.options.none');
-                }    
+                }
                 break;
             case 'boolean':
-                if((bool)$this->value === true) {
+                if ((bool) $this->value === true) {
                     $value = __('app.options.yes');
                 } else {
                     $value = __('app.options.no');
-                }    
+                }
                 break;
             case 'select':
-                if(!empty($this->value) && $this->value !== 'none') {
-                    $options =  (array)json_decode($this->options);
+                if (! empty($this->value) && $this->value !== 'none') {
+                    $options = (array) json_decode($this->options);
+                    if ($this->key === 'search_provider') {
+                        $options = Search::providers()->pluck('name', 'id')->toArray();
+                    }
                     $value = __($options[$this->value]);
                 } else {
                     $value = __('app.options.none');
-                }                
+                }
                 break;
             default:
                 $value = __($this->value);
@@ -83,32 +88,33 @@ class Setting extends Model
         }
 
         return $value;
-
     }
 
     public function getEditValueAttribute()
     {
-        if((bool)$this->system === true) {
+        if ((bool) $this->system === true) {
             $value = self::_fetch($this->key);
         } else {
             $value = self::fetch($this->key);
         }
         $this->value = $value;
-        switch($this->type) {
+        switch ($this->type) {
             case 'image':
                 $value = '';
-                if(isset($this->value) && !empty($this->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 .= Form::file('value', ['class' => 'form-control']);
-                if(isset($this->value) && !empty($this->value)) {
+                if (isset($this->value) && ! empty($this->value)) {
                     $value .= '<a class="settinglink" href="'.route('settings.clear', $this->id).'" title="'.__('app.settings.remove').'">'.__('app.settings.reset').'</a>';
                 }
-                
+
                 break;
             case 'boolean':
                 $checked = false;
-                if(isset($this->value) && (bool)$this->value === true) $checked = true;
+                if (isset($this->value) && (bool) $this->value === true) {
+                    $checked = true;
+                }
                 $set_checked = ($checked) ? ' checked="checked"' : '';
                 $value = '
                 <input type="hidden" name="value" value="0" />
@@ -120,26 +126,30 @@ class Setting extends Model
                 break;
             case 'select':
                 $options = json_decode($this->options);
-                foreach($options as $key => $opt) {
+                if ($this->key === 'search_provider') {
+                    $options = Search::providers()->pluck('name', 'id');
+                }
+                foreach ($options as $key => $opt) {
                     $options->$key = __($opt);
                 }
                 $value = Form::select('value', $options, null, ['class' => 'form-control']);
                 break;
+            case 'textarea':
+                $value = Form::textarea('value', null, ['class' => 'form-control', 'cols' => '44', 'rows' => '15']);
+                break;
             default:
                 $value = Form::text('value', null, ['class' => 'form-control']);
                 break;
         }
 
         return $value;
-
     }
 
     public function group()
     {
-        return $this->belongsTo('App\SettingGroup', 'group_id');
+        return $this->belongsTo(\App\SettingGroup::class, 'group_id');
     }
 
-
     /**
      * @param string $key
      *
@@ -148,53 +158,54 @@ class Setting extends Model
     public static function fetch($key)
     {
         $user = self::user();
+
         return self::_fetch($key, $user);
     }
+
     /**
      * @param string $key
      *
      * @return mixed
      */
-    public static function _fetch($key, $user=null)
+    public static function _fetch($key, $user = null)
     {
-        #$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
-        #if (Setting::cached($cachekey)) {
-        #    return Setting::$cache[$cachekey];
-        #} else {
-            $find = self::where('key', '=', $key)->first();
+        //$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
+        //if (Setting::cached($cachekey)) {
+        //    return Setting::$cache[$cachekey];
+        //} else {
+        $find = self::where('key', '=', $key)->first();
 
-            if (!is_null($find)) {
-                if((bool)$find->system === true) { // if system variable use global value
+        if (! is_null($find)) {
+            if ((bool) $find->system === true) { // if system variable use global value
+                $value = $find->value;
+            } else { // not system variable so use user specific value
+                // check if user specified value has been set
+                //print_r($user);
+                $usersetting = $user->settings()->where('id', $find->id)->first();
+                //print_r($user->settings);
+                //die(var_dump($usersetting));
+                //->pivot->value;
+                //echo "user: ".$user->id." --- ".$usersettings;
+                if (isset($usersetting) && ! empty($usersetting)) {
+                    $value = $usersetting->pivot->uservalue;
+                } else { // if not get default from base setting
+                    //$user->settings()->save($find, ['value' => $find->value]);
+                    //$has_setting = $user->settings()->where('id', $find->id)->exists();
+                    //if($has_setting) {
+                    //    $user->settings()->updateExistingPivot($find->id, ['uservalue' => (string)$find->value]);
+                    //} else {
+                    //    $user->settings()->save($find, ['uservalue' => (string)$find->value]);
+                    //}
                     $value = $find->value;
-                } else { // not system variable so use user specific value
-                    // check if user specified value has been set
-                    //print_r($user);
-                    $usersetting = $user->settings()->where('id', $find->id)->first();
-                    //print_r($user->settings);
-                    //die(var_dump($usersetting));
-                    //->pivot->value;
-                    //echo "user: ".$user->id." --- ".$usersettings;
-                    if(isset($usersetting) && !empty($usersetting)) {
-                        $value = $usersetting->pivot->uservalue;
-                    } else { // if not get default from base setting
-                        //$user->settings()->save($find, ['value' => $find->value]);
-                        #$has_setting = $user->settings()->where('id', $find->id)->exists();
-                        #if($has_setting) {
-                        #    $user->settings()->updateExistingPivot($find->id, ['uservalue' => (string)$find->value]);
-                        #} else {
-                        #    $user->settings()->save($find, ['uservalue' => (string)$find->value]);
-                        #}
-                        $value = $find->value;
-                    }
-                    
                 }
-                #Setting::add($cachekey, $value);
-
-                return $value;
-            } else {
-                return false;
             }
-        #}
+            //Setting::add($cachekey, $value);
+
+            return $value;
+        } else {
+            return false;
+        }
+        //}
     }
 
     /**
@@ -203,7 +214,7 @@ class Setting extends Model
      */
     public static function add($key, $value)
     {
-        Setting::$cache[$key] = $value;
+        self::$cache[$key] = $value;
     }
 
     /**
@@ -213,61 +224,7 @@ class Setting extends Model
      */
     public static function cached($key)
     {
-        return array_key_exists($key, Setting::$cache);
-    }
-
-    /**
-     * @return html
-     */
-    public static function search()
-    {
-        $output = '';
-        $homepage_search = self::fetch('homepage_search');
-        $search_provider = self::where('key', '=', 'search_provider')->first();
-        $user_search_provider = self::fetch('search_provider');
-        //die(print_r($search_provider));
-       
-        //die(var_dump($user_search_provider));
-        // return early if search isn't applicable
-        if((bool)$homepage_search !== true) return $output;
-        if($user_search_provider === 'none') return $output;
-        if(empty($user_search_provider)) return $output;
-        if(is_null($user_search_provider)) return $output;
-
-
-        if((bool)$homepage_search && (bool)$search_provider) {
-
-            $options = (array)json_decode($search_provider->options);
-            $name = $options[$user_search_provider];
-            if((bool)$user_search_provider) {
-                switch($user_search_provider) {
-                    case 'google':
-                        $url = 'https://www.google.com/search';
-                        $var = 'q';
-                        break;
-                    case 'ddg':
-                        $url = 'https://duckduckgo.com/';
-                        $var = 'q';
-                        break;
-                    case 'bing':
-                        $url = 'https://www.bing.com/search';
-                        $var = 'q';
-                        break;
-                    case 'startpage':
-                        $url = 'https://www.startpage.com/';
-                        $var = 'q';
-                }
-                $output .= '<div class="searchform">';
-                $output .= Form::open(['url' => $url, 'method' => 'get']);
-                $output .= '<div class="input-container">';
-                $output .= Form::text($var, null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __($name).' '.__('app.settings.search').'...']);
-                $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
-                $output .= '</div>';
-                $output .= Form::close();
-                $output .= '</div>';
-            }
-        }
-        return $output;
+        return array_key_exists($key, self::$cache);
     }
 
     /**
@@ -275,13 +232,11 @@ class Setting extends Model
      */
     public function users()
     {
-        return $this->belongsToMany('App\User')->using('App\SettingUser')->withPivot('uservalue');
+        return $this->belongsToMany(\App\User::class)->using(\App\SettingUser::class)->withPivot('uservalue');
     }
 
     public static function user()
     {
         return User::currentUser();
     }
-
-
 }

app/SettingGroup.php

@@ -22,6 +22,6 @@ class SettingGroup extends Model
 
     public function settings()
     {
-        return $this->hasMany('App\Setting', 'group_id');
+        return $this->hasMany(\App\Setting::class, 'group_id');
     }
 }

app/SupportedApps.php

@@ -0,0 +1,174 @@
+<?php
+
+namespace App;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Log;
+
+abstract class SupportedApps
+{
+    protected $jar = false;
+
+    protected $method = 'GET';
+
+    protected $error;
+
+    public function appTest($url, $attrs = [], $overridevars = false)
+    {
+        if (empty($this->config->url)) {
+            return (object) [
+                'code' => 404,
+                'status' => 'No URL has been specified',
+                'response' => 'No URL has been specified',
+            ];
+        }
+        $res = $this->execute($url, $attrs);
+        if ($res == null) {
+            return (object) [
+                'code' => null,
+                'status' => $this->error,
+                'response' => 'Connection failed',
+            ];
+        }
+        switch ($res->getStatusCode()) {
+            case 200:
+                $status = 'Successfully communicated with the API';
+                break;
+            case 401:
+                $status = 'Failed: Invalid credentials';
+                break;
+            case 404:
+                $status = 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                $status = 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }
+
+        return (object) [
+            'code' => $res->getStatusCode(),
+            'status' => $status,
+            'response' => $res->getBody(),
+        ];
+    }
+
+    public function execute($url, $attrs = [], $overridevars = false, $overridemethod = false)
+    {
+        $res = null;
+
+        $vars = ($overridevars !== false) ?
+        $overridevars : [
+            'http_errors' => false,
+            'timeout' => 15,
+            'connect_timeout' => 15,
+        ];
+
+        $client = new Client($vars);
+
+        $method = ($overridemethod !== false) ? $overridemethod : $this->method;
+
+        try {
+            return $client->request($method, $url, $attrs);
+        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+            Log::error('Connection refused');
+            Log::debug($e->getMessage());
+            $this->error = 'Connection refused - '.(string) $e->getMessage();
+        } catch (\GuzzleHttp\Exception\ServerException $e) {
+            Log::debug($e->getMessage());
+            $this->error = (string) $e->getResponse()->getBody();
+        }
+        $this->error = 'General error connecting with API';
+
+        return $res;
+    }
+
+    public function login()
+    {
+    }
+
+    public function normaliseurl($url, $addslash = true)
+    {
+        $url = rtrim($url, '/');
+        if ($addslash) {
+            $url .= '/';
+        }
+
+        return $url;
+    }
+
+    public function getLiveStats($status, $data)
+    {
+        $className = get_class($this);
+        $explode = explode('\\', $className);
+        $name = end($explode);
+
+        $html = view('SupportedApps::'.$name.'.livestats', $data)->with('data', $data)->render();
+
+        return json_encode(['status' => $status, 'html' => $html]);
+        //return
+    }
+
+    public static function getList()
+    {
+        // $list_url = 'https://apps.heimdall.site/list';
+        $list_url = config('app.appsource').'list.json';
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+
+        return $client->request('GET', $list_url);
+    }
+
+    public static function configValue($item = null, $key = null)
+    {
+        if (isset($item) && ! empty($item)) {
+            return $item->getconfig()->$key;
+        } else {
+            return null;
+        }
+    }
+
+    public static function getFiles($app)
+    {
+        $zipurl = config('app.appsource').'files/'.$app->sha.'.zip';
+
+        $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15]);
+        $res = $client->request('GET', $zipurl);
+
+        if (! file_exists(app_path('SupportedApps'))) {
+            mkdir(app_path('SupportedApps'), 0777, true);
+        }
+
+        $src = app_path('SupportedApps/'.className($app->name).'.zip');
+        file_put_contents($src, $res->getBody());
+
+        $zip = new \ZipArchive();
+        $x = $zip->open($src);  // open the zip file to extract
+        if ($x === true) {
+            $zip->extractTo(app_path('SupportedApps')); // place in the directory with same name
+            $zip->close();
+            unlink($src); //Deleting the Zipped file
+        } else {
+            var_dump($x);
+        }
+    }
+
+    public static function saveApp($details, $app)
+    {
+        $app->appid = $details->appid;
+        $app->name = $details->name;
+        $app->sha = $details->sha ?? null;
+        $app->icon = 'icons/'.$details->icon;
+        $app->website = $details->website;
+        $app->license = $details->license;
+
+        $appclass = $app->class();
+        $application = new $appclass;
+        $enhanced = (bool) ($application instanceof \App\EnhancedApps);
+        $app->class = $appclass;
+        $app->enhanced = $enhanced;
+        $app->tile_background = $details->tile_background;
+        $app->save();
+
+        return $app;
+    }
+}

app/SupportedApps/AirSonic.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class AirSonic implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#08F';
-    }
-    public function icon()
-    {
-        return 'supportedapps/airsonic.png';
-    }
-}

app/SupportedApps/Bazarr.php

@@ -1,14 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Bazarr implements Contracts\Applications {
-    
-    public function defaultColour()
-    {
-        return '#222';
-    }
-    public function icon()
-    {
-        return 'supportedapps/bazarr.png';
-    }
-   
-}

app/SupportedApps/Bitwarden.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Bitwarden implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#3c8dbc';
-    }
-    public function icon()
-    {
-        return 'supportedapps/bitwarden.png';
-    }
-}

app/SupportedApps/BookStack.php

@@ -1,14 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class BookStack implements Contracts\Applications {
-    
-    public function defaultColour()
-    {
-        return '#02679E';
-    }
-    public function icon()
-    {
-        return 'supportedapps/bookstack.png';
-    }
-   
-}

app/SupportedApps/Booksonic.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Booksonic implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#58a';
-    }
-    public function icon()
-    {
-        return 'supportedapps/booksonic.png';
-    }
-}

app/SupportedApps/Cardigann.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class Cardigann implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#753';
-    }
-    public function icon()
-    {
-        return 'supportedapps/cardigann.png';
-    }
-}

app/SupportedApps/Contracts/Applications.php

@@ -1,9 +0,0 @@
-<?php namespace App\SupportedApps\Contracts;
-
-interface Applications {
-
-    public function defaultColour();
-
-    public function icon();
-    
-}

app/SupportedApps/Contracts/Livestats.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps\Contracts;
-
-interface Livestats {
-
-    public function configDetails();
-
-    public function testConfig();
-
-    public function executeConfig();
-    
-}

app/SupportedApps/CouchPotato.php

@@ -1,122 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Log;
-
-class CouchPotato implements Contracts\Applications, Contracts\Livestats
-{
-
-    private $_client;
-
-    public function __construct()
-    {
-        $this->_client = new Client(
-            ['http_errors' => false,
-            'timeout' => 10]
-        );
-    }
-
-    public function defaultColour()
-    {
-        return '#363840';
-    }
-    public function icon()
-    {
-        return 'supportedapps/couchpotato.png';
-    }
-    public function configDetails()
-    {
-        return 'couchpotato';
-    }
-    public function testConfig()
-    {
-        $res = $this->sendRequest();
-        if ($res == null) {
-            echo 'CouchPotato connection failed';
-            return;
-        }
-        switch($res->getStatusCode()) {
-        case 200:
-            echo "Successfully connected to CouchPotato";
-            break;
-        case 401:
-            echo 'Failed: Invalid credentials';
-            break;
-        case 404:
-            echo 'Failed: Please make sure your URL is correct and includes the port';
-            break;
-        case 409:
-            echo 'Failed: Incorrect session id';
-            break;
-        default:
-            echo 'Something went wrong... Code: '.$res->getStatusCode();
-            break;
-        }
-    }
-
-    public function executeConfig()
-    {
-        $html = '';
-        $res = $this->sendRequest();
-        if ($res == null) {
-            Log::debug('CouchPotato connection failed');
-            return '';
-        }
-        $data = json_decode($res->getBody());
-        if (! isset($data->movies)) {
-            Log::debug('Failed to fetch data from CouchPotato');
-            return '';
-        }
-        $movies = $data->movies;
-        $wantedMovies = $availableMovies = 0;
-        foreach ($movies as $v) {
-            switch ($v->status) {
-            case 'active':
-                $wantedMovies++;
-                break;
-            case 'done':
-                $availableMovies++;
-                break;
-            default:
-                Log::warning('Unexpected CouchPotato status received: '.$v['status']);
-                break;
-            }
-        }
-
-        $html = '
-        <ul class="livestats">
-            <li><span class="title">Wanted</span><sub>'.$wantedMovies.'</sub></li>
-            <li><span class="title">Available</span><sub>'.$availableMovies.'</sub></li>
-        </ul>
-        ';
-        return json_encode(['status' => 'inactive', 'html' => $html]);
-    }
-
-    private function sendRequest()
-    {
-        $res = null;
-        try{
-            $res = $this->_client->request(
-                'GET',
-                $this->getApiUrl()
-            );
-        }catch(\GuzzleHttp\Exception\BadResponseException $e){
-            Log::error("Connection to {$e->getRequest()->getUrl()} failed");
-            Log::debug($e->getMessage());
-            $res = $e->getRequest();
-        }catch(\GuzzleHttp\Exception\ConnectException $e) {
-            Log::error("CouchPotato connection refused");
-            Log::debug($e->getMessage());
-        }
-        return $res;
-    }
-
-    private function getApiUrl()
-    {
-        $url = $this->config->url;
-        $url = rtrim($url, '/');
-        $apiUrl = $url.'/api/'.$this->config->apikey.'/movie.list';
-        return $apiUrl;
-    }
-}

app/SupportedApps/Deluge.php

@@ -1,109 +0,0 @@
-<?php namespace App\SupportedApps;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-class Deluge implements Contracts\Applications, Contracts\Livestats {
-    public function defaultColour()
-    {
-        return '#357';
-    }
-    public function icon()
-    {
-        return 'supportedapps/deluge.png';
-    }
-
-    public function configDetails()
-    {
-        return 'deluge';
-    }
-
-    public function testConfig()
-    {
-        $res = $this->login()[0];
-        switch($res->getStatusCode()) {
-            case 200:
-                $data = json_decode($res->getBody());
-                if(!isset($data->result) || is_null($data->result) || $data->result == false) {
-                    echo 'Failed: Invalid Credentials';
-                } else {
-                    echo 'Successfully connected to the API';
-                }
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'active';
-        $jar = $this->login()[1];
-        $res = $this->getDetails($jar);
-        $data = json_decode($res->getBody());
-        $download_rate = $data->result->stats->download_rate;
-        $upload_rate = $data->result->stats->upload_rate;
-        $seed_count = $data->result->filters->state[2];
-        $leech_count = $data->result->filters->state[1];
-        $html = '
-        <ul class="livestats">
-            <li><span class="title"><i class="fas fa-arrow-down"></i> '.$this->formatBytes($download_rate).'</span></li>
-            <li><span class="title"><i class="fas fa-arrow-up"></i> '.$this->formatBytes($upload_rate).'</span></li>
-        </ul>
-        <ul class="livestats">
-            <li><span class="title">Leech: '.$leech_count[1].'</span></li>
-            <li><span class="title">Seed: '.$seed_count[1].'</span></li>
-        </ul>
-        ';
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-    public function getDetails($jar)
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $url = rtrim($url, '/');
-        $api_url = $url.'/json';
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('POST', $api_url, [
-            'body' => '{"method": "web.update_ui", "params": [["none"], {}], "id": 1}',
-            'cookies' => $jar,
-            'headers'  => ['content-type' => 'application/json', 'Accept' => 'application/json']
-        ]);
-        return $res;
-    }
-    public function login()
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $password = $config->password;
-        $url = rtrim($url, '/');
-        $api_url = $url.'/json';
-        $jar = new \GuzzleHttp\Cookie\CookieJar();
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('POST', $api_url, [
-            'body' => '{"method": "auth.login", "params": ["'.$password.'"], "id": 1}',
-            'cookies' => $jar,
-            'headers'  => ['content-type' => 'application/json', 'Accept' => 'application/json']
-        ]);
-        return array($res,$jar);
-    }
-
-    function formatBytes($bytes, $precision = 2) { 
-        $units = array('B', 'KB', 'MB', 'GB', 'TB'); 
-
-        $bytes = max($bytes, 0); 
-        $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); 
-        $pow = min($pow, count($units) - 1); 
-
-        // Uncomment one of the following alternatives
-        $bytes /= pow(1024, $pow);
-        // $bytes /= (1 << (10 * $pow)); 
-
-        return round($bytes, $precision) . ' ' . $units[$pow] . 'ps'; 
-    }
-}

app/SupportedApps/Dokuwiki.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Dokuwiki implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#9d7056';
-    }
-    public function icon()
-    {
-        return 'supportedapps/dokuwiki.png';
-    }
-}

app/SupportedApps/Duplicati.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Duplicati implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#2c3744';
-    }
-    public function icon()
-    {
-        return 'supportedapps/duplicati.png';
-    }
-}

app/SupportedApps/Emby.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Emby implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#222';
-    }
-    public function icon()
-    {
-        return 'supportedapps/emby.png';
-    }
-}

app/SupportedApps/Flood.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Flood implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '##00D091';
-    }
-    public function icon()
-    {
-        return 'supportedapps/Flood.png';
-    }
-}

app/SupportedApps/FreshRSS.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class FreshRSS implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#003B73';
-    }
-    public function icon()
-    {
-        return 'supportedapps/freshrss.png';
-    }
-}

app/SupportedApps/Gitea.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Gitea implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#585e52';
-    }
-    public function icon()
-    {
-        return 'supportedapps/gitea.png';
-    }
-}

app/SupportedApps/Glances.php

@@ -1,14 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Glances implements Contracts\Applications {
-    
-    public function defaultColour()
-    {
-        return '#2c363f';
-    }
-    public function icon()
-    {
-        return 'supportedapps/glances.png';
-    }
-   
-}

app/SupportedApps/Grafana.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Grafana implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#a56e4d';
-    }
-    public function icon()
-    {
-        return 'supportedapps/grafana.png';
-    }
-}

app/SupportedApps/Graylog.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Graylog implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#158';
-    }
-    public function icon()
-    {
-        return 'supportedapps/graylog.png';
-    }
-}

app/SupportedApps/Headphones.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Headphones implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#185';
-    }
-    public function icon()
-    {
-        return 'supportedapps/headphones.png';
-    }
-}

app/SupportedApps/HomeAssistant.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class HomeAssistant implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#073c52';
-    }
-    public function icon()
-    {
-        return 'supportedapps/homeassistant.png';
-    }
-}

app/SupportedApps/Jackett.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Jackett implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#484814';
-    }
-    public function icon()
-    {
-        return 'supportedapps/jackett.png';
-    }
-}

app/SupportedApps/Jdownloader.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Jdownloader implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#2b494f';
-    }
-    public function icon()
-    {
-        return 'supportedapps/jdownloader.png';
-    }
-}

app/SupportedApps/Krusader.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class Krusader implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#5A5';
-    }
-    public function icon()
-    {
-        return 'supportedapps/krusader.png';
-    }
-}

app/SupportedApps/Lidarr.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Lidarr implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#183c18';
-    }
-    public function icon()
-    {
-        return 'supportedapps/lidarr.png';
-    }
-}

app/SupportedApps/Mailcow.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Mailcow implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#161b1f';
-    }
-    public function icon()
-    {
-        return 'supportedapps/mailcow.svg';
-    }
-}

app/SupportedApps/Mcmyadmin.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Mcmyadmin implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#30404b';
-    }
-    public function icon()
-    {
-        return 'supportedapps/mcmyadmin.png';
-    }
-}

app/SupportedApps/Medusa.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Medusa implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#4b5e55';
-    }
-    public function icon()
-    {
-        return 'supportedapps/medusa.png';
-    }
-}

app/SupportedApps/Monica.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Monica implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#fafbfc';
-    }
-    public function icon()
-    {
-        return 'supportedapps/monica.png';
-    }
-}

app/SupportedApps/MusicBrainz.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class MusicBrainz implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#a0a';
-    }
-    public function icon()
-    {
-        return 'supportedapps/musicbrainz.png';
-    }
-}

app/SupportedApps/Mylar.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Mylar implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#aa0';
-    }
-    public function icon()
-    {
-        return 'supportedapps/mylar.png';
-    }
-}

app/SupportedApps/Netdata.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Netdata implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#543737';
-    }
-    public function icon()
-    {
-        return 'supportedapps/netdata.png';
-    }
-}

app/SupportedApps/Nextcloud.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Nextcloud implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#0e2c3e';
-    }
-    public function icon()
-    {
-        return 'supportedapps/nextcloud.png';
-    }
-}

app/SupportedApps/NowShowing.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class NowShowing implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#690000';
-    }
-    public function icon()
-    {
-        return 'supportedapps/nowshowing.png';
-    }
-}

app/SupportedApps/Nzbget.php

@@ -1,84 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Nzbget implements Contracts\Applications, Contracts\Livestats {
-
-    public $config;
-
-    public function defaultColour()
-    {
-        return '#253827';
-    }
-    public function icon()
-    {
-        return 'supportedapps/nzbget.png';
-    }
-    public function configDetails()
-    {
-        return 'nzbget';
-    }
-    public function testConfig()
-    {
-        $res = $this->buildRequest('status');
-        switch($res->getStatusCode()) {
-            case 200:
-                echo 'Successfully connected to the API';
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'inactive';
-        $res = $this->buildRequest('status');
-        $data = json_decode($res->getBody());
-        //$data->result->RemainingSizeMB = '10000000';
-        //$data->result->DownloadRate = '100000000';
-        if($data) {
-            $size = $data->result->RemainingSizeMB;
-            $rate = $data->result->DownloadRate;
-            $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
-            $current_speed = format_bytes($rate, false, ' <span>');
-
-            $active = ($size > 0 || $rate > 0) ? 'active' : 'inactive';
-            $html = '
-            <ul class="livestats">
-                <li><span class="title">Queue</span><strong>'.$queue_size.'</strong></li>
-                <li><span class="title">Speed</span><strong>'.$current_speed.'/s</span></strong></li>
-            </ul>
-            ';
-        }
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-    public function buildRequest($endpoint)
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $username = $config->username;
-        $password = $config->password;
-
-        $rebuild_url = str_replace('http://', 'http://'.$username.':'.$password.'@', $url);
-        $rebuild_url = str_replace('https://', 'https://'.$username.':'.$password.'@', $rebuild_url);
-        $rebuild_url = rtrim($rebuild_url, '/');
-
-
-        $api_url = $rebuild_url.'/jsonrpc/'.$endpoint;
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-   
-}

app/SupportedApps/Nzbhydra.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Nzbhydra implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#53644d';
-    }
-    public function icon()
-    {
-        return 'supportedapps/nzbhydra.png';
-    }
-}

app/SupportedApps/Ombi.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Ombi implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#150f09';
-    }
-    public function icon()
-    {
-        return 'supportedapps/ombi.png';
-    }
-}

app/SupportedApps/OpenMediaVault.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class OpenMediaVault implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#5AF';
-    }
-    public function icon()
-    {
-        return 'supportedapps/openmediavault.png';
-    }
-}

app/SupportedApps/Openhab.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Openhab implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#2b2525';
-    }
-    public function icon()
-    {
-        return 'supportedapps/openhab.png';
-    }
-}

app/SupportedApps/Opnsense.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Opnsense implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#211914';
-    }
-    public function icon()
-    {
-        return 'supportedapps/opnsense.png';
-    }
-}

app/SupportedApps/Pfsense.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Pfsense implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#243699';
-    }
-    public function icon()
-    {
-        return 'supportedapps/pfsense.png';
-    }
-}

app/SupportedApps/Pihole.php

@@ -1,73 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Pihole implements Contracts\Applications, Contracts\Livestats {
-    public function defaultColour()
-    {
-        return '#352222';
-    }
-    public function icon()
-    {
-        return 'supportedapps/pihole.png';
-    }
-
-    public function configDetails()
-    {
-        return 'pihole';
-    }
-
-    public function testConfig()
-    {
-        $res = $this->buildRequest();
-        switch($res->getStatusCode()) {
-            case 200:
-                echo 'Successfully connected to the API';
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'active';
-        $res = $this->buildRequest();
-        $data = json_decode($res->getBody());
-
-        $html = '
-            <ul class="livestats">
-                <li><span class="title">Domains<br />Blocked</span><strong>'.$data->domains_being_blocked.'</strong></li>
-                <li><span class="title">Blocked<br />Today</span><strong>'.$data->ads_blocked_today.'</span></strong></li>
-            </ul>
-            ';
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-
-    public function buildRequest()
-    {
-        $config = $this->config;
-        $url = $config->url;
-
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/api.php';
-        //die( $api_url.' --- ');
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-
-
-}

app/SupportedApps/Plex.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Plex implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#222';
-    }
-    public function icon()
-    {
-        return 'supportedapps/plex.png';
-    }
-}

app/SupportedApps/Plexpy.php

@@ -1,77 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Plexpy implements Contracts\Applications, Contracts\Livestats {
-
-    public $config;
-
-    public function defaultColour()
-    {
-        return '#2d2208';
-    }
-    public function icon()
-    {
-        return 'supportedapps/plexpy.png';
-    }
-    public function configDetails()
-    {
-        return 'plexpy';
-    }
-    public function testConfig()
-    {
-        $res = $this->buildRequest('arnold');
-        switch($res->getStatusCode()) {
-            case 200:
-                $data = json_decode($res->getBody());
-                if(isset($data->error) && !empty($data->error)) {
-                    echo 'Failed: '.$data->error;
-                } else {
-                    echo 'Successfully connected to the API';
-                }
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'active';
-        $res = $this->buildRequest('get_activity');
-        $data = json_decode($res->getBody());
-        $stream_count = $data->response->data->stream_count;
-
-        $html = '
-        <ul class="livestats">
-            <li><span class="title">Stream Count</span><strong>'.$stream_count.'</strong></li>
-        </ul>
-        ';
-
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-    public function buildRequest($endpoint)
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $apikey = $config->apikey;
-
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/api/v2?apikey='.$apikey.'&cmd='.$endpoint;
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-   
-}

app/SupportedApps/Plexrequests.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Plexrequests implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#3c2d1c';
-    }
-    public function icon()
-    {
-        return 'supportedapps/plexrequests.png';
-    }
-}

app/SupportedApps/Portainer.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Portainer implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#283f44';
-    }
-    public function icon()
-    {
-        return 'supportedapps/portainer.png';
-    }
-}

app/SupportedApps/Proxmox.php

@@ -1,80 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Proxmox implements Contracts\Applications, Contracts\Livestats {
-    public function defaultColour()
-    {
-        return '#542e0a';
-    }
-    public function icon()
-    {
-        return 'supportedapps/proxmox.png';
-    }
-
-    public function configDetails()
-    {
-        //return 'proxmox';
-        return null;
-    }
-
-    public function testConfig()
-    {
-        /*$res = $this->buildRequest();
-        switch($res->getStatusCode()) {
-            case 200:
-                echo 'Successfully connected to the API';
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }*/
-        return null;
-    }
-
-    public function executeConfig()
-    {
-        /*
-        $output = '';
-        $res = $this->buildRequest();
-        $data = json_decode($res->getBody());
-
-            $output = '
-            <ul class="livestats">
-                <li><span class="title">Domains<br />Blocked</span><strong>'.$data->domains_being_blocked.'</strong></li>
-                <li><span class="title">Blocked<br />Today</span><strong>'.$data->ads_blocked_today.'</span></strong></li>
-            </ul>
-            ';
-        return $output;
-        */
-        return null;
-    }
-
-    public function buildRequest($endpoint='')
-    {
-        $config = $this->config;
-
-        $username = $config->username;
-        $password = $config->password;
-
-        $url = $config->url;
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/api2/json/'.$endpoint.'?username='.$username.'&password='.$password;
-        //die( $api_url.' --- ');
-
-        $client = new Client(['http_errors' => false, 'verify' => false ]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-
-
-}

app/SupportedApps/Radarr.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Radarr implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#3e3726';
-    }
-    public function icon()
-    {
-        return 'supportedapps/radarr.png';
-    }
-}

app/SupportedApps/Rancher.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Rancher implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#78c9cf';
-    }
-    public function icon()
-    {
-        return 'supportedapps/rancher.png';
-    }
-}

app/SupportedApps/Runeaudio.php

@@ -1,95 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Runeaudio implements Contracts\Applications, Contracts\Livestats {
-    public function defaultColour()
-    {
-        return '#05A';
-    }
-    public function icon()
-    {
-        return 'supportedapps/runeaudio.png';
-    }
-
-    public function configDetails()
-    {
-        return 'runeaudio';
-    }
-
-    public function testConfig()
-    {
-        $res = $this->buildRequest('status');
-        switch($res->getStatusCode()) {
-            case 200:
-                echo 'Successfully connected to the API';
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-
-    public function executeConfig()
-    {
-        $output = '';
-        $active = 'active';
-        $artist = '';
-        $song_title = '';
-        $res = $this->buildRequest('currentsong');
-        $array = explode("\n", $res->getBody());
-        foreach($array as $item) {
-            $item_array = explode(": ", $item);
-            if ($item_array[0] == 'Artist') {
-                $artist = $item_array[1];
-            } elseif ($item_array[0] == 'Title') {
-                $song_title = $item_array[1];
-            }
-        }
-
-        $output = '<ul class="livestats">';
-
-        if (strlen($artist) > 12) {
-            $output = $output.'<li><span class="title-marquee"><span>'.$artist.'</span></span></li>';
-        } else {
-            $output = $output.'<li><span class="title">'.$artist.'</span></li>';
-        }
-
-        $output = $output.'</ul><ul class="livestats">';
-
-        if (strlen($song_title) > 12) {
-            $output = $output.'<li><span class="title-marquee"><span>'.$song_title.'</span></span></li>';
-        } else {
-            $output = $output.'<li><span class="title">'.$song_title.'</span></li>';
-        }
-
-        $output = $output.'</ul>';
-
-        return json_encode(['status' => $active, 'html' => $output]);
-    }
-
-    public function buildRequest($endpoint)
-    {
-        $config = $this->config;
-        $url = $config->url;
-
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/command/?cmd='.$endpoint;
-        //die( $api_url.' --- ');
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-
-
-}

app/SupportedApps/Sabnzbd.php

@@ -1,89 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Sabnzbd implements Contracts\Applications, Contracts\Livestats {
-
-    public $config;
-
-    public function defaultColour()
-    {
-        return '#3e3924';
-    }
-    public function icon()
-    {
-        return 'supportedapps/sabnzbd.png';
-    }
-    public function configDetails()
-    {
-        return 'sabnzbd';
-    }
-    public function testConfig()
-    {
-        $res = $this->buildRequest('queue');
-        switch($res->getStatusCode()) {
-            case 200:
-                $data = json_decode($res->getBody());
-                if(isset($data->error) && !empty($data->error)) {
-                    echo 'Failed: '.$data->error;
-                } else {
-                    echo 'Successfully connected to the API';
-                }
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'inactive';
-        $res = $this->buildRequest('queue');
-        $data = json_decode($res->getBody());
-        //$data->result->RemainingSizeMB = '10000000';
-        //$data->result->DownloadRate = '100000000';
-        if($data) {
-            $size = $data->queue->mbleft;
-            $rate = $data->queue->kbpersec;
-            $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
-            $current_speed = format_bytes($rate*1000, false, ' <span>');
-
-            $active = ($size > 0 || $rate > 0) ? 'active' : 'inactive';
-            $html = '
-                <ul class="livestats">
-                    <li><span class="title">Queue</span><strong>'.$queue_size.'</strong></li>
-                    <li><span class="title">Speed</span><strong>'.$current_speed.'/s</span></strong></li>
-                </ul>
-            ';
-        }
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-    public function buildRequest($endpoint)
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $apikey = $config->apikey;
-
-        //print_r($config);
-        //die();
-
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/api?output=json&apikey='.$apikey.'&mode='.$endpoint;
-        //die( $api_url.' --- ');
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-   
-}

app/SupportedApps/Sickrage.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Sickrage implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#6185a6';
-    }
-    public function icon()
-    {
-        return 'supportedapps/sickrage.png';
-    }
-}

app/SupportedApps/Sonarr.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Sonarr implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#163740';
-    }
-    public function icon()
-    {
-        return 'supportedapps/sonarr.png';
-    }
-}

app/SupportedApps/Syncthing.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class Syncthing implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#888';
-    }
-    public function icon()
-    {
-        return 'supportedapps/syncthing.png';
-    }
-}

app/SupportedApps/TVheadend.php

@@ -1,14 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class TVheadend implements Contracts\Applications {
-    
-    public function defaultColour()
-    {
-        return '#006080';
-    }
-    public function icon()
-    {
-        return 'supportedapps/tvheadend.png';
-    }
-   
-}

app/SupportedApps/Tautulli.php

@@ -1,77 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-
-class Tautulli implements Contracts\Applications, Contracts\Livestats {
-
-    public $config;
-
-    public function defaultColour()
-    {
-        return '#2d2208';
-    }
-    public function icon()
-    {
-        return 'supportedapps/tautulli.png';
-    }
-    public function configDetails()
-    {
-        return 'tautulli';
-    }
-    public function testConfig()
-    {
-        $res = $this->buildRequest('arnold');
-        switch($res->getStatusCode()) {
-            case 200:
-                $data = json_decode($res->getBody());
-                if(isset($data->error) && !empty($data->error)) {
-                    echo 'Failed: '.$data->error;
-                } else {
-                    echo 'Successfully connected to the API';
-                }
-                break;
-            case 401:
-                echo 'Failed: Invalid credentials';
-                break;
-            case 404:
-                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
-                break;
-            default:
-                echo 'Something went wrong... Code: '.$res->getStatusCode();
-                break;
-        }
-    }
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'active';
-        $res = $this->buildRequest('get_activity');
-        $data = json_decode($res->getBody());
-        $stream_count = $data->response->data->stream_count;
-
-        $html = '
-        <ul class="livestats">
-            <li><span class="title">Stream Count</span><strong>'.$stream_count.'</strong></li>
-        </ul>
-        ';
-
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-    public function buildRequest($endpoint)
-    {
-        $config = $this->config;
-        $url = $config->url;
-        $apikey = $config->apikey;
-
-        $url = rtrim($url, '/');
-
-        $api_url = $url.'/api/v2?apikey='.$apikey.'&cmd='.$endpoint;
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-        return $res;
-
-    }
-   
-}

app/SupportedApps/Traefik.php

@@ -1,78 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-
-class Traefik implements Contracts\Applications, Contracts\Livestats
-{
-
-    public function defaultColour()
-    {
-        return '#28434a';
-    }
-
-    public function icon()
-    {
-        return 'supportedapps/traefik.png';
-    }
-
-    public function configDetails()
-    {
-        return 'traefik';
-    }
-
-    public function testConfig()
-    {
-        $res = $this->sendRequest();
-        if ($res == null) {
-            echo 'Traefik connection failed';
-            return;
-        }
-        switch($res->getStatusCode()) {
-        case 200:
-            $data = json_decode($res->getBody());
-            echo "Successfully connected with status: ".$data->result."\n";
-            break;
-        case 404:
-            echo 'Failed: Please make sure your URL is correct and includes the port';
-            break;
-        default:
-            echo 'Something went wrong... Code: '.$res->getStatusCode();
-            break;
-        }
-    }
-
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'inactive';
-        $res = $this->sendRequest();
-        $data = json_decode($res->getBody());
-        if ($data) {
-            $avg_response_time = $data->average_response_time_sec;
-            $time = $avg_response_time*1000;
-            $time_output = number_format($time, 2);
-            $active = ($time > 0) ? 'active' : 'inactive';
-            $html = '
-                <ul class="livestats">
-                    <li><span class="title">Avg. Response Time</span><sub><i class="fas fa-heartbeat"></i> '.$time_output.' ms</sub></li>
-                </ul>
-            ';
-        }
-        return json_encode(['status' => $active, 'html' => $html]);
-    }
-
-    public function sendRequest()
-    {
-        $config = $this->config;
-        $url = $config->url;
-
-        $url = rtrim($url, '/');
-        $api_url = $url.'/health';
-
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
-        $res = $client->request('GET', $api_url);
-
-        return $res;
-    }
-}

app/SupportedApps/Transmission.php

@@ -1,169 +0,0 @@
-<?php namespace App\SupportedApps;
-
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Log;
-
-class Transmission implements Contracts\Applications, Contracts\Livestats
-{
-
-    private $_client;
-    private $_clientOptions = array();
-
-    public function __construct()
-    {
-        $body = array();
-        $body["method"] = "torrent-get";
-        $body["arguments"] = array("fields" => ["percentDone","status","rateDownload","rateUpload"]);
-        $this->_client = new Client(
-            ['http_errors' => false,
-            'timeout' => 10,
-            'body' => json_encode($body)]
-        );
-    }
-
-    public function defaultColour()
-    {
-        return '#950003';
-    }
-    public function icon()
-    {
-        return 'supportedapps/transmission.png';
-    }
-    public function configDetails()
-    {
-        return 'transmission';
-    }
-    public function testConfig()
-    {
-        $res = $this->sendRequest();
-        if ($res == null) {
-            echo 'Transmission connection failed';
-            return;
-        }
-        switch($res->getStatusCode()) {
-        case 200:
-            $data = json_decode($res->getBody());
-            echo "Successfully connected with status: ".$data->result."\n";
-            break;
-        case 401:
-            echo 'Failed: Invalid credentials';
-            break;
-        case 404:
-            echo 'Failed: Please make sure your URL is correct and includes the port';
-            break;
-        case 409:
-            echo 'Failed: Incorrect session id';
-            break;
-        default:
-            echo 'Something went wrong... Code: '.$res->getStatusCode();
-            break;
-        }
-    }
-
-    public function executeConfig()
-    {
-        $html = '';
-        $active = 'active';
-        $res = $this->sendRequest();
-        if ($res == null) {
-            Log::debug('Transmission connection failed');
-            return '';
-        }
-        $data = json_decode($res->getBody());
-        if (! isset($data->arguments)) {
-            Log::debug('Failed to fetch data from Transmission');
-            return '';
-        }
-        $torrents = $data->arguments->torrents;
-        $torrentCount = count($torrents);
-        $rateDownload = $rateUpload = $completedTorrents = 0;
-        foreach ($torrents as $thisTorrent) {
-            $rateDownload += $thisTorrent->rateDownload;
-            $rateUpload += $thisTorrent->rateUpload;
-            if ($thisTorrent->percentDone == 1) {
-                $completedTorrents += 1;
-            }
-        }
-        if ($torrentCount - $completedTorrents == 0) {
-            // Don't poll as frequently if we don't have any active torrents
-            $active = 'inactive';
-        }
-
-        $html = '
-        <ul class="livestats">
-            <li><span class="title">Done</span><sub>'.$completedTorrents.' / '.$torrentCount.'</sub></li>
-            <li><span class="title">Down</span><sub>'.format_bytes($rateDownload).'</sub></li>
-            <li><span class="title">Up</span><sub>'.format_bytes($rateUpload).'</sub></li>
-        </ul>
-        ';
-        return json_encode(['status' => $active, 'html' => $html]);;
-    }
-
-    private function sendRequest()
-    {
-        $optionsSet = $this->setClientOptions();
-        if (! $optionsSet) {
-            // Pass the failed response back up the chain
-            return null;
-        }
-        $res = $this->torrentGet();
-        if ($res->getStatusCode() == 409) {
-            $this->setClientOptions();
-            $res = $this->torrentGet();
-        }
-        return $res;
-    }
-
-    private function torrentGet()
-    {
-        $res = null;
-        try{
-            $res = $this->_client->request(
-                'POST',
-                $this->getApiUrl(),
-                $this->_clientOptions
-            );
-        }catch(\GuzzleHttp\Exception\BadResponseException $e){
-            Log::error("Connection to {$e->getRequest()->getUrl()} failed");
-            Log::debug($e->getMessage());
-            $res = $e->getRequest();
-        }catch(\GuzzleHttp\Exception\ConnectException $e) {
-            Log::error("Transmission connection refused");
-            Log::debug($e->getMessage());
-        }
-        return $res;
-    }
-
-    private function setClientOptions()
-    {
-        if ($this->config->username != '' || $this->config->password != '') {
-            $this->_clientOptions = ['auth'=> [$this->config->username, $this->config->password, 'Basic']];
-        }
-        try{
-            $res = $this->_client->request('HEAD', $this->getApiUrl(), $this->_clientOptions);
-            $xtId = $res->getHeaderLine('X-Transmission-Session-Id');
-            if ($xtId != null) {
-                $this->_clientOptions['headers'] = ['X-Transmission-Session-Id' => $xtId];
-            } else {
-                Log::error("Unable to get Transmission session information");
-                Log::debug("Status Code: ".$res->getStatusCode());
-            }
-        }catch(\GuzzleHttp\Exception\ConnectException $e){
-            Log::error("Failed connection to Transmission");
-            return false;
-        }
-        return true;
-    }
-
-    private function getApiUrl()
-    {
-        $config = $this->config;
-        $url = $config->url;
-
-        $url = rtrim($url, '/');
-        $api_url = $url.'/transmission/rpc';
-
-        return $api_url;
-    }
-}

app/SupportedApps/Ttrss.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Ttrss implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#9d704c';
-    }
-    public function icon()
-    {
-        return 'supportedapps/tt-rss.png';
-    }
-}

app/SupportedApps/Unifi.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Unifi implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#363840';
-    }
-    public function icon()
-    {
-        return 'supportedapps/unifi.png';
-    }
-}

app/SupportedApps/Unraid.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Unraid implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#A12624';
-    }
-    public function icon()
-    {
-        return 'supportedapps/unraid.png';
-    }
-}

app/SupportedApps/Virtualmin.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Virtualmin implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#161b1f';
-    }
-    public function icon()
-    {
-        return 'supportedapps/virtualmin.svg';
-    }
-}

app/SupportedApps/Watcher3.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class Watcher3 implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#500';
-    }
-    public function icon()
-    {
-        return 'supportedapps/watcher3.png';
-    }
-}

app/SupportedApps/WebTools.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class WebTools implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#555';
-    }
-    public function icon()
-    {
-        return 'supportedapps/webtools.png';
-    }
-}

app/SupportedApps/Webmin.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class Webmin implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#161b1f';
-    }
-    public function icon()
-    {
-        return 'supportedapps/webmin.svg';
-    }
-}

app/SupportedApps/pyLoad.php

@@ -1,11 +0,0 @@
-<?php namespace App\SupportedApps;
-class pyLoad implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#881';
-    }
-    public function icon()
-    {
-        return 'supportedapps/pyload.png';
-    }
-}

app/SupportedApps/ruTorrent.php

@@ -1,12 +0,0 @@
-<?php namespace App\SupportedApps;
-
-class ruTorrent implements Contracts\Applications {
-    public function defaultColour()
-    {
-        return '#004';
-    }
-    public function icon()
-    {
-        return 'supportedapps/rutorrent.png';
-    }
-}