itflow-org · johnnyq · Mar 7, 2025 · Mar 7, 2025 · Mar 9, 2025 · Mar 9, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,57 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [25.03 UNRELEASED]
+
+### Fixed
+- Resolved missing attachments in ticket replies processed via the email parser.
+- Fixed issue where the top half of portrait image uploads appeared cut off at the bottom.
+- Ensured all tables and fields use `CHARACTER SET utf8mb4` and `COLLATE utf8mb4_general_ci` for updates and new installations.
+- Converted `service_domains` table to use InnoDB instead of MyISAM.
+- Fixed the initials function to properly handle UTF-8 characters, preventing contact-related issues.
+- Interfaces can now start with `0`.
+- Adjusted AI prompt handling to focus solely on content, avoiding unnecessary additions.
+
+### Added / Changed
+- Introduced bulk delete functionality for assets.
+- Added the ability to redact ticket replies after a ticket is closed.
+- Added support for redacting specific text while a ticket is open.
+- Switched file upload hashing from SHA256 to MD5 to significantly improve performance.
+- Enabled assigning multiple assets to a single ticket.
+- Updated all many-to-many tables to support cascading deletes using foreign key associations, improving efficiency, performance, and data integrity.
+- Enabled caching for AJAX modals to reduce repeated reloads and enhance browser performance.
+- Upgraded DataTables from 2.2.1 to 2.2.2.
+- Upgraded TinyMCE from 7.6.1 to 7.7.1, providing a significant performance boost.
+- Added “Copy Credentials to Clipboard” button in AJAX asset and contact views.
+- Renamed and reorganized several tables.
+- Improved theme color organization by grouping primary colors and their related shades.
+- Displayed a user icon next to contacts who have user accounts.
+- New image uploads are now converted to optimized `.webp` format by default; original files are no longer saved. Existing images remain unchanged.
+- Added international phone number support throughout the system.
+- Introduced user signatures in preferences, which are now appended to all ticket replies.
+- Optimized search filters to only display defined tags.
+- Added “Projects” to the client-side navigation.
+- Enabled “Create New Ticket” from within project details.
+- Reintroduced batch payment functionality in client invoices.
+- Included client abbreviations in both client and global search options.
+- Added assigned software license details (User/Asset) to the client PDF export.
+- Replaced client-side `pdfMake` with the PHP-based `TCPDF` library for generating client export runbooks.
+- Introduced the ability to download documents as PDFs.
+- Added a “Reference” field to tickets and invoices generated from recurring templates (not yet in active use).
+
+### Breaking Changes
+> **Important:** To update to this version, you **must** run the following commands from the command line from the scripts directory:
+>
+> ```bash
+> php update_cli.php
+> php update_cli.php --db_update
+> ```
+>
+> Repeat `--db_update` until no further updates are found.
+>
+> **Back up your system before upgrading.**  
+> This version includes numerous backend changes critical for future development.
+
 ## [25.02.4]
 
 ### Fixed

diff --git a/admin_role.php b/admin_role.php
@@ -1,7 +1,7 @@
 <?php
 
 // Default Column Sortby Filter
-$sort = "user_role_is_admin";
+$sort = "role_is_admin";
 $order = "DESC";
 
 require_once "includes/inc_all_admin.php";
@@ -13,8 +13,8 @@
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM user_roles
-    WHERE (user_roles.user_role_name LIKE '%$q%' OR user_roles.user_role_description LIKE '%$q%')
-    AND user_roles.user_role_archived_at IS NULL
+    WHERE (role_name LIKE '%$q%' OR role_description LIKE '%$q%')
+    AND role_archived_at IS NULL
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
 
@@ -53,14 +53,14 @@
                     <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                     <tr>
                         <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_name&order=<?php echo $disp; ?>">
-                                Role <?php if ($sort == 'user_role_name') { echo $order_icon; } ?>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_name&order=<?php echo $disp; ?>">
+                                Role <?php if ($sort == 'role_name') { echo $order_icon; } ?>
                             </a>
                         </th>
                         <th>Members</th>
                         <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role_is_admin&order=<?php echo $disp; ?>">
