SonarCloud Cleanups

cron_mail_queue.php

@@ -131,6 +131,7 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
         $email_content = $row['email_content'];
         $email_queued_at = $row['email_queued_at'];
         $email_sent_at = $row['email_sent_at'];
+        $email_ics_str = $row['email_cal_str'];
         // Increment the attempts
         $email_attempts = intval($row['email_attempts']) + 1;
 
@@ -155,7 +156,8 @@ if (mysqli_num_rows($sql_failed_queue) > 0) {
                 $email_recipient,
                 $email_recipient_name,
                 $email_subject,
-                $email_content
+                $email_content,
+                $email_ics_str
             );
 
             if ($mail !== true) {

functions.php

@@ -1053,8 +1053,6 @@ function createiCalStr($datetime, $title, $description, $location) {
     // Todo: add organizer details
     // $event->addNode(new ZCiCalDataNode("ORGANIZER;CN=Organizer Name:MAILTO:organizer@example.com"));
 
-    // Export the iCal object to a string
-    $ics_feed = $cal_event->export();
-
-    return $ics_feed;
+    // Return the iCal string
+    return $cal_event->export();
 }

post/ticket.php

@@ -751,7 +751,7 @@ if (isset($_POST['bulk_ticket_reply'])) {
             // Get Contact Details
             $sql = mysqli_query(
                 $mysqli,
-                "SELECT contact_name, contact_email, ticket_created_by, ticket_assigned_to 
+                "SELECT contact_name, contact_email, ticket_created_by, ticket_assigned_to
                 FROM tickets
                 LEFT JOIN contacts ON ticket_contact_id = contact_id
                 WHERE ticket_id = $ticket_id"
@@ -1186,7 +1186,7 @@ if (isset($_POST['add_invoice_from_ticket'])) {
 
     $sql = mysqli_query(
         $mysqli,
-        "SELECT * FROM tickets 
+        "SELECT * FROM tickets
         LEFT JOIN clients ON ticket_client_id = client_id
         LEFT JOIN contacts ON ticket_contact_id = contact_id 
         LEFT JOIN assets ON ticket_asset_id = asset_id

ticket_edit_schedule_modal.php

@@ -44,4 +44,4 @@
 
         </div>
     </div>
-</div>
+</div>