Update version number

Copy icon if missing on new app add.
Change order of create symlink and load apps

app/Application.php

@@ -13,6 +13,14 @@ class Application extends Model
     //
     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;
     }
 
@@ -40,7 +48,7 @@ class Application extends Model
     public static function applist()
     {
         $list = [];
-        $all = self::orderBy('name')->get();
+        $all = self::orderBy('name')->get()->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE);
         $list['null'] = 'None';
         foreach($all as $app) {
             $name = $app->name;

app/Console/Commands/RegisterApp.php

@@ -40,22 +40,40 @@ class RegisterApp extends Command
     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));
-            $exists = Application::find($app->appid);
-            if($exists) {
-                $this->error('This app is already registered');
-                exit;
+            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);
             }
-            // Doesn't exist so add it
-            SupportedApps::saveApp($app, new Application);
-            $this->info("Application Added - ".$app->name." - ".$app->appid);
             
         } else {
             $this->error('Could not find '.$json);
         }
-        
-        
+
     }
 }

app/Http/Controllers/SettingsController.php

@@ -68,6 +68,8 @@ class SettingsController extends Controller
         if (!is_null($setting)) {
             $data = Setting::getInput();
 
+            $setting_value = null;
+
             if ($setting->type == 'image') {
 
 

app/Item.php

@@ -124,6 +124,14 @@ class Item extends Model
         }
     }
 
