From 64aa12a997d3247eb2ff3dbbc5e1c2b05ecf24f7 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Mon, 2 Jul 2018 18:55:52 +0300 Subject: [PATCH] close #403 Fixed: System not working if no internet connection --- app/Traits/Modules.php | 7 ++++++- app/Utilities/Updater.php | 2 +- app/Utilities/Versions.php | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 4e6207350..5ff860f2b 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -373,8 +373,13 @@ trait Modules $response = $this->getRemote($url, 'GET', ['timeout' => 30, 'referer' => true]); + // Exception + if ($response instanceof RequestException) { + return false; + } + // Bad response - if ($response->getStatusCode() != 200) { + if (!$response || ($response->getStatusCode() != 200)) { return false; } diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php index 5bbd7fd5d..9eb60ce1e 100644 --- a/app/Utilities/Updater.php +++ b/app/Utilities/Updater.php @@ -114,7 +114,7 @@ class Updater return false; } - if ($response->getStatusCode() == 200) { + if ($response && ($response->getStatusCode() == 200)) { $file = $response->getBody()->getContents(); } diff --git a/app/Utilities/Versions.php b/app/Utilities/Versions.php index cec530fdf..849362b31 100644 --- a/app/Utilities/Versions.php +++ b/app/Utilities/Versions.php @@ -99,7 +99,7 @@ class Versions } // Bad response - if ($response->getStatusCode() != 200) { + if (!$response || ($response->getStatusCode() != 200)) { return $latest; } @@ -115,4 +115,4 @@ class Versions return $latest; } -} \ No newline at end of file +}