 }})
@@ -69,21 +83,4 @@ exit(); ?>
@endif
-@if($_SERVER['QUERY_STRING'] === 'error')
-
-
-
-
-
l
-
-
Something went wrong
- Something went wrong during the update process, you can try again or update manually:
-
-
-@endif
-
-
@endpush
\ No newline at end of file
From 867f6c1efc5826344f7c46b6b387268bde6b48fd Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 16:20:05 +0200
Subject: [PATCH 14/37] Update web.php
---
routes/web.php | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/routes/web.php b/routes/web.php
index 9e562a6..df169fe 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,6 +82,36 @@ Route::get('/panel/site', [AdminController::class, 'showSite'])->name('showSite'
Route::post('/panel/site', [AdminController::class, 'editSite'])->name('editSite');
Route::get('/panel/phpinfo', [AdminController::class, 'phpinfo'])->name('phpinfo');
Route::get('/update', function () {return view('update', []);});
+
+Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
+
+ // Check if new version is available
+ if($updater->source()->isNewVersionAvailable() and (file_exists(base_path("backups/CANUPDATE")))) {
+
+ // Get the current installed version
+ echo $updater->source()->getVersionInstalled();
+
+ // Get the new version available
+ $versionAvailable = $updater->source()->getVersionAvailable();
+
+ // Create a release
+ $release = $updater->source()->fetch($versionAvailable);
+
+ // Run the update process
+ $updater->source()->update($release);
+
+ unlink(base_path("backups/CANUPDATE"));
+
+ $URL = Route::current()->getName();
+ header("Location: ".$URL."/../update?success");
+ exit();
+
+ } else {
+ echo "No new version available.";
+ }
+
+});
+
});
require __DIR__.'/auth.php';
From 1fd71f17277fcce87b45caa20ea31bdc0b25580b Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 16:22:14 +0200
Subject: [PATCH 15/37] Update updater.blade.php
---
resources/views/layouts/updater.blade.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/resources/views/layouts/updater.blade.php b/resources/views/layouts/updater.blade.php
index 59010a2..6dee45f 100644
--- a/resources/views/layouts/updater.blade.php
+++ b/resources/views/layouts/updater.blade.php
@@ -4,6 +4,7 @@
+
Update
From d1f9bffc074ce3f95915d3dcae5592f33cea6a56 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 16:27:06 +0200
Subject: [PATCH 16/37] Update sidebar.blade.php
---
resources/views/layouts/sidebar.blade.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index bd106b0..2f01cea 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -210,7 +210,7 @@ if ($url1sb->successful() or $url2sb->successful()) {
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal)
-
An update is available
+
An update is available
@endif
@endif
@elseif(env('NOTIFY_UPDATES') == 'major')
@@ -241,7 +241,7 @@ if ($url1sb->successful() or $url2sb->successful()) {
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal)
-
An update is available
+
An update is available
@endif
@endif
@endif
From 6322e906e9cb955b9dc5fb071455a81d03bf7c10 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 16:28:02 +0200
Subject: [PATCH 17/37] Update version.json
---
version.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/version.json b/version.json
index 57cf282..2714f53 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-2.6.5
+2.6.4
From fd8a2770da8d8cd53e621c3dc32fccc71a8e9a00 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 16:59:52 +0200
Subject: [PATCH 18/37] Update backup.php
---
config/backup.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/backup.php b/config/backup.php
index a066fc8..13056a8 100644
--- a/config/backup.php
+++ b/config/backup.php
@@ -210,33 +210,33 @@ return [
/*
* The number of days for which backups must be kept.
*/
- 'keep_all_backups_for_days' => 7,
+ 'keep_all_backups_for_days' => 0,
/*
* The number of days for which daily backups must be kept.
*/
- 'keep_daily_backups_for_days' => 16,
+ 'keep_daily_backups_for_days' => 0,
/*
* The number of weeks for which one weekly backup must be kept.
*/
- 'keep_weekly_backups_for_weeks' => 8,
+ 'keep_weekly_backups_for_weeks' => 0,
/*
* The number of months for which one monthly backup must be kept.
*/
- 'keep_monthly_backups_for_months' => 4,
+ 'keep_monthly_backups_for_months' => 0,
/*
* The number of years for which one yearly backup must be kept.
*/
- 'keep_yearly_backups_for_years' => 2,
+ 'keep_yearly_backups_for_years' => 0,
/*
* After cleaning up the backups remove the oldest backup until
* this amount of megabytes has been reached.
*/
- 'delete_oldest_backups_when_using_more_megabytes_than' => 5000,
+ 'delete_oldest_backups_when_using_more_megabytes_than' => 0,
],
],
From 7360bd37de0af0bafdf9efd54a0d8727c2552cc7 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 17:00:21 +0200
Subject: [PATCH 19/37] Update update.blade.php
---
resources/views/update.blade.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 0d5931b..e11995e 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -43,7 +43,8 @@
@endif
@if($_SERVER['QUERY_STRING'] === 'backups')
- true]);
+ true]);
$tst = base_path('backups/');
file_put_contents($tst.'CANUPDATE', '');
$URL = Route::current()->getName();
From dc32587dee36f0fefa1f6d6861bf565bf22d0169 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 17:04:47 +0200
Subject: [PATCH 20/37] Update updater.blade.php
---
resources/views/layouts/updater.blade.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/resources/views/layouts/updater.blade.php b/resources/views/layouts/updater.blade.php
index 6dee45f..7e0f409 100644
--- a/resources/views/layouts/updater.blade.php
+++ b/resources/views/layouts/updater.blade.php
@@ -108,6 +108,7 @@ button {
}
button:hover {
background-color: #0065c1;
+ color: #FFF;
box-shadow: 0 10px 20px -10px rgba(0,0,0, 0.6);
}
From 7927d8e021a2e869f9493f8d8380934e5ee0becc Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 17:05:19 +0200
Subject: [PATCH 21/37] Update update.blade.php
---
resources/views/update.blade.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index e11995e..705ca3f 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -24,8 +24,8 @@
Updater
You can update your installation automatically or download the update and install it manually:
@endif
@@ -78,7 +78,7 @@ exit(); ?>
Success!
The update was successful, you can now return to the Admin Panel:
@endif
From 8de8e665d83401e508863af5135ec5fc3145dedf Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 17:28:03 +0200
Subject: [PATCH 22/37] Update .htaccess
---
.htaccess | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.htaccess b/.htaccess
index ab13927..198faaa 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,3 +29,7 @@ Deny from all
Order allow,deny
Deny from all
+
+ Order allow,deny
+ Deny from all
+
\ No newline at end of file
From c90e49fa1c0c6187293b7cbff679e98d4925b571 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 20:53:00 +0200
Subject: [PATCH 23/37] Update web.php
---
routes/web.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/routes/web.php b/routes/web.php
index df169fe..7a1fe62 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -103,7 +103,7 @@ Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
unlink(base_path("backups/CANUPDATE"));
$URL = Route::current()->getName();
- header("Location: ".$URL."/../update?success");
+ header("Location: ".$URL."/../update?finishing");
exit();
} else {
From dde11850759715b96911cef2ca9e9de39539109e Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 20:53:32 +0200
Subject: [PATCH 24/37] Update update.blade.php
---
resources/views/update.blade.php | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 705ca3f..3e80dc0 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -66,7 +66,23 @@ exit(); ?>
@endif
+@if($_SERVER['QUERY_STRING'] === 'finishing')
+
+
+
+
l
+
+
Finishing up
+
+ getName();
+ header("Location: ".$URL."?success");
+ exit(); ?>
+@endif
@if($_SERVER['QUERY_STRING'] === 'success')
From 8f09d399cdae4b92838b7290767b15c6e850153b Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 21:26:57 +0200
Subject: [PATCH 25/37] Update update.blade.php
---
resources/views/update.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 3e80dc0..1fb90e8 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -25,7 +25,7 @@
You can update your installation automatically or download the update and install it manually:
@endif
From 122d9e31e6c822c88400578cc07bff6887a3345c Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 22:09:54 +0200
Subject: [PATCH 26/37] Update update.blade.php
---
resources/views/update.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 1fb90e8..e74869d 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -25,7 +25,7 @@
You can update your installation automatically or download the update and install it manually:
@endif
From df384df2cfc67b131bd4eac8b8375b57216073cf Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 23:15:34 +0200
Subject: [PATCH 27/37] Update sidebar.blade.php
---
resources/views/layouts/sidebar.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 2f01cea..bcba6fe 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -210,7 +210,7 @@ if ($url1sb->successful() or $url2sb->successful()) {
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal)
-
An update is available
+
An update is available
@endif
@endif
@elseif(env('NOTIFY_UPDATES') == 'major')
From 387b67db1d0cde3081e2b4c4447f36f00a81417a Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Wed, 25 May 2022 23:19:29 +0200
Subject: [PATCH 28/37] Update sidebar.blade.php
---
resources/views/layouts/sidebar.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index bcba6fe..7533581 100755
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -210,7 +210,7 @@ if ($url1sb->successful() or $url2sb->successful()) {
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal)
-
An update is available
+
An update is available
@endif
@endif
@elseif(env('NOTIFY_UPDATES') == 'major')
From 84b365958f48e4b9c64dc8208f2f96db62c7645a Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 26 May 2022 11:10:05 +0200
Subject: [PATCH 29/37] Update update.blade.php
---
resources/views/update.blade.php | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index e74869d..1cc79c1 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -1,7 +1,7 @@
@extends('layouts.updater')
@Push('updater-body')
-
+
-
+
l
-
Updater
+ Updater
You can update your installation automatically or download the update and install it manually:
-
+
@endif
@if($_SERVER['QUERY_STRING'] === 'backup')
@@ -39,7 +39,7 @@
l
-
Creating backup
+
Creating backup
@endif
@if($_SERVER['QUERY_STRING'] === 'backups')
@@ -58,7 +58,7 @@ exit(); ?>
l
-
From 95057f6209cfd0c79ca753348e621f9fb0be93d9 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 26 May 2022 11:38:34 +0200
Subject: [PATCH 33/37] Update web.php
---
routes/web.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/routes/web.php b/routes/web.php
index 7a1fe62..72e9b2b 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -102,9 +102,7 @@ Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
unlink(base_path("backups/CANUPDATE"));
- $URL = Route::current()->getName();
- header("Location: ".$URL."/../update?finishing");
- exit();
+ echo "
current() . "/../update?finishing />";
} else {
echo "No new version available.";
From 909c11263f419eed3e9d2e0d7106a328f5481769 Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 26 May 2022 11:40:13 +0200
Subject: [PATCH 34/37] Update update.blade.php
---
resources/views/update.blade.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index af747b2..d158bc4 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -84,9 +84,8 @@ exit(); ?>
//run before finishing:
// EnvEditor::addKey('MY_VALUE', 'truefalse'); // Adds key to .env file
- $URL = Route::current()->getName();
- header("Location: ".$URL."?success");
- exit(); ?>
+ echo "
current() . "?success\" />";
+ ?>
@endif
@if($_SERVER['QUERY_STRING'] === 'success')
From 7cf52a4a6a13b4d60ab4257b38867da3a976e6ac Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 26 May 2022 12:12:09 +0200
Subject: [PATCH 35/37] Update web.php
---
routes/web.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routes/web.php b/routes/web.php
index 72e9b2b..bf4d661 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -102,10 +102,10 @@ Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
unlink(base_path("backups/CANUPDATE"));
- echo "
current() . "/../update?finishing />";
+ echo "
current() . "/../update?finishing\" />";
} else {
- echo "No new version available.";
+ echo "
current() . "/../update?error\" />";
}
});
From 8b7929dfa8a72098b44b1e72b5cf8941a1fbea0f Mon Sep 17 00:00:00 2001
From: Julian Prieber <60265788+JulianPrieber@users.noreply.github.com>
Date: Thu, 26 May 2022 12:12:29 +0200
Subject: [PATCH 36/37] Update update.blade.php
---
resources/views/update.blade.php | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index d158bc4..64abd8d 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -103,5 +103,20 @@ exit(); ?>
@endif
+@if($_SERVER['QUERY_STRING'] === 'error')
+
+
+
+
+
l
+
+
Error
+
Something went wrong with the update :(
+
+
+@endif
+
 }}){kind=avatar}
@else
-  }})
-