+    public static function nameFromClass($class)
+    {
+        $explode = explode('\\', $class);
+        $name = end($explode);
+        
+        return $name;
+    }
+
     public function scopeOfType($query, $type)
     {
         switch($type) {
@@ -148,6 +156,12 @@ class Item extends Model
         return (bool)($app instanceof \App\EnhancedApps);
     }
 
+    public static function isEnhanced($class)
+    {
+        $app = new $class;
+        return (bool)($app instanceof \App\EnhancedApps);
+    }
+
     public function enabled()
     {
         if($this->enhanced()) {

app/Jobs/ProcessApps.php

@@ -34,11 +34,15 @@ class ProcessApps implements ShouldQueue
         $localapps = Application::all();
         $list = json_decode(SupportedApps::getList()->getBody());
         $validapps = [];
+        
         foreach($list->apps as $app) {
             $validapps[] = $app->appid;
+            $localapp = $localapps->where('appid', $app->appid)->first();
+
+            $application = ($localapp) ? $localapp : new Application;
+
             if(!file_exists(app_path('SupportedApps/'.className($app->name)))) {
                 SupportedApps::getFiles($app);
-                $application = new Application;
                 SupportedApps::saveApp($app, $application);
             } else {
                 // check if there has been an update for this app
@@ -46,11 +50,10 @@ class ProcessApps implements ShouldQueue
                 if($localapp) {
                     if($localapp->sha !== $app->sha) {
                         SupportedApps::getFiles($app);
-                        SupportedApps::saveApp($app, $localapp);
+                        SupportedApps::saveApp($app, $application);
                     }
                 }  else {
                     SupportedApps::getFiles($app);
-                    $application = new Application;
                     SupportedApps::saveApp($app, $application);
       
                 }

app/Providers/AppServiceProvider.php

@@ -47,6 +47,11 @@ class AppServiceProvider extends ServiceProvider
             }
 
         }
+
+        if(!is_file(public_path('storage'))) {
+            Artisan::call('storage:link');
+            \Session::put('current_user', null);
+        }
         
         $applications = Application::all();
         if($applications->count() <= 0) {
@@ -58,11 +63,6 @@ class AppServiceProvider extends ServiceProvider
             
         }
 
-        if(!is_file(public_path('storage'))) {
-            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) 
         {

app/SupportedApps.php

@@ -13,6 +13,13 @@ abstract class SupportedApps
 
     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)[
@@ -105,6 +112,13 @@ abstract class SupportedApps
         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 = $app->files;
@@ -129,15 +143,19 @@ abstract class SupportedApps
 
     public static function saveApp($details, $app)
     {
+        if(!file_exists(storage_path('app/public/icons')))  {
+            mkdir(storage_path('app/public/icons'), 0777, true);
+        }
+
         $img_src = app_path('SupportedApps/'.className($details->name).'/'.$details->icon);
-        $img_dest = public_path('storage/supportedapps/'.$details->icon);
+        $img_dest = storage_path('app/public/icons/'.$details->icon);
         //die("i: ".$img_src);
-        copy($img_src, $img_dest);
+        @copy($img_src, $img_dest);
         
         $app->appid = $details->appid;
         $app->name = $details->name;
         $app->sha = $details->sha ?? null;
-        $app->icon = 'supportedapps/'.$details->icon;
+        $app->icon = 'icons/'.$details->icon;
         $app->website = $details->website;
         $app->license = $details->license;
         $app->description = $details->description;

app/SupportedApps/Ghost/Ghost.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\Ghost;
+
+class Ghost extends \App\SupportedApps {
+
+}

app/SupportedApps/Ghost/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "c4745785181de931cfd5bd79294cb1687d82aea9",
+    "name": "Ghost",
+    "website": "https://github.com/tryghost/ghost",
+    "license": "MIT License",
+    "description": "Fiercely independent, professional publishing. A fully open source, powerful platform for building and running modern publications, we power serious blogs, magazines and journalism from DuckDuckGo to OpenAI & Sky News.",
+    "enhanced": false,
+    "tile_background": "light",
+    "icon": "ghost.png"
+}

app/SupportedApps/MailcowSOGo/MailcowSOGo.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\MailcowSOGo;
+
+class MailcowSOGo extends \App\SupportedApps {
+
+}

app/SupportedApps/MailcowSOGo/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "1ec48781d2c87a9e6dc9ee99e5eff0ab5958df09",
+    "name": "Mailcow - SOGo",
+    "website": "https://sogo.nu/",
+    "license": "GNU GPL/LGPL v2 and above",
+    "description": "SOGo is a fully supported and trusted groupware server with a focus on scalability and open standards.\r\n\r\nPart of the Mailcow stack.",
+    "enhanced": false,
+    "tile_background": "dark",
+    "icon": "mailcowsogo.svg"
+}

app/SupportedApps/Mattermost/Mattermost.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\Mattermost;
+
+class Mattermost extends \App\SupportedApps {
+
+}

app/SupportedApps/Mattermost/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "b3e1424fb69ca08481b03ad9d81e95488421997f",
+    "name": "Mattermost",
+    "website": "https://mattermost.com/",
+    "license": "MIT License",
+    "description": "Mattermost provides high trust collaboration and messaging solutions through an open source, community-powered approach. Enjoy all the productivity benefits of workplace messaging across web, mobile and PC, with unlimited archiving, search and integrations within IT-controlled private environments in public clouds, including AWS and Azure, as well as on-premise in private clouds and virtual or physical servers.",
+    "enhanced": false,
+    "tile_background": "light",
+    "icon": "mattermost.png"
+}

app/SupportedApps/MayanEDMS/MayanEDMS.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\MayanEDMS;
+
+class MayanEDMS extends \App\SupportedApps {
+
+}

app/SupportedApps/MayanEDMS/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "6b9e062ff02ea610df64e9b0eca1c973faf1b51d",
+    "name": "Mayan EDMS",
+    "website": "https://github.com/tryghost/ghost",
+    "license": "Apache License 2.0",
+    "description": "Mayan EDMS is an open-source document management system. Its main purpose is to store, introspect, and categorize files, with a strong emphasis on preserving the contextual and business information of documents. It can also OCR, preview, label, sign, send, and receive thoses files. Other features of interest are its workflow system, role based access control, and REST API.",
+    "enhanced": false,
+    "tile_background": "light",
+    "icon": "mayanedms.png"
+}

app/SupportedApps/Nzbget/Nzbget.php

@@ -0,0 +1,45 @@
+<?php namespace App\SupportedApps\Nzbget;
+
+class Nzbget extends \App\SupportedApps implements \App\EnhancedApps {
+
+    public $config;
+
+    public function test()
+    {
+        $test = parent::appTest($this->url('status'));
+        echo $test->status;
+    }
+   
+    public function livestats()
+    {
+        $status = 'inactive';
+        $res = parent::execute($this->url('status'));
+        $details = json_decode($res->getBody());
+
+        $data = [];
+
+        if($details) {
+            $size = $details->result->RemainingSizeMB;
+            $rate = $details->result->DownloadRate;
+            $data['queue_size'] = format_bytes($size*1000*1000, false, ' <span>', '</span>');
+            $data['current_speed'] = format_bytes($rate, false, ' <span>');
+            $status = ($size > 0 || $rate > 0) ? 'active' : 'inactive';
+        }
+
+        return parent::getLiveStats($status, $data);
+        
+    }
+
+    public function url($endpoint)
+    {
+        $api_url = parent::normaliseurl($this->config->url);
+        $username = $this->config->username;
+        $password = $this->config->password;
+        $rebuild_url = str_replace('http://', 'http://'.$username.':'.$password.'@', $api_url);
+        $rebuild_url = str_replace('https://', 'https://'.$username.':'.$password.'@', $rebuild_url);
+        $rebuild_url = rtrim($rebuild_url, '/');
+        
+        $api_url = $rebuild_url.'/jsonrpc/'.$endpoint;
+        return $api_url;
+    }
+}

app/SupportedApps/Privatebin/Privatebin.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\Privatebin;
+
+class Privatebin extends \App\SupportedApps {
+
+}

app/SupportedApps/Privatebin/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "87ecbead58e42b5ab9e1a92ccc0b42075f4fba91",
+    "name": "Privatebin",
+    "website": "https://privatebin.info/",
+    "license": "zlib/libpng License with Acknowledgement",
+    "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data.\r\n\r\nData is encrypted and decrypted in the browser using 256bit AES in Galois Counter mode.",
+    "enhanced": false,
+    "tile_background": "light",
+    "icon": "privatebin.png"
+}

