maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

migrate admin-autoupdate

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-03-16 14:32:10 +01:00
parent d30c9a2ff7
commit dc798c63c7
2 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
admin_autoupdate.php
View File

@@ -22,6 +22,7 @@ const AREA = 'admin';
require __DIR__ . '/lib/init.php'; require __DIR__ . '/lib/init.php';
use Froxlor\Http\HttpClient; use Froxlor\Http\HttpClient;
use Froxlor\UI\Panel\UI;
// define update-uri // define update-uri
define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . $version); define('UPDATE_URI', "https://version.froxlor.org/Froxlor/api/" . $version);
@@ -89,10 +90,39 @@ if ($page == 'overview') {
// zum update schritt #1 -> download // zum update schritt #1 -> download
if ($isnewerversion == 1) { if ($isnewerversion == 1) {
$text = 'There is a newer version available. Update to version <b>' . $_version . '</b> now?<br/>(Your current version is: ' . $version . ')'; $text = 'There is a newer version available. Update to version <b>' . $_version . '</b> now?<br/>(Your current version is: ' . $version . ')';
$hiddenparams = '<input type="hidden" name="newversion" value="' . $_version . '" />';
$yesfile = $filename . '?s=' . $s . '&amp;page=getdownload'; $upd_formfield = [
eval("echo \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";"); 'updates' => [
exit(); 'title' => $lng['update']['update'],
'image' => 'fa-solid fa-download',
'sections' => [
'section_autoupd' => [
'fields' => [
'newversion' => ['type' => 'hidden', 'value' => $_version]
]
]
],
'buttons' => [
[
'class' => 'btn-outline-secondary',
'label' => $lng['panel']['cancel'],
'type' => 'reset'
],
[
'label' => $lng['update']['proceed']
]
]
]
];
UI::twigBuffer('user/form-note.html.twig', [
'formaction' => $linker->getLink(array('section' => 'autoupdate', 'page' => 'getdownload')),
'formdata' => $upd_formfield['updates'],
// alert
'type' => 'warning',
'alert_msg' => $text
]);
UI::twigOutputBuffer();
} elseif ($isnewerversion == 0) { } elseif ($isnewerversion == 0) {
// all good // all good
\Froxlor\UI\Response::standard_success('noupdatesavail'); \Froxlor\UI\Response::standard_success('noupdatesavail');
@@ -168,10 +198,9 @@ elseif ($page == 'getdownload') {
} // extract and install new version } // extract and install new version
elseif ($page == 'extract') { elseif ($page == 'extract') {
$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
if (isset($_POST['send']) && $_POST['send'] == 'send') { if (isset($_POST['send']) && $_POST['send'] == 'send') {
$toExtract = isset($_POST['archive']) ? $_POST['archive'] : null;
$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
// decompress from zip // decompress from zip
$zip = new ZipArchive(); $zip = new ZipArchive();
$res = $zip->open($localArchive); $res = $zip->open($localArchive);
@@ -193,6 +222,9 @@ elseif ($page == 'extract') {
// redirect to update-page? // redirect to update-page?
\Froxlor\UI\Response::redirectTo('admin_updates.php'); \Froxlor\UI\Response::redirectTo('admin_updates.php');
} else {
$toExtract = isset($_GET['archive']) ? $_GET['archive'] : null;
$localArchive = \Froxlor\Froxlor::getInstallDir() . '/updates/' . $toExtract;
} }
if (!file_exists($localArchive)) { if (!file_exists($localArchive)) {
@@ -203,9 +235,39 @@ elseif ($page == 'extract') {
} }
$text = 'Extract downloaded archive "' . $toExtract . '"?'; $text = 'Extract downloaded archive "' . $toExtract . '"?';
$hiddenparams = '';
$yesfile = $filename . '?s=' . $s . '&amp;page=extract&amp;archive=' . $toExtract; $upd_formfield = [
eval("echo \"" . \Froxlor\UI\Template::getTemplate("misc/question_yesno", true) . "\";"); 'updates' => [
'title' => $lng['update']['update'],
'image' => 'fa-solid fa-download',
'sections' => [
'section_autoupd' => [
'fields' => [
'archive' => ['type' => 'hidden', 'value' => $toExtract]
]
]
],
'buttons' => [
[
'class' => 'btn-outline-secondary',
'label' => $lng['panel']['cancel'],
'type' => 'reset'
],
[
'label' => $lng['update']['proceed']
]
]
]
];
UI::twigBuffer('user/form-note.html.twig', [
'formaction' => $linker->getLink(array('section' => 'autoupdate', 'page' => 'extract')),
'formdata' => $upd_formfield['updates'],
// alert
'type' => 'warning',
'alert_msg' => $text
]);
UI::twigOutputBuffer();
} // display error } // display error
elseif ($page == 'error') { elseif ($page == 'error') {

2
lib/Froxlor/Http/HttpClient.php
View File

@@ -36,7 +36,7 @@ class HttpClient
* *
* @throws Exception * @throws Exception
*/ */
public static function fileGet(string $url, string $target): array public static function fileGet(string $url, string $target)
{ {
$fh = fopen($target, 'w'); $fh = fopen($target, 'w');
$ch = curl_init(); $ch = curl_init();