General cleanup/formatting

itflow-org · Feb 9, 2023 · 615f317 · 615f317
1 parent c219324
commit 615f317
Show file tree

Hide file tree

Showing 138 changed files with 3,724 additions and 3,574 deletions.
diff --git a/accounts.php b/accounts.php
@@ -9,11 +9,14 @@
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM accounts
-  WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
-  ORDER BY $sb $o LIMIT $record_from, $record_to");
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM accounts
+    WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 

diff --git a/ajax.php b/ajax.php
@@ -141,7 +141,9 @@
     }
 
     // Lookup all client locations, as networks can be associated with any client location
-    $locations_sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations 
+    $locations_sql = mysqli_query(
+        $mysqli,
+        "SELECT location_id, location_name FROM locations 
         WHERE location_client_id = '$client_id' AND company_id = '$session_company_id'"
     );
     while ($row = mysqli_fetch_array($locations_sql)) {
@@ -226,11 +228,11 @@
     $item_encrypted_credential = '';  // Default empty
 
     $client_id = intval($_GET['client_id']);
-    $item_type = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['type'])));
+    $item_type = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['type'])));
     $item_id = intval($_GET['id']);
-    $item_note = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['note'])));
+    $item_note = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['note'])));
     $item_view_limit = intval($_GET['views']);
-    $item_expires = trim(strip_tags(mysqli_real_escape_string($mysqli,$_GET['expires'])));
+    $item_expires = trim(strip_tags(mysqli_real_escape_string($mysqli, $_GET['expires'])));
     $item_key = randomString(156);
 
     if ($item_type == "Document") {

diff --git a/base32static.php b/base32static.php
@@ -44,7 +44,7 @@ public static function encode($input, $padding = true) {
         $i=0;
 
         while($i < count($fiveBitBinaryArray)) {
-            $base32 .= self::$map[base_convert(str_pad($fiveBitBinaryArray[$i], 5,'0'), 2, 10)];
+            $base32 .= self::$map[base_convert(str_pad($fiveBitBinaryArray[$i], 5, '0'), 2, 10)];
             $i++;
         }
 
@@ -71,7 +71,7 @@ public static function decode($input) {
                 substr($input, -($allowedValues[$i])) != str_repeat(self::$map[32], $allowedValues[$i])) return false;
         }
 
-        $input = str_replace('=','', $input);
+        $input = str_replace('=', '', $input);
         $input = str_split($input);
         $binaryString = "";
 

diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
@@ -48,7 +48,7 @@
                                         <option value="">- Calendar -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $calendar_id = $row['calendar_id'];
                                             $calendar_name = htmlentities($row['calendar_name']);
@@ -117,7 +117,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $client_id = $row['client_id'];
                                                 $client_name = htmlentities($row['client_name']);

diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
@@ -50,7 +50,7 @@
                                     <select class="form-control select2" name="calendar" required>
                                         <?php
 
-                                        $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
+                                        $sql_calendars_select = mysqli_query($mysqli, "SELECT * FROM calendars WHERE company_id = $session_company_id ORDER BY calendar_name ASC");
                                         while ($row = mysqli_fetch_array($sql_calendars_select)) {
                                             $calendar_id_select = $row['calendar_id'];
                                             $calendar_name_select = htmlentities($row['calendar_name']);
@@ -116,7 +116,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
+                                            $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id WHERE clients.company_id = $session_company_id ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql_clients)) {
                                                 $client_id_select = $row['client_id'];
                                                 $client_name_select = htmlentities($row['client_name']);

diff --git a/calendar_events.php b/calendar_events.php
@@ -18,7 +18,7 @@
 require_once("category_quick_add_modal.php");
 
 //loop through IDs and create a modal for each
-$sql = mysqli_query($mysqli,"SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
+$sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
 while ($row = mysqli_fetch_array($sql)) {
     $event_id = $row['event_id'];
     $event_title = htmlentities($row['event_title']);
@@ -70,7 +70,7 @@
             },
             events: [
                 <?php
-                $sql = mysqli_query($mysqli,"SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE calendars.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['event_id']);
                     $event_title = json_encode($row['event_title']);
@@ -84,7 +84,7 @@
                 }
 
                 //Invoices Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN invoices ON client_id = invoice_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['invoice_id']);
                     $event_title = json_encode($row['invoice_prefix'] . $row['invoice_number'] . " " . $row['invoice_scope']);
@@ -94,7 +94,7 @@
                 }
 
                 //Quotes Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN quotes ON client_id = quote_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['quote_id']);
                     $event_title = json_encode($row['quote_prefix'] . $row['quote_number'] . " " . $row['quote_scope']);
@@ -104,7 +104,7 @@
                 }
 
                 //Tickets Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['ticket_id']);
                     $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " " . $row['ticket_subject']);
