From 52a2f2e2ae78c375ec63f2772a60bf3733242876 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Tue, 5 Jan 2016 01:19:59 -0500
Subject: [PATCH] Fix socket.io error

We no longer support self-signed certs, so if we cant connect 99%
chance the daemon is off.
---
 app/Models/Node.php                      | 1 -
 resources/lang/en/server.php             | 2 +-
 resources/views/layouts/master.blade.php | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Models/Node.php b/app/Models/Node.php
index 68f1283d0..2b90136a8 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -79,7 +79,6 @@ class Node extends Model
             'base_uri' => sprintf('%s://%s:%s/', $nodeData->scheme, $nodeData->fqdn, $nodeData->daemonListen),
             'timeout' => 10.0,
             'connect_timeout' => 5.0,
-            'verify' => false,
         ]);
 
         return self::$guzzle[$node];
diff --git a/resources/lang/en/server.php b/resources/lang/en/server.php
index cc7ddcf96..a66a26c43 100644
--- a/resources/lang/en/server.php
+++ b/resources/lang/en/server.php
@@ -9,7 +9,7 @@ return [
     */
 
     'ajax' => [
-        'socket_error' => 'We were unable to connect to the main Socket.IO server, there may be network issues currently. <br /><br />If this is your first time seeing this message it may be because you need to accept this servers SSL certificate. Please click this notification and accept the certificate.',
+        'socket_error' => 'We were unable to connect to the main Socket.IO server, there may be network issues currently. The panel may not work as expected.',
         'socket_status' => 'This server\'s power status has changed to',
         'socket_status_crashed' => 'This server has been detected as CRASHED.',
     ],
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index c06d0efac..733d0f6db 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -49,9 +49,7 @@
                             $('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin').addClass('fa-question-circle').css({ color: '#FF9900' });
                             if(typeof notifySocketError !== 'object') {
                                 notifySocketError = $.notify({
-                                    message: '{!! trans('server.ajax.socket_error') !!}',
-                                    url: 'https://{{ $node->fqdn }}:{{ $node->daemonListen }}',
-                                    target: '_blank'
+                                    message: '{!! trans('server.ajax.socket_error') !!}'
                                 }, {
                                     type: 'danger',
                                     delay: 0