Skip to content

Commit 6df3a35

Browse files
author
wrongecho
committed
Move reports perms to new role system
1 parent abd985d commit 6df3a35

11 files changed

+89
-95
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This file documents all notable changes made to ITFlow.
44

55
## [25.02]
66
### Fixed
7-
- Fix report permissions for un-billed tickets
7+
- Changed several reports over to the new permissions/roles system
88
- Fixed empty task box showing for resolved/closed tickets
99

1010
### Added / Changed

‎includes/reports_side_nav.php

+78-83
Original file line numberDiff line numberDiff line change
@@ -15,81 +15,74 @@
1515

1616
<ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
1717

18-
<?php if ($config_module_enable_accounting == 1) { ?>
19-
<li class="nav-header">FINANCIAL</li>
20-
21-
<?php if (lookupUserPermission("module_financial") >= 1) { ?>
22-
23-
<li class="nav-item">
24-
<a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
25-
<i class="far fa-circle nav-icon"></i>
26-
<p>Income</p>
27-
</a>
28-
</li>
29-
<li class="nav-item">
30-
<a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
31-
<i class="far fa-user nav-icon"></i>
32-
<p>Income By Client</p>
33-
</a>
34-
</li>
35-
<li class="nav-item">
36-
<a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
37-
<i class="fa fa-sync nav-icon"></i>
38-
<p>Recurring Income By Client</p>
39-
</a>
40-
</li>
41-
<li class="nav-item">
42-
<a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
43-
<i class="fa fa-exclamation-triangle nav-icon"></i>
44-
<p>Clients with a Balance</p>
45-
</a>
46-
</li>
47-
<li class="nav-item">
48-
<a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
49-
<i class="far fa-credit-card nav-icon"></i>
50-
<p>Expense</p>
51-
</a>
52-
</li>
53-
<li class="nav-item">
54-
<a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
55-
<i class="far fa-building nav-icon"></i>
56-
<p>Expense By Vendor</p>
57-
</a>
58-
</li>
59-
<li class="nav-item">
60-
<a href="report_budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_budget.php") { echo "active"; } ?>">
61-
<i class="fas fa-list nav-icon"></i>
62-
<p>Budget</p>
63-
</a>
64-
</li>
65-
<li class="nav-item">
66-
<a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
67-
<i class="fas fa-percent nav-icon"></i>
68-
<p>Tax Summary</p>
69-
</a>
70-
</li>
71-
<li class="nav-item">
72-
<a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
73-
<i class="fas fa-file-invoice-dollar nav-icon"></i>
74-
<p>Profit & Loss</p>
75-
</a>
76-
</li>
77-
78-
<?php } ?>
79-
80-
<?php if (lookupUserPermission("module_sales") >= 1) { ?>
81-
<li class="nav-item">
82-
<a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
83-
<i class="nav-icon fas fa-life-ring"></i>
84-
<p>Unbilled Tickets</p>
85-
</a>
86-
</li>
87-
<?php } ?>
18+
<li class="nav-header">FINANCIAL</li>
19+
<?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
20+
<li class="nav-item">
21+
<a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
22+
<i class="far fa-circle nav-icon"></i>
23+
<p>Income</p>
24+
</a>
25+
</li>
26+
<li class="nav-item">
27+
<a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
28+
<i class="far fa-user nav-icon"></i>
29+
<p>Income By Client</p>
30+
</a>
31+
</li>
32+
<li class="nav-item">
33+
<a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
34+
<i class="fa fa-sync nav-icon"></i>
35+
<p>Recurring Income By Client</p>
36+
</a>
37+
</li>
38+
<li class="nav-item">
39+
<a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
40+
<i class="fa fa-exclamation-triangle nav-icon"></i>
41+
<p>Clients with a Balance</p>
42+
</a>
43+
</li>
44+
<li class="nav-item">
45+
<a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
46+
<i class="far fa-credit-card nav-icon"></i>
47+
<p>Expense</p>
48+
</a>
49+
</li>
50+
<li class="nav-item">
51+
<a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
52+
<i class="far fa-building nav-icon"></i>
53+
<p>Expense By Vendor</p>
54+
</a>
55+
</li>
56+
<li class="nav-item">
57+
<a href="report_budget.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_budget.php") { echo "active"; } ?>">
58+
<i class="fas fa-list nav-icon"></i>
59+
<p>Budget</p>
60+
</a>
61+
</li>
62+
<li class="nav-item">
63+
<a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
64+
<i class="fas fa-percent nav-icon"></i>
65+
<p>Tax Summary</p>
66+
</a>
67+
</li>
68+
<li class="nav-item">
69+
<a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
70+
<i class="fas fa-file-invoice-dollar nav-icon"></i>
71+
<p>Profit & Loss</p>
72+
</a>
73+
</li>
74+
<li class="nav-item">
75+
<a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
76+
<i class="nav-icon fas fa-life-ring"></i>
77+
<p>Unbilled Tickets</p>
78+
</a>
79+
</li>
80+
8881
<?php } // End financial reports IF statement ?>
8982

