Merge branch 'ControlPanel-gg:development' into development
This commit is contained in:
commit
be1344f63e
|
@ -67,9 +67,6 @@ function cardStart($title, $subtitle = null)
|
||||||
|
|
||||||
// Getting started
|
// Getting started
|
||||||
if (!isset($_GET['step']) || $_GET['step'] == 1) {
|
if (!isset($_GET['step']) || $_GET['step'] == 1) {
|
||||||
if (!file_exists('../../.env')) {
|
|
||||||
echo run_console('cp .env.example .env');
|
|
||||||
};
|
|
||||||
?>
|
?>
|
||||||
<?php echo cardStart($title = "Mandatory Checks before Installation", $subtitle = "This installer will lead you through the most crucial Steps of Controlpanel.gg's setup"); ?>
|
<?php echo cardStart($title = "Mandatory Checks before Installation", $subtitle = "This installer will lead you through the most crucial Steps of Controlpanel.gg's setup"); ?>
|
||||||
|
|
||||||
|
@ -178,24 +175,20 @@ function cardStart($title, $subtitle = null)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DB Migration & APP_KEY Generation
|
// DB Migration & APP_KEY Generation
|
||||||
if (isset($_GET['step']) && $_GET['step'] == 2.5) {
|
if (isset($_GET['step']) && $_GET['step'] == 2.5) { ?>
|
||||||
|
<form method="POST" enctype="multipart/form-data" class="m-0" action="/install/forms.php" name="feedDB">
|
||||||
|
|
||||||
echo cardStart($title = "Database Migration and Encryption Key Generation", $subtitle = "Lets feed your Database and generate some security keys! <br> This process might take a while. Please do not refresh or close this page!"); ?> <form method="POST" enctype="multipart/form-data" class="m-0" action="/install/forms.php" name="feedDB">
|
<?php echo cardStart($title = "Database Migration and Encryption Key Generation", $subtitle = "Lets feed your Database and generate some security keys! <br> This process might take a while. Please do not refresh or close this page!"); ?> <form method="POST" enctype="multipart/form-data" class="m-0" action="/install/forms.php" name="feedDB">
|
||||||
<form method="POST" enctype="multipart/form-data" class="m-0" action="/install/forms.php" name="feedDB">
|
|
||||||
|
|
||||||
<?php if (isset($_GET['message'])) {
|
<?php if (isset($_GET['message'])) {
|
||||||
echo "<p class='not-ok check'>" . $_GET['message'] . '</p>';
|
echo "<p class='not-ok check'>" . $_GET['message'] . '</p>';
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="w-full flex justify-center ">
|
||||||
|
<button class="w-1/3 min-w-fit mt-2 px-4 py-2 font-bold rounded-md bg-sky-500 hover:bg-sky-600 shadow-sky-400 focus:outline-2 focus:outline focus:outline-offset-2 focus:outline-sky-500" name="feedDB">Submit</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="w-full flex justify-center ">
|
|
||||||
<button class="w-1/3 min-w-fit mt-2 px-4 py-2 font-bold rounded-md bg-sky-500 hover:bg-sky-600 shadow-sky-400 focus:outline-2 focus:outline focus:outline-offset-2 focus:outline-sky-500" name="feedDB">Submit</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -438,4 +431,4 @@ function cardStart($title, $subtitle = null)
|
||||||
?>
|
?>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in a new issue