From 64aa12a997d3247eb2ff3dbbc5e1c2b05ecf24f7 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Mon, 2 Jul 2018 18:55:52 +0300 Subject: [PATCH 1/3] 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 +} From 5a682b94750b57affa711027e081edd41883dc30 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Mon, 2 Jul 2018 19:25:34 +0300 Subject: [PATCH 2/3] version update 1.2.9 to 1.2.10 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index b391a1987..b9d20d7aa 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '2', - 'patch' => '9', + 'patch' => '10', 'build' => '', 'status' => 'Stable', - 'date' => '27-June-2018', + 'date' => '2-July-2018', - 'time' => '20:30', + 'time' => '19:30', 'zone' => 'GMT +3', From f0e48521d43485e3340a0296c6b068ffabcf82a6 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 3 Jul 2018 10:52:38 +0300 Subject: [PATCH 3/3] close #404 Fixed: Apps are not updating --- app/Http/Controllers/Settings/Modules.php | 2 +- app/Utilities/Updater.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Settings/Modules.php b/app/Http/Controllers/Settings/Modules.php index 709aa56ff..ae5a2bea2 100644 --- a/app/Http/Controllers/Settings/Modules.php +++ b/app/Http/Controllers/Settings/Modules.php @@ -22,7 +22,7 @@ class Modules extends Controller return $s; })->pluck('value', 'key'); - $module = Module::get($alias); + $module = Module::findByAlias($alias); return view('settings.modules.edit', compact('setting', 'module')); } diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php index 9eb60ce1e..3a93fff58 100644 --- a/app/Utilities/Updater.php +++ b/app/Utilities/Updater.php @@ -70,7 +70,7 @@ class Updater } } else { // Get module instance - $module = Module::get($alias); + $module = Module::findByAlias($alias); $model = Model::where('alias', $alias)->first(); // Move all files/folders from temp path