diff --git a/cron.php b/cron.php
index 00545568..9298c0c8 100644
--- a/cron.php
+++ b/cron.php
@@ -20,6 +20,7 @@ $company_currency = $row['company_currency'];
 
 // Company Settings
 $config_enable_cron = intval($row['config_enable_cron']);
+$config_cron_key = $row['config_cron_key'];
 $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders'];
 $config_invoice_prefix = $row['config_invoice_prefix'];
 $config_invoice_from_email = $row['config_invoice_from_email'];
@@ -39,6 +40,7 @@ $config_ticket_next_number = intval($row['config_ticket_next_number']);
 $config_ticket_from_name = $row['config_ticket_from_name'];
 $config_ticket_from_email = $row['config_ticket_from_email'];
 $config_ticket_client_general_notifications = intval($row['config_ticket_client_general_notifications']);
+$config_ticket_autoclose = intval($row['config_ticket_autoclose']);
 
 //Get Config for Telemetry
 $config_theme = $row['config_theme'];
@@ -51,294 +53,306 @@ $config_telemetry = intval($row['config_telemetry']);
 // Set Currency Format
 $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY);
 
+$argv = $_SERVER['argv'];
+
 // Check cron is enabled
-if ($config_enable_cron == 1) {
+if ($config_enable_cron == 0) {
+    exit("Cron: is not enabled -- Quitting..");
+}
 
-    /*
-     * ###############################################################################################################
-     *  STARTUP ACTIONS
-     * ###############################################################################################################
-     */
+// Check Cron Key
+if ($argv[1] !== $config_cron_key) {
+    exit("Cron Key invalid  -- Quitting..");
+}
 
-    //Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Started', log_description = 'Cron started for $company_name'");
+/*
+ * ###############################################################################################################
+ *  STARTUP ACTIONS
+ * ###############################################################################################################
+ */
+
+//Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Started', log_description = 'Cron started for $company_name'");
 
 
 
-    /*
-     * ###############################################################################################################
-     *  CLEAN UP (OLD) DATA
-     * ###############################################################################################################
-     */
+/*
+ * ###############################################################################################################
+ *  CLEAN UP (OLD) DATA
+ * ###############################################################################################################
+ */
 
-    // Clean-up ticket views table used for collision detection
-    mysqli_query($mysqli, "TRUNCATE TABLE ticket_views");
+// Clean-up ticket views table used for collision detection
+mysqli_query($mysqli, "TRUNCATE TABLE ticket_views");
 
-    // Clean-up shared items that have been used
-    mysqli_query($mysqli, "DELETE FROM shared_items WHERE item_views = item_view_limit");
+// Clean-up shared items that have been used
+mysqli_query($mysqli, "DELETE FROM shared_items WHERE item_views = item_view_limit");
 
-    // Clean-up shared items that have expired
-    mysqli_query($mysqli, "DELETE FROM shared_items WHERE item_expire_at < NOW()");
+// Clean-up shared items that have expired
+mysqli_query($mysqli, "DELETE FROM shared_items WHERE item_expire_at < NOW()");
 
-    // Invalidate any password reset links
-    mysqli_query($mysqli, "UPDATE contacts SET contact_password_reset_token = NULL WHERE contact_archived_at IS NULL");
+// Invalidate any password reset links
+mysqli_query($mysqli, "UPDATE contacts SET contact_password_reset_token = NULL WHERE contact_archived_at IS NULL");
 
-    // Clean-up old dismissed notifications
-    mysqli_query($mysqli, "DELETE FROM notifications WHERE notification_dismissed_at < CURDATE() - INTERVAL 90 DAY");
+// Clean-up old dismissed notifications
+mysqli_query($mysqli, "DELETE FROM notifications WHERE notification_dismissed_at < CURDATE() - INTERVAL 90 DAY");
 
-    //Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron cleaned up old data'");
+//Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron cleaned up old data'");
 
 
 
-    /*
-     * ###############################################################################################################
-     *  REFRESH DATA
-     * ###############################################################################################################
-     */
-    // 2023-02-20 JQ Commenting this code out as its intermitently breaking cron executions, investigating
-    // ERROR
-    // php cron.php
-    // PHP Fatal error:  Uncaught TypeError: mysqli_fetch_array(): Argument #1 ($result) must be of type mysqli_result, bool given in cron.php:141
-    // Stack trace:
-    //#0 cron.php(141): mysqli_fetch_array()
-    //#1 {main}
-    //  thrown in cron.php on line 141
-    // END ERROR
-    // REFRESH DOMAIN WHOIS DATA (1 a day)
-    //  Get the oldest updated domain (MariaDB shows NULLs first when ordering by default)
-    //$row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT domain_id, domain_name FROM `domains` ORDER BY domain_updated_at LIMIT 1"));
+/*
+ * ###############################################################################################################
+ *  REFRESH DATA
+ * ###############################################################################################################
+ */
+// 2023-02-20 JQ Commenting this code out as its intermitently breaking cron executions, investigating
+// ERROR
+// php cron.php
+// PHP Fatal error:  Uncaught TypeError: mysqli_fetch_array(): Argument #1 ($result) must be of type mysqli_result, bool given in cron.php:141
+// Stack trace:
+//#0 cron.php(141): mysqli_fetch_array()
+//#1 {main}
+//  thrown in cron.php on line 141
+// END ERROR
+// REFRESH DOMAIN WHOIS DATA (1 a day)
+//  Get the oldest updated domain (MariaDB shows NULLs first when ordering by default)
+//$row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT domain_id, domain_name FROM `domains` ORDER BY domain_updated_at LIMIT 1"));
 
-    //if ($row) {
-    //    $domain_id = intval($row['domain_id']);
-    //    $domain_name = sanitizeInput($row['domain_name']);
+//if ($row) {
+//    $domain_id = intval($row['domain_id']);
+//    $domain_name = sanitizeInput($row['domain_name']);
 
-    //    $expire = getDomainExpirationDate($domain_name);
-    //    $records = getDomainRecords($domain_name);
-    //    $a = sanitizeInput($records['a']);
-    //    $ns = sanitizeInput($records['ns']);
-    //    $mx = sanitizeInput($records['mx']);
-    //    $txt = sanitizeInput($records['txt']);
-    //    $whois = sanitizeInput($records['whois']);
+//    $expire = getDomainExpirationDate($domain_name);
+//    $records = getDomainRecords($domain_name);
+//    $a = sanitizeInput($records['a']);
+//    $ns = sanitizeInput($records['ns']);
+//    $mx = sanitizeInput($records['mx']);
+//    $txt = sanitizeInput($records['txt']);
+//    $whois = sanitizeInput($records['whois']);
 
-        // Update the domain
-    //    mysqli_query($mysqli, "UPDATE domains SET domain_name = '$domain_name',  domain_expire = '$expire', domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois' WHERE domain_id = $domain_id");
-    //}
+    // Update the domain
+//    mysqli_query($mysqli, "UPDATE domains SET domain_name = '$domain_name',  domain_expire = '$expire', domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois' WHERE domain_id = $domain_id");
+//}
 
 
-    // TODO: Re-add the cert refresher
+// TODO: Re-add the cert refresher
 
 
 
-    /*
-     * ###############################################################################################################
-     *  ACTION DATA
-     * ###############################################################################################################
-     */
+/*
+ * ###############################################################################################################
+ *  ACTION DATA
+ * ###############################################################################################################
+ */
 
-    // GET NOTIFICATIONS
+// GET NOTIFICATIONS
 
-    // DOMAINS EXPIRING
+// DOMAINS EXPIRING
 
-    $domainAlertArray = [1,7,14,30,90,120];
+$domainAlertArray = [1,7,14,30,90,120];
 
-    foreach ($domainAlertArray as $day) {
+foreach ($domainAlertArray as $day) {
 
-        //Get Domains Expiring
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT * FROM domains
-            LEFT JOIN clients ON domain_client_id = client_id 
-            WHERE domain_expire = CURDATE() + INTERVAL $day DAY"
-        );
+    //Get Domains Expiring
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM domains
+        LEFT JOIN clients ON domain_client_id = client_id 
+        WHERE domain_expire = CURDATE() + INTERVAL $day DAY"
+    );
 
-        while ($row = mysqli_fetch_array($sql)) {
-            $domain_id = intval($row['domain_id']);
-            $domain_name = sanitizeInput($row['domain_name']);
-            $domain_expire = sanitizeInput($row['domain_expire']);
-            $client_id = intval($row['client_id']);
-            $client_name = sanitizeInput($row['client_name']);
+    while ($row = mysqli_fetch_array($sql)) {
+        $domain_id = intval($row['domain_id']);
+        $domain_name = sanitizeInput($row['domain_name']);
+        $domain_expire = sanitizeInput($row['domain_expire']);
+        $client_id = intval($row['client_id']);
+        $client_name = sanitizeInput($row['client_name']);
 
-            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Domain', notification = 'Domain $domain_name for $client_name will expire in $day Days on $domain_expire', notification_client_id = $client_id");
-
-        }
+        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Domain', notification = 'Domain $domain_name for $client_name will expire in $day Days on $domain_expire', notification_client_id = $client_id");
 
     }
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for domain expiring'");
 
-    // CERTIFICATES EXPIRING
+}
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for domain expiring'");
 