app/SupportedApps/Rspamd/Rspamd.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\Rspamd;
+
+class Rspamd extends \App\SupportedApps {
+
+}

app/SupportedApps/Rspamd/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "5876529d5d47f91c435d9230576044bc4cad8547",
+    "name": "Rspamd",
+    "website": "https://rspamd.com/",
+    "license": "Apache 2.0",
+    "description": "Fast, free and open-source spam filtering system.",
+    "enhanced": false,
+    "tile_background": "dark",
+    "icon": "rspamd.png"
+}

app/SupportedApps/SOGo/SOGo.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\SOGo;
+
+class SOGo extends \App\SupportedApps {
+
+}

app/SupportedApps/SOGo/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "d143b3a76b72591495655c5257c7523456bdd736",
+    "name": "SOGo",
+    "website": "https://sogo.nu/",
+    "license": "GNU GPL/LGPL v2 and above",
+    "description": "SOGo is a fully supported and trusted groupware server with a focus on scalability and open standards.",
+    "enhanced": false,
+    "tile_background": "light",
+    "icon": "sogo.svg"
+}

app/SupportedApps/SOGo/sogo.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="792px" height="464px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g>
+        <g>
+            <g>
+                <path d="M643.711,144.938C633.849,144.938 626.847,137.721 626.847,128.035C626.847,118.341 633.849,111.123 643.711,111.123C653.65,111.123 660.652,118.341 660.652,128.035C660.652,137.721 653.65,144.938 643.711,144.938ZM643.681,94.5835C624.154,94.5835 610.288,108.861 610.288,128.035C610.288,147.2 624.154,161.478 643.681,161.478C663.335,161.478 677.202,147.2 677.202,128.035C677.202,108.861 663.335,94.5835 643.681,94.5835ZM643.652,178.811C614.019,178.811 592.965,157.13 592.965,128.035C592.965,98.9315 614.019,77.2602 643.652,77.2602C673.48,77.2602 694.525,98.9315 694.525,128.035C694.525,157.13 673.48,178.811 643.652,178.811ZM643.613,58.4876C603.032,58.4876 574.212,88.1791 574.212,128.035C574.212,167.882 603.032,197.564 643.613,197.564C684.458,197.564 713.288,167.882 713.288,128.035C713.288,88.1791 684.458,58.4876 643.613,58.4876ZM157.492,182.836L136.653,177.871C117.684,173.513 108.048,168.538 108.048,154.858C108.048,139.307 123.903,133.079 138.21,133.079C152.752,133.079 163.377,140.345 169.635,151.656C169.654,151.704 169.684,151.753 169.723,151.812C169.85,152.057 169.997,152.292 170.124,152.537L170.154,152.517C172.122,155.494 175.432,157.482 178.997,157.482C185.068,157.482 189.465,153.095 189.465,147.024C189.465,144.703 188.966,142.245 187.879,140.394C177.205,122.248 159.607,114.424 139.454,114.424C112.093,114.424 85.6524,128.104 85.6524,158.266C85.6524,185.95 113.023,194.038 122.972,196.516L142.871,201.187C158.109,204.918 170.546,209.903 170.546,224.504C170.546,241.298 153.134,248.77 136.34,248.77C119.241,248.77 106.579,240.025 97.8541,227.118L97.8443,227.118C95.9054,224.288 92.899,222.3 89.2169,222.3C83.2826,222.3 78.5037,227.177 78.7191,233.102C78.8171,235.52 79.6201,237.567 80.854,239.32C94.5246,259.777 114.296,267.425 136.34,267.425C164.641,267.425 192.942,254.362 192.942,222.643C192.942,202.127 177.704,187.507 157.492,182.836ZM296.617,248.682C263.038,248.682 241.886,223.495 241.886,190.846C241.886,158.187 263.038,133 296.617,133C330.52,133 351.662,158.187 351.662,190.846C351.662,223.495 330.52,248.682 296.617,248.682ZM296.617,114.345C251.531,114.345 219.499,146.994 219.499,190.846C219.499,234.688 251.531,267.337 296.617,267.337C342.016,267.337 374.048,234.688 374.048,190.846C374.048,146.994 342.016,114.345 296.617,114.345ZM514.985,232.818C514.221,233.552 513.448,234.277 512.606,234.972C511.509,235.981 510.236,237.068 508.786,238.155C500.032,244.491 488.976,248.163 476.049,248.163C442.46,248.163 421.318,222.976 421.318,190.327C421.318,157.668 442.46,132.481 476.049,132.481C509.942,132.481 531.084,157.668 531.084,190.327C531.084,207.376 525.316,222.369 514.985,232.818ZM464.797,315.733C467.304,315.733 469.899,315.566 472.592,315.233C477.567,314.607 482.101,314.332 486.204,314.332C505.281,314.44 514.995,319.983 520.851,326.387C526.697,332.831 528.95,341.566 528.94,348.989C528.95,352.544 528.391,355.726 527.774,357.636C524.856,366.488 518.961,372.511 509.932,377.045C500.972,381.491 489.015,383.763 476.51,383.743C472.034,383.743 467.481,383.459 462.986,382.921C454.486,381.941 443.244,378.289 435.096,371.923C430.993,368.751 427.614,364.99 425.235,360.534C422.875,356.059 421.406,350.869 421.396,344.23L421.396,343.495C421.651,331.254 427.272,323.126 433.431,317.221C436.477,314.342 439.611,312.198 441.892,310.836C442.255,310.621 442.597,310.425 442.911,310.249C448.953,313.823 456.454,315.762 464.797,315.733ZM476.049,113.826C430.964,113.826 398.922,146.475 398.922,190.327C398.922,219.96 413.562,244.461 436.976,257.241C436.663,257.554 436.359,257.877 436.066,258.2C430.014,264.83 426.919,273.32 426.909,281.909C426.9,285.698 427.526,289.586 428.868,293.307C425.832,295.246 422.209,297.9 418.497,301.386C409.547,309.72 399.921,323.733 399.637,343.123C399.627,343.573 399.627,343.946 399.627,344.23C399.617,354.218 401.987,363.227 406.031,370.778C412.113,382.147 421.582,390.059 431.355,395.338C441.187,400.626 451.44,403.436 460.381,404.533C465.708,405.17 471.114,405.512 476.51,405.512C491.532,405.493 506.514,402.957 519.549,396.572C532.524,390.285 543.678,379.464 548.496,364.285C549.926,359.771 550.689,354.649 550.709,348.989C550.689,337.492 547.389,323.449 537.058,311.855C526.727,300.221 509.638,292.455 486.204,292.563C481.112,292.563 475.687,292.916 469.919,293.63C468.058,293.856 466.354,293.963 464.797,293.963C457.619,293.915 454.016,291.927 451.871,289.899C449.756,287.833 448.698,285.101 448.669,281.909C448.659,278.657 449.942,275.24 452.106,272.909C454.319,270.598 457.071,269.031 461.869,268.972C462.3,268.972 462.761,268.982 463.231,269.021C466.306,269.237 469.292,269.345 472.191,269.345C496.173,269.393 514.212,261.961 526.482,251.737C538.791,241.514 545.294,229.077 548.369,219.255L548.329,219.245C551.669,210.422 553.48,200.688 553.48,190.327C553.48,146.475 521.448,113.826 476.049,113.826Z" style="fill:rgb(80,189,55);fill-rule:nonzero;"/>
+            </g>
+        </g>
+    </g>
+</svg>

