From e2d4552e6eecf333fcb892d7bc38c611494a996d Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sun, 12 Mar 2023 09:30:07 +0000
Subject: [PATCH 1/2] Re-indent & remove a random 'h'

---
 client_scheduled_tickets.php | 228 +++++++++++++++++------------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/client_scheduled_tickets.php b/client_scheduled_tickets.php
index 1af0b8f1..b0ef4076 100644
--- a/client_scheduled_tickets.php
+++ b/client_scheduled_tickets.php
@@ -1,4 +1,4 @@
-h<?php
+<?php
 
 // Default Column Sortby Filter
 $sb = "scheduled_ticket_subject";
@@ -23,122 +23,122 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
-        <div class="card-header">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-clock mr-2"></i>Scheduled Tickets</h3>
-            <div class='card-tools'>
-                <div class="float-left">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal">
-                        <i class="fas fa-plus mr-2"></i>New Scheduled Ticket
-                    </button>
-                </div>
+<div class="card card-dark">
+    <div class="card-header">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-clock mr-2"></i>Scheduled Tickets</h3>
+        <div class='card-tools'>
+            <div class="float-left">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addScheduledTicketModal">
+                    <i class="fas fa-plus mr-2"></i>New Scheduled Ticket
+                </button>
             </div>
         </div>
-
-        <div class="card-body">
-
-            <form autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <div class="row">
-
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(htmlentities($q)); } ?>" placeholder="Search Scheduled Tickets">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-
-            <div class="table-responsive-sm">
-
-                <form id="bulk_actions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                    <table class="table table-striped table-borderless table-hover">
-                        <thead class="<?php if ($num_rows[0] == 0) {
-                            echo "d-none";
-                        } ?>">
-                        <tr>
-                            <th><a class="text-dark">Select</a></th>
-                            <th><a class="text-dark">Subject</a></th>
-                            <th><a class="text-dark">Priority</a></th>
-                            <th><a class="text-dark">Frequency</a></th>
-                            <th><a class="text-dark">Next Run Date</a></th>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $scheduled_ticket_id = intval($row['scheduled_ticket_id']);
-                            $scheduled_ticket_subject = htmlentities($row['scheduled_ticket_subject']);
-                            $scheduled_ticket_priority = htmlentities($row['scheduled_ticket_priority']);
-                            $scheduled_ticket_frequency = htmlentities($row['scheduled_ticket_frequency']);
-                            $scheduled_ticket_next_run = htmlentities($row['scheduled_ticket_next_run']);
-                            ?>
-
-                            <tr>
-                                <td>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="scheduled_ticket_ids[]" onchange="showBulkDeleteButton()" value="<?php echo $scheduled_ticket_id ?>">
-                                    </div>
-                                </td>
-
-                                <td class="text-bold"><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)"> <?php echo $scheduled_ticket_subject ?></a></td>
-
-                                <td><?php echo $scheduled_ticket_priority ?></td>
-
-                                <td><?php echo $scheduled_ticket_frequency ?></td>
-
-                                <td><?php echo $scheduled_ticket_next_run ?></td>
-
-                                <td>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                            <i class="fas fa-ellipsis-h"></i>
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <a class="dropdown-item" href="#" data-toggle="modal"
-                                               data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)">
-                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                            </a>
-                                            <?php
-                                            if ($session_user_role == 3) { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold" href="post.php?delete_scheduled_ticket=<?php echo $scheduled_ticket_id; ?>">
-                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                            </a>
-                                        </div>
-                                        <?php } ?>
-                                    </div>
-                                </td>
-                            </tr>
-
-                        <?php } ?>
-
-                        </tbody>
-                    </table>
-
-                </form>
-
-            </div>
-
-            <div class="form-check">
-                <input type="submit" id="button_bulk_delete" form="bulk_actions" name="bulk_delete_scheduled_tickets" value="Bulk Delete" hidden>
-            </div>
-
-            <?php require_once('pagination.php'); ?>
-
-        </div>
     </div>
