From 32d5e333c69da8af86c1f15d62c011c1841c88a9 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 10 Dec 2024 22:06:35 -0500 Subject: [PATCH] Renamed error_logs to app_logs, created app logs list view and renamed function logError to logApp, updated some of the log functions in cron and ticket mail parser to use the new appLog --- admin_app_log.php | 193 +++++++++++++++++++++++++++++++++++ admin_side_nav.php | 6 ++ cron.php | 14 +-- cron_ticket_email_parser.php | 4 +- database_updates.php | 22 +++- database_version.php | 2 +- db.sql | 35 ++++--- functions.php | 4 +- 8 files changed, 249 insertions(+), 31 deletions(-) create mode 100644 admin_app_log.php diff --git a/admin_app_log.php b/admin_app_log.php new file mode 100644 index 00000000..c03f5a24 --- /dev/null +++ b/admin_app_log.php @@ -0,0 +1,193 @@ + + +
+
+

App Logs

+
+
+
+
+
+
+ +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
" id="advancedFilter"> +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + +
+ + Timestamp + + + + Type + + + + Category + + + + Details + +
+
+ +
+
+ +Audit Logs

+
  • + + +

    App Logs

    +     +
  • diff --git a/cron.php b/cron.php index e53a4061..b9472d11 100644 --- a/cron.php +++ b/cron.php @@ -98,7 +98,7 @@ if ( $argv[1] !== $config_cron_key ) { */ //Logging -logAction("Cron", "Start", "Cron Started"); +logApp("Cron", "info", "Cron Started"); /* * ############################################################################################################### @@ -252,7 +252,7 @@ if ($tickets_pending_assignment > 0) { appNotify("Pending Tickets", "There are $tickets_pending_assignment new tickets pending assignment", "tickets.php?status=New"); // Logging - logAction("Cron", "Task", "Cron created notifications for new tickets that are pending assignment"); + logApp("Cron", "info", "Cron created notifications for new tickets that are pending assignment"); } // Recurring (Scheduled) tickets @@ -502,7 +502,8 @@ if ($config_send_invoice_reminders == 1) { appNotify("Mail", "Failed to send email to $contact_email"); - logAction("Mail", "Error", "Failed to send email to $contact_email regarding $subject. $mail"); + // Logging + logApp("Mail", "error", "Failed to send email to $contact_email regarding $subject. $mail"); } } @@ -626,7 +627,8 @@ while ($row = mysqli_fetch_array($sql_recurring)) { appNotify("Mail", "Failed to send email to $contact_email"); - logAction("Mail", "Error", "Failed to send email to $contact_email regarding $subject. $mail"); + // Logging + logApp("Mail", "error", "Failed to send email to $contact_email regarding $subject. $mail"); } @@ -704,7 +706,7 @@ while ($row = mysqli_fetch_array($sql_recurring_expenses)) { } //End Recurring Invoices Loop // Logging -logAction("Cron", "Task", "Cron created expenses from recurring expenses"); +logApp("Cron", "info", "Cron created expenses from recurring expenses"); // TELEMETRY @@ -978,4 +980,4 @@ if ($updates->current_version !== $updates->latest_version) { appNotify("Cron", "Cron successfully executed", "admin_audit_log.php"); // Logging -logAction("Cron", "Ended", "Cron executed successfully"); +logApp("Cron", "info", "Cron executed successfully"); diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index 0c4f3339..72618368 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -57,12 +57,12 @@ if (file_exists($lock_file_path)) { unlink($lock_file_path); // Logging - logAction("Cron-Email-Parser", "Delete", "Cron Email Parser detected a lock file was present but was over 5 minutes old so it removed it."); + logApp("Cron-Email-Parser", "warning", "Cron Email Parser detected a lock file was present but was over 5 minutes old so it removed it."); } else { // Logging - logAction("Cron-Email-Parser", "Locked", "Cron Email Parser attempted to execute but was already executing, so instead it terminated."); + logApp("Cron-Email-Parser", "warning", "Lock file present. Cron Email Parser attempted to execute but was already executing, so instead it terminated."); exit("Script is already running. Exiting."); } diff --git a/database_updates.php b/database_updates.php index a0d5e64a..7881074a 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2352,10 +2352,26 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.1'"); } - // if (CURRENT_DATABASE_VERSION == '1.7.1') { - // // Insert queries here required to update to DB version 1.7.2 + if (CURRENT_DATABASE_VERSION == '1.7.1') { + + mysqli_query($mysqli, "DROP TABLE `error_logs`"); + + mysqli_query($mysqli, "CREATE TABLE `app_logs` ( + `app_log_id` INT(11) NOT NULL AUTO_INCREMENT, + `app_log_category` VARCHAR(200) NULL DEFAULT NULL, + `app_log_type` ENUM('info', 'warning', 'error', 'debug') NOT NULL DEFAULT 'info', + `app_log_details` VARCHAR(1000) NULL DEFAULT NULL, + `app_log_created_at` DATETIME NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`app_log_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.2'"); + } + + // if (CURRENT_DATABASE_VERSION == '1.7.2') { + // // Insert queries here required to update to DB version 1.7.3 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.2'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.7.3'"); // } } else { diff --git a/database_version.php b/database_version.php index e726fef4..78e1fdd2 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.7.1"); +DEFINE("LATEST_DATABASE_VERSION", "1.7.2"); diff --git a/db.sql b/db.sql index 2e2ad7f6..03f740e2 100644 --- a/db.sql +++ b/db.sql @@ -56,6 +56,23 @@ CREATE TABLE `api_keys` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `app_logs` +-- + +DROP TABLE IF EXISTS `app_logs`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `app_logs` ( + `app_log_id` int(11) NOT NULL AUTO_INCREMENT, + `app_log_category` varchar(200) DEFAULT NULL, + `app_log_type` enum('info','warning','error','debug') NOT NULL DEFAULT 'info', + `app_log_details` varchar(1000) DEFAULT NULL, + `app_log_created_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`app_log_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `asset_custom` -- @@ -675,22 +692,6 @@ CREATE TABLE `email_queue` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `error_logs` --- - -DROP TABLE IF EXISTS `error_logs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `error_logs` ( - `error_log_id` int(11) NOT NULL AUTO_INCREMENT, - `error_log_type` varchar(200) NOT NULL, - `error_log_details` varchar(1000) DEFAULT NULL, - `error_log_created_at` datetime NOT NULL DEFAULT current_timestamp(), - PRIMARY KEY (`error_log_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `event_attendees` -- @@ -2289,4 +2290,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2024-12-10 17:46:44 +-- Dump completed on 2024-12-10 22:05:33 diff --git a/functions.php b/functions.php index 0c8573ab..f2d8ef83 100644 --- a/functions.php +++ b/functions.php @@ -1350,10 +1350,10 @@ function logAction($type, $action, $description, $client_id = 0, $entity_id = 0) mysqli_query($mysqli, "INSERT INTO logs SET log_type = '$type', log_action = '$action', log_description = '$description', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $entity_id"); } -function logError($type, $details) { +function logApp($category, $type, $details) { global $mysqli; - mysqli_query($mysqli, "INSERT INTO error_logs SET error_log_type = '$type', error_log_details = '$details'"); + mysqli_query($mysqli, "INSERT INTO app_logs SET app_log_category = '$category', app_log_type = '$type', app_log_details = '$details'"); } function logAuth($status, $details) {