-    $certificateAlertArray = [1,7,14,30,90,120];
+// CERTIFICATES EXPIRING
 
-    foreach ($certificateAlertArray as $day) {
+$certificateAlertArray = [1,7,14,30,90,120];
 
-        //Get Certs Expiring
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT * FROM certificates
-            LEFT JOIN clients ON certificate_client_id = client_id 
-            WHERE certificate_expire = CURDATE() + INTERVAL $day DAY"
-        );
+foreach ($certificateAlertArray as $day) {
 
-        while ($row = mysqli_fetch_array($sql)) {
-            $certificate_id = intval($row['certificate_id']);
-            $certificate_name = sanitizeInput($row['certificate_name']);
-            $certificate_domain = sanitizeInput($row['certificate_domain']);
-            $certificate_expire = sanitizeInput($row['certificate_expire']);
-            $client_id = intval($row['client_id']);
-            $client_name = sanitizeInput($row['client_name']);
+    //Get Certs Expiring
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM certificates
+        LEFT JOIN clients ON certificate_client_id = client_id 
+        WHERE certificate_expire = CURDATE() + INTERVAL $day DAY"
+    );
 
-            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Certificate', notification = 'Certificate $certificate_name for $client_name will expire in $day Days on $certificate_expire', notification_client_id = $client_id");
+    while ($row = mysqli_fetch_array($sql)) {
+        $certificate_id = intval($row['certificate_id']);
+        $certificate_name = sanitizeInput($row['certificate_name']);
+        $certificate_domain = sanitizeInput($row['certificate_domain']);
+        $certificate_expire = sanitizeInput($row['certificate_expire']);
+        $client_id = intval($row['client_id']);
+        $client_name = sanitizeInput($row['client_name']);
 
-        }
+        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Certificate', notification = 'Certificate $certificate_name for $client_name will expire in $day Days on $certificate_expire', notification_client_id = $client_id");
 
     }
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for certificates expiring'");
 
-    // Asset Warranties Expiring
+}
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for certificates expiring'");
 
-    $warranty_alert_array = [1,7,14,30,90,120];
+// Asset Warranties Expiring
 
-    foreach ($warranty_alert_array as $day) {
+$warranty_alert_array = [1,7,14,30,90,120];
 
-        //Get Asset Warranty Expiring
-        $sql = mysqli_query(
-            $mysqli,
-            "SELECT * FROM assets
-            LEFT JOIN clients ON asset_client_id = client_id
-            WHERE asset_warranty_expire = CURDATE() + INTERVAL $day DAY"
-        );
+foreach ($warranty_alert_array as $day) {
 
-        while ($row = mysqli_fetch_array($sql)) {
-            $asset_id = intval($row['asset_id']);
-            $asset_name = sanitizeInput($row['asset_name']);
-            $asset_warranty_expire = sanitizeInput($row['asset_warranty_expire']);
-            $client_id = intval($row['client_id']);
-            $client_name = sanitizeInput($row['client_name']);
+    //Get Asset Warranty Expiring
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM assets
+        LEFT JOIN clients ON asset_client_id = client_id
+        WHERE asset_warranty_expire = CURDATE() + INTERVAL $day DAY"
+    );
 
-            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Asset', notification = 'Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire', notification_client_id = $client_id");
+    while ($row = mysqli_fetch_array($sql)) {
+        $asset_id = intval($row['asset_id']);
+        $asset_name = sanitizeInput($row['asset_name']);
+        $asset_warranty_expire = sanitizeInput($row['asset_warranty_expire']);
+        $client_id = intval($row['client_id']);
+        $client_name = sanitizeInput($row['client_name']);
 
-        }
+        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Asset', notification = 'Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire', notification_client_id = $client_id");
 
     }
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for asset warranties expiring'");
 
-    // Scheduled tickets
+}
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for asset warranties expiring'");
 
-    // Get date for search
-    $today = new DateTime();
-    $today_text = $today->format('Y-m-d');
+// Scheduled tickets
 
-    // Get scheduled tickets for today
-    $sql_scheduled_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_next_run = '$today_text'");
+// Get date for search
+$today = new DateTime();
+$today_text = $today->format('Y-m-d');
 