9083

9184
<li class="nav-header">TECHNICAL</li>
92-
<?php if ($config_module_enable_ticketing) { ?>
85+
<?php if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
9386
<li class="nav-item">
9487
<a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
9588
<i class="nav-icon fas fa-life-ring"></i>
@@ -115,18 +108,20 @@
115108

116109
<li class="nav-header">OVERVIEWS</li>
117110

118-
<li class="nav-item">
119-
<a href="report_assets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_assets.php") { echo "active"; } ?>">
120-
<i class="nav-icon fas fa-desktop"></i>
121-
<p>All Assets</p>
122-
</a>
123-
</li>
124-
<li class="nav-item">
125-
<a href="report_domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_domains.php") { echo "active"; } ?>">
126-
<i class="nav-icon fas fa-globe"></i>
127-
<p>All Domains</p>
128-
</a>
129-
</li>
111+
<?php if (lookupUserPermission("module_support") >= 1) { ?>
112+
<li class="nav-item">
113+
<a href="report_assets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_assets.php") { echo "active"; } ?>">
114+
<i class="nav-icon fas fa-desktop"></i>
115+
<p>All Assets</p>
116+
</a>
117+
</li>
118+
<li class="nav-item">
119+
<a href="report_domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_domains.php") { echo "active"; } ?>">
120+
<i class="nav-icon fas fa-globe"></i>
121+
<p>All Domains</p>
122+
</a>
123+
</li>
124+
<?php } ?>
130125

131126
</ul>
132127

‎report_budget.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
$year = intval($_GET['year']);

‎report_clients_with_balance.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
?>
88

‎report_expense_by_vendor.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
if ($_GET['year'] === 'all') {

‎report_expense_summary.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
$year = intval($_GET['year']);

‎report_income_by_client.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
if ($_GET['year'] === 'all') {

‎report_income_summary.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
$year = intval($_GET['year']);
@@ -147,8 +147,7 @@
147147
</div>
148148
</div>
149149

150-
<?php require_once "includes/footer.php";
151-
?>
150+
<?php require_once "includes/footer.php"; ?>
152151

153152
<script>
154153
// Set new default font family and font color to mimic Bootstrap's default styling

‎report_profit_loss.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateAccountantRole();
5+
enforceUserPermission('module_financial');
66

77
if (isset($_GET['year'])) {
88
$year = intval($_GET['year']);

‎report_ticket_by_client.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateTechRole();
5+
enforceUserPermission('module_support');
66

77
function secondsToTime($inputSeconds) {
88
$inputSeconds = floor($inputSeconds);

‎report_ticket_summary.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require_once "includes/inc_all_reports.php";
44

5-
validateTechRole();
5+
enforceUserPermission('module_support');
66

77
if (isset($_GET['year'])) {
88
$year = intval($_GET['year']);

0 commit comments

Comments
 (0)