diff --git a/admin_debug.php b/admin_debug.php index 5c92c6b3..514f880a 100644 --- a/admin_debug.php +++ b/admin_debug.php @@ -5,7 +5,6 @@ require_once "database_version.php"; require_once "config.php"; - $folderPath = 'uploads'; function countFilesInDirectory($dir) { @@ -190,7 +189,8 @@ $phpVersion = phpversion(); $mysqlVersion = $mysqli->server_version; $operatingSystem = php_uname(); $webServer = $_SERVER['SERVER_SOFTWARE']; -$errorLog = ini_get('error_log'); +$errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; +$updates = fetchUpdates(); ?> @@ -207,7 +207,7 @@ $errorLog = ini_get('error_log'); echo "MySQL Version: " . $mysqlVersion . "
"; echo "Operating System: " . $operatingSystem . "
"; echo "Web Server: " . $webServer . "
"; - echo "PHP Error Log: " . $errorLog + echo "Apache/PHP Error Log: " . $errorLog ?>
@@ -223,6 +223,14 @@ $errorLog = ini_get('error_log'); echo "Total size of files in $folderPath and its subdirectories: " . $totalSizeMB . " MB"; ?> +
+

ITFlow app

+ current_version . "
"; + echo "Cron enabled: " . $config_enable_cron . "
"; + echo "App Timezone: " . $config_timezone; + ?> +

Database Structure Check

diff --git a/admin_logs.php b/admin_logs.php index 517b0365..99cc103c 100644 --- a/admin_logs.php +++ b/admin_logs.php @@ -6,6 +6,35 @@ $order = "DESC"; require_once "inc_all_admin.php"; +// User Filter +if (isset($_GET['user']) & !empty($_GET['user'])) { + $user_query = 'AND (log_user_id = ' . intval($_GET['user']) . ')'; + $user = intval($_GET['user']); +} else { + // Default - any + $user_query = ''; + $user = ''; +} + +// Log Type Filter +if (isset($_GET['type']) & !empty($_GET['type'])) { + $log_type_query = "AND (log_type = '" . sanitizeInput($_GET['type']) . "')"; + $type = nullable_htmlentities($_GET['type']); +} else { + // Default - any + $log_type_query = ''; + $type = ''; +} + +// Log Action Filter +if (isset($_GET['action']) & !empty($_GET['action'])) { + $log_action_query = "AND (log_action = '" . sanitizeInput($_GET['action']) . "')"; + $action = nullable_htmlentities($_GET['action']); +} else { + // Default - any + $log_action_query = ''; + $action = ''; +} //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -17,6 +46,9 @@ $sql = mysqli_query( LEFT JOIN clients ON log_client_id = client_id WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(log_created_at) BETWEEN '$dtf' AND '$dtt' + $user_query + $log_type_query + $log_action_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -40,6 +72,63 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
" id="advancedFilter">
diff --git a/admin_project_templates.php b/admin_project_templates.php index bed85655..779f948a 100644 --- a/admin_project_templates.php +++ b/admin_project_templates.php @@ -87,7 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - +
diff --git a/admin_side_nav.php b/admin_side_nav.php index 3b13ed39..22f22a18 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -23,6 +23,12 @@

API Keys

+
diff --git a/admin_tag_edit_modal.php b/admin_tag_edit_modal.php index 319c63ad..f0fb9574 100644 --- a/admin_tag_edit_modal.php +++ b/admin_tag_edit_modal.php @@ -31,6 +31,7 @@ +
diff --git a/admin_tags.php b/admin_tags.php index cce37dce..edd1249f 100644 --- a/admin_tags.php +++ b/admin_tags.php @@ -66,6 +66,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $tag_type_display = "Client Tag"; } elseif ( $tag_type == 2) { $tag_type_display = "Location Tag"; + } elseif ( $tag_type == 3) { + $tag_type_display = "Contact Tag"; } else { $tag_type_display = "Unknown Tag"; } diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php index d4c451b2..1c38a709 100644 --- a/admin_ticket_template_details.php +++ b/admin_ticket_template_details.php @@ -26,7 +26,7 @@ $ticket_template_created_at = nullable_htmlentities($row['ticket_template_create $ticket_template_updated_at = nullable_htmlentities($row['ticket_template_updated_at']); // Get Task Templates -$sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id"); +$sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_ticket_template_id = $ticket_template_id ORDER BY task_template_order ASC, task_template_id ASC"); ?> @@ -95,20 +95,27 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE - + - +
- + +
diff --git a/admin_ticket_templates.php b/admin_ticket_templates.php index dd277b4c..ddf33ee4 100644 --- a/admin_ticket_templates.php +++ b/admin_ticket_templates.php @@ -70,7 +70,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - +
diff --git a/admin_update.php b/admin_update.php index b97a0adc..3faf347f 100644 --- a/admin_update.php +++ b/admin_update.php @@ -34,6 +34,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
Update App
+
FORCE Update App

">