-    if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
-        while ($row = mysqli_fetch_array($sql_scheduled_tickets)) {
-            $schedule_id = intval($row['scheduled_ticket_id']);
-            $subject = sanitizeInput($row['scheduled_ticket_subject']);
-            $details_escaped = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']);
-            $details = $row['scheduled_ticket_details'];
-            $priority = sanitizeInput($row['scheduled_ticket_priority']);
-            $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency']));
-            $created_id = intval($row['scheduled_ticket_created_by']);
-            $client_id = intval($row['scheduled_ticket_client_id']);
-            $contact_id = intval($row['scheduled_ticket_contact_id']);
-            $asset_id = intval($row['scheduled_ticket_asset_id']);
+// Get scheduled tickets for today
+$sql_scheduled_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_next_run = '$today_text'");
 
-            //Get the next Ticket Number and add 1 for the new ticket number
-            $ticket_number = $config_ticket_next_number;
-            $new_config_ticket_next_number = $config_ticket_next_number + 1;
-            mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
+if (mysqli_num_rows($sql_scheduled_tickets) > 0) {
+    while ($row = mysqli_fetch_array($sql_scheduled_tickets)) {
+        $schedule_id = intval($row['scheduled_ticket_id']);
+        $subject = sanitizeInput($row['scheduled_ticket_subject']);
+        $details_escaped = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']);
+        $details = $row['scheduled_ticket_details'];
+        $priority = sanitizeInput($row['scheduled_ticket_priority']);
+        $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency']));
+        $created_id = intval($row['scheduled_ticket_created_by']);
+        $client_id = intval($row['scheduled_ticket_client_id']);
+        $contact_id = intval($row['scheduled_ticket_contact_id']);
+        $asset_id = intval($row['scheduled_ticket_asset_id']);
 
-            // Raise the ticket
-            mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details_escaped', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id");
-            $id = mysqli_insert_id($mysqli);
+        //Get the next Ticket Number and add 1 for the new ticket number
+        $ticket_number = $config_ticket_next_number;
+        $new_config_ticket_next_number = $config_ticket_next_number + 1;
+        mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
 
-            // Logging
-            mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'System created scheduled $frequency ticket - $subject', log_client_id = $client_id, log_user_id = $created_id`");
+        // Raise the ticket
+        mysqli_query($mysqli, "INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details_escaped', ticket_priority = '$priority', ticket_status = 'Open', ticket_created_by = $created_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id");
+        $id = mysqli_insert_id($mysqli);
 
-            // E-mail client
-            if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) {
+        // Logging
+        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'System created scheduled $frequency ticket - $subject', log_client_id = $client_id, log_user_id = $created_id`");
 
-                // Get contact/ticket/company details
-                $sql = mysqli_query(
-                    $mysqli,
-                    "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject FROM tickets
-                    LEFT JOIN clients ON ticket_client_id = client_id
-                    LEFT JOIN contacts ON ticket_contact_id = contact_id
-                    WHERE ticket_id = $id"
+        // E-mail client
+        if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) {
+
+            // Get contact/ticket/company details
+            $sql = mysqli_query(
+                $mysqli,
+                "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_subject FROM tickets
+                LEFT JOIN clients ON ticket_client_id = client_id
+                LEFT JOIN contacts ON ticket_contact_id = contact_id
+                WHERE ticket_id = $id"
+            );
+            $row = mysqli_fetch_array($sql);
+
+            $contact_name = $row['contact_name'];
+            $contact_email = $row['contact_email'];
+            $ticket_prefix = $row['ticket_prefix'];
+            $ticket_number = intval($row['ticket_number']);
+            $ticket_subject = $row['ticket_subject'];
+
+            // Verify contact email is valid
+            if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
+
+                $subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
+                $body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
+
+                $mail = sendSingleEmail(
+                    $config_smtp_host,
+                    $config_smtp_username,
+                    $config_smtp_password,
+                    $config_smtp_encryption,
+                    $config_smtp_port,
+                    $config_ticket_from_email,
+                    $config_ticket_from_name,
+                    $contact_email,
+                    $contact_name,
+                    $subject,
+                    $body
                 );
-                $row = mysqli_fetch_array($sql);
-
-                $contact_name = $row['contact_name'];
-                $contact_email = $row['contact_email'];
-                $ticket_prefix = $row['ticket_prefix'];
-                $ticket_number = intval($row['ticket_number']);
-                $ticket_subject = $row['ticket_subject'];
-
-                // Verify contact email is valid
-                if (filter_var($contact_email, FILTER_VALIDATE_EMAIL)) {
-
-                    $subject = "Ticket created - [$ticket_prefix$ticket_number] - $ticket_subject (scheduled)";
-                    $body    = "<i style='color: #808080'>#--itflow--#</i><br><br>Hello, $contact_name<br><br>A ticket regarding \"$ticket_subject\" has been automatically created for you.<br><br>--------------------------------<br>$details--------------------------------<br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Status: Open<br>Portal: https://$config_base_url/portal/ticket.php?id=$id<br><br>~<br>$company_name<br>Support Department<br>$config_ticket_from_email<br>$company_phone";
-
-                    $mail = sendSingleEmail(
-                        $config_smtp_host,
-                        $config_smtp_username,
-                        $config_smtp_password,
-                        $config_smtp_encryption,
-                        $config_smtp_port,
-                        $config_ticket_from_email,
-                        $config_ticket_from_name,
-                        $contact_email,
-                        $contact_name,
-                        $subject,
-                        $body
-                    );
-
-                    if ($mail !== true) {
-                        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'");
-                    }
 
+                if ($mail !== true) {
+                    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'");
                 }
+
             }
-
-            // Set the next run date
-            if ($frequency == "weekly") {
-                // Note: We seemingly have to initialize a new datetime for each loop to avoid stacking the dates
-                $now = new DateTime();
-                $next_run = date_add($now, date_interval_create_from_date_string('1 week'));
-            } elseif ($frequency == "monthly") {
-                $now = new DateTime();
-                $next_run = date_add($now, date_interval_create_from_date_string('1 month'));
-            } elseif ($frequency == "quarterly") {
-                $now = new DateTime();
-                $next_run = date_add($now, date_interval_create_from_date_string('3 months'));
-            } elseif ($frequency == "biannually") {
-                $now = new DateTime();
-                $next_run = date_add($now, date_interval_create_from_date_string('6 months'));
-            } elseif ($frequency == "annually") {
-                $now = new DateTime();
-                $next_run = date_add($now, date_interval_create_from_date_string('12 months'));
-            }
-
-            // Update the run date
-            $next_run = $next_run->format('Y-m-d');
-            $a = mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_next_run = '$next_run' WHERE scheduled_ticket_id = $schedule_id");
-
         }
+
+        // Set the next run date
+        if ($frequency == "weekly") {
+            // Note: We seemingly have to initialize a new datetime for each loop to avoid stacking the dates
+            $now = new DateTime();
+            $next_run = date_add($now, date_interval_create_from_date_string('1 week'));
+        } elseif ($frequency == "monthly") {
+            $now = new DateTime();
+            $next_run = date_add($now, date_interval_create_from_date_string('1 month'));
+        } elseif ($frequency == "quarterly") {
+            $now = new DateTime();
+            $next_run = date_add($now, date_interval_create_from_date_string('3 months'));
+        } elseif ($frequency == "biannually") {
+            $now = new DateTime();
+            $next_run = date_add($now, date_interval_create_from_date_string('6 months'));
+        } elseif ($frequency == "annually") {
+            $now = new DateTime();
+            $next_run = date_add($now, date_interval_create_from_date_string('12 months'));
+        }
+
+        // Update the run date
+        $next_run = $next_run->format('Y-m-d');
+        $a = mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_next_run = '$next_run' WHERE scheduled_ticket_id = $schedule_id");
+
     }
+}
 
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created sent out scheduled tickets'");
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created sent out scheduled tickets'");
 
 
-    // AUTO CLOSE TICKET - CLOSE
-    //  Automatically silently closes tickets 22 hrs after the last chase
+// AUTO CLOSE TICKET - CLOSE
+//  Automatically silently closes tickets 22 hrs after the last chase
+
+// Check to make sure autoclose is enabled
+if ($config_ticket_autoclose == 1) {
     $sql_tickets_to_chase = mysqli_query(
         $mysqli,
         "SELECT * FROM tickets 
@@ -407,453 +421,450 @@ if ($config_enable_cron == 1) {
         mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Ticket Reply', log_action = 'Create', log_description = 'Auto close chaser email sent to $contact_email for ticket $ticket_prefix$ticket_number - $ticket_subject', log_client_id = $client_id");
 
     }
+}
 
 
-    // PAST DUE INVOICE Notifications
-    //$invoiceAlertArray = [$config_invoice_overdue_reminders];
-    $invoiceAlertArray = [30,60,90,120,150,180,210,240,270,300,330,360,390,420,450,480,510,540,570,590,620];
+// PAST DUE INVOICE Notifications
+//$invoiceAlertArray = [$config_invoice_overdue_reminders];
+$invoiceAlertArray = [30,60,90,120,150,180,210,240,270,300,330,360,390,420,450,480,510,540,570,590,620];
 
-    foreach ($invoiceAlertArray as $day) {
+foreach ($invoiceAlertArray as $day) {
 
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT * FROM invoices
+        LEFT JOIN clients ON invoice_client_id = client_id
+        LEFT JOIN contacts ON contact_id = primary_contact
+        WHERE invoice_status NOT LIKE 'Draft'
+        AND invoice_status NOT LIKE 'Paid'
+        AND invoice_status NOT LIKE 'Cancelled'
+        AND DATE_ADD(invoice_due, INTERVAL $day DAY) = CURDATE()
+        ORDER BY invoice_number DESC"
+    );
+
+    while ($row = mysqli_fetch_array($sql)) {
+        $invoice_id = intval($row['invoice_id']);
+        $invoice_prefix = sanitizeInput($row['invoice_prefix']);
+        $invoice_number = intval($row['invoice_number']);
+        $invoice_status = $row['invoice_status'];
+        $invoice_date = $row['invoice_date'];
+        $invoice_due = $row['invoice_due'];
+        $invoice_url_key = $row['invoice_url_key'];
+        $invoice_amount = floatval($row['invoice_amount']);
+        $invoice_currency_code = $row['invoice_currency_code'];
+        $client_id = intval($row['client_id']);
+        $client_name = sanitizeInput($row['client_name']);
+        $contact_name = $row['contact_name'];
+        $contact_email = $row['contact_email'];
+
+        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Invoice Overdue', notification = 'Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', notification_client_id = $client_id, notification_entity_id = $invoice_id");
+
+        $subject = "Overdue Invoice $invoice_prefix$invoice_number";
+        $body    = "Hello $contact_name,<br><br>According to our records, we have not received payment for invoice $invoice_prefix$invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone.
+            <br><br>
+            Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
+
+        $mail = sendSingleEmail(
+            $config_smtp_host,
+            $config_smtp_username,
+            $config_smtp_password,
+            $config_smtp_encryption,
+            $config_smtp_port,
+            $config_invoice_from_email,
+            $config_invoice_from_name,
+            $contact_email,
+            $contact_name,
+            $subject,
+            $body
+        );
+
+        if ($mail === true) {
+            mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_invoice_id = $invoice_id");
+        } else {
+            mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Failed to send Overdue Invoice', history_invoice_id = $invoice_id");
+
+            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'");
+        }
+
+    }
+
+}
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for past due invoices and sent out notifications to the primary contacts email'");
+
+//Send Recurring Invoices that match todays date and are active
+
+//Loop through all recurring that match today's date and is active
+$sql_recurring = mysqli_query($mysqli, "SELECT * FROM recurring LEFT JOIN clients ON client_id = recurring_client_id WHERE recurring_next_date = CURDATE() AND recurring_status = 1");
+
+while ($row = mysqli_fetch_array($sql_recurring)) {
+    $recurring_id = intval($row['recurring_id']);
+    $recurring_scope = sanitizeInput($row['recurring_scope']);
+    $recurring_frequency = sanitizeInput($row['recurring_frequency']);
+    $recurring_status = sanitizeInput($row['recurring_status']);
+    $recurring_last_sent = sanitizeInput($row['recurring_last_sent']);
+    $recurring_next_date = sanitizeInput($row['recurring_next_date']);
+    $recurring_amount = floatval($row['recurring_amount']);
+    $recurring_currency_code = sanitizeInput($row['recurring_currency_code']);
+    $recurring_note = sanitizeInput($row['recurring_note']); //Escape SQL
+    $category_id = intval($row['recurring_category_id']);
+    $client_id = intval($row['recurring_client_id']);
+    $client_name = sanitizeInput($row['client_name']); //Escape SQL just in case a name is like Safran's etc
+    $client_net_terms = intval($row['client_net_terms']);
+
+
+    //Get the last Invoice Number and add 1 for the new invoice number
+    $sql_invoice_number = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1");
+    $row = mysqli_fetch_array($sql_invoice_number);
+    $config_invoice_next_number = intval($row['config_invoice_next_number']);
+
+    $new_invoice_number = $config_invoice_next_number;
+    $new_config_invoice_next_number = $config_invoice_next_number + 1;
+    mysqli_query($mysqli, "UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = 1");
+
+    //Generate a unique URL key for clients to access
+    $url_key = randomString(156);
+
+    mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = $recurring_amount, invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_client_id = $client_id");
+
+    $new_invoice_id = mysqli_insert_id($mysqli);
+
+    //Copy Items from original recurring invoice to new invoice
+    $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC");
+
+    while ($row = mysqli_fetch_array($sql_invoice_items)) {
+        $item_id = intval($row['item_id']);
+        $item_name = sanitizeInput($row['item_name']); //SQL Escape incase of ,
+        $item_description = sanitizeInput($row['item_description']); //SQL Escape incase of ,
+        $item_quantity = floatval($row['item_quantity']);
+        $item_price = floatval($row['item_price']);
+        $item_subtotal = floatval($row['item_subtotal']);
+        $item_tax = floatval($row['item_tax']);
+        $item_total = floatval($row['item_total']);
+        $tax_id = intval($row['item_tax_id']);
+
+        //Insert Items into New Invoice
+        mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax, item_total = $item_total, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id");
+
+    }
+
+    mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id");
+
+    mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Recurring Sent', notification = 'Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent', notification_client_id = $client_id, notification_entity_id = $new_invoice_id");
+
+    //Update recurring dates
+
+    mysqli_query($mysqli, "UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency) WHERE recurring_id = $recurring_id");
+
+    if ($config_recurring_auto_send_invoice == 1) {
         $sql = mysqli_query(
             $mysqli,
             "SELECT * FROM invoices
             LEFT JOIN clients ON invoice_client_id = client_id
             LEFT JOIN contacts ON contact_id = primary_contact
-            WHERE invoice_status NOT LIKE 'Draft'
-            AND invoice_status NOT LIKE 'Paid'
-            AND invoice_status NOT LIKE 'Cancelled'
-            AND DATE_ADD(invoice_due, INTERVAL $day DAY) = CURDATE()
-            ORDER BY invoice_number DESC"
+            WHERE invoice_id = $new_invoice_id"
         );
 
-        while ($row = mysqli_fetch_array($sql)) {
-            $invoice_id = intval($row['invoice_id']);
-            $invoice_prefix = sanitizeInput($row['invoice_prefix']);
-            $invoice_number = intval($row['invoice_number']);
-            $invoice_status = $row['invoice_status'];
-            $invoice_date = $row['invoice_date'];
-            $invoice_due = $row['invoice_due'];
-            $invoice_url_key = $row['invoice_url_key'];
-            $invoice_amount = floatval($row['invoice_amount']);
-            $invoice_currency_code = $row['invoice_currency_code'];
-            $client_id = intval($row['client_id']);
-            $client_name = sanitizeInput($row['client_name']);
-            $contact_name = $row['contact_name'];
-            $contact_email = $row['contact_email'];
+        $row = mysqli_fetch_array($sql);
+        $invoice_prefix = $row['invoice_prefix'];
+        $invoice_number = intval($row['invoice_number']);
+        $invoice_date = $row['invoice_date'];
+        $invoice_due = $row['invoice_due'];
+        $invoice_amount = floatval($row['invoice_amount']);
+        $invoice_url_key = $row['invoice_url_key'];
+        $client_id = intval($row['client_id']);
+        $client_name = $row['client_name'];
+        $contact_name = $row['contact_name'];
+        $contact_email = sanitizeInput($row['contact_email']);
 
-            mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Invoice Overdue', notification = 'Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days', notification_client_id = $client_id, notification_entity_id = $invoice_id");
 
-            $subject = "Overdue Invoice $invoice_prefix$invoice_number";
-            $body    = "Hello $contact_name,<br><br>According to our records, we have not received payment for invoice $invoice_prefix$invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone.
-                <br><br>
-                Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
+        $subject = "Invoice $invoice_prefix$invoice_number";
+        $body    = "Hello $contact_name,<br><br>Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
 
-            $mail = sendSingleEmail(
-                $config_smtp_host,
-                $config_smtp_username,
-                $config_smtp_password,
-                $config_smtp_encryption,
-                $config_smtp_port,
-                $config_invoice_from_email,
-                $config_invoice_from_name,
-                $contact_email,
-                $contact_name,
-                $subject,
-                $body
-            );
+        $mail = sendSingleEmail(
+            $config_smtp_host,
+            $config_smtp_username,
+            $config_smtp_password,
+            $config_smtp_encryption,
+            $config_smtp_port,
+            $config_invoice_from_email,
+            $config_invoice_from_name,
+            $contact_email,
+            $contact_name,
+            $subject,
+            $body
+        );
 
-            if ($mail === true) {
-                mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Overdue Invoice', history_invoice_id = $invoice_id");
-            } else {
-                mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Failed to send Overdue Invoice', history_invoice_id = $invoice_id");
+        if ($mail === true) {
+            mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Invoice!', history_invoice_id = $new_invoice_id");
+            mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Sent', invoice_client_id = $client_id WHERE invoice_id = $new_invoice_id");
 
-                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'");
-            }
+        } else {
+            mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Draft', history_description = 'Cron Failed to send Invoice!', history_invoice_id = $new_invoice_id");
 
+            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'");
         }
 
-    }
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created notifications for past due invoices and sent out notifications to the primary contacts email'");
-
-    //Send Recurring Invoices that match todays date and are active
-
-    //Loop through all recurring that match today's date and is active
-    $sql_recurring = mysqli_query($mysqli, "SELECT * FROM recurring LEFT JOIN clients ON client_id = recurring_client_id WHERE recurring_next_date = CURDATE() AND recurring_status = 1");
-
-    while ($row = mysqli_fetch_array($sql_recurring)) {
-        $recurring_id = intval($row['recurring_id']);
-        $recurring_scope = sanitizeInput($row['recurring_scope']);
-        $recurring_frequency = sanitizeInput($row['recurring_frequency']);
-        $recurring_status = sanitizeInput($row['recurring_status']);
-        $recurring_last_sent = sanitizeInput($row['recurring_last_sent']);
-        $recurring_next_date = sanitizeInput($row['recurring_next_date']);
-        $recurring_amount = floatval($row['recurring_amount']);
-        $recurring_currency_code = sanitizeInput($row['recurring_currency_code']);
-        $recurring_note = sanitizeInput($row['recurring_note']); //Escape SQL
-        $category_id = intval($row['recurring_category_id']);
-        $client_id = intval($row['recurring_client_id']);
-        $client_name = sanitizeInput($row['client_name']); //Escape SQL just in case a name is like Safran's etc
-        $client_net_terms = intval($row['client_net_terms']);
-
-
-        //Get the last Invoice Number and add 1 for the new invoice number
-        $sql_invoice_number = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1");
-        $row = mysqli_fetch_array($sql_invoice_number);
-        $config_invoice_next_number = intval($row['config_invoice_next_number']);
-
-        $new_invoice_number = $config_invoice_next_number;
-        $new_config_invoice_next_number = $config_invoice_next_number + 1;
-        mysqli_query($mysqli, "UPDATE settings SET config_invoice_next_number = $new_config_invoice_next_number WHERE company_id = 1");
-
-        //Generate a unique URL key for clients to access
-        $url_key = randomString(156);
-
-        mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_amount = $recurring_amount, invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_client_id = $client_id");
-
-        $new_invoice_id = mysqli_insert_id($mysqli);
-
-        //Copy Items from original recurring invoice to new invoice
-        $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC");
-
-        while ($row = mysqli_fetch_array($sql_invoice_items)) {
-            $item_id = intval($row['item_id']);
-            $item_name = sanitizeInput($row['item_name']); //SQL Escape incase of ,
-            $item_description = sanitizeInput($row['item_description']); //SQL Escape incase of ,
-            $item_quantity = floatval($row['item_quantity']);
-            $item_price = floatval($row['item_price']);
-            $item_subtotal = floatval($row['item_subtotal']);
-            $item_tax = floatval($row['item_tax']);
-            $item_total = floatval($row['item_total']);
-            $tax_id = intval($row['item_tax_id']);
-
-            //Insert Items into New Invoice
-            mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $item_quantity, item_price = $item_price, item_subtotal = $item_subtotal, item_tax = $item_tax, item_total = $item_total, item_tax_id = $tax_id, item_invoice_id = $new_invoice_id");
-
-        }
-
-        mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id");
-
-        mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Recurring Sent', notification = 'Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent', notification_client_id = $client_id, notification_entity_id = $new_invoice_id");
-
-        //Update recurring dates
-
-        mysqli_query($mysqli, "UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency) WHERE recurring_id = $recurring_id");
-
-        if ($config_recurring_auto_send_invoice == 1) {
-            $sql = mysqli_query(
-                $mysqli,
-                "SELECT * FROM invoices
-                LEFT JOIN clients ON invoice_client_id = client_id
-                LEFT JOIN contacts ON contact_id = primary_contact
-                WHERE invoice_id = $new_invoice_id"
-            );
-
-            $row = mysqli_fetch_array($sql);
-            $invoice_prefix = $row['invoice_prefix'];
-            $invoice_number = intval($row['invoice_number']);
-            $invoice_date = $row['invoice_date'];
-            $invoice_due = $row['invoice_due'];
-            $invoice_amount = floatval($row['invoice_amount']);
-            $invoice_url_key = $row['invoice_url_key'];
-            $client_id = intval($row['client_id']);
-            $client_name = $row['client_name'];
-            $contact_name = $row['contact_name'];
-            $contact_email = sanitizeInput($row['contact_email']);
-
-
-            $subject = "Invoice $invoice_prefix$invoice_number";
-            $body    = "Hello $contact_name,<br><br>Please view the details of the invoice below.<br><br>Invoice: $invoice_prefix$invoice_number<br>Issue Date: $invoice_date<br>Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "<br>Due Date: $invoice_due<br><br><br>To view your invoice click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>Billing Department<br>$config_invoice_from_email<br>$company_phone";
-
-            $mail = sendSingleEmail(
-                $config_smtp_host,
-                $config_smtp_username,
-                $config_smtp_password,
-                $config_smtp_encryption,
-                $config_smtp_port,
-                $config_invoice_from_email,
-                $config_invoice_from_name,
-                $contact_email,
-                $contact_name,
-                $subject,
-                $body
-            );
-
-            if ($mail === true) {
-                mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron Emailed Invoice!', history_invoice_id = $new_invoice_id");
-                mysqli_query($mysqli, "UPDATE invoices SET invoice_status = 'Sent', invoice_client_id = $client_id WHERE invoice_id = $new_invoice_id");
-
-            } else {
-                mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Draft', history_description = 'Cron Failed to send Invoice!', history_invoice_id = $new_invoice_id");
-
-                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'");
-            }
+    } //End if Autosend is on
+} //End Recurring Invoices Loop
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created invoices from recurring invoices and sent emails out'");
 
-        } //End if Autosend is on
-    } //End Recurring Invoices Loop
-    // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Task', log_description = 'Cron created invoices from recurring invoices and sent emails out'");
 
+// TELEMETRY
 
-    // TELEMETRY
+if ($config_telemetry == 1) {
 
-    if ($config_telemetry == 1) {
+    $current_version = exec("git rev-parse HEAD");
 
-        $current_version = exec("git rev-parse HEAD");
+    // Client Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS num FROM clients"));
+    $client_count = $row['num'];
 
-        // Client Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('client_id') AS num FROM clients"));
-        $client_count = $row['num'];
+    // Ticket Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM tickets"));
+    $ticket_count = $row['num'];
 
-        // Ticket Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM tickets"));
-        $ticket_count = $row['num'];
+    // Calendar Event Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events"));
+    $calendar_event_count = $row['num'];
 
-        // Calendar Event Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events"));
-        $calendar_event_count = $row['num'];
-
-        // Quote Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes"));
-        $quote_count = $row['num'];
-
-        // Invoice Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices"));
-        $invoice_count = $row['num'];
+    // Quote Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes"));
+    $quote_count = $row['num'];
 
-        // Revenue Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('revenue_id') AS num FROM revenues"));
-        $revenue_count = $row['num'];
+    // Invoice Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices"));
+    $invoice_count = $row['num'];
 
-        // Recurring Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring"));
-        $recurring_count = $row['num'];
+    // Revenue Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('revenue_id') AS num FROM revenues"));
+    $revenue_count = $row['num'];
 
-        // Account Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('account_id') AS num FROM accounts"));
-        $account_count = $row['num'];
+    // Recurring Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring"));
+    $recurring_count = $row['num'];
 
-        // Tax Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tax_id') AS num FROM taxes"));
-        $tax_count = $row['num'];
-
-        // Product Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('product_id') AS num FROM products"));
-        $product_count = $row['num'];
-
-        // Payment Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
-        $payment_count = $row['num'];
-
-        // Company Vendor Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
-        $company_vendor_count = $row['num'];
-
-        // Expense Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('expense_id') AS num FROM expenses WHERE expense_vendor_id > 0"));
-        $expense_count = $row['num'];
+    // Account Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('account_id') AS num FROM accounts"));
+    $account_count = $row['num'];
 
-        // Trip Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips"));
-        $trip_count = $row['num'];
+    // Tax Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tax_id') AS num FROM taxes"));
+    $tax_count = $row['num'];
 
-        // Transfer Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('transfer_id') AS num FROM transfers"));
-        $transfer_count = $row['num'];
+    // Product Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('product_id') AS num FROM products"));
+    $product_count = $row['num'];
 
-        // Contact Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts"));
-        $contact_count = $row['num'];
-
-        // Location Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations"));
-        $location_count = $row['num'];
-
-        // Asset Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets"));
-        $asset_count = $row['num'];
-
-        // Software Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 0"));
-        $software_count = $row['num'];
-
-        // Software Template Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 1"));
-        $software_template_count = $row['num'];
-
-        // Password Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins"));
-        $password_count = $row['num'];
-
-        // Network Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks"));
-        $network_count = $row['num'];
-
-        // Certificate Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates"));
-        $certificate_count = $row['num'];
-
-        // Domain Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains"));
-        $domain_count = $row['num'];
-
-        // Service Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services"));
-        $service_count = $row['num'];
-
-        // Client Vendor Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id > 0"));
-        $client_vendor_count = $row['num'];
-
-        // Vendor Template Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 1"));
-        $vendor_template_count = $row['num'];
-
-        // File Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files"));
-        $file_count = $row['num'];
-
-        // Document Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 0"));
-        $document_count = $row['num'];
-
-        // Document Template Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
-        $document_template_count = $row['num'];
-
-        // Shared Item Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('item_id') AS num FROM shared_items"));
-        $shared_item_count = $row['num'];
-
-        // Company Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('company_id') AS num FROM companies"));
-        $company_count = $row['num'];
-
-        // User Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('user_id') AS num FROM users"));
-        $user_count = $row['num'];
-
-        // Category Expense Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Expense'"));
-        $category_expense_count = $row['num'];
-
-        // Category Income Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Income'"));
-        $category_income_count = $row['num'];
-
-        // Category Referral Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Referral'"));
-        $category_referral_count = $row['num'];
-
-        // Category Payment Method Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Payment Method'"));
-        $category_payment_method_count = $row['num'];
-
-        // Tag Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tag_id') AS num FROM tags"));
-        $tag_count = $row['num'];
-
-        // API Key Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('api_key_id') AS num FROM api_keys"));
-        $api_key_count = $row['num'];
-
-        // Log Count
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('log_id') AS num FROM logs"));
-        $log_count = $row['num'];
-
-        $postdata = http_build_query(
-            array(
-                'installation_id' => "$installation_id",
-                'version' => "$current_version",
-                'company_name' => "$company_name",
-                'city' => "$company_city",
-                'state' => "$company_state",
-                'country' => "$company_country",
-                'currency' => "$company_currency",
-                'client_count' => $client_count,
-                'ticket_count' => $ticket_count,
-                'calendar_event_count' => $calendar_event_count,
-                'quote_count' => $quote_count,
-                'invoice_count' => $invoice_count,
-                'revenue_count' => $revenue_count,
-                'recurring_count' => $recurring_count,
-                'account_count' => $account_count,
-                'tax_count' => $tax_count,
-                'product_count' => $product_count,
-                'payment_count' => $payment_count,
-                'company_vendor_count' => $company_vendor_count,
-                'expense_count' => $expense_count,
-                'trip_count' => $trip_count,
-                'transfer_count' => $transfer_count,
-                'contact_count' => $contact_count,
-                'location_count' => $location_count,
-                'asset_count' => $asset_count,
-                'software_count' => $software_count,
-                'software_template_count' => $software_template_count,
-                'password_count' => $password_count,
-                'network_count' => $network_count,
-                'certificate_count' => $certificate_count,
-                'domain_count' => $domain_count,
-                'service_count' => $service_count,
-                'client_vendor_count' => $client_vendor_count,
-                'vendor_template_count' => $vendor_template_count,
-                'file_count' => $file_count,
-                'document_count' => $document_count,
-                'document_template_count' => $document_template_count,
-                'shared_item_count' => $shared_item_count,
-                'company_count' => $company_count,
-                'user_count' => $user_count,
-                'category_expense_count' => $category_expense_count,
-                'category_income_count' => $category_income_count,
-                'category_referral_count' => $category_referral_count,
-                'category_payment_method_count' => $category_payment_method_count,
-                'tag_count' => $tag_count,
-                'api_key_count' => $api_key_count,
-                'log_count' => $log_count,
-                'config_theme' => "$config_theme",
-                'config_enable_cron' => $config_enable_cron,
-                'config_ticket_email_parse' => $config_ticket_email_parse,
-                'config_module_enable_itdoc' => $config_module_enable_itdoc,
-                'config_module_enable_ticketing' => $config_module_enable_ticketing,
-                'config_module_enable_accounting' => $config_module_enable_accounting,
-                'config_telemetry' => $config_telemetry,
-                'collection_method' => 3
-            )
-        );
-
-        $opts = array('http' =>
-            array(
-                'method' => 'POST',
-                'header' => 'Content-type: application/x-www-form-urlencoded',
-                'content' => $postdata
-            )
-        );
-
-        $context = stream_context_create($opts);
-
-        $result = file_get_contents('https://telemetry.itflow.org', false, $context);
-
-        // Logging
-        mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers'");
-    }
-
-
-
-    /*
-     * ###############################################################################################################
-     *  FINISH UP
-     * ###############################################################################################################
-     */
-
-    // Send Alert to inform Cron was run
-    mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Cron', notification = 'Cron.php successfully executed'");
+    // Payment Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments WHERE payment_invoice_id > 0"));
+    $payment_count = $row['num'];
+
+    // Company Vendor Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id = 0"));
+    $company_vendor_count = $row['num'];
+
+    // Expense Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('expense_id') AS num FROM expenses WHERE expense_vendor_id > 0"));
+    $expense_count = $row['num'];
+
+    // Trip Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips"));
+    $trip_count = $row['num'];
+
+    // Transfer Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('transfer_id') AS num FROM transfers"));
+    $transfer_count = $row['num'];
+
+    // Contact Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('contact_id') AS num FROM contacts"));
+    $contact_count = $row['num'];
+
+    // Location Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('location_id') AS num FROM locations"));
+    $location_count = $row['num'];
+
+    // Asset Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('asset_id') AS num FROM assets"));
+    $asset_count = $row['num'];
+
+    // Software Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 0"));
+    $software_count = $row['num'];
+
+    // Software Template Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 1"));
+    $software_template_count = $row['num'];
+
+    // Password Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins"));
+    $password_count = $row['num'];
+
+    // Network Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks"));
+    $network_count = $row['num'];
+
+    // Certificate Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('certificate_id') AS num FROM certificates"));
+    $certificate_count = $row['num'];
+
+    // Domain Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('domain_id') AS num FROM domains"));
+    $domain_count = $row['num'];
+
+    // Service Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services"));
+    $service_count = $row['num'];
+
+    // Client Vendor Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 0 AND vendor_client_id > 0"));
+    $client_vendor_count = $row['num'];
+
+    // Vendor Template Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_template = 1"));
+    $vendor_template_count = $row['num'];
+
+    // File Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('file_id') AS num FROM files"));
+    $file_count = $row['num'];
+
+    // Document Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 0"));
+    $document_count = $row['num'];
+
+    // Document Template Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_template = 1"));
+    $document_template_count = $row['num'];
+
+    // Shared Item Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('item_id') AS num FROM shared_items"));
+    $shared_item_count = $row['num'];
+
+    // Company Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('company_id') AS num FROM companies"));
+    $company_count = $row['num'];
+
+    // User Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('user_id') AS num FROM users"));
+    $user_count = $row['num'];
+
+    // Category Expense Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Expense'"));
+    $category_expense_count = $row['num'];
+
+    // Category Income Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Income'"));
+    $category_income_count = $row['num'];
+
+    // Category Referral Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Referral'"));
+    $category_referral_count = $row['num'];
+
+    // Category Payment Method Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('category_id') AS num FROM categories WHERE category_type = 'Payment Method'"));
+    $category_payment_method_count = $row['num'];
+
+    // Tag Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('tag_id') AS num FROM tags"));
+    $tag_count = $row['num'];
+
+    // API Key Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('api_key_id') AS num FROM api_keys"));
+    $api_key_count = $row['num'];
+
+    // Log Count
+    $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('log_id') AS num FROM logs"));
+    $log_count = $row['num'];
+
+    $postdata = http_build_query(
+        array(
+            'installation_id' => "$installation_id",
+            'version' => "$current_version",
+            'company_name' => "$company_name",
+            'city' => "$company_city",
+            'state' => "$company_state",
+            'country' => "$company_country",
+            'currency' => "$company_currency",
+            'client_count' => $client_count,
+            'ticket_count' => $ticket_count,
+            'calendar_event_count' => $calendar_event_count,
+            'quote_count' => $quote_count,
+            'invoice_count' => $invoice_count,
+            'revenue_count' => $revenue_count,
+            'recurring_count' => $recurring_count,
+            'account_count' => $account_count,
+            'tax_count' => $tax_count,
+            'product_count' => $product_count,
+            'payment_count' => $payment_count,
+            'company_vendor_count' => $company_vendor_count,
+            'expense_count' => $expense_count,
+            'trip_count' => $trip_count,
+            'transfer_count' => $transfer_count,
+            'contact_count' => $contact_count,
+            'location_count' => $location_count,
+            'asset_count' => $asset_count,
+            'software_count' => $software_count,
+            'software_template_count' => $software_template_count,
+            'password_count' => $password_count,
+            'network_count' => $network_count,
+            'certificate_count' => $certificate_count,
+            'domain_count' => $domain_count,
+            'service_count' => $service_count,
+            'client_vendor_count' => $client_vendor_count,
+            'vendor_template_count' => $vendor_template_count,
+            'file_count' => $file_count,
+            'document_count' => $document_count,
+            'document_template_count' => $document_template_count,
+            'shared_item_count' => $shared_item_count,
+            'company_count' => $company_count,
+            'user_count' => $user_count,
+            'category_expense_count' => $category_expense_count,
+            'category_income_count' => $category_income_count,
+            'category_referral_count' => $category_referral_count,
+            'category_payment_method_count' => $category_payment_method_count,
+            'tag_count' => $tag_count,
+            'api_key_count' => $api_key_count,
+            'log_count' => $log_count,
+            'config_theme' => "$config_theme",
+            'config_enable_cron' => $config_enable_cron,
+            'config_ticket_email_parse' => $config_ticket_email_parse,
+            'config_module_enable_itdoc' => $config_module_enable_itdoc,
+            'config_module_enable_ticketing' => $config_module_enable_ticketing,
+            'config_module_enable_accounting' => $config_module_enable_accounting,
+            'config_telemetry' => $config_telemetry,
+            'collection_method' => 3
+        )
+    );
+
+    $opts = array('http' =>
+        array(
+            'method' => 'POST',
+            'header' => 'Content-type: application/x-www-form-urlencoded',
+            'content' => $postdata
+        )
+    );
+
+    $context = stream_context_create($opts);
+
+    $result = file_get_contents('https://telemetry.itflow.org', false, $context);
 
     // Logging
-    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Ended', log_description = 'Cron executed successfully for $company_name'");
-
-
+    mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers'");
 }
-// End Cron enabled check
+
+
+
+/*
+ * ###############################################################################################################
+ *  FINISH UP
+ * ###############################################################################################################
+ */
+
+// Send Alert to inform Cron was run
+mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Cron', notification = 'Cron.php successfully executed'");
+
+// Logging
+mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Ended', log_description = 'Cron executed successfully for $company_name'");
diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php
index 48ecefb6..2332aa4b 100644
--- a/cron_ticket_email_parser.php
+++ b/cron_ticket_email_parser.php
@@ -29,6 +29,13 @@ if ($config_ticket_email_parse == 0) {
     exit("Email Parser: Feature is not enabled - check Settings > Ticketing > Email-to-ticket parsing. See https://docs.itflow.org/ticket_email_parse  -- Quitting..");
 }
 
+$argv = $_SERVER['argv'];
+
+// Check Cron Key
+if ($argv[1] !== $config_cron_key) {
+    exit("Cron Key invalid  -- Quitting..");
+}
+
 // Check IMAP extension works/installed
 if (!function_exists('imap_open')) {
     exit("Email Parser: PHP IMAP extension is not installed. See https://docs.itflow.org/ticket_email_parse  -- Quitting..");
diff --git a/database_updates.php b/database_updates.php
index d72000a4..afd03d55 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -969,11 +969,21 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.1'");
     }
 
-    //if (CURRENT_DATABASE_VERSION == '0.5.1') {
-    // Insert queries here required to update to DB version 0.5.2
+    if (CURRENT_DATABASE_VERSION == '0.5.1') {
+        //Insert queries here required to update to DB version 0.5.2
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_ticket_autoclose` TINYINT(1) NOT NULL DEFAULT 0 AFTER `config_ticket_client_general_notifications`");
 
-    // Then, update the database to the next sequential version
-    // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.2'");
+        mysqli_query($mysqli, "ALTER TABLE `settings` ADD `config_cron_key` VARCHAR(255) NULL DEFAULT NULL AFTER `config_enable_cron`");
+
+        // Then, update the database to the next sequential version
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.2'");
+    }
+
+    //if (CURRENT_DATABASE_VERSION == '0.5.2') {
+        //Insert queries here required to update to DB version 0.5.3
+
+        // Then, update the database to the next sequential version
+        //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.5.3'");
     //}
 
 } else {
diff --git a/database_version.php b/database_version.php
index 2e959d54..3e9bb371 100644
--- a/database_version.php
+++ b/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "0.5.1");
+DEFINE("LATEST_DATABASE_VERSION", "0.5.2");
diff --git a/get_settings.php b/get_settings.php
index f610cc42..12cf677b 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -59,10 +59,13 @@ $config_ticket_from_name = $row['config_ticket_from_name'];
 $config_ticket_from_email = $row['config_ticket_from_email'];
 $config_ticket_email_parse = intval($row['config_ticket_email_parse']);
 $config_ticket_client_general_notifications = intval($row['config_ticket_client_general_notifications']);
+$config_ticket_autoclose = intval($row['config_ticket_autoclose']);
 
-// Alerts
+// Cron
 $config_enable_cron = intval($row['config_enable_cron']);
+$config_cron_key = $row['config_cron_key'];
 
+// Alerts & Notifications
 $config_recurring_auto_send_invoice = intval($row['config_recurring_auto_send_invoice']);
 $config_enable_alert_domain_expire = intval($row['config_enable_alert_domain_expire']);
 $config_send_invoice_reminders = intval($row['config_send_invoice_reminders']);
diff --git a/post.php b/post.php
index 129db37d..f1341bfb 100644
--- a/post.php
+++ b/post.php
@@ -682,8 +682,9 @@ if(isset($_POST['edit_ticket_settings'])){
     $config_ticket_from_name = sanitizeInput($_POST['config_ticket_from_name']);
     $config_ticket_email_parse = intval($_POST['config_ticket_email_parse']);
     $config_ticket_client_general_notifications = intval($_POST['config_ticket_client_general_notifications']);
+    $config_ticket_autoclose = intval($_POST['config_ticket_autoclose']);
 
-    mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name', config_ticket_email_parse = '$config_ticket_email_parse', config_ticket_client_general_notifications = $config_ticket_client_general_notifications WHERE company_id = 1");
+    mysqli_query($mysqli,"UPDATE settings SET config_ticket_prefix = '$config_ticket_prefix', config_ticket_next_number = $config_ticket_next_number, config_ticket_from_email = '$config_ticket_from_email', config_ticket_from_name = '$config_ticket_from_name', config_ticket_email_parse = '$config_ticket_email_parse', config_ticket_client_general_notifications = $config_ticket_client_general_notifications , config_ticket_autoclose = $config_ticket_autoclose WHERE company_id = 1");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name modified ticket settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
@@ -739,6 +740,7 @@ if(isset($_POST['edit_alert_settings'])){
     validateAdminRole();
 
     $config_enable_cron = intval($_POST['config_enable_cron']);
+    $config_cron_key = sanitizeInput($_POST['config_cron_key']);
     $config_enable_alert_domain_expire = intval($_POST['config_enable_alert_domain_expire']);
     $config_send_invoice_reminders = intval($_POST['config_send_invoice_reminders']);
     $config_invoice_overdue_reminders = sanitizeInput($_POST['config_invoice_overdue_reminders']);
@@ -754,6 +756,22 @@ if(isset($_POST['edit_alert_settings'])){
 
 }
 
+if(isset($_GET['generate_cron_key'])){
+    validateAdminRole();
+
+    $key = randomString(32);
+
+    mysqli_query($mysqli,"UPDATE settings SET config_cron_key = '$key' WHERE company_id = 1");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modify', log_description = '$session_name regenerated cron key', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Cron key regenerated!";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_POST['edit_online_payment_settings'])){
 
     validateAdminRole();
diff --git a/settings_alerts.php b/settings_alerts.php
index 117ef463..f9a9ecc0 100644
--- a/settings_alerts.php
+++ b/settings_alerts.php
@@ -15,6 +15,19 @@ require_once("inc_all_settings.php"); ?>
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Cron Key</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="config_cron_key" placeholder="Generate a CRON Key" value="<?php echo htmlentities($config_cron_key); ?>" readonly>
+                        <div class="input-group-append">
+                            <a href="post.php?generate_cron_key" class="btn btn-secondary"><i class="fas fa-fw fa-sync mr-2"></i>Generate</a>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_enable_alert_domain_expire" <?php if ($config_enable_alert_domain_expire == 1) { echo "checked"; } ?> value="1" id="alertDomainExpireSwitch">
diff --git a/settings_ticket.php b/settings_ticket.php
index ee18b89f..ea0cabc0 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -62,6 +62,14 @@ require_once("inc_all_settings.php"); ?>
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_ticket_autoclose" <?php if($config_ticket_autoclose == 1){ echo "checked"; } ?> value="1" id="ticketAutoCloseSwitch">
+                        <label class="custom-control-label" for="ticketAutoCloseSwitch">Enable Autoclose Tickets <small class="text-secondary">(If no response is received after 48 hrs, a chaser email is sent mentioning "This is an automatic friendly reminder that your ticket regarding "Test ticket" will be closed, unless you respond", including the last public technician response for reference
+If no response is received after a further 22 hrs (70 total since ticket was put in auto close), the ticket is silently closed. (Note: I chose 70 hrs to help prevent situations where the chaser email is sent twice - feel free to adjust as needed))</small></label>
+                    </div>
+                </div>
+
                 <hr>
 
                 <button type="submit" name="edit_ticket_settings" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>