diff --git a/application/app/Providers/AppServiceProvider.php b/application/app/Providers/AppServiceProvider.php index 10f7f23..8f2e405 100644 --- a/application/app/Providers/AppServiceProvider.php +++ b/application/app/Providers/AppServiceProvider.php @@ -1,9 +1,11 @@ hasTable('servers')) { - $servers = \App\Server::get(); + $servers = Server::get(); foreach ($servers as $server) { Config::set('database.connections.'.$server->id.'.driver', 'mysql'); @@ -37,7 +39,7 @@ public function boot() Config::set('database.connections.'.$server->id.'.collation', 'utf8_unicode_ci'); Config::set('database.connections.'.$server->id.'.charset', 'utf8'); Config::set('database.connections.'.$server->id.'.prefix', $server->db_prefix); - if(isset($server->db_ssl)) { + if(isset($server->db_ssl) && $server->db_ssl === 1) { Config::set('database.connections.'.$server->id.'.options', array( PDO::MYSQL_ATTR_SSL_CA => $server->db_ca, PDO::MYSQL_ATTR_SSL_CERT => $server->db_cert, diff --git a/application/resources/assets/js/admin.js b/application/resources/assets/js/admin.js index f5aaba5..d19a925 100644 --- a/application/resources/assets/js/admin.js +++ b/application/resources/assets/js/admin.js @@ -20,7 +20,7 @@ $(document).ready(function() { function checkUpdates() { - $.get('https://ftbastler.github.io/BoNeMEAL/updates.json', function(json) { + $.get('https://raw.githubusercontent.com/ftbastler/BoNeMEAL/master/updates.json', function(json) { $('#update').html('

' + json['title'] + '

' + json['body'] + '

' + 'Download now!' + '

'); }).fail(function() { $('#update').html('Error. Could not load updates.'); diff --git a/updates.json b/updates.json new file mode 100644 index 0000000..583753c --- /dev/null +++ b/updates.json @@ -0,0 +1,4 @@ +{ + "title": "BoNeMEAL v1.4.1", + "body": "SSL Mysql Connection Support
Allows you to connect to MySQL servers that require SSL connections.
Various Bugfixes." +}