-                                Admin <?php if ($sort == 'user_role_is_admin') { echo $order_icon; } ?>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_is_admin&order=<?php echo $disp; ?>">
+                                Admin <?php if ($sort == 'role_is_admin') { echo $order_icon; } ?>
                             </a>
                         </th>
                         <th class="text-center">Action</th>
@@ -70,17 +70,17 @@
                     <?php
 
                     while ($row = mysqli_fetch_array($sql)) {
-                        $role_id = intval($row['user_role_id']);
-                        $role_name = nullable_htmlentities($row['user_role_name']);
-                        $role_description = nullable_htmlentities($row['user_role_description']);
-                        $role_admin = intval($row['user_role_is_admin']);
-                        $role_archived_at = nullable_htmlentities($row['user_role_archived_at']);
+                        $role_id = intval($row['role_id']);
+                        $role_name = nullable_htmlentities($row['role_name']);
+                        $role_description = nullable_htmlentities($row['role_description']);
+                        $role_admin = intval($row['role_is_admin']);
+                        $role_archived_at = nullable_htmlentities($row['role_archived_at']);
 
                         // Count number of users that have each role
-                        $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(users.user_id) FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL");
+                        $sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(user_id) FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL");
                         $role_user_count = mysqli_fetch_row($sql_role_user_count)[0];
 
-                        $sql_users = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL");
+                        $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL");
                         // Initialize an empty array to hold user names
                         $user_names = [];
 
@@ -90,7 +90,7 @@
                         }
 
                         // Convert the array of user names to a comma-separated string
-                        $user_names_string = implode(",", $user_names) ;
+                        $user_names_string = implode(",", $user_names);
 
                         if (empty($user_names_string)) {
                             $user_names_string = "-";

diff --git a/admin_settings_company.php b/admin_settings_company.php
@@ -12,7 +12,8 @@
 $company_city = nullable_htmlentities($row['company_city']);
 $company_state = nullable_htmlentities($row['company_state']);
 $company_zip = nullable_htmlentities($row['company_zip']);
-$company_phone = formatPhoneNumber($row['company_phone']);
+$company_phone_country_code = formatPhoneNumber($row['company_phone_country_code']);
+$company_phone = nullable_htmlentities(formatPhoneNumber($row['company_phone'], $company_phone_country_code));
 $company_email = nullable_htmlentities($row['company_email']);
 $company_website = nullable_htmlentities($row['company_website']);
 $company_logo = nullable_htmlentities($row['company_logo']);
@@ -110,13 +111,18 @@
                                 </div>
                             </div>
 
-                            <div class="form-group">
-                                <label>Phone</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                            <label>Phone</label>
+                            <div class="form-row">
+                                <div class="col-9">
+                                    <div class="form-group">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                                            </div>
+                                            <input type="tel" class="form-control col-2" name="phone_country_code" value="+<?php echo $company_phone_country_code; ?>" placeholder="Code" maxlength="4">
+                                            <input type="tel" class="form-control" name="phone" value="<?php echo $company_phone; ?>" placeholder="Phone Number" maxlength="200">
+                                        </div>
                                     </div>
-                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $company_phone; ?>">
                                 </div>
                             </div>
 
@@ -152,4 +158,3 @@
 
 <?php
 require_once "includes/footer.php";
-
diff --git a/admin_settings_default.php b/admin_settings_default.php
@@ -218,28 +218,6 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                <label>Phone Mask</label>
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-phone"></i></span>
-                    </div>
-                    <select class="form-control select2" name="phone_mask">
-                        <?php
-                            $sql = mysqli_query($mysqli, "SELECT config_phone_mask FROM settings WHERE company_id = 1");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $phone_mask = intval($row['config_phone_mask']);
-                            } ?>
-                            <option <?php if ($phone_mask == 1) { echo "selected"; }?> value=1>
-                                US Format - e.g. (412) 888-9999
-                            </option>
-                            <option <?php if ($phone_mask == 0) { echo "selected"; }?> value=0>
-                                Non-US Format - e.g. 4128889999
-                            </option>
-                    </select>
-                </div>
-            </div>
-
             <hr>
 
             <button type="submit" name="edit_default_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>

