Update app.php

Bug Fix On Newly Added Apps

app/Item.php

@@ -26,16 +26,21 @@ class Item extends Model
     public static function supportedList()
     {
         return [
+            'AirSonic' => \App\SupportedApps\AirSonic::class,
+            'Cardigann' => \App\SupportedApps\Cardigann::class,
+            'CouchPotato' => \App\SupportedApps\CouchPotato::class,
             'Deluge' => \App\SupportedApps\Deluge::class,
             'Dokuwiki' => \App\SupportedApps\Dokuwiki::class,
             'Duplicati' => \App\SupportedApps\Duplicati::class,
             'Emby' => \App\SupportedApps\Emby::class,
             'Gitea' => \App\SupportedApps\Gitea::class,
             'Glances' => \App\SupportedApps\Glances::class,
+            'Grafana' => \App\SupportedApps\Grafana::class,
             'Graylog' => \App\SupportedApps\Graylog::class,
             'Home Assistant' => \App\SupportedApps\HomeAssistant::class,
             'Jackett' => \App\SupportedApps\Jackett::class,
             'Jdownloader' => \App\SupportedApps\Jdownloader::class,
+            'Krusader' => \App\SupportedApps\Krusader::class,
             'Lidarr' => \App\SupportedApps\Lidarr::class,
             'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class,
             'Medusa' => \App\SupportedApps\Medusa::class,
@@ -46,6 +51,7 @@ class Item extends Model
             '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,
@@ -57,12 +63,16 @@ class Item extends Model
             'Sabnzbd' => \App\SupportedApps\Sabnzbd::class,
             'Sickrage' => \App\SupportedApps\Sickrage::class,
             'Sonarr' => \App\SupportedApps\Sonarr::class,
+            'Tautulli' => \App\SupportedApps\Tautulli::class,
             'Transmission' => \App\SupportedApps\Transmission::class,
             'Traefik' => \App\SupportedApps\Traefik::class,
-            'Ttrss' => \App\SupportedApps\Ttrss::class,
+            'tt-rss' => \App\SupportedApps\Ttrss::class,
             'UniFi' => \App\SupportedApps\Unifi::class,
-            'pFsense' => \App\SupportedApps\Pfsense::class,
+            'pfSense' => \App\SupportedApps\Pfsense::class,
+            'pyLoad' => \App\SupportedApps\pyLoad::class,
             'ruTorrent' => \App\SupportedApps\ruTorrent::class,
+            'Watcher3' => \App\SupportedApps\Watcher3::class,
+            'WebTools' => \App\SupportedApps\WebTools::class,
         ];
     }
     public static function supportedOptions()
@@ -155,7 +165,7 @@ class Item extends Model
         if((int)$this->type === 1) {
             return '';
         } else {
-            return ' target="_blank"';
+            return ' target="heimdallapp"';
         }
     }
 

app/SupportedApps/AirSonic.php

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

app/SupportedApps/Cardigann.php

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

app/SupportedApps/CouchPotato.php

@@ -0,0 +1,122 @@
+<?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/Grafana.php

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

app/SupportedApps/Krusader.php

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

app/SupportedApps/OpenMediaVault.php

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

app/SupportedApps/Tautulli.php

@@ -0,0 +1,77 @@
+<?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/Transmission.php

