Merge branch 'develop' of github.com:itflow-org/itflow into develop

This commit is contained in:
johnnyq 2025-09-08 13:06:49 -04:00
commit 68872ab9fb
5 changed files with 9 additions and 14 deletions

View File

@ -1,6 +1,6 @@
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
<a class="brand-link pb-1 mt-1" href="../user/dashboard.php">
<a class="brand-link pb-1 mt-1" href="../user/<?php echo $config_start_page ?>">
<p class="h6">
<i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
<span class="brand-text">

View File

@ -48,7 +48,7 @@ if (isset($_POST['add_payment_provider'])) {
//Vendor
$sql_vendor = mysqli_query($mysqli,"SELECT vendor_id FROM vendors WHERE vendor_name = '$provider' AND vendor_client_id = 0 AND vendor_archived_at IS NULL LIMIT 1");
if (mysqli_num_rows($sql_vendor) == 0) {
mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$provider', vendor_descripion = 'Payment Processor Provider', vendor_client_id = 0");
mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$provider', vendor_description = 'Payment Processor Provider', vendor_client_id = 0");
$vendor_id = mysqli_insert_id($mysqli);
} else {
$row = mysqli_fetch_array($sql_vendor);

View File

@ -28,7 +28,7 @@ $config_imap_username = $row['config_imap_username'];
$config_imap_password = $row['config_imap_password'];
// Defaults
$config_start_page = $row['config_start_page'];
$config_start_page = $row['config_start_page'] ?? 'clients.php';
$config_default_transfer_from_account = intval($row['config_default_transfer_from_account']);
$config_default_transfer_to_account = intval($row['config_default_transfer_to_account']);
$config_default_payment_account = intval($row['config_default_payment_account']);

View File

@ -3,11 +3,8 @@
if (file_exists("config.php")) {
//require_once "includes/check_login.php";
if (isset($config_start_page)) {
header("Location: /user/$config_start_page");
} else {
header("Location: /user");
}
header("Location: /user/$config_start_page");
} else {
header("Location: /setup");
exit();

View File

@ -15,10 +15,8 @@ require_once "includes/inc_all.php";
<!-- Page Content -->
<h1>Blank Page</h1>
<hr>
<meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
<?php
if (isset($config_start_page)) { ?>
<meta http-equiv="refresh" content="0;url=<?php echo $config_start_page; ?>">
<?php }
require_once "../includes/footer.php";