@@ -115,7 +115,7 @@
                 }
 
                 //Vendors Added Created
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN vendors ON client_id = vendor_client_id WHERE vendor_template = 0 AND clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['vendor_id']);
                     $event_title = json_encode($row['vendor_name']);
@@ -125,7 +125,7 @@
                 }
 
                 //Clients Added
-                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE clients.company_id = $session_company_id");
+                $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE clients.company_id = $session_company_id");
                 while ($row = mysqli_fetch_array($sql)) {
                     $event_id = json_encode($row['client_id']);
                     $event_title = json_encode($row['client_name']);

diff --git a/categories.php b/categories.php
@@ -3,35 +3,39 @@
 require_once("inc_all_settings.php");
 
 if (isset($_GET['category'])) {
-    $category = strip_tags(mysqli_real_escape_string($mysqli,$_GET['category']));
+    $category = strip_tags(mysqli_real_escape_string($mysqli, $_GET['category']));
 } else {
     $category = "Expense";
 }
 
 if (!empty($_GET['sb'])) {
-    $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
+    $sb = strip_tags(mysqli_real_escape_string($mysqli, $_GET['sb']));
 } else {
     $sb = "category_name";
 }
 
 //Rebuild URL
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM categories
-  WHERE category_name LIKE '%$q%'
-  AND category_type = '$category'
-  AND category_archived_at IS NULL
-  AND company_id = $session_company_id 
-  ORDER BY $sb $o LIMIT $record_from, $record_to"
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM categories
+    WHERE category_name LIKE '%$q%'
+    AND category_type = '$category'
+    AND category_archived_at IS NULL
+    AND company_id = $session_company_id 
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
 );
 
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 //Colors Used
-$sql_colors_used = mysqli_query($mysqli,"SELECT category_color FROM categories 
-  WHERE category_type = '$category'
-  AND category_archived_at IS NULL
-  AND company_id = $session_company_id"
+$sql_colors_used = mysqli_query(
+    $mysqli,
+    "SELECT category_color FROM categories 
+    WHERE category_type = '$category'
+    AND category_archived_at IS NULL
+    AND company_id = $session_company_id"
 );
 
 while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {

diff --git a/client_add_modal.php b/client_add_modal.php
@@ -64,7 +64,7 @@
                                         <option value="">N/A</option>
                                         <?php
 
-                                        $referral_sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
+                                        $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC");
                                         while ($row = mysqli_fetch_array($referral_sql)) {
                                             $referral = htmlentities($row['category_name']); ?>
                                             <option><?php echo $referral; ?></option>
@@ -271,7 +271,7 @@
                             <ul class="list-group">
 
                                 <?php
-                                $sql_tags_select = mysqli_query($mysqli,"SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
+                                $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 AND company_id = $session_company_id ORDER BY tag_name ASC");
 
                                 while ($row = mysqli_fetch_array($sql_tags_select)) {
                                     $tag_id_select = $row['tag_id'];

diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
@@ -122,7 +122,7 @@
                                         <option value="">- Location -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $location_id = $row['location_id'];
                                             $location_name = htmlentities($row['location_name']);
@@ -145,7 +145,7 @@
                                             <option value="">- Contact -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $contact_id = $row['contact_id'];
                                                 $contact_name = htmlentities($row['contact_name']);
@@ -184,7 +184,7 @@
                                         <option value="">- Network -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $network_id = $row['network_id'];
                                             $network_name = htmlentities($row['network_name']);
@@ -232,7 +232,7 @@
                                         <option value="">- Vendor -</option>
                                         <?php
 
-                                        $sql = mysqli_query($mysqli,"SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
+                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
                                         while ($row = mysqli_fetch_array($sql)) {
                                             $vendor_id = $row['vendor_id'];
                                             $vendor_name = htmlentities($row['vendor_name']);