diff --git a/CHANGELOG.md b/CHANGELOG.md index b802af8a..3e0e60ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ This file documents all notable changes made to ITFlow. +## [25.03.1] + +### Fixed +- Phone number missing in various sections. +- Match Database. +- Client Export Only display licenses users and assets from the selected client only. + ## [25.03] ### Fixed diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 4edce4a8..bd91b576 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -22,7 +22,7 @@ $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_ $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); $contact_extension = nullable_htmlentities($row['contact_extension']); $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); -$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code)); +$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); $contact_email = nullable_htmlentities($row['contact_email']); $contact_photo = nullable_htmlentities($row['contact_photo']); $contact_pin = nullable_htmlentities($row['contact_pin']); diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php index 9e650361..339ed3ee 100644 --- a/ajax/ajax_contact_edit.php +++ b/ajax/ajax_contact_edit.php @@ -19,7 +19,7 @@ $contact_extension = nullable_htmlentities($row['contact_extension']); $contact_phone_country_code = nullable_htmlentities($row['contact_phone_country_code']); $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); -$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code)); +$contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); $contact_email = nullable_htmlentities($row['contact_email']); $contact_pin = nullable_htmlentities($row['contact_pin']); $contact_photo = nullable_htmlentities($row['contact_photo']); diff --git a/contact_details.php b/contact_details.php index f77f7051..f77ff726 100644 --- a/contact_details.php +++ b/contact_details.php @@ -32,7 +32,7 @@ if (isset($_GET['contact_id'])) { $contact_phone = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_phone_country_code)); $contact_extension = nullable_htmlentities($row['contact_extension']); $contact_mobile_country_code = nullable_htmlentities($row['contact_mobile_country_code']); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_phone'], $contact_mobile_country_code)); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row['contact_mobile'], $contact_mobile_country_code)); $contact_email = nullable_htmlentities($row['contact_email']); $contact_photo = nullable_htmlentities($row['contact_photo']); $contact_pin = nullable_htmlentities($row['contact_pin']); diff --git a/db.sql b/db.sql index e7e25b7d..724d1fb6 100644 --- a/db.sql +++ b/db.sql @@ -201,7 +201,7 @@ CREATE TABLE `asset_interfaces` ( `interface_ip` varchar(200) DEFAULT NULL, `interface_nat_ip` varchar(200) DEFAULT NULL, `interface_ipv6` varchar(200) DEFAULT NULL, - `interface_notes` text DEFAULT NULL, + `interface_notes` mediumtext DEFAULT NULL, `interface_primary` tinyint(1) DEFAULT 0, `interface_created_at` datetime NOT NULL DEFAULT current_timestamp(), `interface_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), @@ -224,7 +224,7 @@ DROP TABLE IF EXISTS `asset_notes`; CREATE TABLE `asset_notes` ( `asset_note_id` int(11) NOT NULL AUTO_INCREMENT, `asset_note_type` varchar(200) NOT NULL, - `asset_note` text DEFAULT NULL, + `asset_note` mediumtext DEFAULT NULL, `asset_note_created_by` int(11) NOT NULL, `asset_note_created_at` datetime NOT NULL DEFAULT current_timestamp(), `asset_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), @@ -459,7 +459,7 @@ DROP TABLE IF EXISTS `client_notes`; CREATE TABLE `client_notes` ( `client_note_id` int(11) NOT NULL AUTO_INCREMENT, `client_note_type` varchar(200) NOT NULL, - `client_note` text DEFAULT NULL, + `client_note` mediumtext DEFAULT NULL, `client_note_created_by` int(11) NOT NULL, `client_note_created_at` datetime NOT NULL DEFAULT current_timestamp(), `client_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), @@ -639,7 +639,7 @@ DROP TABLE IF EXISTS `contact_notes`; CREATE TABLE `contact_notes` ( `contact_note_id` int(11) NOT NULL AUTO_INCREMENT, `contact_note_type` varchar(200) NOT NULL, - `contact_note` text DEFAULT NULL, + `contact_note` mediumtext DEFAULT NULL, `contact_note_created_by` int(11) NOT NULL, `contact_note_created_at` datetime NOT NULL DEFAULT current_timestamp(), `contact_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), @@ -782,7 +782,7 @@ DROP TABLE IF EXISTS `custom_links`; CREATE TABLE `custom_links` ( `custom_link_id` int(11) NOT NULL AUTO_INCREMENT, `custom_link_name` varchar(200) NOT NULL, - `custom_link_description` text DEFAULT NULL, + `custom_link_description` mediumtext DEFAULT NULL, `custom_link_uri` varchar(500) NOT NULL, `custom_link_new_tab` tinyint(1) NOT NULL DEFAULT 0, `custom_link_icon` varchar(200) DEFAULT NULL, @@ -1292,7 +1292,7 @@ DROP TABLE IF EXISTS `project_templates`; CREATE TABLE `project_templates` ( `project_template_id` int(11) NOT NULL AUTO_INCREMENT, `project_template_name` varchar(200) NOT NULL, - `project_template_description` text DEFAULT NULL, + `project_template_description` mediumtext DEFAULT NULL, `project_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), `project_template_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `project_template_archived_at` datetime DEFAULT NULL, @@ -1403,14 +1403,14 @@ DROP TABLE IF EXISTS `racks`; CREATE TABLE `racks` ( `rack_id` int(11) NOT NULL AUTO_INCREMENT, `rack_name` varchar(200) NOT NULL, - `rack_description` text DEFAULT NULL, + `rack_description` mediumtext DEFAULT NULL, `rack_model` varchar(200) DEFAULT NULL, `rack_depth` varchar(50) DEFAULT NULL, `rack_type` varchar(50) DEFAULT NULL, `rack_units` int(11) NOT NULL, `rack_photo` varchar(200) DEFAULT NULL, `rack_physical_location` varchar(200) DEFAULT NULL, - `rack_notes` text DEFAULT NULL, + `rack_notes` mediumtext DEFAULT NULL, `rack_created_at` datetime NOT NULL DEFAULT current_timestamp(), `rack_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `rack_archived_at` datetime DEFAULT NULL, @@ -2175,7 +2175,7 @@ DROP TABLE IF EXISTS `ticket_templates`; CREATE TABLE `ticket_templates` ( `ticket_template_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_template_name` varchar(200) NOT NULL, - `ticket_template_description` text DEFAULT NULL, + `ticket_template_description` mediumtext DEFAULT NULL, `ticket_template_subject` varchar(500) DEFAULT NULL, `ticket_template_details` longtext DEFAULT NULL, `ticket_template_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -2498,4 +2498,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-26 11:13:46 +-- Dump completed on 2025-03-29 17:35:17 diff --git a/includes/app_version.php b/includes/app_version.php index 956cbfa0..c0e7e2c3 100644 --- a/includes/app_version.php +++ b/includes/app_version.php @@ -5,4 +5,4 @@ * Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month. */ -DEFINE("APP_VERSION", "25.03"); +DEFINE("APP_VERSION", "25.03.1"); diff --git a/post/user/client.php b/post/user/client.php index 4ab99da6..bd95eb32 100644 --- a/post/user/client.php +++ b/post/user/client.php @@ -641,7 +641,7 @@ if (isset($_POST["export_client_pdf"])) { $contact_phone = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_phone_country_code)); $contact_extension = nullable_htmlentities($row["contact_extension"]); $contact_mobile_country_code = nullable_htmlentities($row["contact_mobile_country_code"]); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_mobile_country_code)); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_mobile"], $contact_mobile_country_code)); $contact_email = nullable_htmlentities($row["contact_email"]); $client_website = nullable_htmlentities($row["client_website"]); @@ -716,6 +716,8 @@ if (isset($_POST["export_client_pdf"])) { software ON software_contacts.software_id = software.software_id WHERE software_archived_at IS NULL AND contact_archived_at IS NULL + AND software_client_id = $client_id + AND contact_client_id = $client_id ORDER BY contact_name, software_name;" ); @@ -732,6 +734,8 @@ if (isset($_POST["export_client_pdf"])) { software ON software_assets.software_id = software.software_id WHERE software_archived_at IS NULL AND asset_archived_at IS NULL + AND software_client_id = $client_id + AND asset_client_id = $client_id ORDER BY asset_name, software_name;" ); @@ -825,7 +829,7 @@ if (isset($_POST["export_client_pdf"])) { $contact_extension = "x$contact_extension"; } $contact_mobile_country_code = nullable_htmlentities($row["contact_mobile_country_code"]); - $contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_phone"], $contact_mobile_country_code)); + $contact_mobile = nullable_htmlentities(formatPhoneNumber($row["contact_mobile"], $contact_mobile_country_code)); $html .= "