Calendar 0) { ?> - + if ($num_calendar_events > 0) { ?> +
diff --git a/get_settings.php b/includes/get_settings.php similarity index 100% rename from get_settings.php rename to includes/get_settings.php diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index f4867bf4..49a589d7 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -208,8 +208,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); $num_documents = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id")); - $num_events = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); + $num_calendar_events = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); $num_trips = $row['num']; diff --git a/inc_set_timezone.php b/includes/inc_set_timezone.php similarity index 100% rename from inc_set_timezone.php rename to includes/inc_set_timezone.php diff --git a/settings_localization_array.php b/includes/settings_localization_array.php similarity index 100% rename from settings_localization_array.php rename to includes/settings_localization_array.php diff --git a/login.php b/login.php index 25eb1584..845665ed 100644 --- a/login.php +++ b/login.php @@ -11,7 +11,7 @@ if (!file_exists('config.php')) { require_once "config.php"; // Set Timezone -require_once "inc_set_timezone.php"; +require_once "includes/inc_set_timezone.php"; // Check if the application is configured for HTTPS-only access if ($config_https_only && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'on') && (!isset($_SERVER['HTTP_X_FORWARDED_PROTO']) || $_SERVER['HTTP_X_FORWARDED_PROTO'] !== 'https')) { diff --git a/post.php b/post.php index 228b53e6..00a58329 100644 --- a/post.php +++ b/post.php @@ -8,7 +8,7 @@ require_once "config.php"; require_once "functions.php"; -require_once "check_login.php"; +require_once "includes/check_login.php"; // Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them) define('FROM_POST_HANDLER', true); diff --git a/scripts/cron.php b/scripts/cron.php index 6185024a..e9ffc3b0 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_companies = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); diff --git a/scripts/cron_certificate_refresher.php b/scripts/cron_certificate_refresher.php index 9cb2feb6..70149aba 100644 --- a/scripts/cron_certificate_refresher.php +++ b/scripts/cron_certificate_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; diff --git a/scripts/cron_domain_refresher.php b/scripts/cron_domain_refresher.php index 5132e0f0..2bb04656 100644 --- a/scripts/cron_domain_refresher.php +++ b/scripts/cron_domain_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1"); diff --git a/scripts/cron_mail_queue.php b/scripts/cron_mail_queue.php index f536a57a..87e52447 100644 --- a/scripts/cron_mail_queue.php +++ b/scripts/cron_mail_queue.php @@ -10,7 +10,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php index 04de4b31..f0569f2b 100644 --- a/scripts/cron_ticket_email_parser.php +++ b/scripts/cron_ticket_email_parser.php @@ -19,11 +19,11 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; // Get settings for the "default" company -require_once "../get_settings.php"; +require_once "../includes/get_settings.php"; $config_ticket_prefix = sanitizeInput($config_ticket_prefix); $config_ticket_from_name = sanitizeInput($config_ticket_from_name); diff --git a/setup.php b/setup.php index 96cb5d67..12393a13 100644 --- a/setup.php +++ b/setup.php @@ -19,7 +19,7 @@ if ($config_enable_setup == 0) { exit; } -include_once "settings_localization_array.php"; +include_once "includes/settings_localization_array.php"; $errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; // Get a list of all available timezones diff --git a/temp_bulk_close_bugfix.php b/temp_bulk_close_bugfix.php deleted file mode 100644 index f277099f..00000000 --- a/temp_bulk_close_bugfix.php +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - -Navigate back to tickets - all bulk closed tickets should be fixed now and no longer appear as open.
- - - -