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

added extra ../ to href for css and js in header and footer to allow code to be placed deeper within the directory structure moved reports to /user/reports, this should also fix the new custom directories

This commit is contained in:
johnnyq 2025-09-23 17:05:12 -04:00
parent 93061eb695
commit 6b6c70f1df
23 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
includes/footer.php
View File

@ -19,27 +19,27 @@ if (basename(dirname($_SERVER['REQUEST_URI'])) === 'admin') { ?>
<!-- REQUIRED SCRIPTS -->
<!-- Bootstrap 4 -->
<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
<script src="../../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Custom js-->
<script src="../plugins/moment/moment.min.js"></script>
<script src="../plugins/chart.js/chart.umd.min.js"></script>
<script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
<script src="../plugins/daterangepicker/daterangepicker.js"></script>
<script src="../plugins/select2/js/select2.min.js"></script>
<script src="../plugins/inputmask/jquery.inputmask.min.js"></script>
<script src="../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
<script src="../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
<script src="../plugins/clipboardjs/clipboard.min.js"></script>
<script src="../js/keepalive.js"></script>
<script src="../plugins/DataTables/datatables.min.js"></script>
<script src="../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
<script src="../../plugins/moment/moment.min.js"></script>
<script src="../../plugins/chart.js/chart.umd.min.js"></script>
<script src="../../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
<script src="../../plugins/daterangepicker/daterangepicker.js"></script>
<script src="../../plugins/select2/js/select2.min.js"></script>
<script src="../../plugins/inputmask/jquery.inputmask.min.js"></script>
<script src="../../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
<script src="../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
<script src="../../plugins/clipboardjs/clipboard.min.js"></script>
<script src="../../js/keepalive.js"></script>
<script src="../../plugins/DataTables/datatables.min.js"></script>
<script src="../../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
<!-- AdminLTE App -->
<script src="../plugins/adminlte/js/adminlte.min.js"></script>
<script src="../js/app.js"></script>
<script src="../js/ajax_modal.js"></script>
<script src="../js/confirm_modal.js"></script>
<script src="../../plugins/adminlte/js/adminlte.min.js"></script>
<script src="../../js/app.js"></script>
<script src="../../js/ajax_modal.js"></script>
<script src="../../js/confirm_modal.js"></script>
</body>
</html>

26
includes/header.php
View File

@ -20,26 +20,26 @@ header("X-Frame-Options: DENY");
<!-- Favicon -->
<?php if(file_exists('../uploads/favicon.ico')): ?>
<link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
<link rel="icon" type="image/x-icon" href="../../uploads/favicon.ico">
<?php endif; ?>
<!-- Font Awesome -->
<link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
<link rel="stylesheet" href="../../plugins/fontawesome-free/css/all.min.css">
<!-- Custom Styles -->
<link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
<link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
<link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
<link href="../plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
<link href="../plugins/toastr/toastr.min.css" rel="stylesheet">
<link href="../plugins/DataTables/datatables.min.css" rel="stylesheet">
<link href="../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
<link href="../css/itflow_custom.css" rel="stylesheet">
<link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
<link href="../../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
<link href="../../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
<link href="../../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
<link href="../../plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
<link href="../../plugins/toastr/toastr.min.css" rel="stylesheet">
<link href="../../plugins/DataTables/datatables.min.css" rel="stylesheet">
<link href="../../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
<link href="../../css/itflow_custom.css" rel="stylesheet">
<link rel="stylesheet" href="../../plugins/adminlte/css/adminlte.min.css">
<!-- Scripts -->
<script src="../plugins/jquery/jquery.min.js"></script>
<script src="../plugins/toastr/toastr.min.js"></script>
<script src="../../plugins/jquery/jquery.min.js"></script>
<script src="../../plugins/toastr/toastr.min.js"></script>
</head>
<body class="
hold-transition sidebar-mini layout-fixed layout-navbar-fixed

14
includes/top_nav.php
View File

@ -12,7 +12,7 @@
<ul class="navbar-nav ml-auto">
<!-- SEARCH FORM -->
<form class="form-inline" action="../user/global_search.php">
<form class="form-inline" action="../../user/global_search.php">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" type="search" placeholder="Search everywhere" name="query"
value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
@ -64,7 +64,7 @@
?>
<li class="nav-item">
<a class="nav-link ajax-modal" href="#" data-modal-url="../modals/notifications.php">
<a class="nav-link ajax-modal" href="#" data-modal-url="../../modals/notifications.php">
<i class="fas fa-bell"></i>
<?php if ($num_notifications) { ?>
<span class="badge badge-light badge-pill navbar-badge position-absolute" style="top: 1px; right: 3px;">
@ -79,7 +79,7 @@
<?php if (empty($session_avatar)) { ?>
<i class="fas fa-user-circle mr-1"></i>
<?php }else{ ?>
<img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>"
<img src="<?php echo "../../uploads/users/$session_user_id/$session_avatar"; ?>"
class="user-image img-circle">
<?php } ?>
<span
@ -92,7 +92,7 @@
<i class="fas fa-user-circle fa-6x"></i>
<?php }else{ ?>
<img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
<img src="<?php echo "../../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
<?php } ?>
<p>
<?php echo stripslashes(nullable_htmlentities($session_name)); ?>
@ -102,10 +102,10 @@
<!-- Menu Footer-->
<li class="user-footer">
<?php if ($session_is_admin) { ?>
<a href="../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
<a href="../../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
<?php } ?>
<a href="../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
<a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
<a href="../../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
<a href="../post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
</li>
</ul>
</li>

4
modals/notifications.php
View File

@ -86,11 +86,11 @@ ob_start();
]; ?>" class="btn btn-primary">
<span class="text-white text-bold"><i class="fas fa-check mr-2"></i>Dismiss all</span>
</a>
<a href="notifications.php" class="btn btn-secondary">
<a href="../../user/notifications.php" class="btn btn-secondary">
<span class="text-white">See all Notifications</span>
</a>
<?php } else { ?>
<a href="notifications.php?dismissed" class="btn btn-dark">
<a href="../../user/notifications.php?dismissed" class="btn btn-dark">
<span class="text-white text-bold">See Dismissed Notifications</span>
</a>
<?php } ?>

