โฐ
-
Ticket Controls
-
-
-
-
-
`;
- const hamburgerEditButton = hamburgerMenu.querySelector('#hamburgerEditButton');
- if (hamburgerEditButton) {
- hamburgerEditButton.addEventListener('click', toggleHamburgerEditMode);
- }
-
- document.addEventListener('keydown', (event) => {
- if (event.key === 'Escape') {
- cancelHamburgerEdit();
- }
- });
+ console.log('Ticket hamburger menu HTML created');
+
+ // Add inline editing functionality
+ setupInlineEditing(hamburgerMenu);
} else {
+ console.log('Creating dashboard hamburger menu');
+
+ // Dashboard hamburger menu (your existing code)
hamburgerMenu.innerHTML = `
โฐ
@@ -596,38 +519,60 @@ function createHamburgerMenu() {
`;
- // Populate categories and types from data attributes
+ // Get current URL parameters
+ const urlParams = new URLSearchParams(window.location.search);
+ const currentCategories = urlParams.get('category') ? urlParams.get('category').split(',') : [];
+ const currentTypes = urlParams.get('type') ? urlParams.get('type').split(',') : [];
+
+ // Get containers
const categoriesContainer = hamburgerMenu.querySelector('#category-filters');
const typesContainer = hamburgerMenu.querySelector('#type-filters');
+ // Get data from body attributes
const categories = JSON.parse(document.body.dataset.categories || '[]');
const types = JSON.parse(document.body.dataset.types || '[]');
// Create checkboxes for categories
categories.forEach(category => {
const label = document.createElement('label');
+ label.style.display = 'block';
+ label.style.marginBottom = '5px';
+
const checkbox = document.createElement('input');
checkbox.type = 'checkbox';
checkbox.value = category;
checkbox.name = 'category';
+
+ const isChecked = currentCategories.includes(category);
+
label.appendChild(checkbox);
- label.appendChild(document.createTextNode(category));
+ label.appendChild(document.createTextNode(' ' + category));
categoriesContainer.appendChild(label);
+
+ checkbox.checked = isChecked;
});
// Create checkboxes for types
types.forEach(type => {
const label = document.createElement('label');
+ label.style.display = 'block';
+ label.style.marginBottom = '5px';
+
const checkbox = document.createElement('input');
checkbox.type = 'checkbox';
checkbox.value = type;
checkbox.name = 'type';
+
+ const isChecked = currentTypes.includes(type);
+
label.appendChild(checkbox);
- label.appendChild(document.createTextNode(type));
+ label.appendChild(document.createTextNode(' ' + type));
typesContainer.appendChild(label);
+
+ checkbox.checked = isChecked;
});
- // Apply filters
+ // Apply filters event
const applyFiltersBtn = hamburgerMenu.querySelector('#apply-filters');
applyFiltersBtn.addEventListener('click', () => {
const selectedCategories = Array.from(
@@ -638,7 +583,6 @@ function createHamburgerMenu() {
typesContainer.querySelectorAll('input:checked')
).map(cb => cb.value);
- // Construct URL with filters
const params = new URLSearchParams(window.location.search);
if (selectedCategories.length > 0) {
@@ -653,37 +597,275 @@ function createHamburgerMenu() {
params.delete('type');
}
- // Reload with new filters
+ params.set('page', '1');
window.location.search = params.toString();
});
- // Clear filters
+ // Clear filters event
const clearFiltersBtn = hamburgerMenu.querySelector('#clear-filters');
clearFiltersBtn.addEventListener('click', () => {
const params = new URLSearchParams(window.location.search);
params.delete('category');
params.delete('type');
+ params.set('page', '1');
window.location.search = params.toString();
});
}
+
+ console.log('Adding hamburger menu to body');
+
// Add to body
document.body.appendChild(hamburgerMenu);
+
+ console.log('Hamburger menu added, setting up event listeners');
// Toggle hamburger menu
const hamburgerIcon = hamburgerMenu.querySelector('.hamburger-icon');
const hamburgerContent = hamburgerMenu.querySelector('.hamburger-content');
- hamburgerIcon.addEventListener('click', () => {
- hamburgerContent.classList.toggle('open');
- document.body.classList.toggle('menu-open');
- });
+
+ if (hamburgerIcon && hamburgerContent) {
+ hamburgerIcon.addEventListener('click', () => {
+ console.log('Hamburger icon clicked');
+ hamburgerContent.classList.toggle('open');
+ document.body.classList.toggle('menu-open');
+ });
- // Close hamburger menu
- const closeButton = hamburgerMenu.querySelector('.close-hamburger');
- closeButton.addEventListener('click', () => {
- hamburgerContent.classList.remove('open');
- document.body.classList.remove('menu-open');
+ // Close hamburger menu
+ const closeButton = hamburgerMenu.querySelector('.close-hamburger');
+ if (closeButton) {
+ closeButton.addEventListener('click', () => {
+ console.log('Close button clicked');
+ hamburgerContent.classList.remove('open');
+ document.body.classList.remove('menu-open');
+ });
+ }
+
+ console.log('Hamburger menu created successfully');
+ } else {
+ console.error('Failed to find hamburger icon or content');
+ }
+}
+
+function setupInlineEditing(hamburgerMenu) {
+ const editableFields = hamburgerMenu.querySelectorAll('.editable-field');
+
+ editableFields.forEach(field => {
+ const valueSpan = field.querySelector('.editable-value');
+ const dropdown = field.querySelector('.edit-dropdown');
+ const select = field.querySelector('.field-select');
+ const saveBtn = field.querySelector('.save-btn');
+ const cancelBtn = field.querySelector('.cancel-btn');
+ const fieldName = field.dataset.field;
+
+ // Make value span clickable
+ valueSpan.style.cursor = 'pointer';
+ valueSpan.style.padding = '4px 8px';
+ valueSpan.style.borderRadius = '4px';
+ valueSpan.style.transition = 'background-color 0.2s';
+
+ // Hover effect
+ valueSpan.addEventListener('mouseenter', () => {
+ valueSpan.style.backgroundColor = 'var(--hover-bg, #f0f0f0)';
+ });
+
+ valueSpan.addEventListener('mouseleave', () => {
+ if (dropdown.style.display === 'none') {
+ valueSpan.style.backgroundColor = 'transparent';
+ }
+ });
+
+ // Click to edit
+ valueSpan.addEventListener('click', () => {
+ dropdown.style.display = 'block';
+ valueSpan.style.backgroundColor = 'var(--hover-bg, #f0f0f0)';
+ select.focus();
+ });
+
+ // Save changes
+ saveBtn.addEventListener('click', () => {
+ const newValue = select.value;
+ const oldValue = valueSpan.dataset.current;
+
+ if (newValue !== oldValue) {
+ saveFieldChange(fieldName, newValue, valueSpan, dropdown);
+ } else {
+ cancelEdit(valueSpan, dropdown);
+ }
+ });
+
+ // Cancel changes
+ cancelBtn.addEventListener('click', () => {
+ select.value = valueSpan.dataset.current;
+ cancelEdit(valueSpan, dropdown);
+ });
+
+ // Cancel on escape key
+ select.addEventListener('keydown', (e) => {
+ if (e.key === 'Escape') {
+ select.value = valueSpan.dataset.current;
+ cancelEdit(valueSpan, dropdown);
+ } else if (e.key === 'Enter') {
+ saveBtn.click();
+ }
+ });
+
+ // Cancel when clicking outside
+ document.addEventListener('click', (e) => {
+ if (!field.contains(e.target) && dropdown.style.display === 'block') {
+ select.value = valueSpan.dataset.current;
+ cancelEdit(valueSpan, dropdown);
+ }
+ });
});
}
-// Add to DOMContentLoaded
-document.addEventListener('DOMContentLoaded', createHamburgerMenu);
+function saveFieldChange(fieldName, newValue, valueSpan, dropdown) {
+ if (!window.ticketData) {
+ console.error('No ticket data available');
+ return;
+ }
+
+ const data = {
+ ticket_id: parseInt(window.ticketData.id),
+ [fieldName]: fieldName === 'priority' ? parseInt(newValue) : newValue
+ };
+
+ console.log('Saving field change:', data);
+
+ // Show loading state
+ valueSpan.style.opacity = '0.6';
+
+ fetch('/api/update_ticket.php', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(data)
+ })
+ .then(response => {
+ return response.text().then(text => {
+ try {
+ return JSON.parse(text);
+ } catch (e) {
+ throw new Error('Invalid JSON response: ' + text);
+ }
+ });
+ })
+ .then(result => {
+ console.log('Update result:', result);
+ if (result.success) {
+ // Update the hamburger menu display
+ if (fieldName === 'priority') {
+ valueSpan.textContent = 'P' + newValue;
+ } else {
+ valueSpan.textContent = newValue;
+ }
+
+ valueSpan.dataset.current = newValue;
+
+ // Update window.ticketData
+ window.ticketData[fieldName] = fieldName === 'priority' ? parseInt(newValue) : newValue;
+
+ // Update main page elements
+ if (fieldName === 'status') {
+ const statusDisplay = document.getElementById('statusDisplay');
+ if (statusDisplay) {
+ // Remove all existing status classes
+ statusDisplay.className = statusDisplay.className.replace(/status-\S+/g, '').trim();
+
+ // Create the correct CSS class name to match your CSS
+ // "Open" -> "status-Open"
+ // "In Progress" -> "status-In-Progress"
+ // "Closed" -> "status-Closed"
+ const cssClass = newValue.replace(/\s+/g, '-'); // "In Progress" -> "In-Progress"
+ const fullClassName = `status-${cssClass}`;
+
+ statusDisplay.className = fullClassName;
+ statusDisplay.textContent = newValue;
+
+ console.log('Updated status display class to:', fullClassName);
+ console.log('Status display element:', statusDisplay);
+ }
+ }
+
+ if (fieldName === 'priority') {
+ const priorityDisplay = document.querySelector('.priority-indicator');
+ if (priorityDisplay) {
+ // Remove all priority classes first
+ priorityDisplay.className = priorityDisplay.className.replace(/priority-\d+/g, '');
+ priorityDisplay.className = `priority-indicator priority-${newValue}`;
+ priorityDisplay.textContent = 'P' + newValue;
+ }
+
+ // Update the ticket container's data-priority attribute for styling
+ const ticketContainer = document.querySelector('.ticket-container');
+ if (ticketContainer) {
+ ticketContainer.setAttribute('data-priority', newValue);
+ }
+ }
+
+ console.log('Field updated successfully');
+ cancelEdit(valueSpan, dropdown);
+
+ } else {
+ console.error('Error updating field:', result.error || 'Unknown error');
+ alert('Error updating ' + fieldName + ': ' + (result.error || 'Unknown error'));
+ cancelEdit(valueSpan, dropdown);
+ }
+ })
+ .catch(error => {
+ console.error('Error updating field:', error);
+ alert('Error updating ' + fieldName + ': ' + error.message);
+ cancelEdit(valueSpan, dropdown);
+ })
+ .finally(() => {
+ valueSpan.style.opacity = '1';
+ });
+}
+
+function cancelEdit(valueSpan, dropdown) {
+ dropdown.style.display = 'none';
+ valueSpan.style.backgroundColor = 'transparent';
+}
+
+
+// Ticket page functions (if needed)
+function saveTicket() {
+ const editables = document.querySelectorAll('.editable');
+ const data = {};
+
+ let ticketId;
+ if (window.location.href.includes('?id=')) {
+ ticketId = window.location.href.split('id=')[1];
+ } else {
+ const matches = window.location.pathname.match(/\/ticket\/(\d+)/);
+ ticketId = matches ? matches[1] : null;
+ }
+
+ editables.forEach(field => {
+ if (field.dataset.field) {
+ data[field.dataset.field] = field.value;
+ }
+ });
+
+ fetch('/api/update_ticket.php', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ ticket_id: ticketId,
+ ...data
+ })
+ })
+ .then(response => response.json())
+ .then(data => {
+ if(data.success) {
+ const statusDisplay = document.getElementById('statusDisplay');
+ if (statusDisplay) {
+ statusDisplay.className = `status-${data.status}`;
+ statusDisplay.textContent = data.status;
+ }
+ }
+ });
+}
\ No newline at end of file
diff --git a/assets/js/ticket.js b/assets/js/ticket.js
index a5280ea..30720c7 100644
--- a/assets/js/ticket.js
+++ b/assets/js/ticket.js
@@ -25,12 +25,6 @@ function saveTicket() {
// Use the correct API path
const apiUrl = '/api/update_ticket.php';
- console.log('Sending request to:', apiUrl);
- console.log('Sending data:', JSON.stringify({
- ticket_id: ticketId,
- ...data
- }));
-
fetch(apiUrl, {
method: 'POST',
headers: {
@@ -42,7 +36,6 @@ function saveTicket() {
})
})
.then(response => {
- console.log('Response status:', response.status);
if (!response.ok) {
return response.text().then(text => {
console.error('Server response:', text);
@@ -52,7 +45,6 @@ function saveTicket() {
return response.json();
})
.then(data => {
- console.log('Response data:', data);
if(data.success) {
const statusDisplay = document.getElementById('statusDisplay');
if (statusDisplay) {
@@ -141,6 +133,22 @@ function addComment() {
// Clear the comment box
document.getElementById('newComment').value = '';
+ // Format the comment text for display
+ let displayText;
+ if (isMarkdownEnabled) {
+ // For markdown, use marked.parse
+ displayText = marked.parse(commentText);
+ } else {
+ // For non-markdown, convert line breaks to
and escape HTML
+ displayText = commentText
+ .replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''')
+ .replace(/\n/g, '
');
+ }
+
// Add new comment to the list
const commentsList = document.querySelector('.comments-list');
const newComment = `
@@ -149,9 +157,7 @@ function addComment() {
-
+
`;
commentsList.insertAdjacentHTML('afterbegin', newComment);
@@ -180,9 +186,17 @@ function togglePreview() {
}
function updatePreview() {
- const preview = document.getElementById('markdownPreview');
- const textarea = document.getElementById('newComment');
- preview.innerHTML = marked.parse(textarea.value);
+ const commentText = document.getElementById('newComment').value;
+ const previewDiv = document.getElementById('markdownPreview');
+ const isMarkdownEnabled = document.getElementById('markdownMaster').checked;
+
+ if (isMarkdownEnabled && commentText.trim()) {
+ // For markdown preview, use marked.parse which handles line breaks correctly
+ previewDiv.innerHTML = marked.parse(commentText);
+ previewDiv.style.display = 'block';
+ } else {
+ previewDiv.style.display = 'none';
+ }
}
function toggleMarkdownMode() {
diff --git a/config/config.php b/config/config.php
index 962a570..f5c7898 100644
--- a/config/config.php
+++ b/config/config.php
@@ -9,7 +9,8 @@ $GLOBALS['config'] = [
'DB_USER' => $envVars['DB_USER'] ?? 'root',
'DB_PASS' => $envVars['DB_PASS'] ?? '',
'DB_NAME' => $envVars['DB_NAME'] ?? 'tinkertickets',
- 'BASE_URL' => '/tinkertickets', // Application base URL
+ 'BASE_URL' => '', // Empty since we're serving from document root
'ASSETS_URL' => '/assets', // Assets URL
'API_URL' => '/api' // API URL
-];
\ No newline at end of file
+];
+?>
\ No newline at end of file
diff --git a/controllers/DashboardController.php b/controllers/DashboardController.php
index 32f9355..b0c7dd9 100644
--- a/controllers/DashboardController.php
+++ b/controllers/DashboardController.php
@@ -3,8 +3,10 @@ require_once 'models/TicketModel.php';
class DashboardController {
private $ticketModel;
+ private $conn;
public function __construct($conn) {
+ $this->conn = $conn;
$this->ticketModel = new TicketModel($conn);
}
@@ -12,12 +14,27 @@ class DashboardController {
// Get query parameters
$page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
$limit = isset($_COOKIE['ticketsPerPage']) ? (int)$_COOKIE['ticketsPerPage'] : 15;
- $status = isset($_GET['status']) ? $_GET['status'] : 'Open';
- $sortColumn = isset($_COOKIE['defaultSortColumn']) ? $_COOKIE['defaultSortColumn'] : 'ticket_id';
- $sortDirection = isset($_COOKIE['sortDirection']) ? $_COOKIE['sortDirection'] : 'desc';
+ $sortColumn = isset($_GET['sort']) ? $_GET['sort'] : 'ticket_id';
+ $sortDirection = isset($_GET['dir']) ? $_GET['dir'] : 'desc';
+ $category = isset($_GET['category']) ? $_GET['category'] : null;
+ $type = isset($_GET['type']) ? $_GET['type'] : null;
- // Get tickets with pagination
- $result = $this->ticketModel->getAllTickets($page, $limit, $status, $sortColumn, $sortDirection);
+ // Handle status filtering
+ $status = null;
+ if (isset($_GET['status']) && !empty($_GET['status'])) {
+ $status = $_GET['status'];
+ } else if (!isset($_GET['show_all'])) {
+ // Default: show Open and In Progress (exclude Closed)
+ $status = 'Open,In Progress';
+ }
+ // If $_GET['show_all'] exists or no status param with show_all, show all tickets (status = null)
+
+ // Get tickets with pagination and sorting
+ $result = $this->ticketModel->getAllTickets($page, $limit, $status, $sortColumn, $sortDirection, $category, $type);
+
+ // Get categories and types for filters
+ $categories = $this->getCategories();
+ $types = $this->getTypes();
// Extract data for the view
$tickets = $result['tickets'];
@@ -27,4 +44,25 @@ class DashboardController {
// Load the dashboard view
include 'views/DashboardView.php';
}
-}
\ No newline at end of file
+
+ private function getCategories() {
+ $sql = "SELECT DISTINCT category FROM tickets WHERE category IS NOT NULL ORDER BY category";
+ $result = $this->conn->query($sql);
+ $categories = [];
+ while($row = $result->fetch_assoc()) {
+ $categories[] = $row['category'];
+ }
+ return $categories;
+ }
+
+ private function getTypes() {
+ $sql = "SELECT DISTINCT type FROM tickets WHERE type IS NOT NULL ORDER BY type";
+ $result = $this->conn->query($sql);
+ $types = [];
+ while($row = $result->fetch_assoc()) {
+ $types[] = $row['type'];
+ }
+ return $types;
+ }
+}
+?>
\ No newline at end of file
diff --git a/controllers/TicketController.php b/controllers/TicketController.php
index 67207f3..2f8ea2b 100644
--- a/controllers/TicketController.php
+++ b/controllers/TicketController.php
@@ -6,10 +6,24 @@ require_once dirname(__DIR__) . '/models/CommentModel.php';
class TicketController {
private $ticketModel;
private $commentModel;
+ private $envVars;
public function __construct($conn) {
$this->ticketModel = new TicketModel($conn);
$this->commentModel = new CommentModel($conn);
+
+ // Load environment variables for Discord webhook
+ $envPath = dirname(__DIR__) . '/.env';
+ $this->envVars = [];
+ if (file_exists($envPath)) {
+ $lines = file($envPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ foreach ($lines as $line) {
+ if (strpos($line, '=') !== false && strpos($line, '#') !== 0) {
+ list($key, $value) = explode('=', $line, 2);
+ $this->envVars[trim($key)] = trim($value);
+ }
+ }
+ }
}
public function view($id) {
@@ -22,8 +36,8 @@ class TicketController {
return;
}
- // Get comments for this ticket
- $comments = $this->ticketModel->getTicketComments($id);
+ // Get comments for this ticket using CommentModel
+ $comments = $this->commentModel->getCommentsByTicketId($id);
// Load the view
include dirname(__DIR__) . '/views/TicketView.php';
@@ -51,8 +65,11 @@ class TicketController {
$result = $this->ticketModel->createTicket($ticketData);
if ($result['success']) {
+ // Send Discord webhook notification for new ticket
+ $this->sendDiscordWebhook($result['ticket_id'], $ticketData);
+
// Redirect to the new ticket
- header("Location: /tinkertickets/ticket/" . $result['ticket_id']);
+ header("Location: " . $GLOBALS['config']['BASE_URL'] . "/ticket/" . $result['ticket_id']);
exit;
} else {
$error = $result['error'];
@@ -66,32 +83,17 @@ class TicketController {
}
public function update($id) {
- // Debug function
- $debug = function($message, $data = null) {
- $log_message = date('Y-m-d H:i:s') . " - [Controller] " . $message;
- if ($data !== null) {
- $log_message .= ": " . (is_string($data) ? $data : json_encode($data));
- }
- $log_message .= "\n";
- file_put_contents('/tmp/api_debug.log', $log_message, FILE_APPEND);
- };
-
// Check if this is an AJAX request
- $debug("Request method", $_SERVER['REQUEST_METHOD']);
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
// For AJAX requests, get JSON data
$input = file_get_contents('php://input');
- $debug("Raw input", $input);
$data = json_decode($input, true);
- $debug("Decoded data", $data);
// Add ticket_id to the data
$data['ticket_id'] = $id;
- $debug("Added ticket_id to data", $id);
// Validate input data
if (empty($data['title'])) {
- $debug("Title is empty");
header('Content-Type: application/json');
echo json_encode([
'success' => false,
@@ -101,26 +103,16 @@ class TicketController {
}
// Update ticket
- $debug("Calling model updateTicket method");
- try {
- $result = $this->ticketModel->updateTicket($data);
- $debug("Model updateTicket result", $result);
- } catch (Exception $e) {
- $debug("Exception in model updateTicket", $e->getMessage());
- $debug("Stack trace", $e->getTraceAsString());
- throw $e;
- }
+ $result = $this->ticketModel->updateTicket($data);
// Return JSON response
header('Content-Type: application/json');
if ($result) {
- $debug("Update successful, sending success response");
echo json_encode([
'success' => true,
'status' => $data['status']
]);
} else {
- $debug("Update failed, sending error response");
echo json_encode([
'success' => false,
'error' => 'Failed to update ticket'
@@ -128,29 +120,90 @@ class TicketController {
}
} else {
// For direct access, redirect to view
- $debug("Not a POST request, redirecting");
header("Location: " . $GLOBALS['config']['BASE_URL'] . "/ticket/$id");
exit;
}
}
- public function index() {
- // Get query parameters
- $page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
- $limit = isset($_COOKIE['ticketsPerPage']) ? (int)$_COOKIE['ticketsPerPage'] : 15;
- $status = isset($_GET['status']) ? $_GET['status'] : 'Open';
- $sortColumn = isset($_COOKIE['defaultSortColumn']) ? $_COOKIE['defaultSortColumn'] : 'ticket_id';
- $sortDirection = isset($_COOKIE['sortDirection']) ? $_COOKIE['sortDirection'] : 'desc';
+ private function sendDiscordWebhook($ticketId, $ticketData) {
+ if (!isset($this->envVars['DISCORD_WEBHOOK_URL']) || empty($this->envVars['DISCORD_WEBHOOK_URL'])) {
+ error_log("Discord webhook URL not configured, skipping webhook for ticket creation");
+ return;
+ }
- // Get tickets with pagination
- $result = $this->ticketModel->getAllTickets($page, $limit, $status, $sortColumn, $sortDirection);
+ $webhookUrl = $this->envVars['DISCORD_WEBHOOK_URL'];
- // Extract data for the view
- $tickets = $result['tickets'];
- $totalTickets = $result['total'];
- $totalPages = $result['pages'];
+ // Create ticket URL
+ $ticketUrl = "http://tinkertickets.local/ticket/$ticketId";
- // Load the dashboard view
- include 'views/DashboardView.php';
+ // Map priorities to Discord colors
+ $priorityColors = [
+ 1 => 0xff4d4d, // Red
+ 2 => 0xffa726, // Orange
+ 3 => 0x42a5f5, // Blue
+ 4 => 0x66bb6a, // Green
+ 5 => 0x9e9e9e // Gray
+ ];
+
+ $priority = (int)($ticketData['priority'] ?? 4);
+ $color = $priorityColors[$priority] ?? 0x3498db;
+
+ $embed = [
+ 'title' => '๐ซ New Ticket Created',
+ 'description' => "**#{$ticketId}** - " . $ticketData['title'],
+ 'url' => $ticketUrl,
+ 'color' => $color,
+ 'fields' => [
+ [
+ 'name' => 'Priority',
+ 'value' => 'P' . $priority,
+ 'inline' => true
+ ],
+ [
+ 'name' => 'Category',
+ 'value' => $ticketData['category'] ?? 'General',
+ 'inline' => true
+ ],
+ [
+ 'name' => 'Type',
+ 'value' => $ticketData['type'] ?? 'Issue',
+ 'inline' => true
+ ],
+ [
+ 'name' => 'Status',
+ 'value' => $ticketData['status'] ?? 'Open',
+ 'inline' => true
+ ]
+ ],
+ 'footer' => [
+ 'text' => 'Tinker Tickets'
+ ],
+ 'timestamp' => date('c')
+ ];
+
+ $payload = [
+ 'embeds' => [$embed]
+ ];
+
+ // Send webhook
+ $ch = curl_init($webhookUrl);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+
+ $webhookResult = curl_exec($ch);
+ $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ $curlError = curl_error($ch);
+ curl_close($ch);
+
+ if ($curlError) {
+ error_log("Discord webhook cURL error: $curlError");
+ } else {
+ error_log("Discord webhook sent for new ticket. HTTP Code: $httpCode");
+ }
}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/create_ticket_api.php b/create_ticket_api.php
index d91b63d..b65b274 100644
--- a/create_ticket_api.php
+++ b/create_ticket_api.php
@@ -180,7 +180,7 @@ $discord_data = [
"embeds" => [[
"title" => "New Ticket Created: #" . $ticket_id,
"description" => $title,
- "url" => "http://10.10.10.45/ticket.php?id=" . $ticket_id,
+ "url" => "http://tinkertickets.local/ticket/" . $ticket_id,
"color" => $priorityColors[$priority],
"fields" => [
["name" => "Priority", "value" => $priority, "inline" => true],
diff --git a/index.php b/index.php
index 7bfbdf4..80454c8 100644
--- a/index.php
+++ b/index.php
@@ -2,52 +2,64 @@
// Main entry point for the application
require_once 'config/config.php';
-// Parse the URL
+// Parse the URL - no need to remove base path since we're at document root
$request = $_SERVER['REQUEST_URI'];
-$basePath = '/tinkertickets'; // Adjust based on your installation path
-$request = str_replace($basePath, '', $request);
-// Create database connection
-$conn = new mysqli(
- $GLOBALS['config']['DB_HOST'],
- $GLOBALS['config']['DB_USER'],
- $GLOBALS['config']['DB_PASS'],
- $GLOBALS['config']['DB_NAME']
-);
+// Remove query string for routing (but keep it available)
+$requestPath = strtok($request, '?');
+
+// Create database connection for non-API routes
+if (!str_starts_with($requestPath, '/api/')) {
+ $conn = new mysqli(
+ $GLOBALS['config']['DB_HOST'],
+ $GLOBALS['config']['DB_USER'],
+ $GLOBALS['config']['DB_PASS'],
+ $GLOBALS['config']['DB_NAME']
+ );
+
+ if ($conn->connect_error) {
+ die("Connection failed: " . $conn->connect_error);
+ }
+}
// Simple router
switch (true) {
- case $request == '/' || $request == '':
+ case $requestPath == '/' || $requestPath == '':
require_once 'controllers/DashboardController.php';
$controller = new DashboardController($conn);
$controller->index();
break;
- case preg_match('/^\/ticket\?id=(\d+)$/', $request, $matches) ||
- preg_match('/^\/ticket\/(\d+)$/', $request, $matches):
+ case preg_match('/^\/ticket\/(\d+)$/', $requestPath, $matches):
require_once 'controllers/TicketController.php';
$controller = new TicketController($conn);
$controller->view($matches[1]);
break;
- case $request == '/ticket/create':
+ case $requestPath == '/ticket/create':
require_once 'controllers/TicketController.php';
$controller = new TicketController($conn);
$controller->create();
break;
- case preg_match('/^\/ticket\/(\d+)\/update$/', $request, $matches):
- require_once 'controllers/TicketController.php';
- $controller = new TicketController($conn);
- $controller->update($matches[1]);
+ // API Routes - these handle their own database connections
+ case $requestPath == '/api/update_ticket.php':
+ require_once 'api/update_ticket.php';
break;
- case preg_match('/^\/ticket\/(\d+)\/comment$/', $request, $matches):
- require_once 'controllers/CommentController.php';
- $controller = new CommentController($conn);
- $controller->addComment($matches[1]);
+ case $requestPath == '/api/add_comment.php':
+ require_once 'api/add_comment.php';
break;
+ // Legacy support for old URLs
+ case $requestPath == '/dashboard.php':
+ header("Location: /");
+ exit;
+
+ case preg_match('/^\/ticket\.php/', $requestPath) && isset($_GET['id']):
+ header("Location: /ticket/" . $_GET['id']);
+ exit;
+
default:
// 404 Not Found
header("HTTP/1.0 404 Not Found");
@@ -55,4 +67,8 @@ switch (true) {
break;
}
-$conn->close();
\ No newline at end of file
+// Close database connection if it was opened
+if (isset($conn)) {
+ $conn->close();
+}
+?>
\ No newline at end of file
diff --git a/models/CommentModel.php b/models/CommentModel.php
index 47a74f4..5455210 100644
--- a/models/CommentModel.php
+++ b/models/CommentModel.php
@@ -9,7 +9,7 @@ class CommentModel {
public function getCommentsByTicketId($ticketId) {
$sql = "SELECT * FROM ticket_comments WHERE ticket_id = ? ORDER BY created_at DESC";
$stmt = $this->conn->prepare($sql);
- $stmt->bind_param("i", $ticketId);
+ $stmt->bind_param("s", $ticketId); // Changed to string since ticket_id is varchar
$stmt->execute();
$result = $stmt->get_result();
@@ -31,11 +31,14 @@ class CommentModel {
$username = $commentData['user_name'] ?? 'User';
$markdownEnabled = isset($commentData['markdown_enabled']) && $commentData['markdown_enabled'] ? 1 : 0;
+ // Preserve line breaks in the comment text
+ $commentText = $commentData['comment_text'];
+
$stmt->bind_param(
"sssi",
$ticketId,
$username,
- $commentData['comment_text'],
+ $commentText,
$markdownEnabled
);
@@ -44,7 +47,8 @@ class CommentModel {
'success' => true,
'user_name' => $username,
'created_at' => date('M d, Y H:i'),
- 'markdown_enabled' => $markdownEnabled
+ 'markdown_enabled' => $markdownEnabled,
+ 'comment_text' => $commentText
];
} else {
return [
@@ -53,4 +57,5 @@ class CommentModel {
];
}
}
-}
\ No newline at end of file
+}
+?>
\ No newline at end of file
diff --git a/models/TicketModel.php b/models/TicketModel.php
index 7cefcbf..4bb1e2e 100644
--- a/models/TicketModel.php
+++ b/models/TicketModel.php
@@ -35,16 +35,45 @@ class TicketModel {
return $comments;
}
- public function getAllTickets($page = 1, $limit = 15, $status = 'Open', $sortColumn = 'ticket_id', $sortDirection = 'desc') {
+ public function getAllTickets($page = 1, $limit = 15, $status = 'Open', $sortColumn = 'ticket_id', $sortDirection = 'desc', $category = null, $type = null) {
// Calculate offset
$offset = ($page - 1) * $limit;
- // Build WHERE clause for status filtering
- $whereClause = "";
+ // Build WHERE clause
+ $whereConditions = [];
+ $params = [];
+ $paramTypes = '';
+
+ // Status filtering
if ($status) {
$statuses = explode(',', $status);
$placeholders = str_repeat('?,', count($statuses) - 1) . '?';
- $whereClause = "WHERE status IN ($placeholders)";
+ $whereConditions[] = "status IN ($placeholders)";
+ $params = array_merge($params, $statuses);
+ $paramTypes .= str_repeat('s', count($statuses));
+ }
+
+ // Category filtering
+ if ($category) {
+ $categories = explode(',', $category);
+ $placeholders = str_repeat('?,', count($categories) - 1) . '?';
+ $whereConditions[] = "category IN ($placeholders)";
+ $params = array_merge($params, $categories);
+ $paramTypes .= str_repeat('s', count($categories));
+ }
+
+ // Type filtering
+ if ($type) {
+ $types = explode(',', $type);
+ $placeholders = str_repeat('?,', count($types) - 1) . '?';
+ $whereConditions[] = "type IN ($placeholders)";
+ $params = array_merge($params, $types);
+ $paramTypes .= str_repeat('s', count($types));
+ }
+
+ $whereClause = '';
+ if (!empty($whereConditions)) {
+ $whereClause = 'WHERE ' . implode(' AND ', $whereConditions);
}
// Validate sort column to prevent SQL injection
@@ -60,8 +89,8 @@ class TicketModel {
$countSql = "SELECT COUNT(*) as total FROM tickets $whereClause";
$countStmt = $this->conn->prepare($countSql);
- if ($status) {
- $countStmt->bind_param(str_repeat('s', count($statuses)), ...$statuses);
+ if (!empty($params)) {
+ $countStmt->bind_param($paramTypes, ...$params);
}
$countStmt->execute();
@@ -72,12 +101,13 @@ class TicketModel {
$sql = "SELECT * FROM tickets $whereClause ORDER BY $sortColumn $sortDirection LIMIT ? OFFSET ?";
$stmt = $this->conn->prepare($sql);
- if ($status) {
- $types = str_repeat('s', count($statuses)) . 'ii';
- $params = array_merge($statuses, [$limit, $offset]);
- $stmt->bind_param($types, ...$params);
- } else {
- $stmt->bind_param("ii", $limit, $offset);
+ // Add limit and offset parameters
+ $params[] = $limit;
+ $params[] = $offset;
+ $paramTypes .= 'ii';
+
+ if (!empty($params)) {
+ $stmt->bind_param($paramTypes, ...$params);
}
$stmt->execute();
diff --git a/views/DashboardView.php b/views/DashboardView.php
index 48f1ad5..0bfe6f7 100644
--- a/views/DashboardView.php
+++ b/views/DashboardView.php
@@ -1,6 +1,6 @@
@@ -12,10 +12,10 @@