-    <script src="js/scheduled_tickets_edit_modal.js"></script>
-    <script src="js/scheduled_tickets_bulk_delete_button.js"></script>
+
+    <div class="card-body">
+
+        <form autocomplete="off">
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(htmlentities($q)); } ?>" placeholder="Search Scheduled Tickets">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+
+        <div class="table-responsive-sm">
+
+            <form id="bulk_actions" action="post.php" method="post">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="<?php if ($num_rows[0] == 0) {
+                        echo "d-none";
+                    } ?>">
+                    <tr>
+                        <th><a class="text-dark">Select</a></th>
+                        <th><a class="text-dark">Subject</a></th>
+                        <th><a class="text-dark">Priority</a></th>
+                        <th><a class="text-dark">Frequency</a></th>
+                        <th><a class="text-dark">Next Run Date</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $scheduled_ticket_id = intval($row['scheduled_ticket_id']);
+                        $scheduled_ticket_subject = htmlentities($row['scheduled_ticket_subject']);
+                        $scheduled_ticket_priority = htmlentities($row['scheduled_ticket_priority']);
+                        $scheduled_ticket_frequency = htmlentities($row['scheduled_ticket_frequency']);
+                        $scheduled_ticket_next_run = htmlentities($row['scheduled_ticket_next_run']);
+                        ?>
+
+                        <tr>
+                            <td>
+                                <div class="form-check">
+                                    <input class="form-check-input" type="checkbox" name="scheduled_ticket_ids[]" onchange="showBulkDeleteButton()" value="<?php echo $scheduled_ticket_id ?>">
+                                </div>
+                            </td>
+
+                            <td class="text-bold"><a href="#" data-toggle="modal" data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)"> <?php echo $scheduled_ticket_subject ?></a></td>
+
+                            <td><?php echo $scheduled_ticket_priority ?></td>
+
+                            <td><?php echo $scheduled_ticket_frequency ?></td>
+
+                            <td><?php echo $scheduled_ticket_next_run ?></td>
+
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal"
+                                           data-target="#editScheduledTicketModal" onclick="populateScheduledTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
+                                        <?php
+                                        if ($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_scheduled_ticket=<?php echo $scheduled_ticket_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    </div>
+                                    <?php } ?>
+                                </div>
+                            </td>
+                        </tr>
+
+                    <?php } ?>
+
+                    </tbody>
+                </table>
+
+            </form>
+
+        </div>
+
+        <div class="form-check">
+            <input type="submit" id="button_bulk_delete" form="bulk_actions" name="bulk_delete_scheduled_tickets" value="Bulk Delete" hidden>
+        </div>
+
+        <?php require_once('pagination.php'); ?>
+
+    </div>
+</div>
+<script src="js/scheduled_tickets_edit_modal.js"></script>
+<script src="js/scheduled_tickets_bulk_delete_button.js"></script>
 
 <?php
 

From e9ac93085d4b1b0f15be02530d2d86de689cde48 Mon Sep 17 00:00:00 2001
From: Marcus Hill <bcf8c9f2@opayq.com>
Date: Sun, 12 Mar 2023 10:12:53 +0000
Subject: [PATCH 2/2] Fix typo

---
 report_recurring_by_client.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/report_recurring_by_client.php b/report_recurring_by_client.php
index ebfd23b8..2bc1f276 100644
--- a/report_recurring_by_client.php
+++ b/report_recurring_by_client.php
@@ -37,7 +37,7 @@ $sql = mysqli_query($mysqli, "
                 <?php
 
                 while ($row = mysqli_fetch_array($sql)) {
-                    $client_id = intval($_row['client_id']);
+                    $client_id = intval($row['client_id']);
                     $client_name = htmlentities($row['client_name']);
                     $recurring_monthly_total = floatval($row['recurring_monthly_total']);
                     $recurring_total = $recurring_total + $recurring_monthly_total;
@@ -50,7 +50,7 @@ $sql = mysqli_query($mysqli, "
                     </tr>
                     <?php
                 }
-        
+
                 ?>
                     <tr>
                         <th>Total Monthly Income</th>