@@ -28,7 +28,7 @@ class Transmission implements Contracts\Applications, Contracts\Livestats
     }
     public function icon()
     {
-        return 'supportedapps/Transmission.png';
+        return 'supportedapps/transmission.png';
     }
     public function configDetails()
     {

app/SupportedApps/Watcher3.php

@@ -0,0 +1,11 @@
+<?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

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

app/SupportedApps/pyLoad.php

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

config/app.php

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

readme.md

@@ -27,20 +27,31 @@ If you want to see a quick video of it in use, go to https://youtu.be/GXnnMAxPzM
 ## Supported applications
 You can use the app to link to any site or application, but Foundation apps will auto fill in the icon for the app and supply a default color for the tile.  In addition Enhanced apps allow you provide details to an apps API, allowing you to view live stats directly on the dashboad.  For example, the NZBGet and Sabnzbd Enhanced apps will display the queue size and download speed while something is downloading.
 
+Supported applications are recognized by the title of the application as entered in the title field when adding an application. For example, to add a link to pfSense, begin by typing "p" in the title field and then select "pfSense" from the list of supported applications.
+
 **Enhanced**
+- CouchPotato
 - NZBGet
 - Pihole
+- PlexPy
+- Proxmox
+- Runeaudio
 - Sabnzbd
+- Tautulli
 - Transmission
 
 **Foundation**
+- AirSonic
+- Cardigann
 - Deluge
 - DokuWiki
 - Duplicati
 - Emby
 - Gitea
+- Grafana
 - Graylog
 - Jdownloader
+- Krusader
 - Lidarr
 - McMyAdmin
 - Medusa
@@ -49,8 +60,8 @@ You can use the app to link to any site or application, but Foundation apps will
 - Nextcloud
 - Ombi
 - OpenHAB
+- OpenMediaVault
 - Plex
-- Plexpy
 - Plexrequests
 - Portainer
 - Radarr
@@ -60,12 +71,15 @@ You can use the app to link to any site or application, but Foundation apps will
 - Traefik
 - UniFI
 - pfSense
+- pyLoad
 - rTorrent/ruTorrent
+- Watcher3
+- WebTools
 
 ## Installing
 Apart from the Laravel dependencies, namely PHP >= 7.0.0, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension and XML PHP Extension, the only other thing Heimdall needs is sqlite support.
 
-Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to it.  For simple testing you could just go to the folder and type `php artisan serve`
+Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder.  For simple testing you could just go to the folder and type `php artisan serve`
 
 There are also dockers and instructions on how to use them at 
 
@@ -137,6 +151,20 @@ location / {
 }
 ```
 
+### Self-signed certificates and local CAs
+Per default Heimdall uses the standard certificate bundle file (ca-certificates.crt) to verify HTTPS sites and will ignore additional certificates placed in /etc/ssl/certs. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle:
+
+- Create a unified certificate .pem-file that contains all CAs and certificates that Heimdall has to verify. For example, if you use both LetsEncrypt and a local CA for your internal apps, concatenate the LetsEncrypt intermediate CA (export via browser) and your local CA cert.pem (or any number of self-signed certs) into one heimdall.pem file.
+- Place the heimdall.pem into the container (if you use Docker), for example by placing it in the path that you mapped to /config. Make sure that the Heimdall user has read access (chmod a+r).
+- Set the openssl.cafile setting in /config/php/php-local.ini to your cert bundle:
+
+```
+# /config/php/php-local.ini
+openssl.cafile = /config/heimdall.pem
+```
+
+Restart the container and the enhanced apps should now be able to access your local HTTP websites. This configuration will survive updating or recreating the Heimdall container.
+
 ## Support
 https://discord.gg/CCjHKn4 or through Github issues
 

resources/views/app.blade.php

@@ -23,6 +23,8 @@
         <meta name="msapplication-TileColor" content="#ffffff">
         <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
         <meta name="theme-color" content="#ffffff">
+        <meta name="mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-capable" content="yes">
         <link rel="stylesheet" href="{{ mix('css/app.css') }}" type="text/css" />
 
     </head>

resources/views/item.blade.php

@@ -11,7 +11,7 @@
                                 <div data-id="{{ $app->id }}" data-dataonly="{{ $app->config->dataonly or '0' }}" class="livestats-container"></div>
                                 @endif
                             </div>
-                            <a class="link"{{ $app->link_target }} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
+                            <a class="link"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
                         </div>
                         <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
                         

resources/views/supportedapps/couchpotato.blade.php

@@ -0,0 +1,13 @@
+<h2>{{ __('app.apps.config') }} ({{ __('app.optional') }})</h2>
+<div class="items">
+    <input type="hidden" name="config[enabled]" value="1" />
+    <input type="hidden" data-config="dataonly" class="config-item" name="config[dataonly]" value="1" />
+    <input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\CouchPotato" />
+    <div class="input">
+        <label>{{ __('app.apps.apikey') }}</label>
+        {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
+    </div>
+    <div class="input">
+        <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
+    </div>
+</div>

resources/views/supportedapps/tautulli.blade.php

@@ -0,0 +1,15 @@
+<h2>{{ __('app.apps.config') }} ({{ __('app.optional') }})</h2>
+<div class="items">
+    <input type="hidden" data-config="type" class="config-item" name="config[type]" value="\App\SupportedApps\Tautulli" />
+    <div class="input">
+        <label>{{ strtoupper(__('app.url')) }}</label>
+        {!! Form::text('config[override_url]', null, array('placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control')) !!}
+    </div>
+    <div class="input">
+        <label>{{ __('app.apps.apikey') }}</label>
+        {!! Form::text('config[apikey]', null, array('placeholder' => __('app.apps.apikey'), 'data-config' => 'apikey', 'class' => 'form-control config-item')) !!}
+    </div>
+    <div class="input">
+        <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
+    </div>
+</div>