20
user/includes/inc_all_reports.php
View File

@ -1,20 +0,0 @@
<?php
require_once "../config.php";
require_once "../functions.php";
require_once "../includes/router.php";
require_once "../includes/check_login.php";
require_once "../includes/page_title.php";
// Reporting Perms
enforceUserPermission('module_reporting');
require_once "../includes/header.php";
require_once "../includes/top_nav.php";
require_once "includes/reports_side_nav.php";
require_once "../includes/inc_wrapper.php";
require_once "../includes/inc_alert_feedback.php";
require_once "../includes/filter_header.php";
// Set variable default values
$largest_income_month = 0;
$largest_invoice_month = 0;
$recurring_total = 0;

2
user/includes/side_nav.php
View File

@ -188,7 +188,7 @@
<?php if (lookupUserPermission("module_reporting") >= 1) { ?>
<li class="nav-item mt-3">
<a href="report_overview.php" class="nav-link">
<a href="reports/" class="nav-link">
<i class="fas fa-chart-line nav-icon"></i>
<p>Reports</p>
<i class="fas fa-angle-right nav-icon float-right"></i>

2
user/report_budget.php → user/reports/budget.php
View File

@ -103,5 +103,5 @@ $monthlyTotals = array_fill(1, 12, 0); // Initialize monthly totals for each mo
</div>
</div>
<?php require_once "../includes/footer.php";
<?php require_once "../../includes/footer.php";
?>

4
user/report_clients_with_balance.php → user/reports/clients_with_balance.php
View File

@ -67,7 +67,7 @@ enforceUserPermission('module_financial');
?>
<tr>
<td><a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td><a href="../../user/invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></td>
</tr>
<?php
@ -81,5 +81,5 @@ enforceUserPermission('module_financial');
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";

2
user/report_credential_rotation.php → user/reports/credential_rotation.php
View File

@ -71,5 +71,5 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";

2
user/report_expense_by_vendor.php → user/reports/expense_by_vendor.php
View File

@ -93,5 +93,5 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
</div>
</div>
<?php require_once "../includes/footer.php";
<?php require_once "../../includes/footer.php";
?>

2
user/report_expense_summary.php → user/reports/expense_summary.php
View File

@ -122,7 +122,7 @@ $largest_expense_month = 0;
</div>
</div>
<?php require_once "../includes/footer.php"; ?>
<?php require_once "../../includes/footer.php"; ?>
<script>
// Bootstrap-like defaults for Chart.js v4

20
user/reports/includes/inc_all_reports.php Normal file
View File

@ -0,0 +1,20 @@
<?php
require_once "../../config.php";
require_once "../../functions.php";
require_once "../../includes/router.php";
require_once "../../includes/check_login.php";
require_once "../../includes/page_title.php";
// Reporting Perms
enforceUserPermission('module_reporting');
require_once "../../includes/header.php";
require_once "../../includes/top_nav.php";
require_once "includes/reports_side_nav.php";
require_once "../../includes/inc_wrapper.php";
require_once "../../includes/inc_alert_feedback.php";
require_once "../../includes/filter_header.php";
// Set variable default values
$largest_income_month = 0;
$largest_invoice_month = 0;
$recurring_total = 0;

28
user/includes/reports_side_nav.php → user/reports/includes/reports_side_nav.php
View File

@ -1,7 +1,7 @@
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary d-print-none">
<a class="pb-1 mt-1 brand-link" href="index.php">
<a class="pb-1 mt-1 brand-link" href="../../user/<?php echo $config_start_page ?>">
<p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
<span class="brand-text ">Back | <strong>Reports</strong>
</p>
@ -18,55 +18,55 @@
<li class="nav-header">FINANCIAL</li>
<?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
<li class="nav-item">
<a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
<a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
<i class="far fa-circle nav-icon"></i>
<p>Income</p>
</a>
</li>
<li class="nav-item">
<a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
<a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
<i class="far fa-user nav-icon"></i>
<p>Income By Client</p>
</a>
</li>
<li class="nav-item">
<a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
<a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
<i class="fa fa-sync nav-icon"></i>
<p>Recurring Income By Client</p>
</a>
</li>
<li class="nav-item">
<a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
<a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
<i class="fa fa-exclamation-triangle nav-icon"></i>
<p>Clients with a Balance</p>
</a>
</li>
<li class="nav-item">
<a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
<a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
<i class="far fa-credit-card nav-icon"></i>
<p>Expense</p>
</a>
</li>
<li class="nav-item">
<a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
<a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
<i class="far fa-building nav-icon"></i>
<p>Expense By Vendor</p>
</a>
</li>
<li class="nav-item">
<a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
<a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
<i class="fas fa-percent nav-icon"></i>
<p>Tax Summary</p>
</a>
</li>
<li class="nav-item">
<a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
<a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
<i class="fas fa-file-invoice-dollar nav-icon"></i>
<p>Profit & Loss</p>
</a>
</li>
<li class="nav-item">
<a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
<a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Unbilled Tickets</p>
</a>
@ -78,21 +78,21 @@
<li class="nav-header">TECHNICAL</li>
<?php if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
<li class="nav-item">
<a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
<a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Tickets</p>
</a>
</li>
<li class="nav-item">
<a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_by_client.php") { echo "active"; } ?>">
<a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Tickets by Client</p>
</a>
</li>
<li class="nav-item">
<a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
<a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i>
<p>Time by Technician</p>
</a>
@ -100,7 +100,7 @@
<?php } ?>
<?php if (lookupUserPermission("module_credential") >= 1) { ?>
<li class="nav-item">
<a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
<a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-key"></i>
<p>Credential rotation</p>
</a>

4
user/report_income_by_client.php → user/reports/income_by_client.php
View File

@ -77,7 +77,7 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
?>
<tr>
<td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td><a href="../../user/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
</tr>
<?php
@ -91,5 +91,5 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";

2
user/report_income_summary.php → user/reports/income_summary.php
View File

@ -124,7 +124,7 @@ $largest_income_month = 0;
</div>
</div>
<?php require_once "../includes/footer.php"; ?>
<?php require_once "../../includes/footer.php"; ?>
<script>
// Bootstrap-like defaults for Chart.js v4

2
user/report_overview.php → user/reports/index.php
View File

@ -16,5 +16,5 @@ require_once "includes/inc_all_reports.php";
</div>
</div>
<?php require_once "../includes/footer.php"; ?>
<?php require_once "../../includes/footer.php"; ?>

2
user/report_profit_loss.php → user/reports/profit_loss.php
View File

@ -433,5 +433,5 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
</div>
</div>
<?php require_once "../includes/footer.php";
<?php require_once "../../includes/footer.php";

4
user/report_recurring_by_client.php → user/reports/recurring_by_client.php
View File

@ -46,7 +46,7 @@ $sql = mysqli_query($mysqli, "
<tr>
<td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td><a href="../../user/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_monthly_total, $session_company_currency); ?></td>
</tr>
<?php
@ -63,5 +63,5 @@ $sql = mysqli_query($mysqli, "
</div>
</div>
<?php require_once "../includes/footer.php";
<?php require_once "../../includes/footer.php";
?>

2
user/report_tax_summary.php → user/reports/tax_summary.php
View File

@ -117,5 +117,5 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
</div>
</div>
<?php require_once "../includes/footer.php";
<?php require_once "../../includes/footer.php";

2
user/report_ticket_by_client.php → user/reports/ticket_by_client.php
View File

@ -339,5 +339,5 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";

2
user/report_ticket_summary.php → user/reports/ticket_summary.php
View File

@ -95,7 +95,7 @@ $largest_ticket_month = 0;
</div>
</div>
<?php require_once "../includes/footer.php"; ?>
<?php require_once "../../includes/footer.php"; ?>
<script>
// Bootstrap-like defaults for Chart.js v4

4
user/report_tickets_unbilled.php → user/reports/tickets_unbilled.php
View File

@ -152,7 +152,7 @@ $rows = 0;
<tr>
<td>
<a href="tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
<a href="../../user/tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
</td>
<td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $ticket_closed_count; ?></td>
@ -178,5 +178,5 @@ $rows = 0;
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";

2
user/report_time_by_tech.php → user/reports/time_by_tech.php
View File

@ -177,5 +177,5 @@ $sql_users = mysqli_query($mysqli, "
</div>
<?php
require_once "../includes/footer.php";
require_once "../../includes/footer.php";