From f7c777596ef90cdf670f5e2c491f6b57d7d67ac7 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 26 Jan 2022 09:04:06 +0100 Subject: [PATCH 1/2] Changed Versionnumber to 0.7 --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index c490961f..21a5d0a3 100644 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,7 @@ use App\Models\Settings; return [ - 'version' => '0.6.2', + 'version' => '0.7', /* |-------------------------------------------------------------------------- | Application Name From 3d9e463b72a295da5afa2711a9ea38816db57b48 Mon Sep 17 00:00:00 2001 From: 1Day Date: Wed, 26 Jan 2022 12:48:32 +0100 Subject: [PATCH 2/2] change location of install.lock, change strings --- app/Providers/AppServiceProvider.php | 2 +- install.lock | 1 + public/install/index.php | 4 ++-- resources/views/admin/settings/index.blade.php | 7 ++++--- resources/views/home.blade.php | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 install.lock diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e31083b1..18291f4c 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -51,7 +51,7 @@ class AppServiceProvider extends ServiceProvider }); //only run if the installer has been executed - if (file_exists(public_path()."/install/install.lock")) { + if (file_exists(base_path()."/install.lock")) { $settings = Settings::all(); // Set all configs from database foreach ($settings as $setting) { diff --git a/install.lock b/install.lock new file mode 100644 index 00000000..a93f059a --- /dev/null +++ b/install.lock @@ -0,0 +1 @@ +locked \ No newline at end of file diff --git a/public/install/index.php b/public/install/index.php index aed826da..55bd42b0 100644 --- a/public/install/index.php +++ b/public/install/index.php @@ -1,7 +1,7 @@ @@ -449,7 +449,7 @@ echo $cardheader; - @if(!file_exists(public_path()."/install/install.lock")) + @if(!file_exists(base_path()."/install.lock"))

{{ __('The installer is not locked!') }}

-

{{ __('please create a file called "install.lock" in your "dashboard/public/installer" directory!') }}

-

{{ __('otherwise no settings will be loaded!') }}

+

{{ __('please create a file called "install.lock" in your dashboard Root directory. Otherwise no settings will be loaded!') }}

+ +
@endif diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index d9158a98..a8d58c88 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -18,11 +18,11 @@ - @if(!file_exists(public_path()."/install/install.lock") && Auth::User()->role == "admin") + @if(!file_exists(base_path()."/install.lock") && Auth::User()->role == "admin")

{{ __('The installer is not locked!') }}

-

{{ __('please create a file called "install.lock" in your "dashboard/public/installer" directory!') }}

-

{{ __('otherwise no settings will be loaded!') }}

+

{{ __('please create a file called "install.lock" in your dashboard Root directory. Otherwise no settings will be loaded!') }}

+
@endif