From f77bd4f0c643d988ea5e64b764344e016a34ceda Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 4 Mar 2026 17:09:13 -0500 Subject: [PATCH] Calendar: Add Delete Calendar, rename System calendar to Built-in calendar with builtin calendar names, moved calendar select on top for both edit / add event --- agent/calendar.php | 91 ++++++++++++++----- agent/modals/calendar/calendar_event_add.php | 20 ++-- agent/modals/calendar/calendar_event_edit.php | 24 ++--- agent/post/event.php | 25 +++++ 4 files changed, 113 insertions(+), 47 deletions(-) diff --git a/agent/calendar.php b/agent/calendar.php index 228917bc..c08f56e1 100644 --- a/agent/calendar.php +++ b/agent/calendar.php @@ -30,43 +30,84 @@ if (isset($_GET['calendar_id'])) {
-
-

Calendars

+
+

Custom Calendars

- +
+ +
+ -
- -
- - +
+ + Rename + + +
+ + Delete + + +
- -
+
+ +
-
-

System Calendars

-
- -
+
+

Built-in Calendars

+
+ Invoices +
+ +
+ Quotes +
+ +
+ Tickets (Created) +
+ +
+ Recurring Tickets +
+ +
+ Tickets (Scheduled) +
+ +
+ Vendors +
+ + + +
+ Clients +
+ + +
diff --git a/agent/modals/calendar/calendar_event_add.php b/agent/modals/calendar/calendar_event_add.php index 4ff3549e..671dbe29 100644 --- a/agent/modals/calendar/calendar_event_add.php +++ b/agent/modals/calendar/calendar_event_add.php @@ -29,16 +29,6 @@
-
- -
-
- -
- -
-
-
@@ -62,6 +52,16 @@
+
+ +
+
+ +
+ +
+
+
diff --git a/agent/modals/calendar/calendar_event_edit.php b/agent/modals/calendar/calendar_event_edit.php index 234bb0a9..0f1ad846 100644 --- a/agent/modals/calendar/calendar_event_edit.php +++ b/agent/modals/calendar/calendar_event_edit.php @@ -22,7 +22,7 @@ $client_id = intval($row['event_client_id']); ob_start(); ?>
-
+
Editing:
@@ -36,7 +36,7 @@ ob_start();
  • - Event + Event
  • Details @@ -52,16 +52,6 @@ ob_start();
    -
    - -
    -
    - -
    - -
    -
    -
    @@ -84,6 +74,16 @@ ob_start();
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/agent/post/event.php b/agent/post/event.php index 377bee1d..78d58d48 100644 --- a/agent/post/event.php +++ b/agent/post/event.php @@ -43,6 +43,31 @@ if (isset($_POST['edit_calendar'])) { } +if (isset($_GET['delete_calendar'])) { + + validateCSRFToken($_GET['csrf_token']); + + $calendar_id = intval($_GET['delete_calendar']); + + // Get Calendar Name + $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE calendar_id = $calendar_id"); + $row = mysqli_fetch_assoc($sql); + $calendar_name = sanitizeInput($row['calendar_name']); + + // Delete Calendar + mysqli_query($mysqli,"DELETE FROM calendars WHERE calendar_id = $calendar_id"); + + // Delete Events + mysqli_query($mysqli,"DELETE FROM calendar_events WHERE event_calendar_id = $calendar_id"); + + logAction("Calendar", "Delete", "$session_name deleted calendar $calendar_name and associated events"); + + flash_alert("Calendar $calendar_name deleted", 'error'); + + redirect(); + +} + if (isset($_POST['add_event'])) { validateCSRFToken($_POST['csrf_token']);