Merge pull request #1263 from itflow-org/develop

Develop to Master for 26.02 Release Take 2

Author: johnnyq

.gitignore

@@ -32,10 +32,6 @@ plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/URI/*
 plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/*
 !plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/.gitkeep
 .vscode/settings.json
-xcustom/*
-!xcustom/readme.php
-post/xcustom
-!post/xcustom/readme.php
 admin/custom/*
 !admin/custom/readme.php
 agent/custom/*
@@ -53,5 +49,3 @@ setup/custom/*
 api/v1/custom/*
 !api/v1/custom/readme.php
 .zed
-
-

CHANGELOG.md

@@ -2,6 +2,55 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [26.02] Stable Release
+### Bug Fixes
+- Mail Parser - Do not automatically send new ticket notifications to noreply/donotreply addresses.
+- Ticket: removed newline \n on Parsed emails.
+- Show Trips for everyone if accounting module is enabled.
+- Fix Invoice Exporting.
+- Fix Billable Column not sorting correctly in tickets.
+- Fix Login flow where user agent and client user exists and agent has MFA but will not let them continue.
+- Fix passing missing user_id var in client portal.
+- Fix Ticket Templates not auto filling when selected.
+- Fix Invoices not being sent to all billings contacts when manaully sent.
+- Fix Documents and Files not able to be bulk deleted.
+- Fix Role Archiving, can be archived as long as no users are assigned to the role.
+- Fix showing Powered By ITFlow visibility on the login screen when Whitelabel is enabled.
+- Missing username in audit log on successful login due to missing passed user_id to logging.
+- API: Fix updating all documents instead of the intended document.
+- Documents: Fix Document created at not showing the correct creation date of the master document.
+- Ticket: Fixed Using edit ticket modal agent was not able to be set.
+- Always check if a user is archived and or disabled instead of just during login.
+- Report: Fix Collected tax report not totalling all tax categories.
+
+### New Features & Updates 
+- Task Approval System for ticket tasks: Once an approval is requested, the task cannot be marked as complete until approved. Internal Approvals Any other technician, or Specific technician, Client Approvals Anyone (usually the requestor) Tech contacts Billing contacts.
+- Printable Invoice Packing Slips now available.
+- Drastic Performance Bump: Up to 50% faster queries accross the board and reduced server memory usage by 40% by switching Database Query method from mysqli_fetch_array to mysqli_fetch_assoc.
+- Added Connect to Microsoft 365 Button to mail settings.
+- OAUTH2 support for Microsoft 365 and Google Workspaces is now considered stable and working.
+- Favorites: Assets and Credentials now can be favorited singly or by Bulk action. Favorited items appear in the client overview now.
+- Files/Documents: Collapsable folders feature, collapsed by default with a button to expand all.
+- URL Keys and such are now set to a more manageable 32 Characters by default.
+- Various UI/UX Updates throughout the app, with focus oin ticket details, contact details modal etc.
+- Added Show Archived files and documents to the files section.
+- Added Bulk Archive and restore options to files and documents.
+- Rewrite of the Kanban Ticket view to match our procedural style of coding.
+- All options are available in TinyMCE now in Mobile mode.
+- Agent names appear now in Invoice History section.
+- Mail Parser: Support flowed text.
+- Assets: Keep Purchase reference when copying.
+- Assets: Add basic tracking history: Archiving, restoring, name changes, transferimg to new clients.
+- Mail Parser: NDR Parsing.
+- Allow SVG files in mail attachments.
+- Tickets: Use a more friendly time worked instead of 02:41:00 translates to 2h 41m.
+- Update wording on ticket to invoice item details.
+- Merge Tickets: Now wth a ticket merge dropdown list of tickets instead of a text field.
+- Role Permissions can now be set during role creation, update Permission UI to use radio buttons instead of select boxes.
+- Bump TinyMCE 8.2.2 to 8.3.2.
+- Bump PHPMailer from 7.0.1 to 7.0.2.
+- Bump Datatables from 2.3.4 to 2.3.7.
+
 ## [25.12.1] Maint Release
 
 ### Major Changes

README.md

@@ -16,7 +16,7 @@
     <br />
     <a href="https://demo.itflow.org"><strong>View demo</strong></a>
     <br />
-    Username: <b>demo@demo</b> | Password: <b>demo</b>
+    Username: <b>demo@demo.com</b> | Password: <b>demo</b>
     <br />
     <br />
     <a href="https://itflow.org/#about">About</a>
@@ -93,6 +93,7 @@ If you want to improve ITFlow, feel free to fork the repo and create a pull requ
 We’re incredibly grateful to the organizations and individuals who support the project - a big thank you to:
 - CompuMatter
 - F1 for HELP
+- digiBandit
 - JetBrains (PhpStorm)
 
 ## License

admin/ai_model.php

@@ -58,7 +58,7 @@
                 <tbody>
                 <?php
 
-                while ($row = mysqli_fetch_array($sql)) {
+                while ($row = mysqli_fetch_assoc($sql)) {
                     $provider_id = intval($row['ai_provider_id']);
                     $provider_name = nullable_htmlentities($row['ai_provider_name']);
                     $model_id = intval($row['ai_model_id']);

admin/ai_provider.php

@@ -48,7 +48,7 @@
                 <tbody>
                 <?php
 
-                while ($row = mysqli_fetch_array($sql)) {
+                while ($row = mysqli_fetch_assoc($sql)) {
                     $provider_id = intval($row['ai_provider_id']);
                     $provider_name = nullable_htmlentities($row['ai_provider_name']);
                     $url = nullable_htmlentities($row['ai_provider_api_url']);

admin/api_keys.php

@@ -49,7 +49,7 @@
                             <div class="dropdown-menu">
                                 <button class="dropdown-item text-danger text-bold"
                                         type="submit" form="bulkActions" name="bulk_delete_api_keys">
-                                    <i class="fas fa-fw fa-trash mr-2"></i>Revoke
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                             </div>
                         </div>
@@ -105,7 +105,7 @@
                     <tbody>
                     <?php
 
-                    while ($row = mysqli_fetch_array($sql)) {
+                    while ($row = mysqli_fetch_assoc($sql)) {
                         $api_key_id = intval($row['api_key_id']);
                         $api_key_name = nullable_htmlentities($row['api_key_name']);
                         $api_key_secret = nullable_htmlentities("************" . substr($row['api_key_secret'], -4));
@@ -139,9 +139,16 @@
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                            <i class="fas fa-fw fa-times mr-2"></i>Revoke
-                                        </a>
+                                        <?php if ($api_key_expire > date("Y-m-d H:i:s")) { ?>
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?revoke_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                <i class="fas fa-fw fa-times mr-2"></i>Revoke
+                                            </a>
+                                        <?php } ?>
+                                        <?php if ($api_key_expire < date("Y-m-d H:i:s")) { ?>
+                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                <i class="fas fa-fw fa-times mr-2"></i>Delete
+                                            </a>
+                                        <?php } ?>
                                     </div>
                                 </div>
                             </td>
@@ -164,4 +171,3 @@
 
 <?php
 require_once "../includes/footer.php";
-

admin/app_log.php

@@ -66,7 +66,7 @@
 
                                 <?php
                                 $sql_types_filter = mysqli_query($mysqli, "SELECT DISTINCT app_log_type FROM app_logs ORDER BY app_log_type ASC");
-                                while ($row = mysqli_fetch_array($sql_types_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_types_filter)) {
                                     $log_type = nullable_htmlentities($row['app_log_type']);
                                 ?>
                                     <option <?php if ($type_filter == $log_type) { echo "selected"; } ?>><?php echo $log_type; ?></option>
@@ -85,7 +85,7 @@
 
                                 <?php
                                 $sql_categories_filter = mysqli_query($mysqli, "SELECT DISTINCT app_log_category FROM app_logs ORDER BY app_log_category ASC");
-                                while ($row = mysqli_fetch_array($sql_categories_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_categories_filter)) {
                                     $log_category = nullable_htmlentities($row['app_log_category']);
                                 ?>
                                     <option <?php if ($category_filter == $log_category) { echo "selected"; } ?>><?php echo $log_category; ?></option>
@@ -141,7 +141,7 @@
                     <tbody>
                     <?php
 
-                    while ($row = mysqli_fetch_array($sql)) {
+                    while ($row = mysqli_fetch_assoc($sql)) {
                         $log_id = intval($row['app_log_id']);
                         $log_type = nullable_htmlentities($row['app_log_type']);
                         $log_category = nullable_htmlentities($row['app_log_category']);

admin/audit_log.php

@@ -80,15 +80,15 @@
                             </div>
                         </div>
                     </div>
-                    
+
                     <div class="col-sm-2">
                         <div class="input-group mb-3 mb-md-0">
                             <select class="form-control select2" name="client" onchange="this.form.submit()">
                                 <option value="">- All Clients -</option>
 
                                 <?php
                                 $sql_clients_filter = mysqli_query($mysqli, "SELECT * FROM clients ORDER BY client_name ASC");
-                                while ($row = mysqli_fetch_array($sql_clients_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_clients_filter)) {
                                     $client_id = intval($row['client_id']);
                                     $client_name = nullable_htmlentities($row['client_name']);
                                 ?>
@@ -108,7 +108,7 @@
 
                                 <?php
                                 $sql_users_filter = mysqli_query($mysqli, "SELECT * FROM users ORDER BY user_name ASC");
-                                while ($row = mysqli_fetch_array($sql_users_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_users_filter)) {
                                     $user_id = intval($row['user_id']);
                                     $user_name = nullable_htmlentities($row['user_name']);
                                 ?>
@@ -128,7 +128,7 @@
 
                                 <?php
                                 $sql_types_filter = mysqli_query($mysqli, "SELECT DISTINCT log_type FROM logs ORDER BY log_type ASC");
-                                while ($row = mysqli_fetch_array($sql_types_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_types_filter)) {
                                     $log_type = nullable_htmlentities($row['log_type']);
                                 ?>
                                     <option <?php if ($type_filter == $log_type) { echo "selected"; } ?>><?php echo $log_type; ?></option>
@@ -147,7 +147,7 @@
 
                                 <?php
                                 $sql_actions_filter = mysqli_query($mysqli, "SELECT DISTINCT log_action FROM logs ORDER BY log_action ASC");
-                                while ($row = mysqli_fetch_array($sql_actions_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_actions_filter)) {
                                     $log_action = nullable_htmlentities($row['log_action']);
                                 ?>
                                     <option <?php if ($action_filter == $log_action) { echo "selected"; } ?>><?php echo $log_action; ?></option>
@@ -225,7 +225,7 @@
                     <tbody>
                     <?php
 
-                    while ($row = mysqli_fetch_array($sql)) {
+                    while ($row = mysqli_fetch_assoc($sql)) {
                         $log_id = intval($row['log_id']);
                         $log_type = nullable_htmlentities($row['log_type']);
                         $log_action = nullable_htmlentities($row['log_action']);
@@ -280,4 +280,3 @@
 
 <?php
 require_once "../includes/footer.php";
-

admin/category.php

@@ -111,7 +111,7 @@ class="fas fa-fw fa-archive mr-2"></i>Archived</a>
                 <tbody>
                     <?php
 
-                    while ($row = mysqli_fetch_array($sql)) {
+                    while ($row = mysqli_fetch_assoc($sql)) {
                         $category_id = intval($row['category_id']);
                         $category_name = nullable_htmlentities($row['category_name']);
                         $category_color = nullable_htmlentities($row['category_color']);

admin/contract_template.php

@@ -59,7 +59,7 @@
                 </thead>
                 <tbody>
                     <?php
-                        while ($row = mysqli_fetch_array($sql)) {
+                        while ($row = mysqli_fetch_assoc($sql)) {
                             $id = intval($row['contract_template_id']);
                             $name = nullable_htmlentities($row['contract_template_name']);
                             $type = nullable_htmlentities($row['contract_template_type']);