AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update setup to include restore option but place it in its own nav section for seperation. Also if DB and config is configured skip and do not show checks or database in the side nav

This commit is contained in:
johnnyq 2025-05-24 12:28:34 -04:00
parent c512a716d2
commit 77be5af4e5
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets.php
View File

@ -519,7 +519,7 @@ if (mysqli_num_rows($os_sql) > 0) {
if ($contact_name) {
$contact_name_display = "<a href='#'
data-toggle='ajax-modal'
data-modal-size='lg'
data-modal-size='xl'
data-ajax-url='ajax/ajax_contact_details.php'
data-ajax-id='$asset_contact_id'>
$contact_name $contact_archive_display

41
setup.php
View File

@ -8,7 +8,6 @@ if (file_exists("config.php")) {
include "functions.php";
include "includes/database_version.php";
if (!isset($config_enable_setup)) {
$config_enable_setup = 1;
}
@ -18,6 +17,18 @@ if ($config_enable_setup == 0) {
exit;
}
$mysqli_available = isset($mysqli) && $mysqli instanceof mysqli;
$db_tables_exist = false;
if ($mysqli_available) {
$check = mysqli_query($mysqli, "SHOW TABLES LIKE 'users'");
if ($check && mysqli_num_rows($check) > 0) {
$db_tables_exist = true;
}
}
$minimal_setup_mode = file_exists("config.php") && $config_enable_setup == 1 && $mysqli_available && $db_tables_exist;
include_once "includes/settings_localization_array.php";
$errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log";
@ -584,6 +595,7 @@ if (isset($_POST['add_telemetry'])) {
<!-- Sidebar Menu -->
<nav class="mt-2">
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<?php if (!$minimal_setup_mode): ?>
<li class="nav-item">
<a href="?checks" class="nav-link <?php if (isset($_GET['checks'])) { echo "active"; } ?>">
<i class="nav-icon fas fa-check"></i>
@ -597,6 +609,7 @@ if (isset($_POST['add_telemetry'])) {
<p>2 - Database</p>
</a>
</li>
<?php endif; ?>
<li class="nav-item">
<a href="?user" class="nav-link <?php if (isset($_GET['user'])) { echo "active"; } ?>">
@ -622,6 +635,15 @@ if (isset($_POST['add_telemetry'])) {
<p>6 - Telemetry</p>
</a>
</li>
<li class="nav-header">Utilities</li>
<li class="nav-item">
<a href="?restore" class="nav-link <?php if (isset($_GET['restore'])) { echo "active"; } ?>">
<i class="nav-icon fas fa-upload text-warning"></i>
<p>Restore Backup</p>
</a>
</li>
</ul>
</nav>
</div>
@ -1360,10 +1382,19 @@ if (isset($_POST['add_telemetry'])) {
}
?>
<hr>
<div style="text-align: center;">
<a href="?checks" class="btn btn-primary text-bold">
Begin Setup<i class="fas fa-fw fa-arrow-alt-circle-right ml-2"></i>
</a>
<div class="text-center">
<?php if ($minimal_setup_mode): ?>
<a href="?user" class="btn btn-primary text-bold mr-2">
Create First User <i class="fas fa-fw fa-user ml-2"></i>
</a>
<a href="?restore" class="btn btn-warning text-bold">
Restore from Backup <i class="fas fa-fw fa-upload ml-2"></i>
</a>
<?php else: ?>
<a href="?checks" class="btn btn-primary text-bold">
Begin Setup <i class="fas fa-fw fa-arrow-alt-circle-right ml-2"></i>
</a>
<?php endif; ?>
</div>
</div>
</div>