diff --git a/post/user/event.php b/post/user/event.php
index 74682ad2..c3f842dc 100644
--- a/post/user/event.php
+++ b/post/user/event.php
@@ -13,8 +13,8 @@ if (isset($_POST['add_calendar'])) {
 
     $calendar_id = mysqli_insert_id($mysqli);
 
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar', log_action = 'Create', log_description = '$session_name created calendar $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $calendar_id");
+    // Logging
+    logAction("Calendar", "Create", "$session_name created calendar $name", 0, $calendar_id);
 
     $_SESSION['alert_message'] = "Calendar <strong>$name</strong> created";
 
@@ -30,8 +30,8 @@ if (isset($_POST['edit_calendar'])) {
 
     mysqli_query($mysqli,"UPDATE calendars SET calendar_name = '$name', calendar_color = '$color' WHERE calendar_id = $calendar_id");
 
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar', log_action = 'Edit', log_description = '$session_name Edited calendar $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $calendar_id");
+    // Logging
+    logAction("Calendar", "Edit", "$session_name edited calendar $name", 0, $calendar_id);
 
     $_SESSION['alert_message'] = "Calendar <strong>$name</strong> edited";
 
@@ -96,16 +96,16 @@ if (isset($_POST['add_event'])) {
 
         // Logging for email (success/fail)
         if ($mail === true) {
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Email', log_description = '$session_name emailed event $title to $contact_name from client $client_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client, log_user_id = $session_user_id, log_entity_id = $event_id");
+            logAction("Calendar Event", "Email", "$session_name emailed event $title to $contact_name from client $client_name", $client, $event_id);
         } else {
-            mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email'");
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+            appNotify("Mail", "Failed to send email to $contact_email");
+            logAction("Mail", "Error", "Failed to send email to $contact_email regarding $subject. $mail");
         }
 
     } // End mail IF
 
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Create', log_description = '$session_name created a calendar event titled $title in calendar $calendar_name', log_ip = '$session_ip', log_client_id = $client, log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $event_id");
+    // Logging
+    logAction("Calendar Event", "Create", "$session_name created a calendar event titled $title in calendar $calendar_name", $client, $event_id);
 
     $_SESSION['alert_message'] = "Event <strong>$title</strong> created in calendar <strong>$calendar_name</strong>";
 
@@ -164,18 +164,18 @@ if (isset($_POST['edit_event'])) {
         $mail = addToMailQueue($mysqli, $data);
         // Logging for email (success/fail)
         if ($mail === true) {
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar_Event', log_action = 'Email', log_description = '$session_name Emailed modified event $title to $client_name email $client_email', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+            logAction("Calendar Event", "Email", "$session_name Emailed modified event $title to $contact_name email $contact_email", $client, $event_id);
         } else {
-            mysqli_query($mysqli,"INSERT INTO notifications SET notification_type = 'Mail', notification = 'Failed to send email to $contact_email'");
-            mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Mail', log_action = 'Error', log_description = 'Failed to send email to $contact_email regarding $subject. $mail', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+            appNotify("Mail", "Failed to send email to $contact_email");
+            logAction("Mail", "Error", "Failed to send email to $contact_email regarding $subject. $mail");
         }
 
     } // End mail IF
 
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Modify', log_description = '$session_name modified calendar event $title', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client, log_user_id = $session_user_id, log_entity_id = $event_id");
+    logAction("Calendar Event", "Edit", "$session_name edited calendar event $title", $client, $event_id);
 
-    $_SESSION['alert_message'] = "Calendar event titled <strong>$title</strong> updated";
+    $_SESSION['alert_message'] = "Calendar event titled <strong>$title</strong> edited";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
@@ -192,8 +192,8 @@ if (isset($_GET['delete_event'])) {
 
     mysqli_query($mysqli,"DELETE FROM events WHERE event_id = $event_id");
 
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Calendar Event', log_action = 'Delete', log_description = '$session_name deleted calendar event titled $event_title', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id");
+    // Logging
+    logAction("Calendar Event", "Delete", "$session_name deleted calendar event $event_title", $client_id);
 
     $_SESSION['alert_type'] = "error";
     $_SESSION['alert_message'] = "Calendar event titled <strong>$event_title</strong> deleted";