app/SupportedApps/Snibox/Snibox.php

@@ -0,0 +1,5 @@
+<?php namespace App\SupportedApps\Snibox;
+
+class Snibox extends \App\SupportedApps {
+
+}

app/SupportedApps/Snibox/app.json

@@ -0,0 +1,10 @@
+{
+    "appid": "6c050d5bdf522fa20599560ff0f6b74e7dcd97a8",
+    "name": "Snibox",
+    "website": "https://github.com/snibox/snibox",
+    "license": "MIT License",
+    "description": "Snibox is a self-hosted, single-user (for now) snippet manager. Developed to collect and organize code snippets. Supports various programming languages, markdown, plain text.",
+    "enhanced": false,
+    "tile_background": "dark",
+    "icon": "snibox.png"
+}

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.1.3',
+    'version' => '2.1.11',
 
     /*
     |--------------------------------------------------------------------------

database/migrations/2018_11_06_112434_create_failed_jobs_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFailedJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}

public/css/app.css

@@ -1318,6 +1318,10 @@ hr {
           flex-direction: column;
 }
 
+.livestats-container.black .livestats strong {
+  color: #000;
+}
+
 input:-webkit-autofill,
 input:-webkit-autofill:hover,
 input:-webkit-autofill:focus

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=fb2cfb67b5f04db8beee",
-    "/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d"
-}
+    "/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d",
+    "/css/app.css": "/css/app.css?id=476a34b0b53427a036fd"
+}

resources/assets/sass/_app.scss

@@ -898,6 +898,13 @@ hr {
 		}
 
 	}
+	&.black {
+		.livestats {
+			strong {
+				color: #000;
+			}
+		}
+	}
 }
 
 input:-webkit-autofill,

resources/views/item.blade.php

@@ -1,14 +1,14 @@
                     <section class="item-container{{ $app->droppable }}" data-id="{{ $app->id }}">
                         <div class="item" style="background-color: {{ $app->colour }}">
                             @if($app->icon)
-                            <img class="app-icon" src="{{ asset('/storage/'.$app->icon) }}" />
+                            <img class="app-icon" src="{{ asset('/storage/'.str_replace('supportedapps', 'icons', $app->icon)) }}" />
                             @else
                             <img class="app-icon" src="{{ asset('/img/heimdall-icon-small.png') }}" />
                             @endif
                             <div class="details">
                                 <div class="title{{ title_color($app->colour) }}">{{ $app->title }}</div>
                                 @if($app->enabled())
-                                <div data-id="{{ $app->id }}" data-dataonly="{{ $app->getconfig()->dataonly ?? '0' }}" class="livestats-container"></div>
+                                <div data-id="{{ $app->id }}" data-dataonly="{{ $app->getconfig()->dataonly ?? '0' }}" class="livestats-container{{ title_color($app->colour) }}"></div>
                                 @endif
                             </div>
                             <a class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>

resources/views/items/form.blade.php

@@ -81,13 +81,23 @@
 
             
             @if(isset($item) && $item->enhanced())
+
             <div id="sapconfig" style="display: block;">
                 @if(isset($item))
                 @include('SupportedApps::'.$item->getconfig()->name.'.config')
                 @endif
             </div>
+
+            @elseif(old('class') && App\Item::isEnhanced(old('class')))
+
+            <div id="sapconfig" style="display: block;">
+                @include('SupportedApps::'.App\Item::nameFromClass(old('class')).'.config')
+            </div>
+
             @else
+
             <div id="sapconfig"></div>
+            
             @endif
             
         </div>

resources/views/items/scripts.blade.php

@@ -26,6 +26,12 @@
                     appload(appvalue);
                 }
             });
+            // initial load
+            $('#tile-preview .title').html($('#appname').val());
+            $('#tile-preview .item').css('backgroundColor', $('#appcolour').val());
+            $('#tile-preview .app-icon').attr('src', $('#appimage img').attr('src'));
+
+            // Updates
             $('#appname').on('keyup change', function(e) {
                 $('#tile-preview .title').html($(this).val());
             })
@@ -39,7 +45,10 @@
             $('.tags').select2();
 
             function appload(appvalue) {
-                $.post('{{ route('appload') }}', { app: appvalue }, function(data) {
+                if(appvalue == 'None') {
+                    $('#sapconfig').html('').hide();
+                } else {
+                    $.post('{{ route('appload') }}', { app: appvalue }, function(data) {
                         // Main details
                         $('#appimage').html("<img src='"+data.iconview+"' /><input type='hidden' name='icon' value='"+data.icon+"' />");
                         $('input[name=colour]').val(data.colour);
@@ -53,8 +62,11 @@
                             $.get('/view/'+data.config, function(getdata) {
                                 $('#sapconfig').html(getdata).show();
                             });
+                        } else {
+                            $('#sapconfig').html('').hide();
                         }
                     }, "json");
+                }
 
             }
 

resources/views/settings/form.blade.php

@@ -8,10 +8,10 @@
         </header>
         <div class="create">
             {!! csrf_field() !!}
-            <!--<div class="input">
+            <?php /*<div class="input">
                 <label>Application name</label>
                 {!! Form::select('supported', \App\Item::supportedOptions(), array('placeholder' => 'Title','class' => 'form-control')) !!}
-            </div>-->
+            </div>*/ ?>
 
             <div class="input">
                     {!! $setting->edit_value !!}