diff --git a/admin_settings_invoice.php b/admin_settings_invoice.php
@@ -77,7 +77,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="config_recurring_prefix" placeholder="Recurring Prefix" value="<?php echo nullable_htmlentities($config_recurring_prefix); ?>" required>
+                        <input type="text" class="form-control" name="config_recurring_invoice_prefix" placeholder="Recurring Invoice Prefix" value="<?php echo nullable_htmlentities($config_recurring_invoice_prefix); ?>" required>
                     </div>
                 </div>
 
@@ -87,7 +87,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
                         </div>
-                        <input type="number" min="0" class="form-control" name="config_recurring_next_number" placeholder="Next Recurring Number" value="<?php echo intval($config_recurring_next_number); ?>" required>
+                        <input type="number" min="0" class="form-control" name="config_recurring_invoice_next_number" placeholder="Next Recurring Invoice Number" value="<?php echo intval($config_recurring_invoice_next_number); ?>" required>
                     </div>
                 </div>
 

diff --git a/admin_settings_theme.php b/admin_settings_theme.php
@@ -19,7 +19,7 @@
 
                         ?>
 
-                        <div class="col-3 text-center mb-3">
+                        <div class="col-4 text-center mb-3">
                             <div class="form-group">
                                 <div class="custom-control custom-radio">
                                     <input class="custom-control-input" type="radio" onchange="this.form.submit()" id="customRadio<?php echo $theme_color; ?>" name="edit_theme_settings" value="<?php echo $theme_color; ?>" <?php if ($config_theme == $theme_color) { echo "checked"; } ?>>

diff --git a/admin_user.php b/admin_user.php
@@ -6,16 +6,13 @@
 
 require_once "includes/inc_all_admin.php";
 
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
 $sql = mysqli_query(
     $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings, user_roles
-    WHERE users.user_id = user_settings.user_id
-    AND user_settings.user_role = user_roles.user_role_id
-    AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
+    "SELECT SQL_CALC_FOUND_ROWS * FROM users
+    LEFT JOIN user_roles ON user_role_id = role_id
+    LEFT JOIN user_settings ON users.user_id = user_settings.user_id
+    WHERE (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
+    AND user_type = 1
     AND user_archived_at IS NULL
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
@@ -36,6 +33,7 @@
                 <div class="dropdown-menu">
                     <!--<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
                     <?php if ($num_rows[0] > 1) { ?>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#resetAllUserPassModal"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
                     <?php } ?>
@@ -55,9 +53,6 @@
                     </div>
                 </div>
                 <div class="col-md-8">
-                    <div class="float-right">
-                        <button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
-                    </div>
                 </div>
             </div>
         </form>
@@ -77,8 +72,8 @@
                         </a>
                     </th>
                     <th>
-                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_role&order=<?php echo $disp; ?>">
-                            Role <?php if ($sort == 'user_role') { echo $order_icon; } ?>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=role_name&order=<?php echo $disp; ?>">
+                            Role <?php if ($sort == 'role_name') { echo $order_icon; } ?>
                         </a>
                     </th>
                     <th>
@@ -116,8 +111,8 @@
                         $mfa_status_display = "<i class='fas fa-fw fa-lock text-success'></i>";
                     }
                     $user_config_force_mfa = intval($row['user_config_force_mfa']);
-                    $user_role = $row['user_role'];
-                    $user_role_display = nullable_htmlentities($row['user_role_name']);
+                    $user_role = intval($row['user_role_id']);
+                    $user_role_display = nullable_htmlentities($row['role_name']);
                     $user_initials = nullable_htmlentities(initials($user_name));
 
                     $sql_last_login = mysqli_query(
@@ -139,7 +134,7 @@
                     }
 
                     // Get User Client Access Permissions
-                    $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_permissions WHERE user_id = $user_id");
+                    $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id");
                     $client_access_array = [];
                     while ($row = mysqli_fetch_assoc($user_client_access_sql)) {
                         $client_access_array[] = intval($row['client_id']);
@@ -241,4 +236,4 @@ function generatePassword() {
 require_once "modals/admin_user_invite_modal.php";
 require_once "modals/admin_user_export_modal.php";
 require_once "modals/admin_user_all_reset_password_modal.php";
-require_once "includes/footer.php";
+require_once "includes/footer.php";