Merge pull request #1177 from itflow-org/develop

Release v25.02.1
itflow-org · Mar 1, 2025 · 7e658ee · 7e658ee
2 parents bbee81c + 45b61ba
commit 7e658ee
Show file tree

Hide file tree

Showing 83 changed files with 2,235 additions and 827 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ xcustom/*
 !xcustom/readme.php
 post/xcustom
 !post/xcustom/readme.php
+.zed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [25.02.1]
+### Fixed
+- Resolved broken links in the client overview, project and client listings, and rack details.
+- Corrected asset transfer functionality to clients.
+- Fixed the ticket scheduling redirect.
+- Corrected the ticket link in the Scheduled Ticket Agent Notification email.
+- Addressed issues with credentials and ticket actions in the Contact Detail Modal.
+- Fixed text wrapping in notifications.
+- Adjusted notifications so that they are sorted with the newest first.
+- Fixed drag-and-drop functionality for tickets in the Kanban view on mobile devices.
+- Resolved a weird issue with TinyMCE that prevented using links referencing your ITFlow instance url.
+- Corrected image orientation issues during upload and the preview optimization process.
+
+### Added / Changed
+- Introduced entity link indicator icons and counts in the contacts and credentials section.
+- Implemented a fade animation for the new AJAX modal.
+- Removed the Client Overview Expire Day Select and replaced it with simplified 1, 7, or 45-day options.
+- Added the ability to link and unlink entities within asset details.
+- Introduced quick tag/category creation across the app.
+- Added a Vendor Quick Details Modal.
+- Enabled vendor linking and added a License Purchase Reference in the Software Licenses section.
+- Added download original, optimized and thumbnail option for images.
+- Added Paid status to the top corner of Invoice PDFs
+
 ## [25.02]
 ### Fixed
 - Migrated several reports to the new permissions/roles system

diff --git a/admin_settings_notification.php b/admin_settings_notification.php
@@ -37,7 +37,7 @@
                             <th>
                                 <div><i class="fas fa-fw fa-globe mr-2"></i>Domain Expiration Notice</div>
                                 <small class="text-muted">
-                                    (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
+                                    (This setting triggers a notification when a domain is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.)
                                 </small>
                             </th>
                             <td>
@@ -54,7 +54,7 @@
                             <th>
                                 <div><i class="fas fa-fw fa-lock mr-2"></i>Certificate Expiration Notice</div>
                                 <small class="text-muted">
-                                    (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
+                                    (This setting triggers a notification when a certificate is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.)
                                 </small>
                             </th>
                             <td>
@@ -67,7 +67,7 @@
                             <th>
                                 <div><i class="fas fa-fw fa-desktop mr-2"></i>Asset Warranty Expiration Notice</div>
                                 <small class="text-muted">
-                                    (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7, 14, 30 and 90 days prior to expiry.)
+                                    (This setting triggers a notification when an asset is approaching its expiration date, specifically at 1, 7 and 45 days prior to expiry.)
                                 </small>
                             </th>
                             <td>

diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php
@@ -121,9 +121,7 @@
         logins.login_note,
         logins.login_important,
         logins.login_contact_id,
-        logins.login_vendor_id,
-        logins.login_asset_id,
-        logins.login_software_id
+        logins.login_asset_id
     FROM logins
     LEFT JOIN login_tags ON login_tags.login_id = logins.login_id
     LEFT JOIN tags ON tags.tag_id = login_tags.tag_id
@@ -474,9 +472,7 @@ function updateAssetNotes(asset_id) {
                         $login_note = nullable_htmlentities($row['login_note']);
                         $login_important = intval($row['login_important']);
                         $login_contact_id = intval($row['login_contact_id']);
-                        $login_vendor_id = intval($row['login_vendor_id']);
                         $login_asset_id = intval($row['login_asset_id']);
-                        $login_software_id = intval($row['login_software_id']);
 
                         // Tags
                         $login_tag_name_display_array = array();
@@ -852,7 +848,11 @@ function updateAssetNotes(asset_id) {
 </div>
 
 <div class="modal-footer bg-white">
-    <a href="asset_details.php?<?php echo $client_url; ?>asset_id=<?php echo $asset_id; ?>" class="btn btn-primary text-bold"><span class="text-white">More Details</span></a>
+    <a href="asset_details.php?<?php echo $client_url; ?>asset_id=<?php echo $asset_id; ?>" class="btn btn-primary text-bold"><span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span></a>
+    <a href="#" class="btn btn-secondary" 
+        data-toggle="ajax-modal" data-ajax-url="ajax/ajax_asset_edit.php" data-ajax-id="<?php echo $asset_id; ?>">
+        <span class="text-white"><i class="fas fa-edit mr-2"></i>Edit</span>
+    </a>
     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
 </div>
 

diff --git a/ajax/ajax_category_add.php b/ajax/ajax_category_add.php
@@ -0,0 +1,43 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$category = nullable_htmlentities($_GET['category']);
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>New Category</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="type" value="<?php echo ($category); ?>">
+
+    <div class="modal-body bg-white">
+
+        <div class="form-row">
+
+            <div class="form-group col-sm-9">
+                <div class="input-group">
+                    <input type="text" class="form-control" name="name" placeholder="Category name" maxlength="200" required autofocus>
+                </div>
+            </div>
+
+            <div class="form-group col-sm-3">
+                <div class="input-group">
+                    <input type="color" class="form-control" name="color" required>
+                </div>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="add_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
diff --git a/ajax/ajax_certificate_edit.php b/ajax/ajax_certificate_edit.php
@@ -12,6 +12,7 @@
 $certificate_domain = nullable_htmlentities($row['certificate_domain']);
 $certificate_domain_id = intval($row['certificate_domain_id']);
 $certificate_issued_by = nullable_htmlentities($row['certificate_issued_by']);
+$certificate_public_key = nullable_htmlentities($row['certificate_public_key']);
 $certificate_expire = nullable_htmlentities($row['certificate_expire']);
 $certificate_created_at = nullable_htmlentities($row['certificate_created_at']);
 $client_id = intval($row['certificate_client_id']);

diff --git a/ajax/ajax_client_edit.php b/ajax/ajax_client_edit.php
@@ -125,6 +125,14 @@
                             }
                             ?>
                         </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button"
+                                data-toggle="ajax-modal"
+                                data-modal-size="sm"
+                                data-ajax-url="ajax/ajax_category_add.php?category=Referral">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
                     </div>
                 </div>
 
@@ -157,6 +165,15 @@
                             <?php } ?>
 
                         </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button"
+                                data-toggle="ajax-modal"
+                                data-modal-size="sm"
+                                data-ajax-url="ajax/ajax_tag_add.php"
+                                data-ajax-id="1">
+                                <i class="fas fa-fw fa-plus"></i>
+                            </button>
+                        </div>
                     </div>
                 </div>
 

diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php
@@ -402,7 +402,7 @@ function updateContactNotes(contact_id) {
         <?php } ?>
 
         <?php if ($credential_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-credentials<?php echo $asset_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-credentials<?php echo $contact_id; ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead>
@@ -446,9 +446,7 @@ function updateContactNotes(contact_id) {
                         $login_note = nullable_htmlentities($row['login_note']);
                         $login_important = intval($row['login_important']);
                         $login_contact_id = intval($row['login_contact_id']);
-                        $login_vendor_id = intval($row['login_vendor_id']);
                         $login_asset_id = intval($row['login_asset_id']);
-                        $login_software_id = intval($row['login_software_id']);
 
                         // Tags
                         $login_tag_name_display_array = array();
@@ -499,7 +497,7 @@ function updateContactNotes(contact_id) {
         <?php } ?>
 
         <?php if ($ticket_count) { ?>
-        <div class="tab-pane fade" id="pills-contact-tickets<?php echo $asset_id; ?>">
+        <div class="tab-pane fade" id="pills-contact-tickets<?php echo $contact_id; ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover table-sm">
                     <thead class="text-dark">
@@ -848,7 +846,13 @@ function updateContactNotes(contact_id) {
 </div>
 
 <div class="modal-footer bg-white">
-    <a href="contact_details.php?<?php echo $client_url; ?>contact_id=<?php echo $contact_id; ?>" class="btn btn-primary text-bold"><span class="text-white">More Details</span></a>
+    <a href="contact_details.php?<?php echo $client_url; ?>contact_id=<?php echo $contact_id; ?>" class="btn btn-primary text-bold">
+        <span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span>
+    </a>
+    <a href="#" class="btn btn-secondary" 
+        data-toggle="ajax-modal" data-ajax-url="ajax/ajax_contact_edit.php" data-ajax-id="<?php echo $contact_id; ?>">
+        <span class="text-white"><i class="fas fa-edit mr-2"></i>Edit</span>
+    </a>
     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Close</button>
 </div>
 

diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php
@@ -311,6 +311,15 @@
                             <?php } ?>
 
                         </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button"
+                                data-toggle="ajax-modal"
+                                data-modal-size="sm"
+                                data-ajax-url="ajax/ajax_tag_add.php"
+                                data-ajax-id="3">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
                     </div>
                 </div>
 

diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php
@@ -21,9 +21,7 @@
 $login_archived_at = nullable_htmlentities($row['login_archived_at']);
 $login_important = intval($row['login_important']);
 $login_contact_id = intval($row['login_contact_id']);
-$login_vendor_id = intval($row['login_vendor_id']);
 $login_asset_id = intval($row['login_asset_id']);
-$login_software_id = intval($row['login_software_id']);
 
 // Tags
 $login_tag_id_array = array();
@@ -189,28 +187,6 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Vendor</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                        </div>
-                        <select class="form-control select2" name="vendor">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql_vendors = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                            while ($row = mysqli_fetch_array($sql_vendors)) {
-                                $vendor_id_select = intval($row['vendor_id']);
-                                $vendor_name_select = nullable_htmlentities($row['vendor_name']);
-                                ?>
-                                <option <?php if ($login_vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Asset</label>
                     <div class="input-group">
@@ -240,28 +216,6 @@
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Software</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
-                        </div>
-                        <select class="form-control select2" name="software">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql_software = mysqli_query($mysqli, "SELECT software_id, software_name FROM software WHERE software_client_id = $client_id ORDER BY software_name ASC");
-                            while ($row = mysqli_fetch_array($sql_software)) {
-                                $software_id_select = intval($row['software_id']);
-                                $software_name_select = nullable_htmlentities($row['software_name']);
-                                ?>
-                                <option <?php if ($login_software_id == $software_id_select) { echo "selected"; } ?> value="<?php echo $software_id_select; ?>"><?php echo $software_name_select; ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
             </div>
 
             <div class="tab-pane fade" id="pills-login-notes<?php echo $login_id; ?>">
@@ -288,6 +242,15 @@
                             <?php } ?>
 
                         </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary" type="button"
+                                data-toggle="ajax-modal"
+                                data-modal-size="sm"
+                                data-ajax-url="ajax/ajax_tag_add.php"
+                                data-ajax-id="4">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
                     </div>
                 </div>