resources/views/tags/form.blade.php

@@ -52,15 +52,7 @@
                 </div>
             </div>
             
-            @if(isset($item) && isset($item->config->view))
-            <div id="sapconfig" style="display: block;">
-                @if(isset($item))
-                @include('supportedapps.'.$item->config->view)
-                @endif
-            </div>
-            @else
             <div id="sapconfig"></div>
-            @endif
             
         </div>
         <footer>

vendor/composer/ClassLoader.php

@@ -379,9 +379,9 @@ class ClassLoader
                 $subPath = substr($subPath, 0, $lastPos);
                 $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        $length = $this->prefixLengthsPsr4[$first][$search];
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                             return $file;
                         }
                     }

vendor/composer/LICENSE

@@ -1,21 +1,56 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Composer
+Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
+Source: https://github.com/composer/composer
 
-Copyright (c) Nils Adermann, Jordi Boggiano
+Files: *
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+License: Expat
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+Files: src/Composer/Util/TlsHelper.php
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+           2013, Evan Coury <me@evancoury.com>
+License: Expat and BSD-2-Clause
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

vendor/composer/autoload_classmap.php

@@ -29,6 +29,7 @@ return array(
     'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php',
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
     'App\\Item' => $baseDir . '/app/Item.php',
+    'App\\Jobs\\ProcessApps' => $baseDir . '/app/Jobs/ProcessApps.php',
     'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
     'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
@@ -69,15 +70,43 @@ return array(
     'App\\SupportedApps\\NZBHydra\\NZBHydra' => $baseDir . '/app/SupportedApps/NZBHydra/NZBHydra.php',
     'App\\SupportedApps\\Netdata\\Netdata' => $baseDir . '/app/SupportedApps/Netdata/Netdata.php',
     'App\\SupportedApps\\Nextcloud\\Nextcloud' => $baseDir . '/app/SupportedApps/Nextcloud/Nextcloud.php',
+    'App\\SupportedApps\\NodeRed\\NodeRed' => $baseDir . '/app/SupportedApps/NodeRed/NodeRed.php',
     'App\\SupportedApps\\NowShowing\\NowShowing' => $baseDir . '/app/SupportedApps/NowShowing/NowShowing.php',
     'App\\SupportedApps\\Nzbget\\Nzbget' => $baseDir . '/app/SupportedApps/Nzbget/Nzbget.php',
+    'App\\SupportedApps\\OPNsense\\OPNsense' => $baseDir . '/app/SupportedApps/OPNsense/OPNsense.php',
     'App\\SupportedApps\\Ombi\\Ombi' => $baseDir . '/app/SupportedApps/Ombi/Ombi.php',
     'App\\SupportedApps\\Pihole\\Pihole' => $baseDir . '/app/SupportedApps/Pihole/Pihole.php',
+    'App\\SupportedApps\\PlexRequests\\PlexRequests' => $baseDir . '/app/SupportedApps/PlexRequests/PlexRequests.php',
+    'App\\SupportedApps\\Plex\\Plex' => $baseDir . '/app/SupportedApps/Plex/Plex.php',
+    'App\\SupportedApps\\Portainer\\Portainer' => $baseDir . '/app/SupportedApps/Portainer/Portainer.php',
+    'App\\SupportedApps\\Proxmox\\Proxmox' => $baseDir . '/app/SupportedApps/Proxmox/Proxmox.php',
     'App\\SupportedApps\\Radarr\\Radarr' => $baseDir . '/app/SupportedApps/Radarr/Radarr.php',
+    'App\\SupportedApps\\Rancher\\Rancher' => $baseDir . '/app/SupportedApps/Rancher/Rancher.php',
+    'App\\SupportedApps\\RuneAudio\\RuneAudio' => $baseDir . '/app/SupportedApps/RuneAudio/RuneAudio.php',
+    'App\\SupportedApps\\SABnzbd\\SABnzbd' => $baseDir . '/app/SupportedApps/SABnzbd/SABnzbd.php',
+    'App\\SupportedApps\\Slack\\Slack' => $baseDir . '/app/SupportedApps/Slack/Slack.php',
     'App\\SupportedApps\\Sonarr\\Sonarr' => $baseDir . '/app/SupportedApps/Sonarr/Sonarr.php',
+    'App\\SupportedApps\\Syncthing\\Syncthing' => $baseDir . '/app/SupportedApps/Syncthing/Syncthing.php',
+    'App\\SupportedApps\\TVHeadend\\TVHeadend' => $baseDir . '/app/SupportedApps/TVHeadend/TVHeadend.php',
+    'App\\SupportedApps\\Tautulli\\Tautulli' => $baseDir . '/app/SupportedApps/Tautulli/Tautulli.php',
+    'App\\SupportedApps\\TheLounge\\TheLounge' => $baseDir . '/app/SupportedApps/TheLounge/TheLounge.php',
+    'App\\SupportedApps\\TinyTinyRSS\\TinyTinyRSS' => $baseDir . '/app/SupportedApps/TinyTinyRSS/TinyTinyRSS.php',
+    'App\\SupportedApps\\Traefik\\Traefik' => $baseDir . '/app/SupportedApps/Traefik/Traefik.php',
     'App\\SupportedApps\\Transmission\\Transmission' => $baseDir . '/app/SupportedApps/Transmission/Transmission.php',
+    'App\\SupportedApps\\UniFi\\UniFi' => $baseDir . '/app/SupportedApps/UniFi/UniFi.php',
+    'App\\SupportedApps\\Unraid\\Unraid' => $baseDir . '/app/SupportedApps/Unraid/Unraid.php',
+    'App\\SupportedApps\\VMwarevCenter\\VMwarevCenter' => $baseDir . '/app/SupportedApps/VMwarevCenter/VMwarevCenter.php',
+    'App\\SupportedApps\\Virtualmin\\Virtualmin' => $baseDir . '/app/SupportedApps/Virtualmin/Virtualmin.php',
+    'App\\SupportedApps\\Watcher\\Watcher' => $baseDir . '/app/SupportedApps/Watcher/Watcher.php',
+    'App\\SupportedApps\\WebTools\\WebTools' => $baseDir . '/app/SupportedApps/WebTools/WebTools.php',
+    'App\\SupportedApps\\Webmin\\Webmin' => $baseDir . '/app/SupportedApps/Webmin/Webmin.php',
+    'App\\SupportedApps\\ZNC\\ZNC' => $baseDir . '/app/SupportedApps/ZNC/ZNC.php',
     'App\\SupportedApps\\openHAB\\openHAB' => $baseDir . '/app/SupportedApps/openHAB/openHAB.php',
     'App\\SupportedApps\\openmediavault\\openmediavault' => $baseDir . '/app/SupportedApps/openmediavault/openmediavault.php',
+    'App\\SupportedApps\\pfSense\\pfSense' => $baseDir . '/app/SupportedApps/pfSense/pfSense.php',
+    'App\\SupportedApps\\pyLoad\\pyLoad' => $baseDir . '/app/SupportedApps/pyLoad/pyLoad.php',
+    'App\\SupportedApps\\qBittorrent\\qBittorrent' => $baseDir . '/app/SupportedApps/qBittorrent/qBittorrent.php',
+    'App\\SupportedApps\\ruTorrent\\ruTorrent' => $baseDir . '/app/SupportedApps/ruTorrent/ruTorrent.php',
     'App\\User' => $baseDir . '/app/User.php',
     'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php',
     'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php',

vendor/composer/autoload_static.php

@@ -458,6 +458,7 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php',
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
         'App\\Item' => __DIR__ . '/../..' . '/app/Item.php',
+        'App\\Jobs\\ProcessApps' => __DIR__ . '/../..' . '/app/Jobs/ProcessApps.php',
         'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
         'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',
@@ -498,15 +499,43 @@ class ComposerStaticInit4b6fb9210a1ea37c2db27b8ff53a1ecf
         'App\\SupportedApps\\NZBHydra\\NZBHydra' => __DIR__ . '/../..' . '/app/SupportedApps/NZBHydra/NZBHydra.php',
         'App\\SupportedApps\\Netdata\\Netdata' => __DIR__ . '/../..' . '/app/SupportedApps/Netdata/Netdata.php',
         'App\\SupportedApps\\Nextcloud\\Nextcloud' => __DIR__ . '/../..' . '/app/SupportedApps/Nextcloud/Nextcloud.php',
+        'App\\SupportedApps\\NodeRed\\NodeRed' => __DIR__ . '/../..' . '/app/SupportedApps/NodeRed/NodeRed.php',
         'App\\SupportedApps\\NowShowing\\NowShowing' => __DIR__ . '/../..' . '/app/SupportedApps/NowShowing/NowShowing.php',
         'App\\SupportedApps\\Nzbget\\Nzbget' => __DIR__ . '/../..' . '/app/SupportedApps/Nzbget/Nzbget.php',
+        'App\\SupportedApps\\OPNsense\\OPNsense' => __DIR__ . '/../..' . '/app/SupportedApps/OPNsense/OPNsense.php',
         'App\\SupportedApps\\Ombi\\Ombi' => __DIR__ . '/../..' . '/app/SupportedApps/Ombi/Ombi.php',
         'App\\SupportedApps\\Pihole\\Pihole' => __DIR__ . '/../..' . '/app/SupportedApps/Pihole/Pihole.php',
+        'App\\SupportedApps\\PlexRequests\\PlexRequests' => __DIR__ . '/../..' . '/app/SupportedApps/PlexRequests/PlexRequests.php',
+        'App\\SupportedApps\\Plex\\Plex' => __DIR__ . '/../..' . '/app/SupportedApps/Plex/Plex.php',
+        'App\\SupportedApps\\Portainer\\Portainer' => __DIR__ . '/../..' . '/app/SupportedApps/Portainer/Portainer.php',
+        'App\\SupportedApps\\Proxmox\\Proxmox' => __DIR__ . '/../..' . '/app/SupportedApps/Proxmox/Proxmox.php',
         'App\\SupportedApps\\Radarr\\Radarr' => __DIR__ . '/../..' . '/app/SupportedApps/Radarr/Radarr.php',
+        'App\\SupportedApps\\Rancher\\Rancher' => __DIR__ . '/../..' . '/app/SupportedApps/Rancher/Rancher.php',
+        'App\\SupportedApps\\RuneAudio\\RuneAudio' => __DIR__ . '/../..' . '/app/SupportedApps/RuneAudio/RuneAudio.php',
+        'App\\SupportedApps\\SABnzbd\\SABnzbd' => __DIR__ . '/../..' . '/app/SupportedApps/SABnzbd/SABnzbd.php',
+        'App\\SupportedApps\\Slack\\Slack' => __DIR__ . '/../..' . '/app/SupportedApps/Slack/Slack.php',
         'App\\SupportedApps\\Sonarr\\Sonarr' => __DIR__ . '/../..' . '/app/SupportedApps/Sonarr/Sonarr.php',
+        'App\\SupportedApps\\Syncthing\\Syncthing' => __DIR__ . '/../..' . '/app/SupportedApps/Syncthing/Syncthing.php',
+        'App\\SupportedApps\\TVHeadend\\TVHeadend' => __DIR__ . '/../..' . '/app/SupportedApps/TVHeadend/TVHeadend.php',
+        'App\\SupportedApps\\Tautulli\\Tautulli' => __DIR__ . '/../..' . '/app/SupportedApps/Tautulli/Tautulli.php',
+        'App\\SupportedApps\\TheLounge\\TheLounge' => __DIR__ . '/../..' . '/app/SupportedApps/TheLounge/TheLounge.php',
+        'App\\SupportedApps\\TinyTinyRSS\\TinyTinyRSS' => __DIR__ . '/../..' . '/app/SupportedApps/TinyTinyRSS/TinyTinyRSS.php',
+        'App\\SupportedApps\\Traefik\\Traefik' => __DIR__ . '/../..' . '/app/SupportedApps/Traefik/Traefik.php',
         'App\\SupportedApps\\Transmission\\Transmission' => __DIR__ . '/../..' . '/app/SupportedApps/Transmission/Transmission.php',
+        'App\\SupportedApps\\UniFi\\UniFi' => __DIR__ . '/../..' . '/app/SupportedApps/UniFi/UniFi.php',
+        'App\\SupportedApps\\Unraid\\Unraid' => __DIR__ . '/../..' . '/app/SupportedApps/Unraid/Unraid.php',
+        'App\\SupportedApps\\VMwarevCenter\\VMwarevCenter' => __DIR__ . '/../..' . '/app/SupportedApps/VMwarevCenter/VMwarevCenter.php',
+        'App\\SupportedApps\\Virtualmin\\Virtualmin' => __DIR__ . '/../..' . '/app/SupportedApps/Virtualmin/Virtualmin.php',
+        'App\\SupportedApps\\Watcher\\Watcher' => __DIR__ . '/../..' . '/app/SupportedApps/Watcher/Watcher.php',
+        'App\\SupportedApps\\WebTools\\WebTools' => __DIR__ . '/../..' . '/app/SupportedApps/WebTools/WebTools.php',
+        'App\\SupportedApps\\Webmin\\Webmin' => __DIR__ . '/../..' . '/app/SupportedApps/Webmin/Webmin.php',
+        'App\\SupportedApps\\ZNC\\ZNC' => __DIR__ . '/../..' . '/app/SupportedApps/ZNC/ZNC.php',
         'App\\SupportedApps\\openHAB\\openHAB' => __DIR__ . '/../..' . '/app/SupportedApps/openHAB/openHAB.php',
         'App\\SupportedApps\\openmediavault\\openmediavault' => __DIR__ . '/../..' . '/app/SupportedApps/openmediavault/openmediavault.php',
+        'App\\SupportedApps\\pfSense\\pfSense' => __DIR__ . '/../..' . '/app/SupportedApps/pfSense/pfSense.php',
+        'App\\SupportedApps\\pyLoad\\pyLoad' => __DIR__ . '/../..' . '/app/SupportedApps/pyLoad/pyLoad.php',
+        'App\\SupportedApps\\qBittorrent\\qBittorrent' => __DIR__ . '/../..' . '/app/SupportedApps/qBittorrent/qBittorrent.php',
+        'App\\SupportedApps\\ruTorrent\\ruTorrent' => __DIR__ . '/../..' . '/app/SupportedApps/ruTorrent/ruTorrent.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
         'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php',
         'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php',